@naturalcycles/backend-lib 4.4.1 → 4.5.0

package/cfg/tsconfig.json

@@ -20,7 +20,7 @@
     "noFallthroughCasesInSwitch": true,
     "forceConsistentCasingInFileNames": true,
     "resolveJsonModule": true,
-    "suppressImplicitAnyIndexErrors": true,
+    "suppressImplicitAnyIndexErrors": false,
     "noImplicitOverride": true,
     "noUncheckedIndexedAccess": true,
     "noPropertyAccessFromIndexSignature": true,

package/dist/db/httpDB.d.ts

@@ -19,7 +19,7 @@ export declare class HttpDB extends BaseCommonDB implements CommonDB {
     getByIds<ROW extends ObjectWithId>(table: string, ids: string[], opt?: CommonDBOptions): Promise<ROW[]>;
     runQuery<ROW extends ObjectWithId>(query: DBQuery<ROW>, opt?: CommonDBOptions): Promise<RunQueryResult<ROW>>;
     runQueryCount<ROW extends ObjectWithId>(query: DBQuery<ROW>, opt?: CommonDBOptions): Promise<number>;
-    saveBatch<ROW extends ObjectWithId>(table: string, rows: ROW[], opt?: CommonDBSaveOptions): Promise<void>;
+    saveBatch<ROW extends Partial<ObjectWithId>>(table: string, rows: ROW[], opt?: CommonDBSaveOptions<ROW>): Promise<void>;
     deleteByIds(table: string, ids: string[], opt?: CommonDBOptions): Promise<number>;
     deleteByQuery<ROW extends ObjectWithId>(query: DBQuery<ROW>, opt?: CommonDBOptions): Promise<number>;
     streamQuery<ROW extends ObjectWithId>(_q: DBQuery<ROW>, _opt?: CommonDBStreamOptions): ReadableTyped<ROW>;

package/dist/deploy/deploy.util.js

@@ -34,7 +34,7 @@ exports.createAndSaveDeployInfo = createAndSaveDeployInfo;
 async function createDeployInfo(backendCfg) {
     const simpleGit = require('simple-git/promise'); // lazy load
     const git = simpleGit('.');
-    const now = (0, js_lib_1.localTime)().utc();
+    const now = (0, js_lib_1.localTime)();
     const gitBranch = (await git.status()).current;
     const gitRev = (await git.revparse(['HEAD'])).slice(0, 7);
     let { gaeProject, gaeProjectByBranch = {}, gaeService, gaeServiceByBranch = {}, serviceWithBranchName, prodBranch, branchesWithTimestampVersions = [], } = backendCfg;

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

@@ -1,6 +1,5 @@
 import { CommonLogger } from '@naturalcycles/js-lib';
-import { Severity } from '@sentry/node';
-import type { Breadcrumb, NodeOptions } from '@sentry/node';
+import type { Breadcrumb, NodeOptions, SeverityLevel } from '@sentry/node';
 import type * as SentryLib from '@sentry/node';
 import { BackendErrorRequestHandler, BackendRequestHandler } from '../index';
 export interface SentrySharedServiceCfg extends NodeOptions {
@@ -34,7 +33,7 @@ export declare class SentrySharedService {
     /**
      * Returns "eventId"
      */
-    captureMessage(msg: string, level?: Severity): string;
+    captureMessage(msg: string, level?: SeverityLevel): string;
     addBreadcrumb(breadcrumb: Breadcrumb): void;
     /**
      * Currently it will only use `logger.error` ("error" level) and ignore `log` and `warn`.

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

@@ -4,16 +4,14 @@ exports.SentrySharedService = void 0;
 const tslib_1 = require("tslib");
 const js_lib_1 = require("@naturalcycles/js-lib");
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
-const node_1 = require("@sentry/node");
 const index_1 = require("../index");
 const sentrySeverityMap = {
-    [node_1.Severity.Debug]: 'log',
-    [node_1.Severity.Log]: 'log',
-    [node_1.Severity.Info]: 'log',
-    [node_1.Severity.Warning]: 'warn',
-    [node_1.Severity.Error]: 'error',
-    [node_1.Severity.Critical]: 'error',
-    [node_1.Severity.Fatal]: 'error',
+    debug: 'log',
+    info: 'log',
+    log: 'log',
+    warning: 'warn',
+    error: 'error',
+    fatal: 'error',
 };
 class SentrySharedService {
     constructor(sentryServiceCfg) {

package/dist/server/reqValidationMiddleware.js

@@ -35,8 +35,6 @@ function redact(redactPaths, obj, error) {
         .map(path => (0, js_lib_1._get)(obj, path))
         .filter(Boolean)
         .forEach(secret => {
-        if (secret) {
-            error.message = error.message.replace(secret, REDACTED);
-        }
+        error.message = error.message.replace(secret, REDACTED);
     });
 }

package/dist/server/serverStatusMiddleware.js

@@ -14,12 +14,12 @@ function serverStatusMiddleware(projectDir, extra) {
 exports.serverStatusMiddleware = serverStatusMiddleware;
 function getServerStatusData(projectDir = process.cwd(), extra) {
     const { gitRev, gitBranch, prod, ts } = (0, deployInfo_util_1.getDeployInfo)(projectDir);
-    const t = (0, js_lib_1.localTime)(ts).utc();
-    const deployBuildTimeUTC = t.toPretty();
+    const t = (0, js_lib_1.localTime)(ts);
+    const deployBuildTime = t.toPretty();
     const buildInfo = [t.toStringCompact(), gitBranch, gitRev].filter(Boolean).join('_');
     return (0, js_lib_1._filterFalsyValues)({
         started: getStartedStr(),
-        deployBuildTimeUTC,
+        deployBuildTime,
         APP_ENV,
         prod,
         buildInfo,
@@ -35,6 +35,6 @@ function getServerStatusData(projectDir = process.cwd(), extra) {
 }
 exports.getServerStatusData = getServerStatusData;
 function getStartedStr() {
-    const started = (0, js_lib_1.localTime)().utc().subtract(process.uptime(), 'second');
-    return `${started.toPretty()} UTC (${started.fromNow()})`;
+    const started = (0, js_lib_1.localTime)().subtract(process.uptime(), 'second');
+    return `${started.toPretty()} (${started.fromNow()})`;
 }

package/dist/server/validateMiddleware.js

@@ -52,8 +52,6 @@ function redact(redactPaths, obj, error) {
         .map(path => (0, js_lib_1._get)(obj, path))
         .filter(Boolean)
         .forEach(secret => {
-        if (secret) {
-            error.message = error.message.replace(secret, REDACTED);
-        }
+        error.message = error.message.replace(secret, REDACTED);
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/backend-lib",
-  "version": "4.4.1",
+  "version": "4.5.0",
   "scripts": {
     "prepare": "husky install && patch-package",
     "serve": "APP_ENV=dev nodemon",
@@ -13,7 +13,7 @@
     "deploy-health-check-debug2": "yarn tsn ./src/bin/deploy-health-check.ts --url https://api-master2.naturalcycles.com --thresholdUnhealthy 5"
   },
   "peerDependencies": {
-    "@sentry/node": "^6.5.1"
+    "@sentry/node": "^7.0.0"
   },
   "dependencies": {
     "@naturalcycles/db-lib": "^8.0.2",
@@ -39,14 +39,13 @@
   },
   "devDependencies": {
     "@naturalcycles/bench-lib": "^1.0.7",
-    "@naturalcycles/dev-lib": "^12.0.3",
-    "@sentry/node": "^6.5.1",
+    "@naturalcycles/dev-lib": "^13.0.0",
+    "@sentry/node": "^7.0.0",
     "@types/ejs": "^3.0.0",
     "@types/js-yaml": "^4.0.0",
     "@types/node": "^17.0.0",
-    "esbuild-register": "^3.1.2",
-    "fastify": "^3.20.1",
-    "jest": "^27.0.1",
+    "fastify": "^4.0.0",
+    "jest": "^28.0.3",
     "nodemon": "^2.0.14",
     "patch-package": "^6.2.1",
     "prettier": "^2.0.0",

package/src/db/httpDB.ts

@@ -92,10 +92,10 @@ export class HttpDB extends BaseCommonDB implements CommonDB {
       .json()
   }
 
-  override async saveBatch<ROW extends ObjectWithId>(
+  override async saveBatch<ROW extends Partial<ObjectWithId>>(
     table: string,
     rows: ROW[],
-    opt?: CommonDBSaveOptions,
+    opt?: CommonDBSaveOptions<ROW>,
   ): Promise<void> {
     await this.got.put(`saveBatch`, {
       json: {

package/src/deploy/deploy.util.ts

@@ -43,7 +43,7 @@ export async function createDeployInfo(backendCfg: BackendCfg): Promise<DeployIn
   const simpleGit = require('simple-git/promise') as typeof simpleGitLib // lazy load
   const git = simpleGit('.')
 
-  const now = localTime().utc()
+  const now = localTime()
   const gitBranch = (await git.status()).current!
   const gitRev = (await git.revparse(['HEAD'])).slice(0, 7)
 

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

@@ -1,20 +1,18 @@
 import { _anyToError, _Memo, CommonLogger, CommonLogLevel } from '@naturalcycles/js-lib'
 import { inspectAny, inspectAnyStringifyFn } from '@naturalcycles/nodejs-lib'
-import { Severity } from '@sentry/node'
-import type { Breadcrumb, NodeOptions } from '@sentry/node'
+import type { Breadcrumb, NodeOptions, SeverityLevel } from '@sentry/node'
 import type * as SentryLib from '@sentry/node'
 import { BackendErrorRequestHandler, BackendRequestHandler, getRequestLogger } from '../index'
 
 export interface SentrySharedServiceCfg extends NodeOptions {}
 
-const sentrySeverityMap: Record<Severity, CommonLogLevel> = {
-  [Severity.Debug]: 'log',
-  [Severity.Log]: 'log',
-  [Severity.Info]: 'log',
-  [Severity.Warning]: 'warn',
-  [Severity.Error]: 'error',
-  [Severity.Critical]: 'error',
-  [Severity.Fatal]: 'error',
+const sentrySeverityMap: Record<SeverityLevel, CommonLogLevel> = {
+  debug: 'log',
+  info: 'log',
+  log: 'log',
+  warning: 'warn',
+  error: 'error',
+  fatal: 'error',
 }
 
 export class SentrySharedService {
@@ -106,7 +104,7 @@ export class SentrySharedService {
   /**
    * Returns "eventId"
    */
-  captureMessage(msg: string, level?: Severity): string {
+  captureMessage(msg: string, level?: SeverityLevel): string {
     getRequestLogger()[sentrySeverityMap[level!] || 'log']('captureMessage:', msg)
     return this.sentry().captureMessage(msg, level)
   }

package/src/server/bodyParserTimeoutMiddleware.ts

@@ -61,7 +61,7 @@ export function bodyParserTimeoutMiddleware(
  */
 export function clearBodyParserTimeout(): BackendRequestHandler {
   return (req, res, next) => {
-    clearTimeout(req.bodyParserTimeout!)
+    clearTimeout(req.bodyParserTimeout)
     next()
   }
 }

package/src/server/reqValidationMiddleware.ts

@@ -59,8 +59,6 @@ function redact(redactPaths: string[], obj: any, error: Error): void {
     .map(path => _get(obj, path))
     .filter(Boolean)
     .forEach(secret => {
-      if (secret) {
-        error.message = error.message.replace(secret, REDACTED)
-      }
+      error.message = error.message.replace(secret, REDACTED)
     })
 }

package/src/server/requestTimeoutMiddleware.ts

@@ -72,7 +72,7 @@ export function requestTimeoutMiddleware(
       )
     }, timeoutSeconds * 1000)
 
-    onFinished(res, () => clearTimeout(req.requestTimeout!))
+    onFinished(res, () => clearTimeout(req.requestTimeout))
 
     next()
   }
@@ -110,7 +110,7 @@ export function customRequestTimeoutMiddleware(
       }
     }, timeoutSeconds * 1000)
 
-    onFinished(res, () => clearTimeout(req.requestTimeout!))
+    onFinished(res, () => clearTimeout(req.requestTimeout))
 
     next()
   }

package/src/server/server.util.ts

@@ -1,4 +1,6 @@
 import { Server } from 'http'
+import { Socket } from 'net'
+import { StringMap } from '@naturalcycles/js-lib'
 
 export interface DestroyableServer extends Server {
   destroy(): Promise<void>
@@ -10,7 +12,7 @@ export interface DestroyableServer extends Server {
  * @experimental
  */
 export function enableDestroy(server: Server): DestroyableServer {
-  const connections = {}
+  const connections: StringMap<Socket> = {}
   const srv = server as DestroyableServer
 
   srv.on('connection', function (conn) {
@@ -23,7 +25,7 @@ export function enableDestroy(server: Server): DestroyableServer {
     // let started = Date.now()
     const p = new Promise(resolve => server.close(resolve))
     for (const key of Object.keys(connections)) {
-      connections[key].destroy()
+      connections[key]!.destroy()
     }
     await p
     // console.log(`destroyed ${Object.keys(connections).length} con(s) in ${_since(started)}`)

package/src/server/serverStatsMiddleware.ts

@@ -31,7 +31,7 @@ interface Stat {
 const serverStatsMap: StringMap<Stat> = {}
 
 const percentiles = [50, 90, 99]
-const families = ['2xx', '4xx', '5xx']
+const families: (keyof Stat)[] = ['2xx', '4xx', '5xx']
 
 // Store this number of last latencies
 const SIZE = 50

package/src/server/serverStatusMiddleware.ts

@@ -17,13 +17,13 @@ export function getServerStatusData(
   extra?: any,
 ): Record<string, any> {
   const { gitRev, gitBranch, prod, ts } = getDeployInfo(projectDir)
-  const t = localTime(ts).utc()
-  const deployBuildTimeUTC = t.toPretty()
+  const t = localTime(ts)
+  const deployBuildTime = t.toPretty()
   const buildInfo = [t.toStringCompact(), gitBranch, gitRev].filter(Boolean).join('_')
 
   return _filterFalsyValues({
     started: getStartedStr(),
-    deployBuildTimeUTC,
+    deployBuildTime,
     APP_ENV,
     prod,
     buildInfo,
@@ -39,6 +39,6 @@ export function getServerStatusData(
 }
 
 function getStartedStr(): string {
-  const started = localTime().utc().subtract(process.uptime(), 'second')
-  return `${started.toPretty()} UTC (${started.fromNow()})`
+  const started = localTime().subtract(process.uptime(), 'second')
+  return `${started.toPretty()} (${started.fromNow()})`
 }

package/src/server/validateMiddleware.ts

@@ -74,8 +74,6 @@ function redact(redactPaths: string[], obj: any, error: Error): void {
     .map(path => _get(obj, path))
     .filter(Boolean)
     .forEach(secret => {
-      if (secret) {
-        error.message = error.message.replace(secret, REDACTED)
-      }
+      error.message = error.message.replace(secret, REDACTED)
     })
 }