From 7da0fc96401a90a722db2458ec06d8277eb6f52a Mon Sep 17 00:00:00 2001 From: Cameron Clough Date: Mon, 21 Mar 2022 13:13:22 +0000 Subject: [PATCH] cleanup --- .babelrc.json | 13 +++++++++++++ .eslintignore | 7 +------ .eslintrc.json | 26 +++++++++++++------------- src/server/controllers/storage.js | 2 +- src/server/index.js | 7 ------- src/worker/index.js | 13 ++++--------- test/dummyGenerator.js | 6 ++---- 7 files changed, 34 insertions(+), 40 deletions(-) create mode 100644 .babelrc.json mode change 100644 => 120000 .eslintignore diff --git a/.babelrc.json b/.babelrc.json new file mode 100644 index 0000000..fdaa24d --- /dev/null +++ b/.babelrc.json @@ -0,0 +1,13 @@ +{ + "sourceMaps": "inline", + "presets": [ + [ + "@babel/preset-env", + { + "targets": { + "node": "current" + } + } + ] + ] +} diff --git a/.eslintignore b/.eslintignore deleted file mode 100644 index ef421b7..0000000 --- a/.eslintignore +++ /dev/null @@ -1,6 +0,0 @@ -cabana -certs -node_modules -static -test -config.js diff --git a/.eslintignore b/.eslintignore new file mode 120000 index 0000000..3e4e48b --- /dev/null +++ b/.eslintignore @@ -0,0 +1 @@ +.gitignore \ No newline at end of file diff --git a/.eslintrc.json b/.eslintrc.json index 8dcabe8..43b2fdd 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,11 +1,11 @@ { + "root": true, "extends": [ "airbnb-base" ], "env": { "es6": true, - "node": true, - "browser": false // do we need this? none of this code will ever run on a browswer + "node": true }, "plugins": [ "no-floating-promise" @@ -16,6 +16,17 @@ // retropilot: this seems dumb. do whatever looks nice. "arrow-body-style": "off", + // specify the maximum length of a line in your program + // https://eslint.org/docs/rules/max-len + // retropilot: ignore comments + "max-len": ["error", 100, 2, { + "ignoreUrls": true, + "ignoreComments": true, + "ignoreRegExpLiterals": true, + "ignoreStrings": true, + "ignoreTemplateLiterals": true + }], + // disallow use of unary operators, ++ and -- // http://eslint.org/docs/rules/no-plusplus // retropilot: we allow them in the for loop @@ -31,17 +42,6 @@ // retropilot: permit referencing functions before they're defined "no-use-before-define": ["error", { "functions": false }], - // specify the maximum length of a line in your program - // https://eslint.org/docs/rules/max-len - // retropilot: ignore comments - "max-len": ["error", 100, 2, { - "ignoreUrls": true, - "ignoreComments": true, - "ignoreRegExpLiterals": true, - "ignoreStrings": true, - "ignoreTemplateLiterals": true - }], - // TODO: fix and remove // retropilot: we are in the process of removing all of these "no-unused-vars": ["warn", { "vars": "all", "args": "after-used", "ignoreRestSiblings": true }], diff --git a/src/server/controllers/storage.js b/src/server/controllers/storage.js index 1fb60fb..6015fae 100644 --- a/src/server/controllers/storage.js +++ b/src/server/controllers/storage.js @@ -21,7 +21,7 @@ function mkDirByPathSync(targetDir, { isRelativeToScript = false } = {}) { const { sep } = path; const initDir = path.isAbsolute(targetDir) ? sep : ''; - const baseDir = isRelativeToScript ? global.__basedir : '.'; + const baseDir = isRelativeToScript ? __dirname : '.'; return targetDir.split(sep).reduce((parentDir, childDir) => { const curDir = path.resolve(baseDir, parentDir, childDir); diff --git a/src/server/index.js b/src/server/index.js index 5e93938..b7cfdbb 100644 --- a/src/server/index.js +++ b/src/server/index.js @@ -1,8 +1,6 @@ import 'dotenv/config'; import http from 'http'; import log4js from 'log4js'; -import { dirname } from 'path'; -import { fileURLToPath } from 'url'; log4js.configure({ appenders: { logfile: { type: 'file', filename: 'server.log' }, out: { type: 'console' } /* {type: "file", filename: "server1.log"} */ }, @@ -15,11 +13,6 @@ process.on('unhandledRejection', (error, p) => { console.dir(error.stack); }); -// TODO evaluate if this is the best way to determine the root of project -const __filename = fileURLToPath(import.meta.url); -const __dirname = dirname(__filename); -global.__basedir = __dirname; - const main = async () => { const logger = log4js.getLogger('default'); const httpServer = http.createServer(await require('./app').default); diff --git a/src/worker/index.js b/src/worker/index.js index 38929a8..355e229 100644 --- a/src/worker/index.js +++ b/src/worker/index.js @@ -1,8 +1,7 @@ import 'dotenv/config'; import crypto from 'crypto'; import fs from 'fs'; -import path, { dirname } from 'path'; -import { fileURLToPath } from 'url'; +import path from 'path'; import log4js from 'log4js'; import dirTree from 'directory-tree'; @@ -13,20 +12,16 @@ import ffprobeStatic from 'ffprobe-static'; import orm from '../models/index.model'; +const startTime = Date.now(); let lastCleaningTime = 0; -let startTime = Date.now(); log4js.configure({ - appenders: { logfile: { type: 'file', filename: 'worker.log' }, out: { type: 'console' } }, - categories: { default: { appenders: ['out', 'logfile'], level: 'info' } } + appenders: { logfile: { type: 'file', filename: 'worker.log' }, out: { type: 'console' } }, + categories: { default: { appenders: ['out', 'logfile'], level: 'info' } }, }); const logger = log4js.getLogger('default'); -const __filename = fileURLToPath(import.meta.url); -const __dirname = dirname(__filename); -global.__basedir = __dirname; - function initializeStorage() { const verifiedPath = mkDirByPathSync(process.env.STORAGE_PATH, { isRelativeToScript: (process.env.STORAGE_PATH.indexOf('/') !== 0) }); if (verifiedPath != null) { diff --git a/test/dummyGenerator.js b/test/dummyGenerator.js index 4c00dd0..d6bce3f 100644 --- a/test/dummyGenerator.js +++ b/test/dummyGenerator.js @@ -1,6 +1,5 @@ - -import jwt from 'jsonwebtoken'; import crypto from 'crypto'; +import jwt from 'jsonwebtoken'; const devicePrivateKey = "-----BEGIN RSA PRIVATE KEY-----\n" + "MIIEowIBAAKCAQEAwhH9PqBd/R/QPvcf1Gom5Vp+zYb1+DLjiFMC7a1lNvV8MUqK\n" + @@ -65,7 +64,6 @@ function getSerial() { } - export default { makeJWT, getImei, getSerial, rougePublicKey, devicePubKey, devicePrivateKey, alreadyRegisteredEmail, newUserEmail -}; \ No newline at end of file +};