From d7bcaf8c2eb5f59db2969bcf404adc89fc5e4b46 Mon Sep 17 00:00:00 2001 From: Redume Date: Wed, 14 Aug 2024 21:20:08 +0300 Subject: [PATCH] =?UTF-8?q?eslint=20=D1=84=D0=B8=D0=BA=D1=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- chart/chart.js | 4 ++-- chart/main.js | 4 ++-- collect-currency/save_crypto.js | 8 ++++---- collect-currency/save_fiat.js | 2 +- server/main.js | 12 ++++++------ shared/config/src/main.js | 2 +- shared/database/src/main.js | 14 +++++++------- shared/logger/src/main.js | 2 +- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/chart/chart.js b/chart/chart.js index ce1e7da..f2bbe83 100644 --- a/chart/chart.js +++ b/chart/chart.js @@ -2,7 +2,7 @@ const ChartJSImage = require('chart.js-image'); const pool = require('../shared/database/src/postgresql.js'); const fs = require('fs'); const axios = require('axios'); -const logger = require('../shared/logger/src/main.js') +const logger = require('../shared/logger/src/main.js'); /** * Graph generation @@ -109,4 +109,4 @@ function save_chart(url, filename) { ); } -module.exports = { gen_chart, save_chart } \ No newline at end of file +module.exports = { gen_chart, save_chart }; \ No newline at end of file diff --git a/chart/main.js b/chart/main.js index 07d8e89..a82cd17 100644 --- a/chart/main.js +++ b/chart/main.js @@ -20,9 +20,9 @@ function main() { fs.unlinkSync(`../charts/${files[i]}`); } } - } catch { return } + } catch { return; } } - }) + }); } schedule.scheduleJob('9 20 * * *', async function () { diff --git a/collect-currency/save_crypto.js b/collect-currency/save_crypto.js index 082fd11..b7facf9 100644 --- a/collect-currency/save_crypto.js +++ b/collect-currency/save_crypto.js @@ -41,7 +41,7 @@ function save_crypto() { value, pair, new Date(data['time']).toLocaleDateString() - ]) + ]); if (db['rows'][0]) return; await pool.query(`INSERT INTO currency (from_currency, conv_currency, rate, date) @@ -56,9 +56,9 @@ function save_crypto() { }).catch((err) => { if (err.response?.data.detail) logger.error(err.response.data.detail); if (err.response?.data.status === 429) { - logger.info('CoinAPI rate limited, rotating token') + logger.info('CoinAPI rate limited, rotating token'); rotate_key(coinapiKeys); - depth-- + depth--; save_crypto(); } }); @@ -73,7 +73,7 @@ function save_crypto() { */ function rotate_key(list) { - apiKeyIndex = list.indexOf(coinapiKeys[apiKeyIndex]) + 1 + apiKeyIndex = list.indexOf(coinapiKeys[apiKeyIndex]) + 1; } module.exports = save_crypto; \ No newline at end of file diff --git a/collect-currency/save_fiat.js b/collect-currency/save_fiat.js index 84eb168..8aa5772 100644 --- a/collect-currency/save_fiat.js +++ b/collect-currency/save_fiat.js @@ -41,7 +41,7 @@ async function save_fiat() { new Date(data['timestamp']).toLocaleDateString() ]); }).catch((err) => { - logger.error(err) + logger.error(err); setTimeout(save_fiat, err.config.timeout); }); diff --git a/server/main.js b/server/main.js index a1040d0..bbdcc74 100644 --- a/server/main.js +++ b/server/main.js @@ -21,7 +21,7 @@ fastify.get('/api/getRate/', async function (req, res){ return res.status(400).send({ status: 400, message: 'The from_currency and conv_currency fields are required' - }) + }); } @@ -58,13 +58,13 @@ fastify.get('/api/getChart/', async function (req, res){ query['conv_currency'], query['start_date'], query['end_date'], - ) + ); if (config['currency']['chart']['save']) chart.save_chart( charts, `${query['from_currency']} ${query['conv_currency']} ` + `(${query['start_date']} - ${query['end_date']}).png` - ) + ); return res.status(200).send({ status: 200, @@ -75,9 +75,9 @@ fastify.get('/api/getChart/', async function (req, res){ fastify.listen({ port: 3000, host: config['server']['host'] ? config['server']['host'] : 'localhost', - }, function (err) { + }, (err) => { if (err) { - fastify.log.error(err) - process.exit(1) + fastify.log.error(err); + process.exit(1); } }); \ No newline at end of file diff --git a/shared/config/src/main.js b/shared/config/src/main.js index ad5bc0e..0da7678 100644 --- a/shared/config/src/main.js +++ b/shared/config/src/main.js @@ -5,7 +5,7 @@ const config = () => { if (!fs.existsSync('../config.yaml')) return; return yaml.parse(fs.readFileSync('../config.yaml', 'utf-8')); -} +}; module.exports = config; \ No newline at end of file diff --git a/shared/database/src/main.js b/shared/database/src/main.js index e82ab5d..b8e00cf 100644 --- a/shared/database/src/main.js +++ b/shared/database/src/main.js @@ -11,7 +11,7 @@ const logger = require('../../logger/src/main.js'); async function getDay(from_currency, conv_currency, date) { if (!from_currency || !conv_currency) return new Error('fromCurrency and convCurrency are required'); - else if (!date) return new Error('date is required') + else if (!date) return new Error('date is required'); const data = await pool.query('SELECT from_currency, conv_currency, date, rate FROM currency ' + 'WHERE from_currency = $1 AND conv_currency = $2 AND date = $3', [ @@ -22,10 +22,10 @@ async function getDay(from_currency, conv_currency, date) { if (!data) return new Error('Missing data'); - let set_date = data['rows'][0]['date'] - set_date = new Date(set_date.setDate(set_date.getDate() + 1)); + const set_date = data['rows'][0]['date']; + data['rows'][0]['date'] = new Date(set_date.setDate(set_date.getDate() + 1)); - logger.debug(data['rows'][0]) + logger.debug(data['rows'][0]); return data['rows'][0]; } @@ -41,7 +41,7 @@ async function getDay(from_currency, conv_currency, date) { async function getPeriod(from_currency, conv_currency, start_date, end_date) { if (!from_currency || !conv_currency) return new Error('from_currency and conv_currency are required'); - else if(!start_date || !end_date) return new Error('start_date and end_date are required') + else if(!start_date || !end_date) return new Error('start_date and end_date are required'); const data = await pool.query('SELECT * FROM currency WHERE ' + '(date BETWEEN $3 AND $4) AND from_currency = $1 AND conv_currency = $2 ORDER BY date', [ @@ -54,11 +54,11 @@ async function getPeriod(from_currency, conv_currency, start_date, end_date) { if (!data) return new Error('Missing data'); for (let i = 0; i < data['rows'].length; i++) { - let date = data['rows'][i]['date'] + let date = data['rows'][i]['date']; date = new Date(date.setDate(date.getDate() + 1)); } - logger.debug(data['rows']) + logger.debug(data['rows']); return data['rows']; } diff --git a/shared/logger/src/main.js b/shared/logger/src/main.js index 0d30a70..caf15f6 100644 --- a/shared/logger/src/main.js +++ b/shared/logger/src/main.js @@ -18,7 +18,7 @@ function getCallerFile() { callerFile = err.stack.shift().getFileName(); if (currentFile !== callerFile) break; } - } catch (e) {} + } catch { return; } Error.prepareStackTrace = originalFunc;