diff --git a/app.js b/app.js index a7820e2..344a8e8 100644 --- a/app.js +++ b/app.js @@ -52,12 +52,12 @@ const limiter = rateLimit({ logger.logger.info(`Starting version ${version.app} in ${mode} mode`); // Remove X-Powered-By header: -app.disable('x-powered-by'); +app.disable("x-powered-by"); // Express Error Handling: app.use((err, req, res, next) => { const statusCode = err.statuscode || 500; - logger.logger.error(err, "Express Error") + logger.logger.error(err, "Express Error"); res.status(statusCode).json({ message: err.message }); return; }); diff --git a/mail-templates/register.html b/mail-templates/register.html index 430a847..8baae9e 100644 --- a/mail-templates/register.html +++ b/mail-templates/register.html @@ -54,7 +54,8 @@
- Tap the button to register this device, or scan the barcode with another device. + Tap the button to register this device, or scan the barcode with + another device.
tags from input const cleanInput = input.replace(/[\n\r]/g, "").replace(/<\/?p[^>]*>/g, ""); return cleanInput; } function getDomainFromEmail(mail: string) { - logger.debug("getDomainFromEmail: Obtaining domain from email address") + logger.debug("getDomainFromEmail: Obtaining domain from email address"); // Needs testing let split = mail.split("@"); return split[1].toLowerCase(); diff --git a/src/utils/timeConvert.utils.ts b/src/utils/timeConvert.utils.ts index 68c6d6d..781e0af 100644 --- a/src/utils/timeConvert.utils.ts +++ b/src/utils/timeConvert.utils.ts @@ -1,18 +1,18 @@ import { logger } from "./logger.utils"; function unixLocal(unix: number): string { - logger.trace(`unixLocal: Converting time: ${unix}`) + logger.trace(`unixLocal: Converting time: ${unix}`); var jsTime = unix * 1000; var dt = new Date(jsTime); return dt.toLocaleString(); } function jsUnix(js: number): number { - logger.trace(`jsUnix: Converting time: ${js}`) + logger.trace(`jsUnix: Converting time: ${js}`); return Math.floor(js / 1000); } -export { jsUnix, unixLocal } +export { jsUnix, unixLocal }; module.exports = { unixLocal, diff --git a/src/utils/translators/ldb/staffStation.ts b/src/utils/translators/ldb/staffStation.ts index 936c0bd..73865d3 100644 --- a/src/utils/translators/ldb/staffStation.ts +++ b/src/utils/translators/ldb/staffStation.ts @@ -16,7 +16,7 @@ export function transform(input: any): StaffLdb | null { try { output = { generatedAt: transformDateTime(data?.generatedAt) || new Date(), - locationName: data?.locationName || 'Not Found', + locationName: data?.locationName || "Not Found", stationManagerCode: data?.stationManagerCode || "UK", nrccMessages: transformNrcc(data?.nrccMessages) || undefined, trainServices: transformTrainServices(data?.trainServices) || undefined, @@ -24,7 +24,7 @@ export function transform(input: any): StaffLdb | null { ferryServices: transformTrainServices(data?.ferryServices) || undefined, }; console.timeEnd("StaffLdb Transformation"); - if (output.locationName !== 'Not Found') { + if (output.locationName !== "Not Found") { return output; } } catch (err) { @@ -43,7 +43,7 @@ function transformDateTime(input: string): Date { function transformNrcc(input: any): NrccMessage[] | undefined { //console.log("Transform Nrcc Running") if (input === undefined) { - return input + return input; } let output: NrccMessage[] = []; let messages = input; @@ -74,7 +74,7 @@ function transformTrainServices(input: any): TrainServices[] { services = [input.service]; } for (const service of services) { - const times = parseTimes(service) + const times = parseTimes(service); const trainService: TrainServices = { rid: service?.rid, uid: service?.uid, @@ -157,29 +157,44 @@ function transformUnspecifiedDateTime(input: string): Date | undefined { } function parseTimes(service: TrainServices) { - let {sta, eta, ata, std, etd, atd} = Object.fromEntries( - Object.entries(service).map(([key, value]) => [key, transformUnspecifiedDateTime(value)]) - ) + let { sta, eta, ata, std, etd, atd } = Object.fromEntries( + Object.entries(service).map(([key, value]) => [ + key, + transformUnspecifiedDateTime(value), + ]) + ); let etaResult: Date | undefined | string = eta; let ataResult: Date | undefined | string = ata; let etdResult: Date | undefined | string = etd; let atdResult: Date | undefined | string = atd; - + if (sta) { - if (eta !== undefined && Math.abs(eta.getTime() - sta.getTime()) / 60000 <= 1.5) { + if ( + eta !== undefined && + Math.abs(eta.getTime() - sta.getTime()) / 60000 <= 1.5 + ) { etaResult = "RT"; } - if (ata !== undefined && Math.abs(ata.getTime() - sta.getTime()) / 60000 <= 1.5) { + if ( + ata !== undefined && + Math.abs(ata.getTime() - sta.getTime()) / 60000 <= 1.5 + ) { ataResult = "RT"; } } - + if (std) { - if (etd !== undefined && Math.abs(etd.getTime() - std.getTime()) / 60000 <= 1.5) { + if ( + etd !== undefined && + Math.abs(etd.getTime() - std.getTime()) / 60000 <= 1.5 + ) { etdResult = "RT"; } - if (atd !== undefined && Math.abs(atd.getTime() - std.getTime()) / 60000 <= 1.5) { + if ( + atd !== undefined && + Math.abs(atd.getTime() - std.getTime()) / 60000 <= 1.5 + ) { atdResult = "RT"; } } @@ -191,5 +206,5 @@ function parseTimes(service: TrainServices) { std: std, etd: etdResult, atd: atdResult, - } + }; } diff --git a/test/utils/timeConvert.utils.test.ts b/test/utils/timeConvert.utils.test.ts index 520221f..cfa3f93 100644 --- a/test/utils/timeConvert.utils.test.ts +++ b/test/utils/timeConvert.utils.test.ts @@ -1,17 +1,17 @@ import { jsUnix, unixLocal } from "../../src/utils/timeConvert.utils"; describe("Time Conversion", () => { - test('Should return unix time (seconds)', () => { + test("Should return unix time (seconds)", () => { const now = new Date(); const nowJs = now.getTime(); const nowUnix = Math.floor(now.getTime() / 1000); expect(jsUnix(nowJs)).toEqual(nowUnix); - }) + }); - test('Should return locale date string', () => { + test("Should return locale date string", () => { const now = new Date(); const nowUnix = Math.floor(now.getTime() / 1000); const result = now.toLocaleString(); expect(unixLocal(nowUnix)).toEqual(result); - }) -}); \ No newline at end of file + }); +}); diff --git a/tsconfig.json b/tsconfig.json index 2aff194..8488067 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -52,11 +52,11 @@ // "declaration": true, /* Generate .d.ts files from TypeScript and JavaScript files in your project. */ // "declarationMap": true, /* Create sourcemaps for d.ts files. */ // "emitDeclarationOnly": true, /* Only output d.ts files and not JavaScript files. */ - "sourceMap": true, /* Create source map files for emitted JavaScript files. */ + "sourceMap": true /* Create source map files for emitted JavaScript files. */, // "inlineSourceMap": true, /* Include sourcemap files inside the emitted JavaScript. */ // "outFile": "./", /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */ "outDir": "./dist" /* Specify an output folder for all emitted files. */, - "removeComments": true, /* Disable emitting comments. */ + "removeComments": true /* Disable emitting comments. */, // "noEmit": true, /* Disable emitting files from a compilation. */ // "importHelpers": true, /* Allow importing helper functions from tslib once per project, instead of including them per-file. */ // "importsNotUsedAsValues": "remove", /* Specify emit/checking behavior for imports that are only used for types. */