diff --git a/collect-currency/save_fiat.js b/collect-currency/save_fiat.js index 3c7dd49..8fc97f8 100644 --- a/collect-currency/save_fiat.js +++ b/collect-currency/save_fiat.js @@ -57,7 +57,10 @@ async function save_fiat() { }) .catch((err) => { logger.error(err); - setTimeout(save_fiat, err.config?.timeout ? err.config?.timeout : 3000); + setTimeout( + save_fiat, + err.config?.timeout ? err.config?.timeout : 3000, + ); }); }), ); diff --git a/server/main.js b/server/main.js index 15e538c..763e011 100644 --- a/server/main.js +++ b/server/main.js @@ -2,7 +2,7 @@ const logger = require('../shared/logger/src/main.js'); const config = require('../shared/config/src/main.js')(); const fs = require('fs'); -const axios= require("axios"); +const axios = require('axios'); const UAParser = require('ua-parser-js'); require('../shared/database/src/create_table.js')(); @@ -34,14 +34,15 @@ fastify.register(configurationRoutes); fastify.register(HomeRoute); fastify.addHook('onResponse', async (request, reply) => { - const routePart = request.raw.url.split('/') + const routePart = request.raw.url.split('/'); const routePartFiltered = routePart - .filter(part => part !== '') - .map(part => `${part}/`); + .filter((part) => part !== '') + .map((part) => `${part}/`); routePartFiltered.unshift('/'); - if (!config?.['analytics']['work'] ? config?.['analytics']['work'] : false) return; + if (!config?.['analytics']['work'] ? config?.['analytics']['work'] : false) + return; else if (!fastify.printRoutes().includes(routePartFiltered.at(-1))) return; const userAgent = request.headers['user-agent']; @@ -49,20 +50,28 @@ fastify.addHook('onResponse', async (request, reply) => { const browser = parser.getBrowser(); const os = parser.getOS(); - const formattedOS = (os.name && os.version) ? `${os.name} ${os.version}` : 'N/A'; - const formattedBrowser = (browser.name && browser.version) ? `${browser.name} ${browser.version}` : 'N/A'; + const formattedOS = + os.name && os.version ? `${os.name} ${os.version}` : 'N/A'; + const formattedBrowser = + browser.name && browser.version + ? `${browser.name} ${browser.version}` + : 'N/A'; const event = { - domain: config['analytics']['plausible_domain'], - name: request.routeOptions.url ? request.routeOptions.url : '404 - Not Found', - url: request.raw.url, - props: { - method: request.method, - statusCode: reply.statusCode, - browser: formattedBrowser, - os: formattedOS, - source: request.headers['referer'] ? request.headers['referer'] : 'direct', - }, + domain: config['analytics']['plausible_domain'], + name: request.routeOptions.url + ? request.routeOptions.url + : '404 - Not Found', + url: request.raw.url, + props: { + method: request.method, + statusCode: reply.statusCode, + browser: formattedBrowser, + os: formattedOS, + source: request.headers['referer'] + ? request.headers['referer'] + : 'direct', + }, }; try { @@ -71,10 +80,10 @@ fastify.addHook('onResponse', async (request, reply) => { Authorization: `Bearer ${config['analytics']['plausible_token']}`, 'Content-Type': 'application/json', 'User-Agent': userAgent, - }, - }); + }, + }); } catch (error) { - fastify.log.error('Error sending event to Plausible:', error.message); + fastify.log.error('Error sending event to Plausible:', error.message); } }); diff --git a/server/routes/configuration.js b/server/routes/configuration.js index 2ca3bef..4423b0d 100644 --- a/server/routes/configuration.js +++ b/server/routes/configuration.js @@ -1,15 +1,15 @@ -const config = require("../../shared/config/src/main.js")(); +const config = require('../../shared/config/src/main.js')(); module.exports = async function configurationRoutes(fastify) { fastify.get('/api/configurations/json', async function (req, res) { - delete config['database'] - delete config['currency']['coinapiKeys'] - delete config['server']['ssl']['private_key'] - delete config['server']['ssl']['cert'] - delete config['analytics']['plausible_token'] + delete config['database']; + delete config['currency']['coinapiKeys']; + delete config['server']['ssl']['private_key']; + delete config['server']['ssl']['cert']; + delete config['analytics']['plausible_token']; return res.status(200).send({ - config - }) + config, + }); }); -} \ No newline at end of file +}; diff --git a/server/routes/getRate.js b/server/routes/getRate.js index 0a454dd..28be5d3 100644 --- a/server/routes/getRate.js +++ b/server/routes/getRate.js @@ -6,7 +6,8 @@ module.exports = async function getRateRoute(fastify) { if (!query['from_currency'] || !query['conv_currency']) { return res.status(400).send({ status: 400, - message: 'The from_currency and conv_currency fields are required', + message: + 'The from_currency and conv_currency fields are required', }); } @@ -32,4 +33,4 @@ module.exports = async function getRateRoute(fastify) { 'Read more in the documentation', }); }); -} \ No newline at end of file +}; diff --git a/server/routes/home.js b/server/routes/home.js index ae60b37..964469c 100644 --- a/server/routes/home.js +++ b/server/routes/home.js @@ -1,8 +1,8 @@ module.exports = async function getRateRoute(fastify) { fastify.get('/', async function (req, res) { - return res.status(200).send({ - message: 'Hello World!', - documentation: 'https://github.com/Redume/Kekkai/wiki/' - }) + return res.status(200).send({ + message: 'Hello World!', + documentation: 'https://github.com/Redume/Kekkai/wiki/', + }); }); -} \ No newline at end of file +}; diff --git a/shared/database/src/create_table.js b/shared/database/src/create_table.js index c9b0280..fe90093 100644 --- a/shared/database/src/create_table.js +++ b/shared/database/src/create_table.js @@ -2,13 +2,18 @@ const fs = require('fs'); const pool = require('./postgresql.js'); async function create_table() { - const schema = fs.readFileSync('../shared/database/data/schema.sql', 'utf8'); + const schema = fs.readFileSync( + '../shared/database/data/schema.sql', + 'utf8', + ); for (let i = 0; i < schema.split(';').length; i++) { try { await pool.query(schema.split(';')[i]); - } catch (err) { continue } + } catch (err) { + continue; + } } } -module.exports = create_table; \ No newline at end of file +module.exports = create_table;