@naturalcycles/backend-lib 9.70.1 → 9.71.1

package/dist/server/logMiddleware.js

@@ -1,4 +1,7 @@
 import { inspect } from 'node:util';
+import { _isPlainObject } from '@naturalcycles/js-lib';
+import { _anyToErrorObject } from '@naturalcycles/js-lib/error';
+import { _safeJsonStringify } from '@naturalcycles/js-lib/string/safeJsonStringify.js';
 import { _objectAssign } from '@naturalcycles/js-lib/types';
 import { _inspect } from '@naturalcycles/nodejs-lib';
 import { dimGrey } from '@naturalcycles/nodejs-lib/colors';
@@ -41,17 +44,46 @@ export const ciLogger = {
 // Documented here: https://cloud.google.com/logging/docs/structured-logging
 // Cloud Run logging: https://cloud.google.com/run/docs/logging
 function writeGCPStructuredLog(meta, args) {
-    console.log(JSON.stringify({
-        message: args.map(a => (typeof a === 'string' ? a : inspect(a))).join(' '),
-        ...meta,
-    }));
+    if (args.length !== 1 || !_isPlainObject(args[0])) {
+        console.log(JSON.stringify({
+            message: args.map(a => (typeof a === 'string' ? a : inspect(a))).join(' '),
+            ...meta,
+        }));
+        return;
+    }
+    const { msg, err, ...entry } = args[0];
+    if (err instanceof Error) {
+        entry['err'] = _anyToErrorObject(err);
+        entry['message'] = msg ? `${msg}\n${inspect(err)}` : inspect(err);
+    }
+    else {
+        if (err !== undefined)
+            entry['err'] = err;
+        if (msg !== undefined)
+            entry['message'] = msg;
+    }
+    console.log(_safeJsonStringify({ ...entry, ...meta }));
 }
 function logToDev(requestId, args) {
     // Run on local machine
-    console.log([
-        requestId ? [dimGrey(`[${requestId}]`)] : [],
-        ...args.map(a => _inspect(a, { includeErrorStack: true, colors: true })),
-    ].join(' '));
+    if (args.length !== 1 || !_isPlainObject(args[0])) {
+        console.log([
+            requestId ? [dimGrey(`[${requestId}]`)] : [],
+            ...args.map(a => _inspect(a, { includeErrorStack: true, colors: true })),
+        ].join(' '));
+        return;
+    }
+    const { msg, err, ...rest } = args[0];
+    const parts = [];
+    if (requestId)
+        parts.push(dimGrey(`[${requestId}]`));
+    if (msg !== undefined)
+        parts.push(String(msg));
+    if (err !== undefined)
+        parts.push(_inspect(err, { includeErrorStack: true, colors: true }));
+    if (Object.keys(rest).length)
+        parts.push(dimGrey(_inspect(rest, { colors: false })));
+    console.log(parts.join(' '));
 }
 /**
  * Same as logToDev, but without request and without colors.

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/backend-lib",
   "type": "module",
-  "version": "9.70.1",
+  "version": "9.71.1",
   "dependencies": {
     "@naturalcycles/db-lib": "^10",
     "@naturalcycles/js-lib": "^15",
@@ -29,7 +29,7 @@
   "peerDependencies": {
     "@sentry/node-core": "^10",
     "firebase-admin": "^14",
-    "simple-git": "^3"
+    "simple-git": "^4"
   },
   "peerDependenciesMeta": {
     "@sentry/node-core": {

package/src/server/eventLoop.util.ts

@@ -1,8 +1,4 @@
-import type {
-  EventLoopMonitorOptions,
-  EventLoopUtilization,
-  IntervalHistogram,
-} from 'node:perf_hooks'
+import type { ELDHistogram, EventLoopMonitorOptions, EventLoopUtilization } from 'node:perf_hooks'
 import { monitorEventLoopDelay, performance, PerformanceObserver } from 'node:perf_hooks'
 import type {
   Integer,
@@ -45,7 +41,7 @@ export class EventLoopMonitor {
   constructor(cfg: EventLoopMonitorCfg = {}) {
     const { measureInterval = 60_000 } = cfg
 
-    const eldOptions: EventLoopMonitorOptions2 = {
+    const eldOptions: EventLoopMonitorOptions = {
       // Node >=24.19 / >=26.5: sample once per event loop iteration (uv_prepare/uv_check hooks),
       // which measures actual per-iteration delay instead of timer jitter.
       // More accurate (no `resolution` offset baked into every percentile) and cheaper.
@@ -103,7 +99,7 @@ export class EventLoopMonitor {
   }
 
   private interval: NodeJS.Timeout
-  private eld: IntervalHistogram
+  private eld: ELDHistogram
   private lastElu: EventLoopUtilization
   /**
    * Undefined until the first interval has completed.
@@ -167,11 +163,3 @@ export interface EventLoopStats {
    */
   gcCPU: Integer
 }
-
-/**
- * Extends the Node types with `samplePerIteration` (added in Node 24.19 / 26.5).
- * Remove once @types/node declares it.
- */
-interface EventLoopMonitorOptions2 extends EventLoopMonitorOptions {
-  samplePerIteration?: boolean
-}

package/src/server/logMiddleware.ts

@@ -1,5 +1,8 @@
 import { inspect } from 'node:util'
+import { _isPlainObject } from '@naturalcycles/js-lib'
+import { _anyToErrorObject } from '@naturalcycles/js-lib/error'
 import type { CommonLogger } from '@naturalcycles/js-lib/log'
+import { _safeJsonStringify } from '@naturalcycles/js-lib/string/safeJsonStringify.js'
 import { _objectAssign } from '@naturalcycles/js-lib/types'
 import type { AnyObject } from '@naturalcycles/js-lib/types'
 import { _inspect } from '@naturalcycles/nodejs-lib'
@@ -50,22 +53,46 @@ export const ciLogger: CommonLogger = {
 // Documented here: https://cloud.google.com/logging/docs/structured-logging
 // Cloud Run logging: https://cloud.google.com/run/docs/logging
 function writeGCPStructuredLog(meta: AnyObject, args: any[]): void {
-  console.log(
-    JSON.stringify({
-      message: args.map(a => (typeof a === 'string' ? a : inspect(a))).join(' '),
-      ...meta,
-    }),
-  )
+  if (args.length !== 1 || !_isPlainObject(args[0])) {
+    console.log(
+      JSON.stringify({
+        message: args.map(a => (typeof a === 'string' ? a : inspect(a))).join(' '),
+        ...meta,
+      }),
+    )
+    return
+  }
+
+  const { msg, err, ...entry } = args[0]
+  if (err instanceof Error) {
+    entry['err'] = _anyToErrorObject(err)
+    entry['message'] = msg ? `${msg}\n${inspect(err)}` : inspect(err)
+  } else {
+    if (err !== undefined) entry['err'] = err
+    if (msg !== undefined) entry['message'] = msg
+  }
+  console.log(_safeJsonStringify({ ...entry, ...meta }))
 }
 
 function logToDev(requestId: string | null, args: any[]): void {
   // Run on local machine
-  console.log(
-    [
-      requestId ? [dimGrey(`[${requestId}]`)] : [],
-      ...args.map(a => _inspect(a, { includeErrorStack: true, colors: true })),
-    ].join(' '),
-  )
+  if (args.length !== 1 || !_isPlainObject(args[0])) {
+    console.log(
+      [
+        requestId ? [dimGrey(`[${requestId}]`)] : [],
+        ...args.map(a => _inspect(a, { includeErrorStack: true, colors: true })),
+      ].join(' '),
+    )
+    return
+  }
+
+  const { msg, err, ...rest } = args[0]
+  const parts: string[] = []
+  if (requestId) parts.push(dimGrey(`[${requestId}]`))
+  if (msg !== undefined) parts.push(String(msg))
+  if (err !== undefined) parts.push(_inspect(err, { includeErrorStack: true, colors: true }))
+  if (Object.keys(rest).length) parts.push(dimGrey(_inspect(rest, { colors: false })))
+  console.log(parts.join(' '))
 }
 
 /**