@naturalcycles/backend-lib 5.7.0 → 5.7.2

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

@@ -68,7 +68,7 @@ async function createDeployInfo(backendCfg, overrideBranch) {
         serviceUrl,
         gitBranch,
         gitRev,
-        ts: now.unix(),
+        ts: now.unix,
     };
     console.log({ deployInfo });
     return deployInfo;

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/index.d.ts

@@ -7,30 +7,30 @@ 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

@@ -12,29 +12,29 @@ 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/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/serverStatusMiddleware.js

@@ -36,5 +36,5 @@ function getServerStatusData(projectDir = process.cwd(), extra) {
 }
 function getStartedStr() {
     const started = js_lib_1.localTime.now().minus(process.uptime(), 'second');
-    return `${started.toPretty()} (${started.fromNow()})`;
+    return `${started.toPretty()} (${started.toFromNowString()})`;
 }

package/package.json

@@ -1,8 +1,13 @@
 {
   "name": "@naturalcycles/backend-lib",
-  "version": "5.7.0",
+  "version": "5.7.2",
   "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",
@@ -17,7 +22,7 @@
   },
   "dependencies": {
     "@naturalcycles/db-lib": "^9.1.0",
-    "@naturalcycles/js-lib": "^14.27.0",
+    "@naturalcycles/js-lib": "^14.244.0",
     "@naturalcycles/nodejs-lib": "^13.1.0",
     "@types/cookie-parser": "^1.4.1",
     "@types/cors": "^2.8.4",
@@ -37,7 +42,7 @@
   },
   "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",
@@ -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/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/deploy/deploy.util.ts

@@ -90,7 +90,7 @@ export async function createDeployInfo(
     serviceUrl,
     gitBranch,
     gitRev,
-    ts: now.unix(),
+    ts: now.unix,
   }
 
   console.log({ deployInfo })

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/index.ts

@@ -7,31 +7,31 @@ 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

@@ -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

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

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/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/serverStatusMiddleware.ts

@@ -41,5 +41,5 @@ export function getServerStatusData(
 
 function getStartedStr(): string {
   const started = localTime.now().minus(process.uptime(), 'second')
-  return `${started.toPretty()} (${started.fromNow()})`
+  return `${started.toPretty()} (${started.toFromNowString()})`
 }

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'