Redume/Kekkai
1
0
Fork 0
mirror of https://github.com/Redume/Kekkai.git synced 2025-02-23 20:51:25 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Ранее выбивалась ошибка из-за таймаута (> 3с) и часть валюты не сохранялась. Исправлено, небольшой рефакторинг кода

Browse source
This commit is contained in:
Данил 2024-08-12 18:21:34 +03:00
parent 2c9a28f80b
commit 403c471db0
1 changed files with 23 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

22
collect-currency/save_fiat.js
View file

@ -13,12 +13,11 @@ async function save_fiat() {
config['currency']['fiat'].forEach( config['currency']['fiat'].forEach(
(value) => config['currency']['fiat'].forEach(async (pair) => { (value) => config['currency']['fiat'].forEach(async (pair) => {
if(value === pair) return; if(value === pair) return;
const res = await axios.get( await axios.get(
`https://duckduckgo.com/js/spice/currency/1/${value}/${pair}`, `https://duckduckgo.com/js/spice/currency/1/${value}/${pair}`,
{ {
timeout: 3000, timeout: 3000,
}); }).then(async (res) => {
const regExp = new RegExp('\\(\\s*(.*)\\s*\\);$', 'mg'); const regExp = new RegExp('\\(\\s*(.*)\\s*\\);$', 'mg');
const data = JSON.parse(Array.from(res.data.matchAll(regExp))[0][1]); const data = JSON.parse(Array.from(res.data.matchAll(regExp))[0][1]);
@ -27,18 +26,13 @@ async function save_fiat() {
logger.debug(JSON.stringify(data)); logger.debug(JSON.stringify(data));
if (res.status !== 200) {
logger.error(`DuckDuckGo ended with the status ${res.status}`);
return;
}
const point = data['to'][0]['mid'].toString().indexOf('.') + 4; 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', const db = await pool.query('SELECT * FROM currency WHERE ' +
[ value, pair, new Date(data['timestamp']).toLocaleDateString() ] 'from_currency = $1 AND conv_currency = $2 AND date = $3',
).then(async (db) => { [ value, pair, new Date(data['timestamp']).toLocaleDateString() ]);
if (db['rows'][0]) return;
if (db['rows'][0]) return;
await pool.query(`INSERT INTO currency (from_currency, conv_currency, rate, date) VALUES ($1, $2, $3, $4)`, await pool.query(`INSERT INTO currency (from_currency, conv_currency, rate, date) VALUES ($1, $2, $3, $4)`,
[ [
value, value,
@ -46,7 +40,11 @@ async function save_fiat() {
data['to'][0]['mid'].toString().slice(0, point), data['to'][0]['mid'].toString().slice(0, point),
new Date(data['timestamp']).toLocaleDateString() new Date(data['timestamp']).toLocaleDateString()
]); ]);
}).catch((err) => {
logger.error(err)
setTimeout(save_fiat, err.config.timeout);
}); });
}) })
); );
} }