@naturalcycles/backend-lib 4.4.0 → 4.4.3

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

@@ -35,8 +35,6 @@ function getServerStatusData(projectDir = process.cwd(), extra) {
 }
 exports.getServerStatusData = getServerStatusData;
 function getStartedStr() {
-    const serverStarted = (0, js_lib_1.localTime)().subtract(process.uptime(), 'second');
-    const s1 = serverStarted.toPretty();
-    const s2 = (0, js_lib_1._ms)(Date.now() - serverStarted.unix() * 1000);
-    return `${s1} (${s2} ago)`;
+    const started = (0, js_lib_1.localTime)().subtract(process.uptime(), 'second');
+    return `${started.toPretty()} (${started.fromNow()})`;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/backend-lib",
-  "version": "4.4.0",
+  "version": "4.4.3",
   "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",
@@ -40,13 +40,12 @@
   "devDependencies": {
     "@naturalcycles/bench-lib": "^1.0.7",
     "@naturalcycles/dev-lib": "^12.0.3",
-    "@sentry/node": "^6.5.1",
+    "@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",
+    "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/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/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/serverStatusMiddleware.ts

@@ -1,4 +1,4 @@
-import { _filterFalsyValues, _ms, localTime } from '@naturalcycles/js-lib'
+import { _filterFalsyValues, localTime } from '@naturalcycles/js-lib'
 import { memoryUsageFull, processSharedUtil } from '@naturalcycles/nodejs-lib'
 import { getDeployInfo } from './deployInfo.util'
 import { BackendRequestHandler } from './server.model'
@@ -39,9 +39,6 @@ export function getServerStatusData(
 }
 
 function getStartedStr(): string {
-  const serverStarted = localTime().subtract(process.uptime(), 'second')
-
-  const s1 = serverStarted.toPretty()
-  const s2 = _ms(Date.now() - serverStarted.unix() * 1000)
-  return `${s1} (${s2} ago)`
+  const started = localTime().subtract(process.uptime(), 'second')
+  return `${started.toPretty()} (${started.fromNow()})`
 }