chore: fixes code smells (#46)

petruki · web-flow · commit 012a01a264b9 · 2025-10-03T21:23:16.000-07:00
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
diff --git a/package.json b/package.json
@@ -50,17 +50,17 @@
     "jsonwebtoken": "^9.0.2",
     "moment": "^2.30.1",
     "mongodb": "^6.20.0",
-    "mongoose": "^8.18.2",
-    "pino": "^9.11.0",
+    "mongoose": "^8.19.0",
+    "pino": "^10.0.0",
     "pino-pretty": "^13.1.1",
     "swagger-ui-express": "^5.0.1",
     "switcher-client": "^4.4.1",
     "validator": "^13.15.15"
   },
   "devDependencies": {
     "env-cmd": "^11.0.0",
-    "eslint": "^9.36.0",
-    "jest": "^30.1.3",
+    "eslint": "^9.37.0",
+    "jest": "^30.2.0",
     "jest-sonar-reporter": "^2.0.0",
     "node-notifier": "^10.0.1",
     "nodemon": "^3.1.10",
diff --git a/src/aggregator/resolvers.js b/src/aggregator/resolvers.js
@@ -14,12 +14,12 @@ export const resolveConfigByKey = async (domain, key) => Config.findOne({ domain
 export function resolveEnvValue(source, field, keys) {
     const arrValue = [];
 
-    keys.forEach(k => {
+    for (const k of keys) {
         arrValue.push({
             env: k,
             value: source[field][k]
         });
-    });
+    }
     
     return arrValue;
 }
diff --git a/src/app-server.js b/src/app-server.js
@@ -1,6 +1,6 @@
-import https from 'https';
-import http from 'http';
-import fs from 'fs';
+import https from 'node:https';
+import http from 'node:http';
+import fs from 'node:fs';
 import Logger from './helpers/logger.js';
 
 export const createServer = (app) => {
diff --git a/src/external/switcher-api-facade.js b/src/external/switcher-api-facade.js
@@ -40,7 +40,7 @@ export async function getRateLimit(key, component) {
         }
     }
 
-    return parseInt(process.env.MAX_REQUEST_PER_MINUTE || DEFAULT_RATE_LIMIT);
+    return Number.parseInt(process.env.MAX_REQUEST_PER_MINUTE || DEFAULT_RATE_LIMIT);
 }
 
 export async function checkHttpsAgent(value) {
diff --git a/src/helpers/cache/worker-manager.js b/src/helpers/cache/worker-manager.js
@@ -28,10 +28,10 @@ export const STATUS_TYPE = {
 };
 
 export class CacheWorkerManager {
-    DEFAULT_INTERVAL = 5000;
+    #DEFAULT_INTERVAL = 5000;
+    worker = null;
 
     constructor(eventHandlers, options) {
-        this.worker = null;
         this.status = STATUS_TYPE.STOPPED;
         this.onCacheUpdates = eventHandlers.onCacheUpdates;
         this.onCacheDeletions = eventHandlers.onCacheDeletions;
@@ -40,7 +40,7 @@ export class CacheWorkerManager {
         this.onError = eventHandlers.onError;
         
         this.options = {
-            interval: this.DEFAULT_INTERVAL,
+            interval: this.#DEFAULT_INTERVAL,
             ...options
         };
     }
diff --git a/src/helpers/index.js b/src/helpers/index.js
@@ -9,7 +9,7 @@ export function payloadReader(payload) {
     return Object.keys(payloadRead)
         .flatMap(field => [field, ...payloadReader(payload[field])
         .map(nestedField => `${field}.${nestedField}`)])
-        .filter(field => isNaN(Number(field)))
+        .filter(field => Number.isNaN(Number(field)))
         .reduce((acc, curr) => {
             if (!acc.includes(curr)) {
                 acc.push(curr);
diff --git a/src/helpers/ipcidr.js b/src/helpers/ipcidr.js
@@ -4,7 +4,7 @@ export default class IPCIDR {
   }
 
   ip4ToInt(ip) {
-    return ip.split('.').reduce((int, oct) => (int << 8) + parseInt(oct, 10), 0) >>> 0;
+    return ip.split('.').reduce((int, oct) => (int << 8) + Number.parseInt(oct, 10), 0) >>> 0;
   }
 
   isIp4InCidr(ip) {
diff --git a/src/helpers/timed-match/index.js b/src/helpers/timed-match/index.js
@@ -1,6 +1,6 @@
-import cp from 'child_process';
-import path from 'path';
-import { fileURLToPath } from 'url';
+import cp from 'node:child_process';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
diff --git a/src/middleware/limiter.js b/src/middleware/limiter.js
@@ -7,7 +7,7 @@ const ERROR_MESSAGE = {
 
 const getMaxRate = (rate_limit) => {
 	if (rate_limit === 0) {
-		return parseInt(DEFAULT_RATE_LIMIT);
+		return Number.parseInt(DEFAULT_RATE_LIMIT);
 	}
 
 	return rate_limit;
@@ -17,7 +17,7 @@ export const DEFAULT_RATE_LIMIT = 1000;
 
 export const defaultLimiter = rateLimit({
 	windowMs: DEFAULT_WINDOWMS,
-	limit: getMaxRate(parseInt(process.env.MAX_REQUEST_PER_MINUTE)),
+	limit: getMaxRate(Number.parseInt(process.env.MAX_REQUEST_PER_MINUTE)),
 	standardHeaders: 'draft-7',
 	legacyHeaders: false,
     message: ERROR_MESSAGE,
diff --git a/src/middleware/validators.js b/src/middleware/validators.js
@@ -14,8 +14,8 @@ export async function checkConfig(req, res, next) {
 }
 
 export async function checkConfigComponent(req, res, next) {
-    const hasComponent = req.config.components.filter((c) => 
-        c.toString() === req.componentId.toString()).length > 0;
+    const hasComponent = req.config.components.some((c) => 
+        c.toString() === req.componentId.toString());
 
     if (!hasComponent) {
         return res.status(401).send({ 
diff --git a/src/models/component.js b/src/models/component.js
@@ -1,6 +1,6 @@
 import mongoose from 'mongoose';
 import bcryptjs from 'bcryptjs';
-import { randomUUID } from 'crypto';
+import { randomUUID } from 'node:crypto';
 import jwt from 'jsonwebtoken';
 import Domain from './domain.js';
 
@@ -41,28 +41,24 @@ const componentSchema = new mongoose.Schema({
 });
 
 componentSchema.methods.generateApiKey = async function () {
-    const component = this;
-
     const apiKey = randomUUID();
     const hash = await bcryptjs.hash(apiKey, EncryptionSalts.COMPONENT);
-    component.apihash = hash;
-    await component.save();
+    this.apihash = hash;
+    await this.save();
     
     return apiKey;
 };
 
 componentSchema.methods.generateAuthToken = async function (environment, rate_limit) {
-    const component = this;
-
     const options = {
         expiresIn: process.env.JWT_CLIENT_TOKEN_EXP_TIME
     };
 
     return jwt.sign(({ 
-        component: component._id,
+        component: this._id,
         environment,
         rate_limit,
-        vc: component.apihash.substring(50, component.apihash.length - 1) 
+        vc: this.apihash.substring(50, this.apihash.length - 1) 
     }), process.env.JWT_SECRET, options);
 };
 
diff --git a/src/models/config-strategy.js b/src/models/config-strategy.js
@@ -163,7 +163,7 @@ function processPAYLOAD(operation, input, values) {
     const keys = payloadReader(inputJson);
     switch(operation) {
         case OperationsType.HAS_ONE:
-            return keys.filter(key => values.includes(key)).length > 0;
+            return keys.some(key => values.includes(key));
         case OperationsType.HAS_ALL:
             return values.every(element => keys.includes(element));
     }
diff --git a/src/services/relay.js b/src/services/relay.js
@@ -1,5 +1,5 @@
 import axios from 'axios';
-import https from 'https';
+import https from 'node:https';
 import { StrategiesToRelayDataType, RelayMethods } from '../models/config.js';
 import { checkHttpsAgent } from '../external/switcher-api-facade.js';
 import Logger from '../helpers/logger.js';
diff --git a/tests/fixtures/db_api.js b/tests/fixtures/db_api.js
@@ -1,6 +1,6 @@
 import mongoose from 'mongoose';
 import bcryptjs from 'bcryptjs';
-import { randomUUID } from 'crypto';
+import { randomUUID } from 'node:crypto';
 import jwt from 'jsonwebtoken';
 import Admin from '../../src/models/admin';
 import Domain from '../../src/models/domain';
diff --git a/tests/fixtures/db_client.js b/tests/fixtures/db_client.js
@@ -1,7 +1,7 @@
 import mongoose from 'mongoose';
 import jwt from 'jsonwebtoken';
 import bcryptjs from 'bcryptjs';
-import { randomUUID } from 'crypto';
+import { randomUUID } from 'node:crypto';
 import Admin from '../../src/models/admin';
 import Domain from '../../src/models/domain';
 import GroupConfig from '../../src/models/group-config';
diff --git a/tests/fixtures/db_client_payload.js b/tests/fixtures/db_client_payload.js
@@ -1,7 +1,7 @@
 import mongoose from 'mongoose';
 import jwt from 'jsonwebtoken';
 import bcryptjs from 'bcryptjs';
-import { randomUUID } from 'crypto';
+import { randomUUID } from 'node:crypto';
 import Admin from '../../src/models/admin';
 import Domain from '../../src/models/domain';
 import GroupConfig from '../../src/models/group-config';
diff --git a/tests/unit-test/switcher-api-facade.test.js b/tests/unit-test/switcher-api-facade.test.js
@@ -40,7 +40,7 @@ describe('Testing Switcher API Facade', () => {
             return getRateLimit(component1Key, component1);
         }; 
 
-        await expect(call()).resolves.toBe(parseInt(process.env.MAX_REQUEST_PER_MINUTE));
+        await expect(call()).resolves.toBe(Number.parseInt(process.env.MAX_REQUEST_PER_MINUTE));
     });
 
 });

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ export async function getRateLimit(key, component) {`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`
`43`		`- return parseInt(process.env.MAX_REQUEST_PER_MINUTE \|\| DEFAULT_RATE_LIMIT);`
	`43`	`+ return Number.parseInt(process.env.MAX_REQUEST_PER_MINUTE \|\| DEFAULT_RATE_LIMIT);`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`export async function checkHttpsAgent(value) {`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ export default class IPCIDR {`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`ip4ToInt(ip) {`
`7`		`- return ip.split('.').reduce((int, oct) => (int << 8) + parseInt(oct, 10), 0) >>> 0;`
	`7`	`+ return ip.split('.').reduce((int, oct) => (int << 8) + Number.parseInt(oct, 10), 0) >>> 0;`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`isIp4InCidr(ip) {`