@naturalcycles/backend-lib 9.4.0 → 9.4.1

package/dist/server/logMiddleware.js

@@ -61,7 +61,9 @@ export function logMiddleware() {
             const meta = {
                 // Experimental!
                 // Testing to include userId in metadata (not message payload) to see if it's searchable
-                userId: req.userId,
+                labels: {
+                    userId: req.userId,
+                },
             };
             // CloudRun does NOT have this env variable set,
             // so you have to set it manually on deployment, like this:

package/dist/server/requestLoggerMiddleware.js

@@ -8,11 +8,18 @@ import { onFinished } from '../index.js';
 export function requestLoggerMiddleware() {
     return (req, res, next) => {
         const started = Date.now();
-        req.log([req.method, req.originalUrl, req.userId].filter(Boolean).join(' '));
+        // todo: include requestId (3-character hash of it?)
+        req.log(['>>', req.method, req.originalUrl, req.userId].filter(Boolean).join(' '));
         onFinished(res, () => {
-            req.log([res.statusCode || '0', _since(started), req.method, req.originalUrl, req.userId]
+            const str = ['<<', res.statusCode, _since(started), req.method, req.originalUrl, req.userId]
                 .filter(Boolean)
-                .join(' '));
+                .join(' ');
+            if (res.statusCode && res.statusCode >= 400) {
+                req.error(str);
+            }
+            else {
+                req.log(str);
+            }
         });
         next();
     };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/backend-lib",
   "type": "module",
-  "version": "9.4.0",
+  "version": "9.4.1",
   "peerDependencies": {
     "@sentry/node": "^9"
   },

package/src/server/logMiddleware.ts

@@ -1,5 +1,5 @@
 import { inspect } from 'node:util'
-import type { AnyObject, CommonLogger, StringMap } from '@naturalcycles/js-lib'
+import type { AnyObject, CommonLogger } from '@naturalcycles/js-lib'
 import { _inspect, dimGrey } from '@naturalcycles/nodejs-lib'
 import type { BackendRequestHandler } from './server.model.js'
 
@@ -73,10 +73,12 @@ function logToCI(args: any[]): void {
 export function logMiddleware(): BackendRequestHandler {
   if (isGAE || isCloudRun) {
     return function gcpStructuredLogHandler(req, _res, next) {
-      const meta: StringMap = {
+      const meta: AnyObject = {
         // Experimental!
         // Testing to include userId in metadata (not message payload) to see if it's searchable
-        userId: req.userId,
+        labels: {
+          userId: req.userId,
+        },
       }
 
       // CloudRun does NOT have this env variable set,

package/src/server/requestLoggerMiddleware.ts

@@ -12,14 +12,19 @@ export function requestLoggerMiddleware(): BackendRequestHandler {
   return (req, res, next) => {
     const started = Date.now() as UnixTimestampMillis
 
-    req.log([req.method, req.originalUrl, req.userId].filter(Boolean).join(' '))
+    // todo: include requestId (3-character hash of it?)
+    req.log(['>>', req.method, req.originalUrl, req.userId].filter(Boolean).join(' '))
 
     onFinished(res, () => {
-      req.log(
-        [res.statusCode || '0', _since(started), req.method, req.originalUrl, req.userId]
-          .filter(Boolean)
-          .join(' '),
-      )
+      const str = ['<<', res.statusCode, _since(started), req.method, req.originalUrl, req.userId]
+        .filter(Boolean)
+        .join(' ')
+
+      if (res.statusCode && res.statusCode >= 400) {
+        req.error(str)
+      } else {
+        req.log(str)
+      }
     })
 
     next()