@naturalcycles/backend-lib 4.18.8 → 4.19.1

package/cfg/tsconfig.json

@@ -8,13 +8,27 @@
     // Target/module
     "target": "es2022",
     "lib": ["esnext"], // add "dom" if needed
-    "module": "commonjs",
-    "moduleResolution": "node",
+    // module `nodenext` is a modern mode that auto-detects cjs/esm
+    // it also defaults `esModuleInterop` and `allowSyntheticDefaultImports` to true
+    "module": "nodenext",
+    "moduleResolution": "nodenext",
     "moduleDetection": "force",
+    // specifying these explicitly for better IDE compatibility (but they're on by default with module=nodenext)
+    "esModuleInterop": true,
+    "allowSyntheticDefaultImports": true,
+    // Faster compilation in general
+    // Support for external compilers (e.g esbuild)
+    // Speedup in Jest by using "isolatedModules" in 'ts-jest' config
+    "isolatedModules": true,
 
     // Emit
     "sourceMap": false,
     "declaration": false,
+    // Otherwise since es2022 it defaults to true
+    // and starts to produce different/unexpected behavior
+    // https://angular.schule/blog/2022-11-use-define-for-class-fields
+    "useDefineForClassFields": false,
+    "importHelpers": true,
 
     // Strictness
     "strict": true,
@@ -25,19 +39,10 @@
     "noImplicitOverride": true,
     "noUncheckedIndexedAccess": true,
     "noPropertyAccessFromIndexSignature": true,
-    // Otherwise since es2022 it defaults to true
-    // and starts to produce different/unexpected behavior
-    // https://angular.schule/blog/2022-11-use-define-for-class-fields
-    "useDefineForClassFields": false,
 
     // Enabled should be faster, but will catch less errors
     // "skipLibCheck": true,
 
-    // Faster compilation in general
-    // Support for external compilers (e.g esbuild)
-    // Speedup in Jest by using "isolatedModules" in 'ts-jest' config
-    "isolatedModules": true,
-
     // Disabled because of https://github.com/Microsoft/TypeScript/issues/29172
     // Need to be specified in the project tsconfig
     // "outDir": "dist",
@@ -54,7 +59,6 @@
     // Other
     "pretty": true,
     "newLine": "lf",
-    "importHelpers": true,
     "experimentalDecorators": true
   }
   // Need to be specified in the project tsconfig

package/dist/admin/adminMiddleware.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLoginHtmlRedirect = exports.loginHtml = exports.requireAdminPermissions = exports.createAdminMiddleware = void 0;
-const fs = require("node:fs");
+const tslib_1 = require("tslib");
+const node_fs_1 = tslib_1.__importDefault(require("node:fs"));
 const js_lib_1 = require("@naturalcycles/js-lib");
-const ejs = require("ejs");
+const ejs_1 = tslib_1.__importDefault(require("ejs"));
 function createAdminMiddleware(adminService, cfgDefaults = {}) {
     return (reqPermissions, cfg) => requireAdminPermissions(adminService, reqPermissions, {
         ...cfgDefaults,
@@ -52,8 +53,8 @@ function loginHtml(firebaseServiceCfg) {
 exports.loginHtml = loginHtml;
 const getLoginHtml = (0, js_lib_1._memoFn)((cfg) => {
     console.log(`reading login.html`);
-    const tmpl = fs.readFileSync(`${__dirname}/login.html`, 'utf8');
-    return ejs.render(tmpl, cfg);
+    const tmpl = node_fs_1.default.readFileSync(`${__dirname}/login.html`, 'utf8');
+    return ejs_1.default.render(tmpl, cfg);
 });
 function getLoginHtmlRedirect(href) {
     return `

package/dist/admin/base.admin.service.d.ts

@@ -1,4 +1,4 @@
-import type * as FirebaseAdmin from 'firebase-admin';
+import type FirebaseAdmin from 'firebase-admin';
 import { BackendRequest, BackendRequestHandler } from '../server/server.model';
 export interface AdminServiceCfg {
     /**

package/dist/admin/firebase.shared.service.d.ts

@@ -1,5 +1,5 @@
 import type { AppOptions, ServiceAccount } from 'firebase-admin';
-import type * as FirebaseAdmin from 'firebase-admin';
+import type FirebaseAdmin from 'firebase-admin';
 export interface FirebaseSharedServiceCfg {
     /**
      * If undefined - will try to use credential.applicationDefault()

package/dist/admin/login.html

@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html>
   <head>
     <title>Login</title>

package/dist/bin/deploy-gae.js

@@ -1,13 +1,14 @@
 #!/usr/bin/env node
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
-const yargs = require("yargs");
+const yargs_1 = tslib_1.__importDefault(require("yargs"));
 const deployGae_1 = require("../deploy/deployGae");
 const deployHealthCheck_1 = require("../deploy/deployHealthCheck");
 const deployPrepare_1 = require("../deploy/deployPrepare");
 (0, nodejs_lib_1.runScript)(async () => {
-    const opt = yargs.options({
+    const opt = yargs_1.default.options({
         ...deployPrepare_1.deployPrepareYargsOptions,
         ...deployHealthCheck_1.deployHealthCheckYargsOptions,
     }).argv;

package/dist/bin/deploy-health-check.js

@@ -9,11 +9,12 @@ yarn deploy-health-check --url https://service-dot-yourproject.appspot.com
 
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
-const yargs = require("yargs");
+const yargs_1 = tslib_1.__importDefault(require("yargs"));
 const deployHealthCheck_1 = require("../deploy/deployHealthCheck");
 (0, nodejs_lib_1.runScript)(async () => {
-    const { url, ...opt } = yargs.options({
+    const { url, ...opt } = yargs_1.default.options({
         ...deployHealthCheck_1.deployHealthCheckYargsOptions,
         url: {
             type: 'string',

package/dist/bin/deploy-prepare.js

@@ -6,11 +6,12 @@ yarn deploy-prepare
 
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
-const yargs = require("yargs");
+const yargs_1 = tslib_1.__importDefault(require("yargs"));
 const deployPrepare_1 = require("../deploy/deployPrepare");
 (0, nodejs_lib_1.runScript)(async () => {
-    const opt = yargs.options(deployPrepare_1.deployPrepareYargsOptions).argv;
+    const opt = yargs_1.default.options(deployPrepare_1.deployPrepareYargsOptions).argv;
     await (0, deployPrepare_1.deployPrepare)(opt);
 });
 // deploy strategy

package/dist/db/httpDB.d.ts

@@ -1,5 +1,5 @@
-import { FetcherOptions, JsonSchemaRootObject, ObjectWithId } from '@naturalcycles/js-lib';
 import { BaseCommonDB, CommonDB, CommonDBOptions, CommonDBSaveOptions, CommonDBStreamOptions, DBQuery, RunQueryResult } from '@naturalcycles/db-lib';
+import { FetcherOptions, JsonSchemaRootObject, ObjectWithId } from '@naturalcycles/js-lib';
 import { ReadableTyped } from '@naturalcycles/nodejs-lib';
 export interface HttpDBCfg extends FetcherOptions {
     baseUrl: string;

package/dist/db/httpDB.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HttpDB = void 0;
 const node_stream_1 = require("node:stream");
-const js_lib_1 = require("@naturalcycles/js-lib");
 const db_lib_1 = require("@naturalcycles/db-lib");
+const js_lib_1 = require("@naturalcycles/js-lib");
 /**
  * Implementation of CommonDB that proxies all requests via HTTP to "httpDBRequestHandler".
  */

package/dist/deploy/backend.cfg.util.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getBackendCfg = void 0;
+const tslib_1 = require("tslib");
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
-const yaml = require("js-yaml");
+const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
 const paths_cnst_1 = require("../paths.cnst");
 const backendCfgSchema = nodejs_lib_1.AjvSchema.readJsonSync(`${paths_cnst_1.resourcesDir}/backendCfg.schema.json`, {
     objectName: 'backend.cfg.yaml',
@@ -12,7 +13,7 @@ function getBackendCfg(projectDir = '.') {
     (0, nodejs_lib_1.requireFileToExist)(backendCfgYamlPath);
     const backendCfg = {
         serviceWithBranchName: true,
-        ...yaml.load((0, nodejs_lib_1._readFileSync)(backendCfgYamlPath)),
+        ...js_yaml_1.default.load((0, nodejs_lib_1._readFileSync)(backendCfgYamlPath)),
     };
     backendCfgSchema.validate(backendCfg);
     return backendCfg;

package/dist/deploy/deploy.util.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateGAEServiceName = exports.createAppYaml = exports.createAndSaveAppYaml = exports.createDeployInfo = exports.createAndSaveDeployInfo = void 0;
-const fs = require("node:fs");
+const tslib_1 = require("tslib");
+const node_fs_1 = tslib_1.__importDefault(require("node:fs"));
 const js_lib_1 = require("@naturalcycles/js-lib");
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
-const yaml = require("js-yaml");
+const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
 const APP_YAML_DEFAULT = () => ({
     runtime: 'nodejs18',
     service: 'default',
@@ -26,7 +27,7 @@ const APP_YAML_DEFAULT = () => ({
 async function createAndSaveDeployInfo(backendCfg, targetDir) {
     const deployInfo = await createDeployInfo(backendCfg);
     const deployInfoPath = `${targetDir}/deployInfo.json`;
-    fs.writeFileSync(deployInfoPath, JSON.stringify(deployInfo, null, 2));
+    node_fs_1.default.writeFileSync(deployInfoPath, JSON.stringify(deployInfo, null, 2));
     console.log(`saved ${(0, nodejs_lib_1.dimGrey)(deployInfoPath)}`);
     return deployInfo;
 }
@@ -73,7 +74,7 @@ exports.createDeployInfo = createDeployInfo;
 function createAndSaveAppYaml(backendCfg, deployInfo, projectDir, targetDir, appYamlPassEnv = '') {
     const appYaml = createAppYaml(backendCfg, deployInfo, projectDir, appYamlPassEnv);
     const appYamlPath = `${targetDir}/app.yaml`;
-    fs.writeFileSync(appYamlPath, yaml.dump(appYaml));
+    node_fs_1.default.writeFileSync(appYamlPath, js_yaml_1.default.dump(appYaml));
     console.log(`saved ${(0, nodejs_lib_1.dimGrey)(appYamlPath)}`);
     return appYaml;
 }
@@ -89,14 +90,14 @@ function createAppYaml(backendCfg, deployInfo, projectDir, appYamlPassEnv = '')
     const appYaml = APP_YAML_DEFAULT();
     // Check existing app.yaml
     const appYamlPath = `${projectDir}/app.yaml`;
-    if (fs.existsSync(appYamlPath)) {
+    if (node_fs_1.default.existsSync(appYamlPath)) {
         console.log(`merging-in ${(0, nodejs_lib_1.dimGrey)(appYamlPath)}`);
-        (0, js_lib_1._merge)(appYaml, yaml.load(fs.readFileSync(appYamlPath, 'utf8')));
+        (0, js_lib_1._merge)(appYaml, js_yaml_1.default.load(node_fs_1.default.readFileSync(appYamlPath, 'utf8')));
     }
     const appEnvYamlPath = `${projectDir}/app.${APP_ENV}.yaml`;
-    if (fs.existsSync(appEnvYamlPath)) {
+    if (node_fs_1.default.existsSync(appEnvYamlPath)) {
         console.log(`merging-in ${(0, nodejs_lib_1.dimGrey)(appEnvYamlPath)}`);
-        (0, js_lib_1._merge)(appYaml, yaml.load(fs.readFileSync(appEnvYamlPath, 'utf8')));
+        (0, js_lib_1._merge)(appYaml, js_yaml_1.default.load(node_fs_1.default.readFileSync(appEnvYamlPath, 'utf8')));
     }
     // appYamlPassEnv
     require('dotenv').config(); // ensure .env is read

package/dist/deploy/deployHealthCheck.js

@@ -2,9 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deployHealthCheck = exports.deployHealthCheckYargsOptions = void 0;
 const node_util_1 = require("node:util");
-const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 const js_lib_1 = require("@naturalcycles/js-lib");
-const nodejs_lib_2 = require("@naturalcycles/nodejs-lib");
+const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 const request_log_util_1 = require("../server/request.log.util");
 exports.deployHealthCheckYargsOptions = {
     thresholdHealthy: {
@@ -70,7 +69,7 @@ async function deployHealthCheck(url, opt = {}) {
         await makeAttempt();
     }
     if (failed) {
-        console.log((0, nodejs_lib_2.red)(`Health check failed!`));
+        console.log((0, nodejs_lib_1.red)(`Health check failed!`));
         if (logOnFailure) {
             try {
                 (0, nodejs_lib_1.execVoidCommandSync)(`gcloud app logs read --project ${gaeProject} --service ${gaeService} --version ${gaeVersion}`, [], { shell: true });
@@ -87,7 +86,7 @@ async function deployHealthCheck(url, opt = {}) {
     }
     async function makeAttempt() {
         attempt++;
-        console.log([`>>`, (0, nodejs_lib_2.dimGrey)(url), (0, node_util_1.inspect)({ attempt }, inspectOpt)].join(' '));
+        console.log([`>>`, (0, nodejs_lib_1.dimGrey)(url), (0, node_util_1.inspect)({ attempt }, inspectOpt)].join(' '));
         const started = Date.now();
         const { err, statusCode = 0 } = await fetcher.doFetch({
             url,
@@ -123,7 +122,7 @@ async function deployHealthCheck(url, opt = {}) {
         console.log([
             `<< HTTP`,
             (0, request_log_util_1.coloredHttpCode)(statusCode),
-            (0, nodejs_lib_2.dimGrey)((0, js_lib_1._since)(started)),
+            (0, nodejs_lib_1.dimGrey)((0, js_lib_1._since)(started)),
             (0, node_util_1.inspect)((0, js_lib_1._filterFalsyValues)({ countHealthy, countUnhealthy }), inspectOpt),
         ].join(' '));
         if (attempt >= maxTries) {
@@ -135,7 +134,7 @@ async function deployHealthCheck(url, opt = {}) {
             console.log(doneReason);
         }
         else {
-            console.log((0, nodejs_lib_2.dimGrey)(`... waiting ${(0, js_lib_1._ms)(currentInterval)} ...`));
+            console.log((0, nodejs_lib_1.dimGrey)(`... waiting ${(0, js_lib_1._ms)(currentInterval)} ...`));
             await (0, js_lib_1.pDelay)(currentInterval);
         }
     }

package/dist/deploy/deployPrepare.js

@@ -2,8 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deployPrepare = exports.deployPrepareYargsOptions = void 0;
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
-const nodejs_lib_2 = require("@naturalcycles/nodejs-lib");
-const nodejs_lib_3 = require("@naturalcycles/nodejs-lib");
 const paths_cnst_1 = require("../paths.cnst");
 const backend_cfg_util_1 = require("./backend.cfg.util");
 const deploy_util_1 = require("./deploy.util");
@@ -58,15 +56,15 @@ async function deployPrepare(opt = {}) {
     const backendCfg = (0, backend_cfg_util_1.getBackendCfg)(projectDir);
     const inputPatterns = backendCfg.files || DEFAULT_FILES;
     const appYamlPassEnv = opt.appYamlPassEnv || backendCfg.appYamlPassEnv;
-    console.log(`1. Copy files to ${(0, nodejs_lib_2.dimGrey)(targetDir)}`);
+    console.log(`1. Copy files to ${(0, nodejs_lib_1.dimGrey)(targetDir)}`);
     // Clean targetDir
     (0, nodejs_lib_1._emptyDirSync)(targetDir);
-    (0, nodejs_lib_3.kpySync)({
+    (0, nodejs_lib_1.kpySync)({
         baseDir: defaultFilesDir,
         outputDir: targetDir,
         dotfiles: true,
     });
-    (0, nodejs_lib_3.kpySync)({
+    (0, nodejs_lib_1.kpySync)({
         baseDir: projectDir,
         inputPatterns,
         outputDir: targetDir,
@@ -78,7 +76,7 @@ async function deployPrepare(opt = {}) {
         const npmrc = `//registry.npmjs.org/:_authToken=${NPM_TOKEN}`;
         (0, nodejs_lib_1._writeFileSync)(npmrcPath, npmrc);
     }
-    console.log(`2. Generate ${(0, nodejs_lib_2.dimGrey)('deployInfo.json')} and ${(0, nodejs_lib_2.dimGrey)('app.yaml')} in targetDir`);
+    console.log(`2. Generate ${(0, nodejs_lib_1.dimGrey)('deployInfo.json')} and ${(0, nodejs_lib_1.dimGrey)('app.yaml')} in targetDir`);
     const deployInfo = await (0, deploy_util_1.createAndSaveDeployInfo)(backendCfg, targetDir);
     (0, deploy_util_1.createAndSaveAppYaml)(backendCfg, deployInfo, projectDir, targetDir, appYamlPassEnv);
     return deployInfo;

package/dist/paths.cnst.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.testDir = exports.srcDir = exports.resourcesDir = exports.projectDir = void 0;
-const path = require("node:path");
-exports.projectDir = path.join(__dirname, '/..');
+const tslib_1 = require("tslib");
+const node_path_1 = tslib_1.__importDefault(require("node:path"));
+exports.projectDir = node_path_1.default.join(__dirname, '/..');
 exports.resourcesDir = `${exports.projectDir}/resources`;
 exports.srcDir = `${exports.projectDir}/src`;
 exports.testDir = `${exports.srcDir}/test`;

package/dist/server/appEngineLogMiddleware.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.appEngineLogMiddleware = exports.ciLogger = exports.devLogger = exports.gaeLogger = void 0;
 const node_util_1 = require("node:util");
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
-const nodejs_lib_2 = require("@naturalcycles/nodejs-lib");
 const { GOOGLE_CLOUD_PROJECT, GAE_INSTANCE } = process.env;
 const isGAE = !!GAE_INSTANCE;
 // Simple "request counter" (poor man's "correlation id") counter, to use on dev machine (not in the cloud)
@@ -45,7 +44,7 @@ function logToDev(requestId, args) {
     // Run on local machine
     console.log([
         requestId ? [(0, nodejs_lib_1.dimGrey)(`[${requestId}]`)] : [],
-        ...args.map(a => (0, nodejs_lib_2.inspectAny)(a, { includeErrorStack: true, colors: true })),
+        ...args.map(a => (0, nodejs_lib_1.inspectAny)(a, { includeErrorStack: true, colors: true })),
     ].join(' '));
 }
 /**
@@ -53,7 +52,7 @@ function logToDev(requestId, args) {
  * This is to not confuse e.g Sentry when it picks up messages with colors
  */
 function logToCI(args) {
-    console.log(args.map(a => (0, nodejs_lib_2.inspectAny)(a, { includeErrorStack: true, colors: false })).join(' '));
+    console.log(args.map(a => (0, nodejs_lib_1.inspectAny)(a, { includeErrorStack: true, colors: false })).join(' '));
 }
 function appEngineLogMiddleware() {
     if (!isGAE || !GOOGLE_CLOUD_PROJECT) {

package/dist/server/createDefaultApp.js

@@ -5,8 +5,8 @@ const cookieParser = require("cookie-parser");
 const cors = require("cors");
 const express = require("express");
 const __1 = require("..");
-const asyncLocalStorageMiddleware_1 = require("./asyncLocalStorageMiddleware");
 const appEngineLogMiddleware_1 = require("./appEngineLogMiddleware");
+const asyncLocalStorageMiddleware_1 = require("./asyncLocalStorageMiddleware");
 const genericErrorMiddleware_1 = require("./genericErrorMiddleware");
 const notFoundMiddleware_1 = require("./notFoundMiddleware");
 const requestTimeoutMiddleware_1 = require("./requestTimeoutMiddleware");

package/dist/server/createDefaultApp.model.d.ts

@@ -1,8 +1,8 @@
 import { Options, OptionsJson, OptionsUrlencoded } from 'body-parser';
 import { CorsOptions } from 'cors';
 import { SentrySharedService } from '../sentry/sentry.shared.service';
-import { BackendRequestHandler } from './server.model';
 import { GenericErrorMiddlewareCfg } from './genericErrorMiddleware';
+import { BackendRequestHandler } from './server.model';
 /**
  * Plain RequestHandler can be provided - then it's mounted to /
  * Otherwise `path` can be provided to specify mounting point.

package/dist/server/deployInfo.util.js

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDeployInfo = void 0;
-const fs = require("node:fs");
+const tslib_1 = require("tslib");
+const node_fs_1 = tslib_1.__importDefault(require("node:fs"));
 const js_lib_1 = require("@naturalcycles/js-lib");
 exports.getDeployInfo = (0, js_lib_1._memoFn)((projectDir) => {
     const deployInfoPath = `${projectDir}/deployInfo.json`;
     try {
-        return JSON.parse(fs.readFileSync(deployInfoPath, 'utf8'));
+        return JSON.parse(node_fs_1.default.readFileSync(deployInfoPath, 'utf8'));
     }
     catch {
         // console.error(`cannot read ${deployInfoPath}, returning empty version`)

package/dist/server/getDefaultRouter.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDefaultRouter = void 0;
-const express_promise_router_1 = require("express-promise-router");
+const tslib_1 = require("tslib");
+const express_promise_router_1 = tslib_1.__importDefault(require("express-promise-router"));
 /**
  * Convenience method.
  */

package/dist/server/validateMiddleware.d.ts

@@ -1,7 +1,7 @@
 import { JsonSchema, JsonSchemaBuilder } from '@naturalcycles/js-lib';
 import { AjvSchema, AjvValidationError } from '@naturalcycles/nodejs-lib';
-import { BackendRequestHandler } from './server.model';
 import { ReqValidationOptions } from './reqValidationMiddleware';
+import { BackendRequestHandler } from './server.model';
 export declare function validateBody(schema: JsonSchema | JsonSchemaBuilder | AjvSchema, opt?: ReqValidationOptions<AjvValidationError>): BackendRequestHandler;
 export declare function validateParams(schema: JsonSchema | JsonSchemaBuilder | AjvSchema, opt?: ReqValidationOptions<AjvValidationError>): BackendRequestHandler;
 export declare function validateQuery(schema: JsonSchema | JsonSchemaBuilder | AjvSchema, opt?: ReqValidationOptions<AjvValidationError>): BackendRequestHandler;

package/dist/server/zodValidateMiddleware.d.ts

@@ -1,6 +1,6 @@
 import { ZodSchema, ZodValidationError } from '@naturalcycles/js-lib';
-import { BackendRequestHandler } from './server.model';
 import { ReqValidationOptions } from './reqValidationMiddleware';
+import { BackendRequestHandler } from './server.model';
 /**
  * Validates req property (body, params or query).
  * Supports Joi schema or AjvSchema (from nodejs-lib).

package/dist/testing/express.test.service.js

@@ -42,11 +42,13 @@ class ExpressTestService {
             await (0, js_lib_1.pDelay)();
         });
         fetcher.close = async () => {
-            const started = Date.now();
-            await new Promise(resolve => server.close(resolve));
-            console.log(`close took ${(0, js_lib_1._since)(started)}`); // todo: investigate why it takes ~5 seconds!
+            // const started = Date.now()
+            // await new Promise(resolve => server.close(resolve))
+            // console.log(`close took ${_since(started)}`) // todo: investigate why it takes ~5 seconds!
+            // Kirill: not awaiting the server-close, otherwise it takes significant waiting time
+            // to "teardown" server after it's been hit by Fetcher
+            server.close();
             // server.destroy()
-            // await pDelay(1000)
         };
         return fetcher;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/backend-lib",
-  "version": "4.18.8",
+  "version": "4.19.1",
   "scripts": {
     "prepare": "husky install",
     "serve": "APP_ENV=dev nodemon",
@@ -46,10 +46,7 @@
     "@types/yargs": "^16.0.0",
     "fastify": "^4.0.0",
     "jest": "^29.0.1",
-    "nodemon": "^3.0.1",
-    "vue-class-component": "^7.2.6",
-    "vuepress": "^1.7.1",
-    "vuepress-plugin-typescript": "^0.3.1"
+    "nodemon": "^3.0.1"
   },
   "files": [
     "dist",

package/readme.md

@@ -6,7 +6,7 @@
 [![Maintainability](https://api.codeclimate.com/v1/badges/c7aa5ef93894ec0246c4/maintainability)](https://codeclimate.com/github/NaturalCycles/backend-lib/maintainability)
 [![Test Coverage](https://api.codeclimate.com/v1/badges/c7aa5ef93894ec0246c4/test_coverage)](https://codeclimate.com/github/NaturalCycles/backend-lib/test_coverage)
 [![code style: prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg?style=flat-square)](https://github.com/prettier/prettier)
-[![Actions](https://github.com/NaturalCycles/backend-lib/workflows/default/badge.svg)](https://github.com/NaturalCycles/backend-lib/actions)
+[![Actions](https://github.com/NaturalCycles/backend-lib/workflows/ci/badge.svg)](https://github.com/NaturalCycles/backend-lib/actions)
 
 # [Documentation](https://naturalcycles.github.io/backend-lib/)
 

package/src/admin/adminMiddleware.ts

@@ -1,6 +1,6 @@
-import * as fs from 'node:fs'
+import fs from 'node:fs'
 import { _memoFn, AppError } from '@naturalcycles/js-lib'
-import * as ejs from 'ejs'
+import ejs from 'ejs'
 import { BackendRequestHandler } from '../server/server.model'
 import { BaseAdminService } from './base.admin.service'
 import { FirebaseSharedServiceCfg } from './firebase.shared.service'

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

@@ -1,6 +1,6 @@
 import { _assert, AppError } from '@naturalcycles/js-lib'
 import { dimGrey, green, red } from '@naturalcycles/nodejs-lib'
-import type * as FirebaseAdmin from 'firebase-admin'
+import type FirebaseAdmin from 'firebase-admin'
 import { BackendRequest, BackendRequestHandler } from '../server/server.model'
 
 export interface AdminServiceCfg {
@@ -31,7 +31,10 @@ const adminInfoDisabled = (): AdminInfo => ({
  * Base implementation based on Firebase Auth tokens passed as 'admin_token' cookie.
  */
 export class BaseAdminService {
-  constructor(private firebaseAuth: FirebaseAdmin.auth.Auth, cfg: AdminServiceCfg) {
+  constructor(
+    private firebaseAuth: FirebaseAdmin.auth.Auth,
+    cfg: AdminServiceCfg,
+  ) {
     this.cfg = {
       adminTokenKey: 'admin_token',
       authEnabled: true,

package/src/admin/firebase.shared.service.ts

@@ -1,6 +1,6 @@
 import { _Memo } from '@naturalcycles/js-lib'
 import type { AppOptions, ServiceAccount } from 'firebase-admin'
-import type * as FirebaseAdmin from 'firebase-admin'
+import type FirebaseAdmin from 'firebase-admin'
 
 export interface FirebaseSharedServiceCfg {
   /**

package/src/admin/login.html

@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html>
   <head>
     <title>Login</title>

package/src/bin/deploy-gae.ts

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 import { runScript } from '@naturalcycles/nodejs-lib'
-import * as yargs from 'yargs'
+import yargs from 'yargs'
 import { deployGae } from '../deploy/deployGae'
 import { deployHealthCheckYargsOptions } from '../deploy/deployHealthCheck'
 import { deployPrepareYargsOptions } from '../deploy/deployPrepare'

package/src/bin/deploy-health-check.ts

@@ -10,7 +10,7 @@ yarn deploy-health-check --url https://service-dot-yourproject.appspot.com
  */
 
 import { runScript } from '@naturalcycles/nodejs-lib'
-import * as yargs from 'yargs'
+import yargs from 'yargs'
 import { deployHealthCheck, deployHealthCheckYargsOptions } from '../deploy/deployHealthCheck'
 
 runScript(async () => {

package/src/bin/deploy-prepare.ts

@@ -7,7 +7,7 @@ yarn deploy-prepare
  */
 
 import { runScript } from '@naturalcycles/nodejs-lib'
-import * as yargs from 'yargs'
+import yargs from 'yargs'
 import { deployPrepare, deployPrepareYargsOptions } from '../deploy/deployPrepare'
 
 runScript(async () => {

package/src/db/httpDB.ts

@@ -1,11 +1,4 @@
 import { Readable } from 'node:stream'
-import {
-  Fetcher,
-  FetcherOptions,
-  getFetcher,
-  JsonSchemaRootObject,
-  ObjectWithId,
-} from '@naturalcycles/js-lib'
 import {
   BaseCommonDB,
   CommonDB,
@@ -15,6 +8,13 @@ import {
   DBQuery,
   RunQueryResult,
 } from '@naturalcycles/db-lib'
+import {
+  Fetcher,
+  FetcherOptions,
+  getFetcher,
+  JsonSchemaRootObject,
+  ObjectWithId,
+} from '@naturalcycles/js-lib'
 import { ReadableTyped } from '@naturalcycles/nodejs-lib'
 
 export interface HttpDBCfg extends FetcherOptions {

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

@@ -1,6 +1,6 @@
 import { StringMap } from '@naturalcycles/js-lib'
 import { _readFileSync, AjvSchema, requireFileToExist } from '@naturalcycles/nodejs-lib'
-import * as yaml from 'js-yaml'
+import yaml from 'js-yaml'
 import { resourcesDir } from '../paths.cnst'
 
 export interface BackendCfg {

package/src/deploy/deploy.util.ts

@@ -1,7 +1,7 @@
-import * as fs from 'node:fs'
+import fs from 'node:fs'
 import { _mapValues, _merge, _truncate, localTime } from '@naturalcycles/js-lib'
 import { dimGrey, white } from '@naturalcycles/nodejs-lib'
-import * as yaml from 'js-yaml'
+import yaml from 'js-yaml'
 import { BackendCfg } from './backend.cfg.util'
 import { AppYaml, DeployInfo } from './deploy.model'
 
@@ -151,16 +151,19 @@ export function createAppYaml(
     .split(',')
     .filter(Boolean)
     // eslint-disable-next-line unicorn/no-array-reduce
-    .reduce((map, key) => {
-      const v = process.env[key]
-      if (!v) {
-        throw new Error(
-          `appYamlPassEnv.${key} is requested, but process.env.${key} is not defined!`,
-        )
-      }
-      map[key] = v
-      return map
-    }, {} as Record<string, string>)
+    .reduce(
+      (map, key) => {
+        const v = process.env[key]
+        if (!v) {
+          throw new Error(
+            `appYamlPassEnv.${key} is requested, but process.env.${key} is not defined!`,
+          )
+        }
+        map[key] = v
+        return map
+      },
+      {} as Record<string, string>,
+    )
 
   if (Object.keys(passEnv).length) {
     console.log(

package/src/deploy/deployHealthCheck.ts

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

package/src/deploy/deployPrepare.ts

@@ -1,6 +1,4 @@
-import { _emptyDirSync, _writeFileSync } from '@naturalcycles/nodejs-lib'
-import { dimGrey } from '@naturalcycles/nodejs-lib'
-import { kpySync } from '@naturalcycles/nodejs-lib'
+import { _emptyDirSync, _writeFileSync, dimGrey, kpySync } from '@naturalcycles/nodejs-lib'
 import { srcDir } from '../paths.cnst'
 import { getBackendCfg } from './backend.cfg.util'
 import { DeployInfo } from './deploy.model'

package/src/paths.cnst.ts

@@ -1,4 +1,4 @@
-import * as path from 'node:path'
+import path from 'node:path'
 
 export const projectDir = path.join(__dirname, '/..')
 export const resourcesDir = `${projectDir}/resources`

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

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

package/src/server/appEngineLogMiddleware.ts

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

package/src/server/asyncLocalStorageMiddleware.ts

@@ -1,7 +1,7 @@
 import { AsyncLocalStorage } from 'node:async_hooks'
 import { _lazyValue, CommonLogger } from '@naturalcycles/js-lib'
-import { BackendRequest, BackendRequestHandler } from './server.model'
 import { gaeLogger, devLogger, ciLogger } from './appEngineLogMiddleware'
+import { BackendRequest, BackendRequestHandler } from './server.model'
 
 const { GAE_INSTANCE, CI } = process.env
 const isGAE = !!GAE_INSTANCE

package/src/server/createDefaultApp.model.ts

@@ -1,8 +1,8 @@
 import { Options, OptionsJson, OptionsUrlencoded } from 'body-parser'
 import { CorsOptions } from 'cors'
 import { SentrySharedService } from '../sentry/sentry.shared.service'
-import { BackendRequestHandler } from './server.model'
 import { GenericErrorMiddlewareCfg } from './genericErrorMiddleware'
+import { BackendRequestHandler } from './server.model'
 
 /**
  * Plain RequestHandler can be provided - then it's mounted to /

package/src/server/createDefaultApp.ts

@@ -2,13 +2,13 @@ import cookieParser = require('cookie-parser')
 import cors = require('cors')
 import express = require('express')
 import { BackendApplication, isGAE, methodOverrideMiddleware } from '..'
+import { appEngineLogMiddleware } from './appEngineLogMiddleware'
+import { asyncLocalStorageMiddleware } from './asyncLocalStorageMiddleware'
 import {
   DefaultAppCfg,
   BackendRequestHandlerCfg,
   BackendRequestHandlerWithPath,
 } from './createDefaultApp.model'
-import { asyncLocalStorageMiddleware } from './asyncLocalStorageMiddleware'
-import { appEngineLogMiddleware } from './appEngineLogMiddleware'
 import { genericErrorMiddleware } from './genericErrorMiddleware'
 import { notFoundMiddleware } from './notFoundMiddleware'
 import { requestTimeoutMiddleware } from './requestTimeoutMiddleware'

package/src/server/deployInfo.util.ts

@@ -1,4 +1,4 @@
-import * as fs from 'node:fs'
+import fs from 'node:fs'
 import { _memoFn } from '@naturalcycles/js-lib'
 import type { DeployInfo } from '../deploy'
 

package/src/server/validateMiddleware.ts

@@ -1,7 +1,7 @@
 import { JsonSchema, JsonSchemaBuilder, _get, AppError } from '@naturalcycles/js-lib'
 import { AjvSchema, AjvValidationError } from '@naturalcycles/nodejs-lib'
-import { BackendRequestHandler } from './server.model'
 import { ReqValidationOptions } from './reqValidationMiddleware'
+import { BackendRequestHandler } from './server.model'
 
 const REDACTED = 'REDACTED'
 

package/src/server/zodValidateMiddleware.ts

@@ -1,6 +1,6 @@
 import { _get, AppError, ZodSchema, ZodValidationError, zSafeValidate } from '@naturalcycles/js-lib'
-import { BackendRequestHandler } from './server.model'
 import { ReqValidationOptions } from './reqValidationMiddleware'
+import { BackendRequestHandler } from './server.model'
 
 const REDACTED = 'REDACTED'
 

package/src/testing/express.test.service.ts

@@ -1,13 +1,6 @@
 import { Server } from 'node:http'
 import { AddressInfo } from 'node:net'
-import {
-  _since,
-  Fetcher,
-  FetcherOptions,
-  FetchFunction,
-  getFetcher,
-  pDelay,
-} from '@naturalcycles/js-lib'
+import { Fetcher, FetcherOptions, FetchFunction, getFetcher, pDelay } from '@naturalcycles/js-lib'
 import { BackendApplication, createDefaultApp, DefaultAppCfg } from '../index'
 import { BackendRequestHandlerCfg } from '../server/createDefaultApp.model'
 
@@ -70,11 +63,13 @@ class ExpressTestService {
     }) as ExpressApp
 
     fetcher.close = async () => {
-      const started = Date.now()
-      await new Promise(resolve => server.close(resolve))
-      console.log(`close took ${_since(started)}`) // todo: investigate why it takes ~5 seconds!
+      // const started = Date.now()
+      // await new Promise(resolve => server.close(resolve))
+      // console.log(`close took ${_since(started)}`) // todo: investigate why it takes ~5 seconds!
+      // Kirill: not awaiting the server-close, otherwise it takes significant waiting time
+      // to "teardown" server after it's been hit by Fetcher
+      server.close()
       // server.destroy()
-      // await pDelay(1000)
     }
 
     return fetcher