@naturalcycles/backend-lib 5.7.2 → 5.8.1

package/dist/admin/adminMiddleware.js

@@ -43,7 +43,7 @@ function requireAdminPermissions(adminService, reqPermissions = [], cfg = {}) {
 }
 function loginHtml(firebaseServiceCfg) {
     const { apiKey: firebaseApiKey, authDomain: firebaseAuthDomain, adminAuthProvider: firebaseAuthProvider = 'GoogleAuthProvider', } = firebaseServiceCfg;
-    return (req, res) => {
+    return (_req, res) => {
         res.send(getLoginHtml({
             firebaseApiKey,
             firebaseAuthDomain,

package/dist/db/httpDBRequestHandler.js

@@ -32,12 +32,12 @@ function httpDBRequestHandler(db) {
         res.end();
     });
     // ping
-    router.get('/ping', async (req, res) => {
+    router.get('/ping', async (_req, res) => {
         await db.ping();
         res.end();
     });
     // getTables
-    router.get('/tables', async (req, res) => {
+    router.get('/tables', async (_req, res) => {
         res.json(await db.getTables());
     });
     // getTableSchema

package/dist/env/env.shared.service.d.ts

@@ -1,13 +1,13 @@
-import { BaseEnv } from './env.model';
-export interface EnvSharedServiceCfg {
-    /**
-     * Dir with ${envName}.env.ts files
-     */
-    envDir: string;
+import { StringMap } from '@naturalcycles/js-lib';
+export interface BaseEnv {
+    name: string;
 }
-export declare class EnvSharedService<ENV extends BaseEnv = any> {
-    private cfg;
-    constructor(cfg: EnvSharedServiceCfg);
+export interface EnvSharedServiceCfg<ENV> {
+    environments: ENV[];
+}
+export declare class EnvSharedService<ENV extends BaseEnv> {
+    constructor(cfg: EnvSharedServiceCfg<ENV>);
+    envMap: StringMap<ENV>;
     private env?;
     init(): void;
     getEnv(): ENV;

package/dist/env/env.shared.service.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EnvSharedService = void 0;
+const js_lib_1 = require("@naturalcycles/js-lib");
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 class EnvSharedService {
     constructor(cfg) {
-        this.cfg = cfg;
+        this.envMap = (0, js_lib_1._by)(cfg.environments, e => e.name);
     }
     init() {
         this.getEnv();
@@ -12,25 +13,17 @@ class EnvSharedService {
     getEnv() {
         if (!this.env) {
             const { APP_ENV } = process.env;
-            if (!APP_ENV) {
-                throw new Error('APP_ENV should be defined!');
-            }
-            const { envDir } = this.cfg;
-            const envFilePath = `${envDir}/${APP_ENV}.env`;
-            try {
-                const module = require(envFilePath);
-                this.env = module.default;
-            }
-            catch {
-                throw new Error(`Cannot read envFile ${envFilePath}`);
-            }
+            (0, js_lib_1._assert)(APP_ENV, 'APP_ENV should be defined!');
+            const env = this.envMap[APP_ENV];
+            (0, js_lib_1._assert)(env, `Environment ${APP_ENV} is not defined`);
+            this.env = env;
             console.log(`APP_ENV=${(0, nodejs_lib_1.dimGrey)(APP_ENV)} loaded`);
         }
         return this.env;
     }
     setEnv(env) {
-        console.log(`setEnv APP_ENV=${(0, nodejs_lib_1.dimGrey)(env ? env.name : 'undefined')}`);
         this.env = env;
+        console.log(`setEnv APP_ENV=${(0, nodejs_lib_1.dimGrey)(env?.name || 'undefined')}`);
     }
 }
 exports.EnvSharedService = EnvSharedService;

package/dist/index.d.ts

@@ -3,7 +3,6 @@ export * from './admin/adminMiddleware';
 export * from './admin/base.admin.service';
 export * from './admin/firebase.shared.service';
 export * from './admin/secureHeaderMiddleware';
-export * from './env/env.model';
 export * from './env/env.shared.service';
 export * from './gae/appEngine.util';
 export * from './sentry/sentry.shared.service';

package/dist/index.js

@@ -8,7 +8,6 @@ tslib_1.__exportStar(require("./admin/adminMiddleware"), exports);
 tslib_1.__exportStar(require("./admin/base.admin.service"), exports);
 tslib_1.__exportStar(require("./admin/firebase.shared.service"), exports);
 tslib_1.__exportStar(require("./admin/secureHeaderMiddleware"), exports);
-tslib_1.__exportStar(require("./env/env.model"), exports);
 tslib_1.__exportStar(require("./env/env.shared.service"), exports);
 tslib_1.__exportStar(require("./gae/appEngine.util"), exports);
 tslib_1.__exportStar(require("./sentry/sentry.shared.service"), exports);

package/dist/server/appEngineLogMiddleware.js

@@ -58,7 +58,7 @@ function logToCI(args) {
 function appEngineLogMiddleware() {
     if (!isGAE || !GOOGLE_CLOUD_PROJECT) {
         // Local machine, return "simple" logToDev middleware with request numbering
-        return function gaeLogMiddlewareDev(req, res, next) {
+        return function gaeLogMiddlewareDev(req, _res, next) {
             // Local machine
             req.requestId = String(++reqCounter);
             req.log = req.warn = req.error = (...args) => logToDev(req.requestId, args);
@@ -66,7 +66,7 @@ function appEngineLogMiddleware() {
         };
     }
     // Otherwise, we're in AppEngine
-    return function appEngineLogHandler(req, res, next) {
+    return function appEngineLogHandler(req, _res, next) {
         const traceHeader = req.header('x-cloud-trace-context');
         if (traceHeader) {
             const [trace] = traceHeader.split('/');

package/dist/server/asyncLocalStorageMiddleware.js

@@ -14,7 +14,7 @@ const isCI = !!CI;
 // Create it lazily (on demand)
 const storage = (0, js_lib_1._lazyValue)(() => new node_async_hooks_1.AsyncLocalStorage());
 function asyncLocalStorageMiddleware() {
-    return (req, res, next) => {
+    return (req, _res, next) => {
         const store = {
             req,
         };

package/dist/server/bodyParserTimeoutMiddleware.js

@@ -35,7 +35,7 @@ function bodyParserTimeoutMiddleware(cfg = {}) {
  * Should be called AFTER bodyParser
  */
 function clearBodyParserTimeout() {
-    return (req, res, next) => {
+    return (req, _res, next) => {
         clearTimeout(req.bodyParserTimeout);
         next();
     };

package/dist/server/methodOverrideMiddleware.js

@@ -6,7 +6,7 @@ function methodOverrideMiddleware(cfg = {}) {
         methodKey: '_method',
         ...cfg,
     };
-    return (req, res, next) => {
+    return (req, _res, next) => {
         if (req.query[methodKey]) {
             req.method = req.query[methodKey];
             // delete req.query[methodKey]

package/dist/server/okMiddleware.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.okMiddleware = okMiddleware;
 function okMiddleware() {
-    return (req, res) => {
+    return (_req, res) => {
         res.json({ ok: 1 });
     };
 }

package/dist/server/safeJsonMiddleware.js

@@ -9,7 +9,7 @@ const js_lib_1 = require("@naturalcycles/js-lib");
  * Original: https://github.com/expressjs/express/blob/master/lib/response.js
  */
 function safeJsonMiddleware() {
-    return function safeJsonHandler(req, res, next) {
+    return function safeJsonHandler(_req, res, next) {
         res.json = (input) => {
             if (!res.get('Content-Type')) {
                 res.set('Content-Type', 'application/json');

package/dist/server/server.util.js

@@ -9,7 +9,7 @@ exports.enableDestroy = enableDestroy;
 function enableDestroy(server) {
     const connections = {};
     const srv = server;
-    srv.on('connection', function (conn) {
+    srv.on('connection', conn => {
         const key = conn.remoteAddress + ':' + conn.remotePort;
         connections[key] = conn;
         conn.on('close', () => delete connections[key]);

package/dist/server/serverStatusMiddleware.js

@@ -8,7 +8,7 @@ const deployInfo_util_1 = require("./deployInfo.util");
 const { versions } = process;
 const { GAE_APPLICATION, GAE_SERVICE, GAE_VERSION, APP_ENV, NODE_OPTIONS } = process.env;
 function serverStatusMiddleware(projectDir, extra) {
-    return async (req, res) => {
+    return async (_req, res) => {
         res.json(getServerStatusData(projectDir, extra));
     };
 }

package/dist/server/simpleRequestLoggerMiddleware.js

@@ -10,7 +10,7 @@ function simpleRequestLoggerMiddleware(_cfg = {}) {
     // Disable logger in AppEngine, as it doesn't make sense there
     // UPD: Only log in dev environment
     if (APP_ENV !== 'dev')
-        return (req, res, next) => next();
+        return (_req, _res, next) => next();
     const cfg = {
         logStart: false,
         logFinish: true,

package/dist/server/validation/validateMiddleware.js

@@ -26,7 +26,7 @@ function validateObject(prop, schema, opt = {}) {
         objectName: `request ${prop}`,
     });
     const reportPredicate = typeof opt.report === 'function' ? opt.report : () => opt.report;
-    return (req, res, next) => {
+    return (req, _res, next) => {
         const error = ajvSchema.getValidationError(req[prop]);
         if (error) {
             const report = reportPredicate(error);

package/dist/server/validation/zodValidateMiddleware.js

@@ -11,7 +11,7 @@ const REDACTED = 'REDACTED';
  */
 function zodReqValidate(prop, schema, opt = {}) {
     const reportPredicate = typeof opt.report === 'function' ? opt.report : () => opt.report;
-    return (req, res, next) => {
+    return (req, _res, next) => {
         const { error } = (0, js_lib_1.zSafeValidate)(req[prop], schema);
         if (!error) {
             return next();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/backend-lib",
-  "version": "5.7.2",
+  "version": "5.8.1",
   "scripts": {
     "prepare": "husky",
     "build": "dev-lib build",
@@ -45,7 +45,7 @@
     "@naturalcycles/dev-lib": "^15.0.4",
     "@sentry/node": "^7.0.0",
     "@types/ejs": "^3.0.0",
-    "@types/node": "^20.1.0",
+    "@types/node": "^22.2.0",
     "@types/yargs": "^16.0.0",
     "fastify": "^4.0.0",
     "jest": "^29.0.1"

package/src/admin/adminMiddleware.ts

@@ -88,7 +88,7 @@ export function loginHtml(firebaseServiceCfg: FirebaseSharedServiceCfg): Backend
     adminAuthProvider: firebaseAuthProvider = 'GoogleAuthProvider',
   } = firebaseServiceCfg
 
-  return (req, res) => {
+  return (_req, res) => {
     res.send(
       getLoginHtml({
         firebaseApiKey,

package/src/admin/base.admin.service.ts

@@ -171,7 +171,7 @@ export class BaseAdminService {
     req: BackendRequest,
     reqPermissions: string[] = [],
     meta: Record<string, any> = {},
-    andComparison: boolean = true,
+    andComparison = true,
   ): Promise<AdminInfo> {
     if (!this.cfg.authEnabled) return adminInfoDisabled()
 

package/src/db/httpDBRequestHandler.ts

@@ -63,13 +63,13 @@ export function httpDBRequestHandler(db: CommonDB): BackendRouter {
   })
 
   // ping
-  router.get('/ping', async (req, res) => {
+  router.get('/ping', async (_req, res) => {
     await db.ping()
     res.end()
   })
 
   // getTables
-  router.get('/tables', async (req, res) => {
+  router.get('/tables', async (_req, res) => {
     res.json(await db.getTables())
   })
 

package/src/deploy/backend.cfg.util.ts

@@ -38,7 +38,7 @@ const backendCfgSchema = AjvSchema.readJsonSync<BackendCfg>(
   },
 )
 
-export function getBackendCfg(projectDir: string = '.'): BackendCfg {
+export function getBackendCfg(projectDir = '.'): BackendCfg {
   const backendCfgYamlPath = `${projectDir}/backend.cfg.yaml`
 
   requireFileToExist(backendCfgYamlPath)

package/src/env/env.shared.service.ts

@@ -1,15 +1,20 @@
+import { _assert, _by, StringMap } from '@naturalcycles/js-lib'
 import { dimGrey } from '@naturalcycles/nodejs-lib'
-import { BaseEnv } from './env.model'
 
-export interface EnvSharedServiceCfg {
-  /**
-   * Dir with ${envName}.env.ts files
-   */
-  envDir: string
+export interface BaseEnv {
+  name: string
 }
 
-export class EnvSharedService<ENV extends BaseEnv = any> {
-  constructor(private cfg: EnvSharedServiceCfg) {}
+export interface EnvSharedServiceCfg<ENV> {
+  environments: ENV[]
+}
+
+export class EnvSharedService<ENV extends BaseEnv> {
+  constructor(cfg: EnvSharedServiceCfg<ENV>) {
+    this.envMap = _by(cfg.environments, e => e.name)
+  }
+
+  envMap: StringMap<ENV>
 
   private env?: ENV
 
@@ -20,28 +25,20 @@ export class EnvSharedService<ENV extends BaseEnv = any> {
   getEnv(): ENV {
     if (!this.env) {
       const { APP_ENV } = process.env
-      if (!APP_ENV) {
-        throw new Error('APP_ENV should be defined!')
-      }
-
-      const { envDir } = this.cfg
-      const envFilePath = `${envDir}/${APP_ENV}.env`
+      _assert(APP_ENV, 'APP_ENV should be defined!')
 
-      try {
-        const module = require(envFilePath)
-        this.env = module.default
-      } catch {
-        throw new Error(`Cannot read envFile ${envFilePath}`)
-      }
+      const env = this.envMap[APP_ENV]
+      _assert(env, `Environment ${APP_ENV} is not defined`)
 
+      this.env = env
       console.log(`APP_ENV=${dimGrey(APP_ENV)} loaded`)
     }
 
-    return this.env!
+    return this.env
   }
 
   setEnv(env?: ENV): void {
-    console.log(`setEnv APP_ENV=${dimGrey(env ? env.name : 'undefined')}`)
     this.env = env
+    console.log(`setEnv APP_ENV=${dimGrey(env?.name || 'undefined')}`)
   }
 }

package/src/index.ts

@@ -3,7 +3,6 @@ export * from './admin/adminMiddleware'
 export * from './admin/base.admin.service'
 export * from './admin/firebase.shared.service'
 export * from './admin/secureHeaderMiddleware'
-export * from './env/env.model'
 export * from './env/env.shared.service'
 export * from './gae/appEngine.util'
 export * from './sentry/sentry.shared.service'

package/src/sentry/sentry.shared.service.ts

@@ -8,9 +8,9 @@ import {
   StringMap,
 } from '@naturalcycles/js-lib'
 import { _inspect, InspectAnyOptions } from '@naturalcycles/nodejs-lib'
-// eslint-disable-next-line import/no-duplicates
+// eslint-disable-next-line import-x/no-duplicates
 import type { Breadcrumb, NodeOptions, SeverityLevel } from '@sentry/node'
-// eslint-disable-next-line import/no-duplicates
+// eslint-disable-next-line import-x/no-duplicates
 import type * as SentryLib from '@sentry/node'
 import { BackendErrorRequestHandler, BackendRequestHandler, getRequestLogger } from '../index'
 

package/src/server/appEngineLogMiddleware.ts

@@ -69,7 +69,7 @@ function logToCI(args: any[]): void {
 export function appEngineLogMiddleware(): BackendRequestHandler {
   if (!isGAE || !GOOGLE_CLOUD_PROJECT) {
     // Local machine, return "simple" logToDev middleware with request numbering
-    return function gaeLogMiddlewareDev(req, res, next) {
+    return function gaeLogMiddlewareDev(req, _res, next) {
       // Local machine
       req.requestId = String(++reqCounter)
       req.log = req.warn = req.error = (...args: any[]) => logToDev(req.requestId!, args)
@@ -79,7 +79,7 @@ export function appEngineLogMiddleware(): BackendRequestHandler {
 
   // Otherwise, we're in AppEngine
 
-  return function appEngineLogHandler(req, res, next) {
+  return function appEngineLogHandler(req, _res, next) {
     const traceHeader = req.header('x-cloud-trace-context')
     if (traceHeader) {
       const [trace] = traceHeader.split('/')

package/src/server/asyncLocalStorageMiddleware.ts

@@ -16,7 +16,7 @@ export interface RequestLocalStorage {
 const storage = _lazyValue(() => new AsyncLocalStorage<RequestLocalStorage>())
 
 export function asyncLocalStorageMiddleware(): BackendRequestHandler {
-  return (req, res, next) => {
+  return (req, _res, next) => {
     const store: RequestLocalStorage = {
       req,
     }

package/src/server/bodyParserTimeoutMiddleware.ts

@@ -60,7 +60,7 @@ export function bodyParserTimeoutMiddleware(
  * Should be called AFTER bodyParser
  */
 export function clearBodyParserTimeout(): BackendRequestHandler {
-  return (req, res, next) => {
+  return (req, _res, next) => {
     clearTimeout(req.bodyParserTimeout)
     next()
   }

package/src/server/methodOverrideMiddleware.ts

@@ -15,7 +15,7 @@ export function methodOverrideMiddleware(
     ...cfg,
   }
 
-  return (req, res, next) => {
+  return (req, _res, next) => {
     if (req.query[methodKey]) {
       req.method = req.query[methodKey] as string
       // delete req.query[methodKey]

package/src/server/okMiddleware.ts

@@ -1,7 +1,7 @@
 import { BackendRequestHandler } from './server.model'
 
 export function okMiddleware(): BackendRequestHandler {
-  return (req, res) => {
+  return (_req, res) => {
     res.json({ ok: 1 })
   }
 }

package/src/server/safeJsonMiddleware.ts

@@ -8,7 +8,7 @@ import { BackendRequestHandler, BackendResponse } from './server.model'
  * Original: https://github.com/expressjs/express/blob/master/lib/response.js
  */
 export function safeJsonMiddleware(): BackendRequestHandler {
-  return function safeJsonHandler(req, res, next) {
+  return function safeJsonHandler(_req, res, next) {
     res.json = (input: any): BackendResponse => {
       if (!res.get('Content-Type')) {
         res.set('Content-Type', 'application/json')

package/src/server/server.util.ts

@@ -15,7 +15,7 @@ export function enableDestroy(server: Server): DestroyableServer {
   const connections: StringMap<Socket> = {}
   const srv = server as DestroyableServer
 
-  srv.on('connection', function (conn) {
+  srv.on('connection', conn => {
     const key = conn.remoteAddress + ':' + conn.remotePort
     connections[key] = conn
     conn.on('close', () => delete connections[key])

package/src/server/serverStatusMiddleware.ts

@@ -7,7 +7,7 @@ const { versions } = process
 const { GAE_APPLICATION, GAE_SERVICE, GAE_VERSION, APP_ENV, NODE_OPTIONS } = process.env
 
 export function serverStatusMiddleware(projectDir?: string, extra?: any): BackendRequestHandler {
-  return async (req, res) => {
+  return async (_req, res) => {
     res.json(getServerStatusData(projectDir, extra))
   }
 }

package/src/server/simpleRequestLoggerMiddleware.ts

@@ -22,7 +22,7 @@ export function simpleRequestLoggerMiddleware(
 ): BackendRequestHandler {
   // Disable logger in AppEngine, as it doesn't make sense there
   // UPD: Only log in dev environment
-  if (APP_ENV !== 'dev') return (req, res, next) => next()
+  if (APP_ENV !== 'dev') return (_req, _res, next) => next()
 
   const cfg: SimpleRequestLoggerMiddlewareCfg = {
     logStart: false,

package/src/server/validation/validateMiddleware.ts

@@ -44,7 +44,7 @@ function validateObject(
   const reportPredicate =
     typeof opt.report === 'function' ? opt.report : () => opt.report as boolean | undefined
 
-  return (req, res, next) => {
+  return (req, _res, next) => {
     const error = ajvSchema.getValidationError(req[prop])
     if (error) {
       const report = reportPredicate(error)

package/src/server/validation/zodValidateMiddleware.ts

@@ -18,7 +18,7 @@ export function zodReqValidate(
   const reportPredicate =
     typeof opt.report === 'function' ? opt.report : () => opt.report as boolean | undefined
 
-  return (req, res, next) => {
+  return (req, _res, next) => {
     const { error } = zSafeValidate(req[prop], schema)
     if (!error) {
       return next()

package/dist/env/env.model.d.ts

@@ -1,3 +0,0 @@
-export interface BaseEnv {
-    name: string;
-}

package/dist/env/env.model.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/src/env/env.model.ts

@@ -1,3 +0,0 @@
-export interface BaseEnv {
-  name: string
-}