@naturalcycles/backend-lib 5.7.1 → 5.8.0

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/admin/secureHeaderMiddleware.js

@@ -21,8 +21,9 @@ function requireSecureHeaderOrAdmin(cfg, reqPermissions) {
             return next();
         // Header provided - don't check for Admin
         if (providedHeader) {
-            if (!secureHeaderValue || (0, nodejs_lib_1.timingSafeStringEqual)(providedHeader, secureHeaderValue))
+            if (!secureHeaderValue || (0, nodejs_lib_1.timingSafeStringEqual)(providedHeader, secureHeaderValue)) {
                 return next();
+            }
             return next(new js_lib_1.AppError('secureHeader or adminToken is required', {
                 backendResponseStatusCode: 401,
                 adminAuthRequired: true,

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/deploy/deployGae.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deployGae = deployGae;
 exports.undeployGae = undeployGae;
-const dev_lib_1 = require("@naturalcycles/dev-lib");
 const js_lib_1 = require("@naturalcycles/js-lib");
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 const backend_cfg_util_1 = require("./backend.cfg.util");
@@ -11,8 +10,8 @@ const deployHealthCheck_1 = require("./deployHealthCheck");
 const deployPrepare_1 = require("./deployPrepare");
 async function deployGae(opt = {}) {
     const { logOnFailure, logOnSuccess } = opt;
-    // 1. build-prod
-    (0, dev_lib_1.buildProdCommand)();
+    // 1. build
+    (0, nodejs_lib_1.execVoidCommandSync)('yarn', ['build']);
     // 2. deploy-prepare
     const deployInfo = await (0, deployPrepare_1.deployPrepare)();
     const targetDir = './tmp/deploy';

package/dist/deploy/index.d.ts

@@ -4,5 +4,5 @@ import { createAppYaml, createDeployInfo } from './deploy.util';
 import { deployGae } from './deployGae';
 import { deployHealthCheck, DeployHealthCheckOptions } from './deployHealthCheck';
 import { deployPrepare } from './deployPrepare';
-export type { BackendCfg, DeployInfo, DeployHealthCheckOptions };
-export { getBackendCfg, createDeployInfo, createAppYaml, deployGae, deployPrepare, deployHealthCheck, };
+export type { BackendCfg, DeployHealthCheckOptions, DeployInfo };
+export { createAppYaml, createDeployInfo, deployGae, deployHealthCheck, deployPrepare, getBackendCfg, };

package/dist/deploy/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.deployHealthCheck = exports.deployPrepare = exports.deployGae = exports.createAppYaml = exports.createDeployInfo = exports.getBackendCfg = void 0;
+exports.getBackendCfg = exports.deployPrepare = exports.deployHealthCheck = exports.deployGae = exports.createDeployInfo = exports.createAppYaml = void 0;
 const backend_cfg_util_1 = require("./backend.cfg.util");
 Object.defineProperty(exports, "getBackendCfg", { enumerable: true, get: function () { return backend_cfg_util_1.getBackendCfg; } });
 const deploy_util_1 = require("./deploy.util");

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

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

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

@@ -1,6 +1,7 @@
 "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) {
@@ -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.cfg.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,34 +3,33 @@ 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';
+export * from './server/appEngineLogMiddleware';
+export * from './server/asyncLocalStorageMiddleware';
+export * from './server/basicAuthMiddleware';
+export * from './server/bodyParserTimeoutMiddleware';
 export * from './server/catchWrapper';
 export * from './server/createDefaultApp';
 export * from './server/createDefaultApp.model';
 export * from './server/deployInfo.util';
-export * from './server/getDefaultRouter';
-export * from './server/bodyParserTimeoutMiddleware';
 export * from './server/genericErrorMiddleware';
-export * from './server/serverStatsMiddleware';
+export * from './server/getDefaultRouter';
 export * from './server/methodOverrideMiddleware';
 export * from './server/notFoundMiddleware';
 export * from './server/okMiddleware';
-export * from './server/basicAuthMiddleware';
+export * from './server/request.log.util';
+export * from './server/request.util';
 export * from './server/requestTimeoutMiddleware';
-export * from './server/validation/validateRequest';
-export * from './server/simpleRequestLoggerMiddleware';
+export * from './server/safeJsonMiddleware';
+export * from './server/server.model';
+export * from './server/serverStatsMiddleware';
 export * from './server/serverStatusMiddleware';
-export * from './server/validation/validateMiddleware';
-export * from './server/validation/zodValidateMiddleware';
-export * from './server/request.log.util';
+export * from './server/simpleRequestLoggerMiddleware';
 export * from './server/startServer';
 export * from './server/startServer.model';
-export * from './server/asyncLocalStorageMiddleware';
-export * from './server/server.model';
-export * from './server/appEngineLogMiddleware';
-export * from './server/safeJsonMiddleware';
-export * from './server/request.util';
+export * from './server/validation/validateMiddleware';
+export * from './server/validation/validateRequest';
+export * from './server/validation/zodValidateMiddleware';
 export { onFinished };

package/dist/index.js

@@ -8,33 +8,32 @@ 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);
+tslib_1.__exportStar(require("./server/appEngineLogMiddleware"), exports);
+tslib_1.__exportStar(require("./server/asyncLocalStorageMiddleware"), exports);
+tslib_1.__exportStar(require("./server/basicAuthMiddleware"), exports);
+tslib_1.__exportStar(require("./server/bodyParserTimeoutMiddleware"), exports);
 tslib_1.__exportStar(require("./server/catchWrapper"), exports);
 tslib_1.__exportStar(require("./server/createDefaultApp"), exports);
 tslib_1.__exportStar(require("./server/createDefaultApp.model"), exports);
 tslib_1.__exportStar(require("./server/deployInfo.util"), exports);
-tslib_1.__exportStar(require("./server/getDefaultRouter"), exports);
-tslib_1.__exportStar(require("./server/bodyParserTimeoutMiddleware"), exports);
 tslib_1.__exportStar(require("./server/genericErrorMiddleware"), exports);
-tslib_1.__exportStar(require("./server/serverStatsMiddleware"), exports);
+tslib_1.__exportStar(require("./server/getDefaultRouter"), exports);
 tslib_1.__exportStar(require("./server/methodOverrideMiddleware"), exports);
 tslib_1.__exportStar(require("./server/notFoundMiddleware"), exports);
 tslib_1.__exportStar(require("./server/okMiddleware"), exports);
-tslib_1.__exportStar(require("./server/basicAuthMiddleware"), exports);
+tslib_1.__exportStar(require("./server/request.log.util"), exports);
+tslib_1.__exportStar(require("./server/request.util"), exports);
 tslib_1.__exportStar(require("./server/requestTimeoutMiddleware"), exports);
-tslib_1.__exportStar(require("./server/validation/validateRequest"), exports);
-tslib_1.__exportStar(require("./server/simpleRequestLoggerMiddleware"), exports);
+tslib_1.__exportStar(require("./server/safeJsonMiddleware"), exports);
+tslib_1.__exportStar(require("./server/server.model"), exports);
+tslib_1.__exportStar(require("./server/serverStatsMiddleware"), exports);
 tslib_1.__exportStar(require("./server/serverStatusMiddleware"), exports);
-tslib_1.__exportStar(require("./server/validation/validateMiddleware"), exports);
-tslib_1.__exportStar(require("./server/validation/zodValidateMiddleware"), exports);
-tslib_1.__exportStar(require("./server/request.log.util"), exports);
+tslib_1.__exportStar(require("./server/simpleRequestLoggerMiddleware"), exports);
 tslib_1.__exportStar(require("./server/startServer"), exports);
 tslib_1.__exportStar(require("./server/startServer.model"), exports);
-tslib_1.__exportStar(require("./server/asyncLocalStorageMiddleware"), exports);
-tslib_1.__exportStar(require("./server/server.model"), exports);
-tslib_1.__exportStar(require("./server/appEngineLogMiddleware"), exports);
-tslib_1.__exportStar(require("./server/safeJsonMiddleware"), exports);
-tslib_1.__exportStar(require("./server/request.util"), exports);
+tslib_1.__exportStar(require("./server/validation/validateMiddleware"), exports);
+tslib_1.__exportStar(require("./server/validation/validateRequest"), exports);
+tslib_1.__exportStar(require("./server/validation/zodValidateMiddleware"), exports);

package/dist/sentry/sentry.shared.service.js

@@ -98,8 +98,9 @@ class SentrySharedService {
             return;
         }
         if (data?.reportRate && // E.g rate of 0.1 means 10% of errors are reported
-            Math.random() > data.reportRate)
+            Math.random() > data.reportRate) {
             return;
+        }
         // This is to avoid Sentry cutting err.message to 253 characters
         // It will log additional "breadcrumb object" before the error
         // It's a Breadcrumb, not a console.log, because console.log are NOT automatically attached as Breadcrumbs in cron-job environments (outside of Express)

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.model.d.ts

@@ -1,5 +1,5 @@
 import type { CommonLogFunction, Promisable } from '@naturalcycles/js-lib';
-import type { IRouter, Request, NextFunction, Response, Application } from 'express';
+import type { Application, IRouter, NextFunction, Request, Response } from 'express';
 /**
  * Use this interface instead of express.Request in cases when TypeScript gives an error, because it haven't "included" this very file.
  *

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,8 +1,13 @@
 {
   "name": "@naturalcycles/backend-lib",
-  "version": "5.7.1",
+  "version": "5.8.0",
   "scripts": {
     "prepare": "husky",
+    "build": "dev-lib build",
+    "test": "dev-lib test",
+    "lint": "dev-lib lint",
+    "bt": "dev-lib bt",
+    "lbt": "dev-lib lbt",
     "dev": "APP_ENV=dev node -r ts-node/register --watch ./src/test/server/server.ts",
     "docs-serve": "NODE_OPTIONS=--openssl-legacy-provider vuepress dev docs",
     "docs-build": "NODE_OPTIONS=--openssl-legacy-provider vuepress build docs",
@@ -37,10 +42,10 @@
   },
   "devDependencies": {
     "@naturalcycles/bench-lib": "^3.0.0",
-    "@naturalcycles/dev-lib": "^13.0.0",
+    "@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"
@@ -71,7 +76,7 @@
     "url": "https://github.com/NaturalCycles/backend-lib"
   },
   "engines": {
-    "node": ">=18.12.0"
+    "node": ">=20.12.0"
   },
   "type": "commonjs",
   "description": "Standard library for making Express.js / AppEngine based backend services",

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/admin/secureHeaderMiddleware.ts

@@ -42,8 +42,9 @@ function requireSecureHeaderOrAdmin(
 
     // Header provided - don't check for Admin
     if (providedHeader) {
-      if (!secureHeaderValue || timingSafeStringEqual(providedHeader, secureHeaderValue))
+      if (!secureHeaderValue || timingSafeStringEqual(providedHeader, secureHeaderValue)) {
         return next()
+      }
 
       return next(
         new AppError('secureHeader or adminToken is required', {

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/deploy/deployGae.ts

@@ -1,4 +1,3 @@
-import { buildProdCommand } from '@naturalcycles/dev-lib'
 import { _anyToError, _objectAssign, pRetry } from '@naturalcycles/js-lib'
 import { appendToGithubSummary, execVoidCommandSync } from '@naturalcycles/nodejs-lib'
 import { getBackendCfg } from './backend.cfg.util'
@@ -11,9 +10,9 @@ export interface DeployGaeOptions extends DeployPrepareOptions, DeployHealthChec
 export async function deployGae(opt: DeployGaeOptions = {}): Promise<void> {
   const { logOnFailure, logOnSuccess } = opt
 
-  // 1. build-prod
+  // 1. build
 
-  buildProdCommand()
+  execVoidCommandSync('yarn', ['build'])
 
   // 2. deploy-prepare
 

package/src/deploy/deployHealthCheck.ts

@@ -1,6 +1,6 @@
 import { inspect, InspectOptions } from 'node:util'
-import { pDelay, _filterFalsyValues, _ms, _since, getFetcher } from '@naturalcycles/js-lib'
-import { execVoidCommandSync, dimGrey, red } from '@naturalcycles/nodejs-lib'
+import { _filterFalsyValues, _ms, _since, getFetcher, pDelay } from '@naturalcycles/js-lib'
+import { dimGrey, execVoidCommandSync, red } from '@naturalcycles/nodejs-lib'
 import { coloredHttpCode } from '../server/request.log.util'
 
 export interface DeployHealthCheckOptions {

package/src/deploy/index.ts

@@ -5,13 +5,13 @@ import { deployGae } from './deployGae'
 import { deployHealthCheck, DeployHealthCheckOptions } from './deployHealthCheck'
 import { deployPrepare } from './deployPrepare'
 
-export type { BackendCfg, DeployInfo, DeployHealthCheckOptions }
+export type { BackendCfg, DeployHealthCheckOptions, DeployInfo }
 
 export {
-  getBackendCfg,
-  createDeployInfo,
   createAppYaml,
+  createDeployInfo,
   deployGae,
-  deployPrepare,
   deployHealthCheck,
+  deployPrepare,
+  getBackendCfg,
 }

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

@@ -1,15 +1,19 @@
+import { _assert, StringMap } from '@naturalcycles/js-lib'
 import { dimGrey } from '@naturalcycles/nodejs-lib'
-import { BaseEnv } from './env.model'
 
-export interface EnvSharedServiceCfg {
+export interface BaseEnv {
+  name: string
+}
+
+export interface EnvSharedServiceCfg<ENV> {
   /**
    * Dir with ${envName}.env.ts files
    */
-  envDir: string
+  envMap: StringMap<ENV>
 }
 
-export class EnvSharedService<ENV extends BaseEnv = any> {
-  constructor(private cfg: EnvSharedServiceCfg) {}
+export class EnvSharedService<ENV extends BaseEnv> {
+  constructor(public cfg: EnvSharedServiceCfg<ENV>) {}
 
   private env?: ENV
 
@@ -20,28 +24,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.cfg.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,35 +3,34 @@ 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'
+export * from './server/appEngineLogMiddleware'
+export * from './server/asyncLocalStorageMiddleware'
+export * from './server/basicAuthMiddleware'
+export * from './server/bodyParserTimeoutMiddleware'
 export * from './server/catchWrapper'
 export * from './server/createDefaultApp'
 export * from './server/createDefaultApp.model'
 export * from './server/deployInfo.util'
-export * from './server/getDefaultRouter'
-export * from './server/bodyParserTimeoutMiddleware'
 export * from './server/genericErrorMiddleware'
-export * from './server/serverStatsMiddleware'
+export * from './server/getDefaultRouter'
 export * from './server/methodOverrideMiddleware'
 export * from './server/notFoundMiddleware'
 export * from './server/okMiddleware'
-export * from './server/basicAuthMiddleware'
+export * from './server/request.log.util'
+export * from './server/request.util'
 export * from './server/requestTimeoutMiddleware'
-export * from './server/validation/validateRequest'
-export * from './server/simpleRequestLoggerMiddleware'
+export * from './server/safeJsonMiddleware'
+export * from './server/server.model'
+export * from './server/serverStatsMiddleware'
 export * from './server/serverStatusMiddleware'
-export * from './server/validation/validateMiddleware'
-export * from './server/validation/zodValidateMiddleware'
-export * from './server/request.log.util'
+export * from './server/simpleRequestLoggerMiddleware'
 export * from './server/startServer'
 export * from './server/startServer.model'
-export * from './server/asyncLocalStorageMiddleware'
-export * from './server/server.model'
-export * from './server/appEngineLogMiddleware'
-export * from './server/safeJsonMiddleware'
-export * from './server/request.util'
+export * from './server/validation/validateMiddleware'
+export * from './server/validation/validateRequest'
+export * from './server/validation/zodValidateMiddleware'
 
 export { onFinished }

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'
 
@@ -126,8 +126,9 @@ export class SentrySharedService {
     if (
       data?.reportRate && // E.g rate of 0.1 means 10% of errors are reported
       Math.random() > data.reportRate
-    )
+    ) {
       return
+    }
 
     // This is to avoid Sentry cutting err.message to 253 characters
     // It will log additional "breadcrumb object" before the error

package/src/server/appEngineLogMiddleware.ts

@@ -1,6 +1,6 @@
 import { inspect } from 'node:util'
 import { AnyObject, CommonLogger } from '@naturalcycles/js-lib'
-import { dimGrey, _inspect } from '@naturalcycles/nodejs-lib'
+import { _inspect, dimGrey } from '@naturalcycles/nodejs-lib'
 import { BackendRequestHandler } from './server.model'
 
 const { GOOGLE_CLOUD_PROJECT, GAE_INSTANCE } = process.env
@@ -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

@@ -1,6 +1,6 @@
 import { AsyncLocalStorage } from 'node:async_hooks'
 import { _lazyValue, CommonLogger } from '@naturalcycles/js-lib'
-import { gaeLogger, devLogger, ciLogger } from './appEngineLogMiddleware'
+import { ciLogger, devLogger, gaeLogger } from './appEngineLogMiddleware'
 import { BackendRequest, BackendRequestHandler } from './server.model'
 
 const { GAE_INSTANCE, CI } = process.env
@@ -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/createDefaultApp.ts

@@ -5,9 +5,9 @@ import { BackendApplication, isGAE, methodOverrideMiddleware } from '..'
 import { appEngineLogMiddleware } from './appEngineLogMiddleware'
 import { asyncLocalStorageMiddleware } from './asyncLocalStorageMiddleware'
 import {
-  DefaultAppCfg,
   BackendRequestHandlerCfg,
   BackendRequestHandlerWithPath,
+  DefaultAppCfg,
 } from './createDefaultApp.model'
 import { genericErrorMiddleware } from './genericErrorMiddleware'
 import { notFoundMiddleware } from './notFoundMiddleware'

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.model.ts

@@ -1,5 +1,5 @@
 import type { CommonLogFunction, Promisable } from '@naturalcycles/js-lib'
-import type { IRouter, Request, NextFunction, Response, Application } from 'express'
+import type { Application, IRouter, NextFunction, Request, Response } from 'express'
 
 /**
  * Use this interface instead of express.Request in cases when TypeScript gives an error, because it haven't "included" this very file.

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

@@ -1,4 +1,4 @@
-import { JsonSchema, JsonSchemaBuilder, _get, AppError } from '@naturalcycles/js-lib'
+import { _get, AppError, JsonSchema, JsonSchemaBuilder } from '@naturalcycles/js-lib'
 import { AjvSchema, AjvValidationError } from '@naturalcycles/nodejs-lib'
 import { BackendRequestHandler } from '../server.model'
 import { ReqValidationOptions } from './validateRequest'
@@ -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
-}