@naturalcycles/backend-lib 4.18.6 → 4.18.8

package/dist/admin/base.admin.service.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseAdminService = void 0;
 const js_lib_1 = require("@naturalcycles/js-lib");
-const colors_1 = require("@naturalcycles/nodejs-lib/dist/colors");
+const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 const adminInfoDisabled = () => ({
     email: 'authDisabled',
     permissions: [],
@@ -35,7 +35,7 @@ class BaseAdminService {
     getEmailPermissions(email) {
         if (!email)
             return;
-        console.log(`getEmailPermissions (${(0, colors_1.dimGrey)(email)}) returning undefined (please override the implementation)`);
+        console.log(`getEmailPermissions (${(0, nodejs_lib_1.dimGrey)(email)}) returning undefined (please override the implementation)`);
         return;
     }
     /**
@@ -43,7 +43,7 @@ class BaseAdminService {
      */
     // eslint-disable-next-line max-params
     async onPermissionCheck(req, email, reqPermissions, required, granted, meta = {}) {
-        req.log(`${(0, colors_1.dimGrey)(email)} ${required ? 'required' : 'optional'} permissions check [${(0, colors_1.dimGrey)(reqPermissions.join(', '))}]: ${granted ? (0, colors_1.green)('GRANTED') : (0, colors_1.red)('DENIED')}`, meta);
+        req.log(`${(0, nodejs_lib_1.dimGrey)(email)} ${required ? 'required' : 'optional'} permissions check [${(0, nodejs_lib_1.dimGrey)(reqPermissions.join(', '))}]: ${granted ? (0, nodejs_lib_1.green)('GRANTED') : (0, nodejs_lib_1.red)('DENIED')}`, meta);
     }
     async getEmailByToken(req, adminToken) {
         if (!adminToken)
@@ -51,7 +51,7 @@ class BaseAdminService {
         try {
             const decodedToken = await this.firebaseAuth.verifyIdToken(adminToken);
             const email = decodedToken?.email;
-            req.log(`admin email: ${(0, colors_1.dimGrey)(email)}`);
+            req.log(`admin email: ${(0, nodejs_lib_1.dimGrey)(email)}`);
             return email;
         }
         catch (err) {

package/dist/bin/deploy-gae.js

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

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

@@ -9,10 +9,10 @@ yarn deploy-health-check --url https://service-dot-yourproject.appspot.com
 
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-const script_1 = require("@naturalcycles/nodejs-lib/dist/script");
+const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 const yargs = require("yargs");
 const deployHealthCheck_1 = require("../deploy/deployHealthCheck");
-(0, script_1.runScript)(async () => {
+(0, nodejs_lib_1.runScript)(async () => {
     const { url, ...opt } = yargs.options({
         ...deployHealthCheck_1.deployHealthCheckYargsOptions,
         url: {

package/dist/bin/deploy-prepare.js

@@ -6,10 +6,10 @@ yarn deploy-prepare
 
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-const script_1 = require("@naturalcycles/nodejs-lib/dist/script");
+const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 const yargs = require("yargs");
 const deployPrepare_1 = require("../deploy/deployPrepare");
-(0, script_1.runScript)(async () => {
+(0, nodejs_lib_1.runScript)(async () => {
     const opt = yargs.options(deployPrepare_1.deployPrepareYargsOptions).argv;
     await (0, deployPrepare_1.deployPrepare)(opt);
 });

package/dist/db/httpDB.d.ts

@@ -1,8 +1,8 @@
-import { JsonSchemaRootObject, ObjectWithId } from '@naturalcycles/js-lib';
+import { FetcherOptions, JsonSchemaRootObject, ObjectWithId } from '@naturalcycles/js-lib';
 import { BaseCommonDB, CommonDB, CommonDBOptions, CommonDBSaveOptions, CommonDBStreamOptions, DBQuery, RunQueryResult } from '@naturalcycles/db-lib';
-import { GetGotOptions, ReadableTyped } from '@naturalcycles/nodejs-lib';
-export interface HttpDBCfg extends GetGotOptions {
-    prefixUrl: string;
+import { ReadableTyped } from '@naturalcycles/nodejs-lib';
+export interface HttpDBCfg extends FetcherOptions {
+    baseUrl: string;
 }
 /**
  * Implementation of CommonDB that proxies all requests via HTTP to "httpDBRequestHandler".
@@ -11,7 +11,7 @@ export declare class HttpDB extends BaseCommonDB implements CommonDB {
     cfg: HttpDBCfg;
     constructor(cfg: HttpDBCfg);
     setCfg(cfg: HttpDBCfg): void;
-    private got;
+    private fetcher;
     ping(): Promise<void>;
     getTables(): Promise<string[]>;
     getTableSchema<ROW extends ObjectWithId>(table: string): Promise<JsonSchemaRootObject<ROW>>;

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 nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 /**
  * Implementation of CommonDB that proxies all requests via HTTP to "httpDBRequestHandler".
  */
@@ -14,53 +14,47 @@ class HttpDB extends db_lib_1.BaseCommonDB {
         this.setCfg(cfg);
     }
     setCfg(cfg) {
-        this.got = (0, nodejs_lib_1.getGot)(cfg);
+        this.fetcher = (0, js_lib_1.getFetcher)(cfg);
     }
     async ping() {
-        await this.got(`ping`);
+        await this.fetcher.getVoid(`ping`);
     }
     async getTables() {
-        return await this.got(`tables`).json();
+        return await this.fetcher.get(`tables`);
     }
     async getTableSchema(table) {
-        return await this.got(`${table}/schema`).json();
+        return await this.fetcher.get(`${table}/schema`);
     }
     async resetCache(table = '') {
-        await this.got.put(`resetCache/${table}`);
+        await this.fetcher.putVoid(`resetCache/${table}`);
     }
     async getByIds(table, ids, opt) {
-        return await this.got
-            .put(`getByIds`, {
+        return await this.fetcher.put(`getByIds`, {
             json: {
                 table,
                 ids,
                 opt,
             },
-        })
-            .json();
+        });
     }
     async runQuery(query, opt) {
-        return await this.got
-            .put(`runQuery`, {
+        return await this.fetcher.put(`runQuery`, {
             json: {
                 query,
                 opt,
             },
-        })
-            .json();
+        });
     }
     async runQueryCount(query, opt) {
-        return await this.got
-            .put(`runQueryCount`, {
+        return await this.fetcher.put(`runQueryCount`, {
             json: {
                 query,
                 opt,
             },
-        })
-            .json();
+        });
     }
     async saveBatch(table, rows, opt) {
-        await this.got.put(`saveBatch`, {
+        await this.fetcher.putVoid(`saveBatch`, {
             json: {
                 table,
                 rows,
@@ -69,25 +63,21 @@ class HttpDB extends db_lib_1.BaseCommonDB {
         });
     }
     async deleteByIds(table, ids, opt) {
-        return await this.got
-            .put(`deleteByIds`, {
+        return await this.fetcher.put(`deleteByIds`, {
             json: {
                 table,
                 ids,
                 opt,
             },
-        })
-            .json();
+        });
     }
     async deleteByQuery(query, opt) {
-        return await this.got
-            .put(`deleteByQuery`, {
+        return await this.fetcher.put(`deleteByQuery`, {
             json: {
                 query,
                 opt,
             },
-        })
-            .json();
+        });
     }
     streamQuery(_q, _opt) {
         console.warn(`streamQuery not implemented`);

package/dist/deploy/deploy.util.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateGAEServiceName = exports.createAppYaml = exports.createAndSaveAppYaml = exports.createDeployInfo = exports.createAndSaveDeployInfo = void 0;
 const fs = require("node:fs");
 const js_lib_1 = require("@naturalcycles/js-lib");
-const colors_1 = require("@naturalcycles/nodejs-lib/dist/colors");
+const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 const yaml = require("js-yaml");
 const APP_YAML_DEFAULT = () => ({
     runtime: 'nodejs18',
@@ -27,7 +27,7 @@ async function createAndSaveDeployInfo(backendCfg, targetDir) {
     const deployInfo = await createDeployInfo(backendCfg);
     const deployInfoPath = `${targetDir}/deployInfo.json`;
     fs.writeFileSync(deployInfoPath, JSON.stringify(deployInfo, null, 2));
-    console.log(`saved ${(0, colors_1.dimGrey)(deployInfoPath)}`);
+    console.log(`saved ${(0, nodejs_lib_1.dimGrey)(deployInfoPath)}`);
     return deployInfo;
 }
 exports.createAndSaveDeployInfo = createAndSaveDeployInfo;
@@ -74,7 +74,7 @@ function createAndSaveAppYaml(backendCfg, deployInfo, projectDir, targetDir, app
     const appYaml = createAppYaml(backendCfg, deployInfo, projectDir, appYamlPassEnv);
     const appYamlPath = `${targetDir}/app.yaml`;
     fs.writeFileSync(appYamlPath, yaml.dump(appYaml));
-    console.log(`saved ${(0, colors_1.dimGrey)(appYamlPath)}`);
+    console.log(`saved ${(0, nodejs_lib_1.dimGrey)(appYamlPath)}`);
     return appYaml;
 }
 exports.createAndSaveAppYaml = createAndSaveAppYaml;
@@ -84,18 +84,18 @@ function createAppYaml(backendCfg, deployInfo, projectDir, appYamlPassEnv = '')
     const { APP_ENV: processAppEnv } = process.env;
     const APP_ENV = processAppEnv || appEnvByBranch[gitBranch] || appEnvDefault;
     if (processAppEnv) {
-        console.log(`using APP_ENV=${(0, colors_1.dimGrey)(processAppEnv)} from process.env`);
+        console.log(`using APP_ENV=${(0, nodejs_lib_1.dimGrey)(processAppEnv)} from process.env`);
     }
     const appYaml = APP_YAML_DEFAULT();
     // Check existing app.yaml
     const appYamlPath = `${projectDir}/app.yaml`;
     if (fs.existsSync(appYamlPath)) {
-        console.log(`merging-in ${(0, colors_1.dimGrey)(appYamlPath)}`);
+        console.log(`merging-in ${(0, nodejs_lib_1.dimGrey)(appYamlPath)}`);
         (0, js_lib_1._merge)(appYaml, yaml.load(fs.readFileSync(appYamlPath, 'utf8')));
     }
     const appEnvYamlPath = `${projectDir}/app.${APP_ENV}.yaml`;
     if (fs.existsSync(appEnvYamlPath)) {
-        console.log(`merging-in ${(0, colors_1.dimGrey)(appEnvYamlPath)}`);
+        console.log(`merging-in ${(0, nodejs_lib_1.dimGrey)(appEnvYamlPath)}`);
         (0, js_lib_1._merge)(appYaml, yaml.load(fs.readFileSync(appEnvYamlPath, 'utf8')));
     }
     // appYamlPassEnv
@@ -113,7 +113,7 @@ function createAppYaml(backendCfg, deployInfo, projectDir, appYamlPassEnv = '')
         return map;
     }, {});
     if (Object.keys(passEnv).length) {
-        console.log(`will merge ${(0, colors_1.white)(String(Object.keys(passEnv).length))} process.env keys to app.yaml: ${(0, colors_1.dimGrey)(Object.keys(passEnv).join(', '))}`);
+        console.log(`will merge ${(0, nodejs_lib_1.white)(String(Object.keys(passEnv).length))} process.env keys to app.yaml: ${(0, nodejs_lib_1.dimGrey)(Object.keys(passEnv).join(', '))}`);
     }
     (0, js_lib_1._merge)(appYaml, {
         service,

package/dist/deploy/deployHealthCheck.js

@@ -4,7 +4,7 @@ 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 colors_1 = require("@naturalcycles/nodejs-lib/dist/colors");
+const nodejs_lib_2 = require("@naturalcycles/nodejs-lib");
 const request_log_util_1 = require("../server/request.log.util");
 exports.deployHealthCheckYargsOptions = {
     thresholdHealthy: {
@@ -70,7 +70,7 @@ async function deployHealthCheck(url, opt = {}) {
         await makeAttempt();
     }
     if (failed) {
-        console.log((0, colors_1.red)(`Health check failed!`));
+        console.log((0, nodejs_lib_2.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 +87,7 @@ async function deployHealthCheck(url, opt = {}) {
     }
     async function makeAttempt() {
         attempt++;
-        console.log([`>>`, (0, colors_1.dimGrey)(url), (0, node_util_1.inspect)({ attempt }, inspectOpt)].join(' '));
+        console.log([`>>`, (0, nodejs_lib_2.dimGrey)(url), (0, node_util_1.inspect)({ attempt }, inspectOpt)].join(' '));
         const started = Date.now();
         const { err, statusCode = 0 } = await fetcher.doFetch({
             url,
@@ -123,7 +123,7 @@ async function deployHealthCheck(url, opt = {}) {
         console.log([
             `<< HTTP`,
             (0, request_log_util_1.coloredHttpCode)(statusCode),
-            (0, colors_1.dimGrey)((0, js_lib_1._since)(started)),
+            (0, nodejs_lib_2.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 +135,7 @@ async function deployHealthCheck(url, opt = {}) {
             console.log(doneReason);
         }
         else {
-            console.log((0, colors_1.dimGrey)(`... waiting ${(0, js_lib_1._ms)(currentInterval)} ...`));
+            console.log((0, nodejs_lib_2.dimGrey)(`... waiting ${(0, js_lib_1._ms)(currentInterval)} ...`));
             await (0, js_lib_1.pDelay)(currentInterval);
         }
     }

package/dist/deploy/deployPrepare.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deployPrepare = exports.deployPrepareYargsOptions = void 0;
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
-const colors_1 = require("@naturalcycles/nodejs-lib/dist/colors");
-const fs_1 = require("@naturalcycles/nodejs-lib/dist/fs");
+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 +58,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, colors_1.dimGrey)(targetDir)}`);
+    console.log(`1. Copy files to ${(0, nodejs_lib_2.dimGrey)(targetDir)}`);
     // Clean targetDir
     (0, nodejs_lib_1._emptyDirSync)(targetDir);
-    (0, fs_1.kpySync)({
+    (0, nodejs_lib_3.kpySync)({
         baseDir: defaultFilesDir,
         outputDir: targetDir,
         dotfiles: true,
     });
-    (0, fs_1.kpySync)({
+    (0, nodejs_lib_3.kpySync)({
         baseDir: projectDir,
         inputPatterns,
         outputDir: targetDir,
@@ -78,7 +78,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, colors_1.dimGrey)('deployInfo.json')} and ${(0, colors_1.dimGrey)('app.yaml')} in targetDir`);
+    console.log(`2. Generate ${(0, nodejs_lib_2.dimGrey)('deployInfo.json')} and ${(0, nodejs_lib_2.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/env/env.shared.service.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EnvSharedService = void 0;
-const colors_1 = require("@naturalcycles/nodejs-lib/dist/colors");
+const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 class EnvSharedService {
     constructor(cfg) {
         this.cfg = cfg;
@@ -24,12 +24,12 @@ class EnvSharedService {
             catch {
                 throw new Error(`Cannot read envFile ${envFilePath}`);
             }
-            console.log(`APP_ENV=${(0, colors_1.dimGrey)(APP_ENV)} loaded`);
+            console.log(`APP_ENV=${(0, nodejs_lib_1.dimGrey)(APP_ENV)} loaded`);
         }
         return this.env;
     }
     setEnv(env) {
-        console.log(`setEnv APP_ENV=${(0, colors_1.dimGrey)(env ? env.name : 'undefined')}`);
+        console.log(`setEnv APP_ENV=${(0, nodejs_lib_1.dimGrey)(env ? env.name : 'undefined')}`);
         this.env = env;
     }
 }

package/dist/server/appEngineLogMiddleware.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.appEngineLogMiddleware = exports.ciLogger = exports.devLogger = exports.gaeLogger = void 0;
 const node_util_1 = require("node:util");
-const colors_1 = require("@naturalcycles/nodejs-lib/dist/colors");
 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)
@@ -44,8 +44,8 @@ function logToAppEngine(meta, args) {
 function logToDev(requestId, args) {
     // Run on local machine
     console.log([
-        requestId ? [(0, colors_1.dimGrey)(`[${requestId}]`)] : [],
-        ...args.map(a => (0, nodejs_lib_1.inspectAny)(a, { includeErrorStack: true, colors: true })),
+        requestId ? [(0, nodejs_lib_1.dimGrey)(`[${requestId}]`)] : [],
+        ...args.map(a => (0, nodejs_lib_2.inspectAny)(a, { includeErrorStack: true, colors: true })),
     ].join(' '));
 }
 /**
@@ -53,7 +53,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_1.inspectAny)(a, { includeErrorStack: true, colors: false })).join(' '));
+    console.log(args.map(a => (0, nodejs_lib_2.inspectAny)(a, { includeErrorStack: true, colors: false })).join(' '));
 }
 function appEngineLogMiddleware() {
     if (!isGAE || !GOOGLE_CLOUD_PROJECT) {

package/dist/server/request.log.util.js

@@ -1,17 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.coloredHttpCode = exports.logRequest = void 0;
-const colors_1 = require("@naturalcycles/nodejs-lib/dist/colors");
+const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 function logRequest(req, statusCode, ...tokens) {
-    req[logLevel(statusCode)]([coloredHttpCode(statusCode), req.method, (0, colors_1.boldGrey)(req.url), ...tokens].join(' '));
+    req[logLevel(statusCode)]([coloredHttpCode(statusCode), req.method, (0, nodejs_lib_1.boldGrey)(req.url), ...tokens].join(' '));
 }
 exports.logRequest = logRequest;
 function coloredHttpCode(statusCode) {
     if (statusCode >= 200 && statusCode < 400)
-        return (0, colors_1.green)(statusCode);
+        return (0, nodejs_lib_1.green)(statusCode);
     if (statusCode >= 400 && statusCode < 500)
-        return (0, colors_1.yellow)(statusCode);
-    return (0, colors_1.red)(statusCode);
+        return (0, nodejs_lib_1.yellow)(statusCode);
+    return (0, nodejs_lib_1.red)(statusCode);
 }
 exports.coloredHttpCode = coloredHttpCode;
 function logLevel(statusCode) {

package/dist/server/simpleRequestLoggerMiddleware.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.simpleRequestLoggerMiddleware = void 0;
 const js_lib_1 = require("@naturalcycles/js-lib");
-const colors_1 = require("@naturalcycles/nodejs-lib/dist/colors");
+const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 const index_1 = require("../index");
 const request_log_util_1 = require("./request.log.util");
 const { APP_ENV } = process.env;
@@ -20,11 +20,11 @@ function simpleRequestLoggerMiddleware(_cfg = {}) {
     return (req, res, next) => {
         const started = Date.now();
         if (logStart) {
-            req.log(['>>', req.method, (0, colors_1.boldGrey)(req.url)].join(' '));
+            req.log(['>>', req.method, (0, nodejs_lib_1.boldGrey)(req.url)].join(' '));
         }
         if (logFinish) {
             (0, index_1.onFinished)(res, () => {
-                (0, request_log_util_1.logRequest)(req, res.statusCode, (0, colors_1.dimGrey)((0, js_lib_1._since)(started)));
+                (0, request_log_util_1.logRequest)(req, res.statusCode, (0, nodejs_lib_1.dimGrey)((0, js_lib_1._since)(started)));
                 // Avoid logging twice. It was previously logged by genericErrorHandler
                 // if (res.__err) {
                 //   logRequest(req, res.statusCode, dimGrey(_since(started)), inspectAny(res.__err))

package/dist/server/startServer.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.startServer = exports.BackendServer = void 0;
 const tslib_1 = require("tslib");
 const js_lib_1 = require("@naturalcycles/js-lib");
-const colors_1 = require("@naturalcycles/nodejs-lib/dist/colors");
+const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 const index_1 = require("../index");
 const { NODE_OPTIONS, APP_ENV } = process.env;
 class BackendServer {
@@ -45,8 +45,8 @@ class BackendServer {
                 address = `http://${addr.address}:${port}`;
             }
         }
-        console.log((0, colors_1.dimGrey)(`node ${process.version}, NODE_OPTIONS: ${NODE_OPTIONS || 'undefined'}, APP_ENV: ${APP_ENV || 'undefined'}`));
-        console.log(`serverStarted on ${(0, colors_1.white)(address)} in ${(0, colors_1.dimGrey)((0, js_lib_1._ms)(process.uptime() * 1000))}`);
+        console.log((0, nodejs_lib_1.dimGrey)(`node ${process.version}, NODE_OPTIONS: ${NODE_OPTIONS || 'undefined'}, APP_ENV: ${APP_ENV || 'undefined'}`));
+        console.log(`serverStarted on ${(0, nodejs_lib_1.white)(address)} in ${(0, nodejs_lib_1.dimGrey)((0, js_lib_1._ms)(process.uptime() * 1000))}`);
         return {
             port,
             server: this.server,
@@ -58,9 +58,9 @@ class BackendServer {
      * Does `process.exit()` in the end.
      */
     async stop(reason) {
-        console.log((0, colors_1.dimGrey)(`Server shutdown (${reason})...`));
+        console.log((0, nodejs_lib_1.dimGrey)(`Server shutdown (${reason})...`));
         const shutdownTimeout = setTimeout(() => {
-            console.log((0, colors_1.boldGrey)('Forceful shutdown after timeout'));
+            console.log((0, nodejs_lib_1.boldGrey)('Forceful shutdown after timeout'));
             process.exit(0);
         }, this.cfg.forceShutdownTimeout ?? 10000);
         try {
@@ -69,7 +69,7 @@ class BackendServer {
                 this.cfg.onShutdown?.(),
             ]);
             clearTimeout(shutdownTimeout);
-            console.log((0, colors_1.dimGrey)('Shutdown completed.'));
+            console.log((0, nodejs_lib_1.dimGrey)('Shutdown completed.'));
             process.exit(0);
         }
         catch (err) {

package/dist/testing/express.test.service.d.ts

@@ -1,13 +1,13 @@
-import { GetGotOptions, Got } from '@naturalcycles/nodejs-lib';
+import { Fetcher, FetcherOptions } from '@naturalcycles/js-lib';
 import { BackendApplication, DefaultAppCfg } from '../index';
 import { BackendRequestHandlerCfg } from '../server/createDefaultApp.model';
-export interface ExpressApp extends Got {
+export interface ExpressApp extends Fetcher {
     close: () => Promise<void>;
 }
 declare class ExpressTestService {
-    createAppFromResource(resource: BackendRequestHandlerCfg, opt?: GetGotOptions, defaultAppCfg?: DefaultAppCfg): ExpressApp;
-    createAppFromResources(resources: BackendRequestHandlerCfg[], opt?: GetGotOptions): ExpressApp;
-    createApp(app: BackendApplication, opt?: GetGotOptions): ExpressApp;
+    createAppFromResource(resource: BackendRequestHandlerCfg, opt?: FetcherOptions, defaultAppCfg?: DefaultAppCfg): ExpressApp;
+    createAppFromResources(resources: BackendRequestHandlerCfg[], opt?: FetcherOptions): ExpressApp;
+    createApp(app: BackendApplication, opt?: FetcherOptions): ExpressApp;
     /**
      * Creates a "Default Express App" with provided resources.
      * Starts an http server on '127.0.0.1' and random available port.

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

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.expressTestService = void 0;
-const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
+const js_lib_1 = require("@naturalcycles/js-lib");
 const index_1 = require("../index");
+const nativeFetchFn = async (url, init) => await globalThis.fetch(url, init);
 // Example:
 // const app = expressTestService.createApp([ debugResource ])
 // afterAll(async () => {
@@ -23,21 +24,31 @@ class ExpressTestService {
     createApp(app, opt) {
         const server = this.createTestServer(app);
         const { port } = server.address();
-        const prefixUrl = `http://127.0.0.1:${port}`;
-        const got = (0, nodejs_lib_1.getGot)({
-            prefixUrl,
+        const baseUrl = `http://127.0.0.1:${port}`;
+        const fetcher = (0, js_lib_1.getFetcher)({
+            baseUrl,
             responseType: 'json',
-            retry: 0,
-            logStart: true,
-            logFinished: true,
+            retry: { count: 0 },
+            logRequest: true,
+            logResponse: true,
+            logWithBaseUrl: false,
+            fetchFn: nativeFetchFn,
             ...opt,
+        }).onAfterResponse(async () => {
+            // This "empty" hook exists to act like `await pDelay`,
+            // so tests using it can reply on `void someAnalyticsService.doSmth()` promises
+            // to be done by that time.
+            // Smart, huh?
+            await (0, js_lib_1.pDelay)();
         });
-        got.close = async () => {
+        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!
             // server.destroy()
             // await pDelay(1000)
         };
-        return got;
+        return fetcher;
     }
     /**
      * Creates a "Default Express App" with provided resources.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/backend-lib",
-  "version": "4.18.6",
+  "version": "4.18.8",
   "scripts": {
     "prepare": "husky install",
     "serve": "APP_ENV=dev nodemon",
@@ -18,7 +18,7 @@
   "dependencies": {
     "@naturalcycles/db-lib": "^8.0.2",
     "@naturalcycles/js-lib": "^14.27.0",
-    "@naturalcycles/nodejs-lib": "^12.0.0",
+    "@naturalcycles/nodejs-lib": "^13.1.0",
     "@types/cookie-parser": "^1.4.1",
     "@types/cors": "^2.8.4",
     "@types/express": "^4.16.1",

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

@@ -1,5 +1,5 @@
 import { _assert, AppError } from '@naturalcycles/js-lib'
-import { dimGrey, green, red } from '@naturalcycles/nodejs-lib/dist/colors'
+import { dimGrey, green, red } from '@naturalcycles/nodejs-lib'
 import type * as FirebaseAdmin from 'firebase-admin'
 import { BackendRequest, BackendRequestHandler } from '../server/server.model'
 

package/src/bin/deploy-gae.ts

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

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

@@ -9,7 +9,7 @@ yarn deploy-health-check --url https://service-dot-yourproject.appspot.com
 
  */
 
-import { runScript } from '@naturalcycles/nodejs-lib/dist/script'
+import { runScript } from '@naturalcycles/nodejs-lib'
 import * as yargs from 'yargs'
 import { deployHealthCheck, deployHealthCheckYargsOptions } from '../deploy/deployHealthCheck'
 

package/src/bin/deploy-prepare.ts

@@ -6,7 +6,7 @@ yarn deploy-prepare
 
  */
 
-import { runScript } from '@naturalcycles/nodejs-lib/dist/script'
+import { runScript } from '@naturalcycles/nodejs-lib'
 import * as yargs from 'yargs'
 import { deployPrepare, deployPrepareYargsOptions } from '../deploy/deployPrepare'
 

package/src/db/httpDB.ts

@@ -1,5 +1,11 @@
 import { Readable } from 'node:stream'
-import { JsonSchemaRootObject, ObjectWithId } from '@naturalcycles/js-lib'
+import {
+  Fetcher,
+  FetcherOptions,
+  getFetcher,
+  JsonSchemaRootObject,
+  ObjectWithId,
+} from '@naturalcycles/js-lib'
 import {
   BaseCommonDB,
   CommonDB,
@@ -9,10 +15,10 @@ import {
   DBQuery,
   RunQueryResult,
 } from '@naturalcycles/db-lib'
-import { getGot, GetGotOptions, Got, ReadableTyped } from '@naturalcycles/nodejs-lib'
+import { ReadableTyped } from '@naturalcycles/nodejs-lib'
 
-export interface HttpDBCfg extends GetGotOptions {
-  prefixUrl: string
+export interface HttpDBCfg extends FetcherOptions {
+  baseUrl: string
 }
 
 /**
@@ -25,27 +31,27 @@ export class HttpDB extends BaseCommonDB implements CommonDB {
   }
 
   setCfg(cfg: HttpDBCfg): void {
-    this.got = getGot(cfg)
+    this.fetcher = getFetcher(cfg)
   }
 
-  private got!: Got
+  private fetcher!: Fetcher
 
   override async ping(): Promise<void> {
-    await this.got(`ping`)
+    await this.fetcher.getVoid(`ping`)
   }
 
   override async getTables(): Promise<string[]> {
-    return await this.got(`tables`).json()
+    return await this.fetcher.get(`tables`)
   }
 
   override async getTableSchema<ROW extends ObjectWithId>(
     table: string,
   ): Promise<JsonSchemaRootObject<ROW>> {
-    return await this.got(`${table}/schema`).json()
+    return await this.fetcher.get(`${table}/schema`)
   }
 
   async resetCache(table = ''): Promise<void> {
-    await this.got.put(`resetCache/${table}`)
+    await this.fetcher.putVoid(`resetCache/${table}`)
   }
 
   override async getByIds<ROW extends ObjectWithId>(
@@ -53,43 +59,37 @@ export class HttpDB extends BaseCommonDB implements CommonDB {
     ids: ROW['id'][],
     opt?: CommonDBOptions,
   ): Promise<ROW[]> {
-    return await this.got
-      .put(`getByIds`, {
-        json: {
-          table,
-          ids,
-          opt,
-        },
-      })
-      .json()
+    return await this.fetcher.put(`getByIds`, {
+      json: {
+        table,
+        ids,
+        opt,
+      },
+    })
   }
 
   override async runQuery<ROW extends ObjectWithId>(
     query: DBQuery<ROW>,
     opt?: CommonDBOptions,
   ): Promise<RunQueryResult<ROW>> {
-    return await this.got
-      .put(`runQuery`, {
-        json: {
-          query,
-          opt,
-        },
-      })
-      .json()
+    return await this.fetcher.put(`runQuery`, {
+      json: {
+        query,
+        opt,
+      },
+    })
   }
 
   override async runQueryCount<ROW extends ObjectWithId>(
     query: DBQuery<ROW>,
     opt?: CommonDBOptions,
   ): Promise<number> {
-    return await this.got
-      .put(`runQueryCount`, {
-        json: {
-          query,
-          opt,
-        },
-      })
-      .json()
+    return await this.fetcher.put(`runQueryCount`, {
+      json: {
+        query,
+        opt,
+      },
+    })
   }
 
   override async saveBatch<ROW extends Partial<ObjectWithId>>(
@@ -97,7 +97,7 @@ export class HttpDB extends BaseCommonDB implements CommonDB {
     rows: ROW[],
     opt?: CommonDBSaveOptions<ROW>,
   ): Promise<void> {
-    await this.got.put(`saveBatch`, {
+    await this.fetcher.putVoid(`saveBatch`, {
       json: {
         table,
         rows,
@@ -107,29 +107,25 @@ export class HttpDB extends BaseCommonDB implements CommonDB {
   }
 
   async deleteByIds(table: string, ids: string[], opt?: CommonDBOptions): Promise<number> {
-    return await this.got
-      .put(`deleteByIds`, {
-        json: {
-          table,
-          ids,
-          opt,
-        },
-      })
-      .json()
+    return await this.fetcher.put(`deleteByIds`, {
+      json: {
+        table,
+        ids,
+        opt,
+      },
+    })
   }
 
   override async deleteByQuery<ROW extends ObjectWithId>(
     query: DBQuery<ROW>,
     opt?: CommonDBOptions,
   ): Promise<number> {
-    return await this.got
-      .put(`deleteByQuery`, {
-        json: {
-          query,
-          opt,
-        },
-      })
-      .json()
+    return await this.fetcher.put(`deleteByQuery`, {
+      json: {
+        query,
+        opt,
+      },
+    })
   }
 
   override streamQuery<ROW extends ObjectWithId>(

package/src/deploy/deploy.util.ts

@@ -1,6 +1,6 @@
 import * as fs from 'node:fs'
 import { _mapValues, _merge, _truncate, localTime } from '@naturalcycles/js-lib'
-import { dimGrey, white } from '@naturalcycles/nodejs-lib/dist/colors'
+import { dimGrey, white } from '@naturalcycles/nodejs-lib'
 import * as yaml from 'js-yaml'
 import { BackendCfg } from './backend.cfg.util'
 import { AppYaml, DeployInfo } from './deploy.model'

package/src/deploy/deployHealthCheck.ts

@@ -1,7 +1,7 @@
 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/dist/colors'
+import { dimGrey, red } from '@naturalcycles/nodejs-lib'
 import { coloredHttpCode } from '../server/request.log.util'
 
 export interface DeployHealthCheckOptions {

package/src/deploy/deployPrepare.ts

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

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

@@ -1,4 +1,4 @@
-import { dimGrey } from '@naturalcycles/nodejs-lib/dist/colors'
+import { dimGrey } from '@naturalcycles/nodejs-lib'
 import { BaseEnv } from './env.model'
 
 export interface EnvSharedServiceCfg {

package/src/server/appEngineLogMiddleware.ts

@@ -1,5 +1,5 @@
 import { inspect } from 'node:util'
-import { dimGrey } from '@naturalcycles/nodejs-lib/dist/colors'
+import { dimGrey } from '@naturalcycles/nodejs-lib'
 import { inspectAny } from '@naturalcycles/nodejs-lib'
 import { AnyObject, CommonLogger } from '@naturalcycles/js-lib'
 import { BackendRequestHandler } from './server.model'

package/src/server/request.log.util.ts

@@ -1,5 +1,5 @@
 import { CommonLogLevel } from '@naturalcycles/js-lib'
-import { boldGrey, green, red, yellow } from '@naturalcycles/nodejs-lib/dist/colors'
+import { boldGrey, green, red, yellow } from '@naturalcycles/nodejs-lib'
 import { BackendRequest } from './server.model'
 
 export function logRequest(req: BackendRequest, statusCode: number, ...tokens: any[]): void {

package/src/server/simpleRequestLoggerMiddleware.ts

@@ -1,5 +1,5 @@
 import { _since } from '@naturalcycles/js-lib'
-import { boldGrey, dimGrey } from '@naturalcycles/nodejs-lib/dist/colors'
+import { boldGrey, dimGrey } from '@naturalcycles/nodejs-lib'
 import { BackendRequestHandler, onFinished } from '../index'
 import { logRequest } from './request.log.util'
 

package/src/server/startServer.ts

@@ -1,6 +1,6 @@
 import { Server } from 'node:http'
 import { _Memo, _ms } from '@naturalcycles/js-lib'
-import { boldGrey, dimGrey, white } from '@naturalcycles/nodejs-lib/dist/colors'
+import { boldGrey, dimGrey, white } from '@naturalcycles/nodejs-lib'
 import { createDefaultApp } from '../index'
 import { StartServerCfg, StartServerData } from './startServer.model'
 

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

@@ -1,10 +1,19 @@
 import { Server } from 'node:http'
 import { AddressInfo } from 'node:net'
-import { getGot, GetGotOptions, Got } from '@naturalcycles/nodejs-lib'
+import {
+  _since,
+  Fetcher,
+  FetcherOptions,
+  FetchFunction,
+  getFetcher,
+  pDelay,
+} from '@naturalcycles/js-lib'
 import { BackendApplication, createDefaultApp, DefaultAppCfg } from '../index'
 import { BackendRequestHandlerCfg } from '../server/createDefaultApp.model'
 
-export interface ExpressApp extends Got {
+const nativeFetchFn: FetchFunction = async (url, init) => await globalThis.fetch(url, init)
+
+export interface ExpressApp extends Fetcher {
   close: () => Promise<void>
 }
 
@@ -17,7 +26,7 @@ export interface ExpressApp extends Got {
 class ExpressTestService {
   createAppFromResource(
     resource: BackendRequestHandlerCfg,
-    opt?: GetGotOptions,
+    opt?: FetcherOptions,
     defaultAppCfg?: DefaultAppCfg,
   ): ExpressApp {
     return this.createApp(
@@ -29,7 +38,7 @@ class ExpressTestService {
     )
   }
 
-  createAppFromResources(resources: BackendRequestHandlerCfg[], opt?: GetGotOptions): ExpressApp {
+  createAppFromResources(resources: BackendRequestHandlerCfg[], opt?: FetcherOptions): ExpressApp {
     return this.createApp(
       createDefaultApp({
         resources,
@@ -38,27 +47,37 @@ class ExpressTestService {
     )
   }
 
-  createApp(app: BackendApplication, opt?: GetGotOptions): ExpressApp {
+  createApp(app: BackendApplication, opt?: FetcherOptions): ExpressApp {
     const server = this.createTestServer(app)
     const { port } = server.address() as AddressInfo
-    const prefixUrl = `http://127.0.0.1:${port}`
+    const baseUrl = `http://127.0.0.1:${port}`
 
-    const got = getGot({
-      prefixUrl,
+    const fetcher = getFetcher({
+      baseUrl,
       responseType: 'json',
-      retry: 0,
-      logStart: true,
-      logFinished: true,
+      retry: { count: 0 },
+      logRequest: true,
+      logResponse: true,
+      logWithBaseUrl: false, // for stable error snapshots
+      fetchFn: nativeFetchFn, // this is to make it NOT mockable
       ...opt,
+    }).onAfterResponse(async () => {
+      // This "empty" hook exists to act like `await pDelay`,
+      // so tests using it can reply on `void someAnalyticsService.doSmth()` promises
+      // to be done by that time.
+      // Smart, huh?
+      await pDelay()
     }) as ExpressApp
 
-    got.close = async () => {
+    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!
       // server.destroy()
       // await pDelay(1000)
     }
 
-    return got
+    return fetcher
   }
 
   /**