@naturalcycles/backend-lib 4.8.2 → 4.9.0

package/cfg/tsconfig.json

@@ -6,8 +6,8 @@
 {
   "compilerOptions": {
     // Target/module
-    "target": "es2020",
-    "lib": ["es2020"], // add "dom" if needed
+    "target": "es2021",
+    "lib": ["es2021"], // add "dom" if needed
     "module": "commonjs",
     "moduleResolution": "node",
 

package/dist/admin/adminMiddleware.d.ts

@@ -18,7 +18,7 @@ export interface RequireAdminCfg {
      */
     autoLogin?: boolean;
 }
-export declare type AdminMiddleware = (reqPermissions?: string[], cfg?: RequireAdminCfg) => BackendRequestHandler;
+export type AdminMiddleware = (reqPermissions?: string[], cfg?: RequireAdminCfg) => BackendRequestHandler;
 export declare function createAdminMiddleware(adminService: BaseAdminService, cfgDefaults?: RequireAdminCfg): AdminMiddleware;
 /**
  * Require Admin permission.

package/dist/admin/adminMiddleware.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLoginHtmlRedirect = exports.loginHtml = exports.requireAdminPermissions = exports.createAdminMiddleware = void 0;
-const fs = require("fs");
+const fs = require("node:fs");
 const js_lib_1 = require("@naturalcycles/js-lib");
 const ejs = require("ejs");
 function createAdminMiddleware(adminService, cfgDefaults = {}) {

package/dist/db/httpDB.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HttpDB = void 0;
-const stream_1 = require("stream");
+const node_stream_1 = require("node:stream");
 const db_lib_1 = require("@naturalcycles/db-lib");
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 /**
@@ -91,7 +91,7 @@ class HttpDB extends db_lib_1.BaseCommonDB {
     }
     streamQuery(_q, _opt) {
         console.warn(`streamQuery not implemented`);
-        return stream_1.Readable.from([]);
+        return node_stream_1.Readable.from([]);
     }
 }
 exports.HttpDB = HttpDB;

package/dist/deploy/deploy.util.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateGAEServiceName = exports.createAppYaml = exports.createAndSaveAppYaml = exports.createDeployInfo = exports.createAndSaveDeployInfo = void 0;
-const fs = require("fs");
+const fs = require("node:fs");
 const js_lib_1 = require("@naturalcycles/js-lib");
 const colors_1 = require("@naturalcycles/nodejs-lib/dist/colors");
 const yaml = require("js-yaml");

package/dist/deploy/deployHealthCheck.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deployHealthCheck = exports.deployHealthCheckYargsOptions = void 0;
-const util_1 = require("util");
+const node_util_1 = require("node:util");
 const js_lib_1 = require("@naturalcycles/js-lib");
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 const colors_1 = require("@naturalcycles/nodejs-lib/dist/colors");
@@ -83,7 +83,7 @@ async function deployHealthCheck(url, opt = {}) {
     }
     async function makeAttempt() {
         attempt++;
-        console.log([`>>`, (0, colors_1.dimGrey)(url), (0, util_1.inspect)({ attempt }, inspectOpt)].join(' '));
+        console.log([`>>`, (0, colors_1.dimGrey)(url), (0, node_util_1.inspect)({ attempt }, inspectOpt)].join(' '));
         const started = Date.now();
         const { statusCode } = await got(url, {
             responseType: 'json',
@@ -120,7 +120,7 @@ async function deployHealthCheck(url, opt = {}) {
             `<< HTTP`,
             (0, request_log_util_1.coloredHttpCode)(statusCode),
             (0, colors_1.dimGrey)((0, js_lib_1._since)(started)),
-            (0, util_1.inspect)((0, js_lib_1._filterFalsyValues)({ countHealthy, countUnhealthy }), inspectOpt),
+            (0, node_util_1.inspect)((0, js_lib_1._filterFalsyValues)({ countHealthy, countUnhealthy }), inspectOpt),
         ].join(' '));
         if (attempt >= maxTries) {
             doneReason = `reached maxTries of ${maxTries}`;

package/dist/paths.cnst.js

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

package/dist/server/appEngineLogMiddleware.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.appEngineLogMiddleware = exports.ciLogger = exports.devLogger = exports.gaeLogger = void 0;
-const util_1 = require("util");
+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 { GOOGLE_CLOUD_PROJECT, GAE_INSTANCE } = process.env;
@@ -37,7 +37,7 @@ exports.ciLogger = {
 // Documented here: https://cloud.google.com/logging/docs/structured-logging
 function logToAppEngine(meta, args) {
     console.log(JSON.stringify({
-        message: args.map(a => (typeof a === 'string' ? a : (0, util_1.inspect)(a))).join(' '),
+        message: args.map(a => (typeof a === 'string' ? a : (0, node_util_1.inspect)(a))).join(' '),
         ...meta,
     }));
 }

package/dist/server/asyncLocalStorageMiddleware.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.requestLogger = exports.getRequestLogger = exports.getRequest = exports.asyncLocalStorageMiddleware = void 0;
-const async_hooks_1 = require("async_hooks");
+const node_async_hooks_1 = require("node:async_hooks");
 const js_lib_1 = require("@naturalcycles/js-lib");
 const appEngineLogMiddleware_1 = require("./appEngineLogMiddleware");
 const { GAE_INSTANCE, CI } = process.env;
@@ -9,7 +9,7 @@ const isGAE = !!GAE_INSTANCE;
 const isCI = !!CI;
 // Singleton, for simplicity
 // Create it lazily (on demand)
-const storage = (0, js_lib_1._lazyValue)(() => new async_hooks_1.AsyncLocalStorage());
+const storage = (0, js_lib_1._lazyValue)(() => new node_async_hooks_1.AsyncLocalStorage());
 function asyncLocalStorageMiddleware() {
     return (req, res, next) => {
         const store = {

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

@@ -7,7 +7,7 @@ import { GenericErrorMiddlewareCfg } from './genericErrorMiddleware';
  * Plain RequestHandler can be provided - then it's mounted to /
  * Otherwise `path` can be provided to specify mounting point.
  */
-export declare type BackendRequestHandlerCfg = BackendRequestHandler | BackendRequestHandlerWithPath;
+export type BackendRequestHandlerCfg = BackendRequestHandler | BackendRequestHandlerWithPath;
 export interface BackendRequestHandlerWithPath {
     path: string;
     handler: BackendRequestHandler;

package/dist/server/deployInfo.util.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDeployInfo = void 0;
-const fs = require("fs");
+const fs = require("node:fs");
 const js_lib_1 = require("@naturalcycles/js-lib");
 exports.getDeployInfo = (0, js_lib_1._memoFn)((projectDir) => {
     const deployInfoPath = `${projectDir}/deployInfo.json`;

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

@@ -20,11 +20,11 @@ export interface BackendRequest extends Request {
     requestTimeout?: NodeJS.Timeout;
     bodyParserTimeout?: NodeJS.Timeout;
 }
-export declare type BackendResponse = Response;
-export declare type BackendRequestHandler = (req: BackendRequest, res: BackendResponse, next: NextFunction) => void;
-export declare type BackendErrorRequestHandler = (err: any, req: BackendRequest, res: BackendResponse, next: NextFunction) => void;
-export declare type BackendRouter = IRouter;
-export declare type BackendApplication = Application;
+export type BackendResponse = Response;
+export type BackendRequestHandler = (req: BackendRequest, res: BackendResponse, next: NextFunction) => void;
+export type BackendErrorRequestHandler = (err: any, req: BackendRequest, res: BackendResponse, next: NextFunction) => void;
+export type BackendRouter = IRouter;
+export type BackendApplication = Application;
 declare module 'http' {
     interface IncomingMessage {
         log: CommonLogFunction;

package/dist/server/server.util.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { Server } from 'http';
+import { Server } from 'node:http';
 export interface DestroyableServer extends Server {
     destroy(): Promise<void>;
 }

package/dist/server/startServer.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { Server } from 'http';
+import { Server } from 'node:http';
 import { StartServerCfg, StartServerData } from './startServer.model';
 export declare class BackendServer {
     private cfg;

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

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { Server } from 'http';
+import { Server } from 'node:http';
 import { SentrySharedService } from '../sentry/sentry.shared.service';
 import { DefaultAppCfg } from './createDefaultApp.model';
 import { BackendApplication } from './server.model';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/backend-lib",
-  "version": "4.8.2",
+  "version": "4.9.0",
   "scripts": {
     "prepare": "husky install && patch-package",
     "serve": "APP_ENV=dev nodemon",
@@ -30,7 +30,7 @@
     "express": "^4.16.4",
     "express-promise-router": "^4.0.0",
     "firebase-admin": "^11.0.0",
-    "fs-extra": "^10.0.0",
+    "fs-extra": "^11.0.0",
     "helmet": "^6.0.0",
     "js-yaml": "^4.0.0",
     "on-finished": "^2.3.0",
@@ -49,14 +49,10 @@
     "jest": "^29.0.1",
     "nodemon": "^2.0.14",
     "patch-package": "^6.2.1",
-    "prettier": "^2.0.0",
     "vue-class-component": "^7.2.6",
     "vuepress": "^1.7.1",
     "vuepress-plugin-typescript": "^0.3.1"
   },
-  "resolutions": {
-    "prettier": "^2.0.0"
-  },
   "files": [
     "dist",
     "cfg",
@@ -82,7 +78,7 @@
     "url": "https://github.com/NaturalCycles/backend-lib"
   },
   "engines": {
-    "node": ">=14.15.0"
+    "node": ">=16.10.0"
   },
   "type": "commonjs",
   "description": "Standard library for making Express.js / AppEngine based backend services",

package/src/admin/adminMiddleware.ts

@@ -1,4 +1,4 @@
-import * as fs from 'fs'
+import * as fs from 'node:fs'
 import { Admin401ErrorData, HttpError, _memoFn } from '@naturalcycles/js-lib'
 import * as ejs from 'ejs'
 import { BackendRequestHandler } from '../server/server.model'

package/src/db/httpDB.ts

@@ -1,4 +1,4 @@
-import { Readable } from 'stream'
+import { Readable } from 'node:stream'
 import { JsonSchemaRootObject, ObjectWithId } from '@naturalcycles/js-lib'
 import {
   BaseCommonDB,

package/src/deploy/deploy.util.ts

@@ -1,4 +1,4 @@
-import * as fs from 'fs'
+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 * as yaml from 'js-yaml'

package/src/deploy/deployHealthCheck.ts

@@ -1,4 +1,4 @@
-import { inspect, InspectOptions } from 'util'
+import { inspect, InspectOptions } from 'node:util'
 import { pDelay, _filterFalsyValues, _ms, _since } from '@naturalcycles/js-lib'
 import { getGot } from '@naturalcycles/nodejs-lib'
 import { dimGrey, red } from '@naturalcycles/nodejs-lib/dist/colors'

package/src/paths.cnst.ts

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

package/src/server/appEngineLogMiddleware.ts

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

package/src/server/asyncLocalStorageMiddleware.ts

@@ -1,4 +1,4 @@
-import { AsyncLocalStorage } from 'async_hooks'
+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'

package/src/server/deployInfo.util.ts

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

package/src/server/server.util.ts

@@ -1,5 +1,5 @@
-import { Server } from 'http'
-import { Socket } from 'net'
+import { Server } from 'node:http'
+import { Socket } from 'node:net'
 import { StringMap } from '@naturalcycles/js-lib'
 
 export interface DestroyableServer extends Server {

package/src/server/startServer.model.ts

@@ -1,4 +1,4 @@
-import { Server } from 'http'
+import { Server } from 'node:http'
 import { SentrySharedService } from '../sentry/sentry.shared.service'
 import { DefaultAppCfg } from './createDefaultApp.model'
 import { BackendApplication } from './server.model'

package/src/server/startServer.ts

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

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

@@ -1,5 +1,5 @@
-import { Server } from 'http'
-import { AddressInfo } from 'net'
+import { Server } from 'node:http'
+import { AddressInfo } from 'node:net'
 import { getGot, GetGotOptions, Got } from '@naturalcycles/nodejs-lib'
 import { BackendApplication, createDefaultApp, DefaultAppCfg } from '../index'
 import { BackendRequestHandlerCfg } from '../server/createDefaultApp.model'