From 403c471db0087c891e0f2b9e23ce84dd93055bd9 Mon Sep 17 00:00:00 2001 From: Redume Date: Mon, 12 Aug 2024 18:21:34 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B0=D0=BD=D0=B5=D0=B5=20=D0=B2=D1=8B?= =?UTF-8?q?=D0=B1=D0=B8=D0=B2=D0=B0=D0=BB=D0=B0=D1=81=D1=8C=20=D0=BE=D1=88?= =?UTF-8?q?=D0=B8=D0=B1=D0=BA=D0=B0=20=D0=B8=D0=B7-=D0=B7=D0=B0=20=D1=82?= =?UTF-8?q?=D0=B0=D0=B9=D0=BC=D0=B0=D1=83=D1=82=D0=B0=20(>=203=D1=81)=20?= =?UTF-8?q?=D0=B8=20=D1=87=D0=B0=D1=81=D1=82=D1=8C=20=D0=B2=D0=B0=D0=BB?= =?UTF-8?q?=D1=8E=D1=82=D1=8B=20=D0=BD=D0=B5=20=D1=81=D0=BE=D1=85=D1=80?= =?UTF-8?q?=D0=B0=D0=BD=D1=8F=D0=BB=D0=B0=D1=81=D1=8C.=20=D0=98=D1=81?= =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=BE,=20=D0=BD?= =?UTF-8?q?=D0=B5=D0=B1=D0=BE=D0=BB=D1=8C=D1=88=D0=BE=D0=B9=20=D1=80=D0=B5?= =?UTF-8?q?=D1=84=D0=B0=D0=BA=D1=82=D0=BE=D1=80=D0=B8=D0=BD=D0=B3=20=D0=BA?= =?UTF-8?q?=D0=BE=D0=B4=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- collect-currency/save_fiat.js | 48 +++++++++++++++++------------------ 1 file changed, 23 insertions(+), 25 deletions(-) diff --git a/collect-currency/save_fiat.js b/collect-currency/save_fiat.js index c34d64c..5b71930 100644 --- a/collect-currency/save_fiat.js +++ b/collect-currency/save_fiat.js @@ -13,40 +13,38 @@ async function save_fiat() { config['currency']['fiat'].forEach( (value) => config['currency']['fiat'].forEach(async (pair) => { if(value === pair) return; - const res = await axios.get( + await axios.get( `https://duckduckgo.com/js/spice/currency/1/${value}/${pair}`, { timeout: 3000, - }); + }).then(async (res) => { + const regExp = new RegExp('\\(\\s*(.*)\\s*\\);$', 'mg'); + const data = JSON.parse(Array.from(res.data.matchAll(regExp))[0][1]); - const regExp = new RegExp('\\(\\s*(.*)\\s*\\);$', 'mg'); - const data = JSON.parse(Array.from(res.data.matchAll(regExp))[0][1]); + delete data['terms']; + delete data['privacy']; - delete data['terms']; - delete data['privacy']; + logger.debug(JSON.stringify(data)); - logger.debug(JSON.stringify(data)); + const point = data['to'][0]['mid'].toString().indexOf('.') + 4; - if (res.status !== 200) { - logger.error(`DuckDuckGo ended with the status ${res.status}`); - return; - } + const db = await pool.query('SELECT * FROM currency WHERE ' + + 'from_currency = $1 AND conv_currency = $2 AND date = $3', + [ value, pair, new Date(data['timestamp']).toLocaleDateString() ]); - const point = data['to'][0]['mid'].toString().indexOf('.') + 4; - - pool.query('SELECT * FROM currency WHERE from_currency = $1 AND conv_currency = $2 AND date = $3', - [ value, pair, new Date(data['timestamp']).toLocaleDateString() ] - ).then(async (db) => { - if (db['rows'][0]) return; - - await pool.query(`INSERT INTO currency (from_currency, conv_currency, rate, date) VALUES ($1, $2, $3, $4)`, - [ - value, - pair, - data['to'][0]['mid'].toString().slice(0, point), - new Date(data['timestamp']).toLocaleDateString() - ]); + if (db['rows'][0]) return; + await pool.query(`INSERT INTO currency (from_currency, conv_currency, rate, date) VALUES ($1, $2, $3, $4)`, + [ + value, + pair, + data['to'][0]['mid'].toString().slice(0, point), + new Date(data['timestamp']).toLocaleDateString() + ]); + }).catch((err) => { + logger.error(err) + setTimeout(save_fiat, err.config.timeout); }); + }) ); }