mirror of
https://github.com/Redume/Kekkai.git
synced 2025-02-23 20:51:25 +03:00
eslint fix
This commit is contained in:
parent
46661287fa
commit
c9c9717d22
6 changed files with 58 additions and 40 deletions
|
@ -57,7 +57,10 @@ async function save_fiat() {
|
||||||
})
|
})
|
||||||
.catch((err) => {
|
.catch((err) => {
|
||||||
logger.error(err);
|
logger.error(err);
|
||||||
setTimeout(save_fiat, err.config?.timeout ? err.config?.timeout : 3000);
|
setTimeout(
|
||||||
|
save_fiat,
|
||||||
|
err.config?.timeout ? err.config?.timeout : 3000,
|
||||||
|
);
|
||||||
});
|
});
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
|
|
|
@ -2,7 +2,7 @@ const logger = require('../shared/logger/src/main.js');
|
||||||
const config = require('../shared/config/src/main.js')();
|
const config = require('../shared/config/src/main.js')();
|
||||||
|
|
||||||
const fs = require('fs');
|
const fs = require('fs');
|
||||||
const axios= require("axios");
|
const axios = require('axios');
|
||||||
const UAParser = require('ua-parser-js');
|
const UAParser = require('ua-parser-js');
|
||||||
|
|
||||||
require('../shared/database/src/create_table.js')();
|
require('../shared/database/src/create_table.js')();
|
||||||
|
@ -34,14 +34,15 @@ fastify.register(configurationRoutes);
|
||||||
fastify.register(HomeRoute);
|
fastify.register(HomeRoute);
|
||||||
|
|
||||||
fastify.addHook('onResponse', async (request, reply) => {
|
fastify.addHook('onResponse', async (request, reply) => {
|
||||||
const routePart = request.raw.url.split('/')
|
const routePart = request.raw.url.split('/');
|
||||||
const routePartFiltered = routePart
|
const routePartFiltered = routePart
|
||||||
.filter(part => part !== '')
|
.filter((part) => part !== '')
|
||||||
.map(part => `${part}/`);
|
.map((part) => `${part}/`);
|
||||||
|
|
||||||
routePartFiltered.unshift('/');
|
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;
|
else if (!fastify.printRoutes().includes(routePartFiltered.at(-1))) return;
|
||||||
|
|
||||||
const userAgent = request.headers['user-agent'];
|
const userAgent = request.headers['user-agent'];
|
||||||
|
@ -49,19 +50,27 @@ fastify.addHook('onResponse', async (request, reply) => {
|
||||||
const browser = parser.getBrowser();
|
const browser = parser.getBrowser();
|
||||||
const os = parser.getOS();
|
const os = parser.getOS();
|
||||||
|
|
||||||
const formattedOS = (os.name && os.version) ? `${os.name} ${os.version}` : 'N/A';
|
const formattedOS =
|
||||||
const formattedBrowser = (browser.name && browser.version) ? `${browser.name} ${browser.version}` : 'N/A';
|
os.name && os.version ? `${os.name} ${os.version}` : 'N/A';
|
||||||
|
const formattedBrowser =
|
||||||
|
browser.name && browser.version
|
||||||
|
? `${browser.name} ${browser.version}`
|
||||||
|
: 'N/A';
|
||||||
|
|
||||||
const event = {
|
const event = {
|
||||||
domain: config['analytics']['plausible_domain'],
|
domain: config['analytics']['plausible_domain'],
|
||||||
name: request.routeOptions.url ? request.routeOptions.url : '404 - Not Found',
|
name: request.routeOptions.url
|
||||||
|
? request.routeOptions.url
|
||||||
|
: '404 - Not Found',
|
||||||
url: request.raw.url,
|
url: request.raw.url,
|
||||||
props: {
|
props: {
|
||||||
method: request.method,
|
method: request.method,
|
||||||
statusCode: reply.statusCode,
|
statusCode: reply.statusCode,
|
||||||
browser: formattedBrowser,
|
browser: formattedBrowser,
|
||||||
os: formattedOS,
|
os: formattedOS,
|
||||||
source: request.headers['referer'] ? request.headers['referer'] : 'direct',
|
source: request.headers['referer']
|
||||||
|
? request.headers['referer']
|
||||||
|
: 'direct',
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -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) {
|
module.exports = async function configurationRoutes(fastify) {
|
||||||
fastify.get('/api/configurations/json', async function (req, res) {
|
fastify.get('/api/configurations/json', async function (req, res) {
|
||||||
delete config['database']
|
delete config['database'];
|
||||||
delete config['currency']['coinapiKeys']
|
delete config['currency']['coinapiKeys'];
|
||||||
delete config['server']['ssl']['private_key']
|
delete config['server']['ssl']['private_key'];
|
||||||
delete config['server']['ssl']['cert']
|
delete config['server']['ssl']['cert'];
|
||||||
delete config['analytics']['plausible_token']
|
delete config['analytics']['plausible_token'];
|
||||||
|
|
||||||
return res.status(200).send({
|
return res.status(200).send({
|
||||||
config
|
config,
|
||||||
})
|
|
||||||
});
|
});
|
||||||
}
|
});
|
||||||
|
};
|
||||||
|
|
|
@ -6,7 +6,8 @@ module.exports = async function getRateRoute(fastify) {
|
||||||
if (!query['from_currency'] || !query['conv_currency']) {
|
if (!query['from_currency'] || !query['conv_currency']) {
|
||||||
return res.status(400).send({
|
return res.status(400).send({
|
||||||
status: 400,
|
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',
|
'Read more in the documentation',
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
};
|
||||||
|
|
|
@ -2,7 +2,7 @@ module.exports = async function getRateRoute(fastify) {
|
||||||
fastify.get('/', async function (req, res) {
|
fastify.get('/', async function (req, res) {
|
||||||
return res.status(200).send({
|
return res.status(200).send({
|
||||||
message: 'Hello World!',
|
message: 'Hello World!',
|
||||||
documentation: 'https://github.com/Redume/Kekkai/wiki/'
|
documentation: 'https://github.com/Redume/Kekkai/wiki/',
|
||||||
})
|
|
||||||
});
|
});
|
||||||
}
|
});
|
||||||
|
};
|
||||||
|
|
|
@ -2,12 +2,17 @@ const fs = require('fs');
|
||||||
const pool = require('./postgresql.js');
|
const pool = require('./postgresql.js');
|
||||||
|
|
||||||
async function create_table() {
|
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++) {
|
for (let i = 0; i < schema.split(';').length; i++) {
|
||||||
try {
|
try {
|
||||||
await pool.query(schema.split(';')[i]);
|
await pool.query(schema.split(';')[i]);
|
||||||
} catch (err) { continue }
|
} catch (err) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue