@naturalcycles/backend-lib 9.73.0 → 9.74.0

package/dist/admin/base.admin.service.js

@@ -168,7 +168,7 @@ export class BaseAdminService {
             err?.code?.includes('id-token-expired')) {
                 return; // skip logging, expected error
             }
-            req.error(`getEmailByToken error:`, err);
+            req.error({ msg: `getEmailByToken error:`, err });
         }
     }
     async getFirebaseAuth() {
@@ -191,7 +191,10 @@ export class BaseAdminService {
      */
     // oxlint-disable-next-line max-params
     async onPermissionCheck(req, email, reqPermissions, required, granted, meta = {}) {
-        req.log(`${dimGrey(email)} ${required ? 'required' : 'optional'} permissions check [${dimGrey(reqPermissions.join(', '))}]: ${granted ? green('GRANTED') : red('DENIED')}`, meta);
+        req.log({
+            ...meta,
+            msg: `${dimGrey(email)} ${required ? 'required' : 'optional'} permissions check [${dimGrey(reqPermissions.join(', '))}]: ${granted ? green('GRANTED') : red('DENIED')}`,
+        });
     }
     /**
      * Install it on POST /admin/login url

package/dist/express/createDefaultApp.js

@@ -2,7 +2,6 @@ import { asyncLocalStorageMiddleware } from '../server/asyncLocalStorageMiddlewa
 import { compressionMiddleware } from '../server/compressionMiddleware.js';
 import { genericErrorMiddleware } from '../server/genericErrorMiddleware.js';
 import { logMiddleware } from '../server/logMiddleware.js';
-import { methodOverrideMiddleware } from '../server/methodOverrideMiddleware.js';
 import { notFoundMiddleware } from '../server/notFoundMiddleware.js';
 import { requestTimeoutMiddleware } from '../server/requestTimeoutMiddleware.js';
 import { simpleRequestLoggerMiddleware } from '../server/simpleRequestLoggerMiddleware.js';
@@ -24,7 +23,6 @@ export async function createDefaultApp(cfg) {
     if (!isTest) {
         app.use(asyncLocalStorageMiddleware());
     }
-    app.use(methodOverrideMiddleware());
     app.use(requestTimeoutMiddleware());
     // app.use(serverStatsMiddleware()) // disabled by default
     // app.use(bodyParserTimeout()) // removed by default

package/dist/index.d.ts

@@ -7,7 +7,6 @@ export * from './server/compressionMiddleware.js';
 export * from './server/eventLoop.util.js';
 export * from './server/genericErrorMiddleware.js';
 export * from './server/logMiddleware.js';
-export * from './server/methodOverrideMiddleware.js';
 export * from './server/notFoundMiddleware.js';
 export * from './server/okMiddleware.js';
 export * from './server/request.log.util.js';

package/dist/index.js

@@ -7,7 +7,6 @@ export * from './server/compressionMiddleware.js';
 export * from './server/eventLoop.util.js';
 export * from './server/genericErrorMiddleware.js';
 export * from './server/logMiddleware.js';
-export * from './server/methodOverrideMiddleware.js';
 export * from './server/notFoundMiddleware.js';
 export * from './server/okMiddleware.js';
 export * from './server/request.log.util.js';

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

@@ -1,5 +1,7 @@
 import { _anyToError, _isErrorObject } from '@naturalcycles/js-lib/error';
-import { _inspect } from '@naturalcycles/nodejs-lib';
+import { commonLoggerCreate } from '@naturalcycles/js-lib/log';
+import { _omit } from '@naturalcycles/js-lib/object/object.util.js';
+import { _inspect, logEntryToString } from '@naturalcycles/nodejs-lib';
 import { getRequestLogger } from '../server/asyncLocalStorageMiddleware.js';
 const sentrySeverityMap = {
     debug: 'log',
@@ -60,7 +62,7 @@ export class SentrySharedService {
         const data = _isErrorObject(err) ? err.data : undefined;
         // Using request-aware logger here
         // Log both the error and attached ErrorData (if any)
-        getRequestLogger().error(...[err_, data].filter(Boolean));
+        getRequestLogger().error({ err: err_, ...data });
         if (data?.report === false) {
             // Skip reporting the error
             return;
@@ -81,7 +83,7 @@ export class SentrySharedService {
      * Returns "eventId"
      */
     captureMessage(msg, level) {
-        getRequestLogger()[sentrySeverityMap[level] || 'log']('captureMessage:', msg);
+        getRequestLogger()[sentrySeverityMap[level] || 'log'](`captureMessage: ${msg}`);
         return this.sentry.captureMessage(msg, level);
     }
     addBreadcrumb(breadcrumb) {
@@ -95,17 +97,14 @@ export class SentrySharedService {
      * @experimental
      */
     getCommonLogger() {
-        return {
-            debug: () => { }, // noop
-            log: () => { }, // noop
-            warn: () => { }, // noop
-            error: (...args) => {
-                const message = args.map(arg => _inspect(arg, INSPECT_OPT)).join(' ');
-                this.sentry.addBreadcrumb({
-                    message,
-                });
-                this.sentry.captureException(_anyToError(args.length === 1 ? args[0] : args));
-            },
-        };
+        return commonLoggerCreate(entry => {
+            if (entry.level !== 'error')
+                return; // noop
+            const { msg, err } = entry;
+            this.sentry.addBreadcrumb({
+                message: logEntryToString(entry, INSPECT_OPT),
+            });
+            this.sentry.captureException(_anyToError(err ?? msg ?? _omit(entry, ['level'])));
+        });
     }
 }

package/dist/server/asyncLocalStorageMiddleware.js

@@ -1,5 +1,6 @@
 import { AsyncLocalStorage } from 'node:async_hooks';
 import { _lazyValue } from '@naturalcycles/js-lib';
+import { commonLoggerCreate } from '@naturalcycles/js-lib/log';
 import { ciLogger, devLogger, gcpStructuredLogger } from './logMiddleware.js';
 const { GAE_INSTANCE, K_SERVICE, CI } = process.env;
 const isGAE = !!GAE_INSTANCE;
@@ -43,9 +44,4 @@ export function getRequestLogger() {
  *
  * @experimental
  */
-export const requestLogger = {
-    debug: (...args) => getRequestLogger().debug(...args),
-    log: (...args) => getRequestLogger().log(...args),
-    warn: (...args) => getRequestLogger().warn(...args),
-    error: (...args) => getRequestLogger().error(...args),
-};
+export const requestLogger = commonLoggerCreate(({ level, ...data }) => getRequestLogger()[level](data));

package/dist/server/genericErrorMiddleware.js

@@ -40,10 +40,10 @@ export function respondWithError(req, res, err) {
     else {
         // because errorService was not provided - we are going to log the error here
         if (headersSent) {
-            req.error(`error after headersSent:`, err);
+            req.error({ msg: `error after headersSent:`, err });
         }
         else {
-            req.error(err);
+            req.error({ err });
         }
         // todo: add endpoint to the log
         // todo: add userId from the "Context" (or, just req.userId?) to the log

package/dist/server/logMiddleware.js

@@ -1,9 +1,9 @@
 import { inspect } from 'node:util';
-import { _isPlainObject } from '@naturalcycles/js-lib';
 import { _anyToErrorObject } from '@naturalcycles/js-lib/error';
+import { commonLoggerCreate } from '@naturalcycles/js-lib/log';
 import { _safeJsonStringify } from '@naturalcycles/js-lib/string/safeJsonStringify.js';
 import { _objectAssign } from '@naturalcycles/js-lib/types';
-import { _inspect } from '@naturalcycles/nodejs-lib';
+import { logEntryToString } from '@naturalcycles/nodejs-lib';
 import { dimGrey } from '@naturalcycles/nodejs-lib/colors';
 const { GOOGLE_CLOUD_PROJECT, GAE_INSTANCE, K_SERVICE, APP_ENV } = process.env;
 const isGAE = !!GAE_INSTANCE;
@@ -16,81 +16,49 @@ let reqCounter = 0;
  * Logger that logs in "GCP structured log" format.
  * To be used in outside-of-request situations (otherwise req.log should be used).
  */
-export const gcpStructuredLogger = {
-    debug: (...args) => writeGCPStructuredLog({ severity: 'DEBUG' }, args),
-    log: (...args) => writeGCPStructuredLog({}, args),
-    warn: (...args) => writeGCPStructuredLog({ severity: 'WARNING' }, args),
-    error: (...args) => writeGCPStructuredLog({ severity: 'ERROR' }, args),
-};
+export const gcpStructuredLogger = commonLoggerCreate(entry => writeGCPStructuredLog({}, entry));
 /**
  * Fancy development logger, to be used in outside-of-request situations
  * (otherwise req.log should be used).
  */
-export const devLogger = {
-    debug: (...args) => logToDev(null, args),
-    log: (...args) => logToDev(null, args),
-    warn: (...args) => logToDev(null, args),
-    error: (...args) => logToDev(null, args),
-};
+export const devLogger = commonLoggerCreate(entry => logToDev(null, entry));
 /**
  * Same as devLogger, but without colors (e.g to not confuse Sentry).
  */
-export const ciLogger = {
-    debug: (...args) => logToCI(args),
-    log: (...args) => logToCI(args),
-    warn: (...args) => logToCI(args),
-    error: (...args) => logToCI(args),
+export const ciLogger = commonLoggerCreate(logToCI);
+const gcpSeverityByLevel = {
+    debug: 'DEBUG',
+    log: 'INFO',
+    warn: 'WARNING',
+    error: 'ERROR',
 };
 // Documented here: https://cloud.google.com/logging/docs/structured-logging
 // Cloud Run logging: https://cloud.google.com/run/docs/logging
-function writeGCPStructuredLog(meta, args) {
-    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];
+function writeGCPStructuredLog(meta, entry) {
+    const { level, msg, err, ...fields } = entry;
     if (err instanceof Error) {
-        entry['err'] = _anyToErrorObject(err);
-        entry['message'] = msg ? `${msg}\n${inspect(err)}` : inspect(err);
+        fields['err'] = _anyToErrorObject(err);
+        fields['message'] = msg ? `${msg}\n${inspect(err)}` : inspect(err);
     }
     else {
         if (err !== undefined)
-            entry['err'] = err;
+            fields['err'] = err;
         if (msg !== undefined)
-            entry['message'] = msg;
+            fields['message'] = msg;
     }
-    console.log(_safeJsonStringify({ ...entry, ...meta }));
+    console.log(_safeJsonStringify({ ...fields, ...meta, severity: gcpSeverityByLevel[level] }));
 }
-function logToDev(requestId, args) {
+function logToDev(requestId, entry) {
     // Run on local machine
-    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(' '));
+    const line = logEntryToString(entry, { colors: true });
+    console.log(requestId ? `${dimGrey(`[${requestId}]`)} ${line}` : line);
 }
 /**
  * Same as logToDev, but without request and without colors.
  * This is to not confuse e.g Sentry when it picks up messages with colors
  */
-function logToCI(args) {
-    console.log(args.map(a => _inspect(a, { includeErrorStack: true, colors: false })).join(' '));
+function logToCI(entry) {
+    console.log(logEntryToString(entry, { colors: false }));
 }
 export function logMiddleware() {
     if (isGAE || isCloudRun) {
@@ -117,12 +85,7 @@ export function logMiddleware() {
             if (isGAE) {
                 meta['appengine.googleapis.com/request_id'] = req.header('x-appengine-request-log-id');
             }
-            _objectAssign(req, {
-                debug: (...args) => writeGCPStructuredLog({ ...meta, severity: 'DEBUG' }, args),
-                log: (...args) => writeGCPStructuredLog({ ...meta, severity: 'INFO' }, args),
-                warn: (...args) => writeGCPStructuredLog({ ...meta, severity: 'WARNING' }, args),
-                error: (...args) => writeGCPStructuredLog({ ...meta, severity: 'ERROR' }, args),
-            });
+            _objectAssign(req, commonLoggerCreate(entry => writeGCPStructuredLog(meta, entry)));
             next();
         };
     }
@@ -131,18 +94,14 @@ export function logMiddleware() {
         return function devLogHandler(req, _res, next) {
             // Local machine
             req.requestId = String(++reqCounter);
-            req.debug =
-                req.log =
-                    req.warn =
-                        req.error =
-                            (...args) => logToDev(req.requestId, args);
+            _objectAssign(req, commonLoggerCreate(entry => logToDev(req.requestId, entry)));
             next();
         };
     }
     // Otherwise, return "simple" logger
     // This includes: unit tests, CI environments
     return function simpleLogHandler(req, _res, next) {
-        req.debug = req.log = req.warn = req.error = (...args) => logToCI(args);
+        _objectAssign(req, ciLogger);
         next();
     };
 }

package/dist/server/notFoundMiddleware.js

@@ -1,6 +1,9 @@
 import { getRequestEndpoint } from './request.util.js';
 export function notFoundMiddleware() {
     return (req, res) => {
-        res.status(404).send(`404 Not Found: ${getRequestEndpoint(req)}`);
+        res
+            .status(404)
+            .type('text/plain')
+            .send(`404 Not Found: ${getRequestEndpoint(req)}`);
     };
 }

package/dist/server/server.model.d.ts

@@ -1,4 +1,4 @@
-import type { CommonLogFunction } from '@naturalcycles/js-lib/log';
+import type { CommonLogger } from '@naturalcycles/js-lib/log';
 import type { Promisable } from '@naturalcycles/js-lib/types';
 import type { Application, IRouter, NextFunction, Request, Response } from 'express';
 /**
@@ -8,11 +8,7 @@ import type { Application, IRouter, NextFunction, Request, Response } from 'expr
  * `BackendRequest` seems to not conflict with anything right now.
  * Previous name `ExpressRequest` was clashing with Sentry.
  */
-export interface BackendRequest<BODY = unknown> extends Request {
-    debug: CommonLogFunction;
-    log: CommonLogFunction;
-    warn: CommonLogFunction;
-    error: CommonLogFunction;
+export interface BackendRequest<BODY = unknown> extends Request, CommonLogger {
     requestId?: string;
     /**
      * Only used for request logging purposes.
@@ -50,11 +46,7 @@ export type BackendErrorRequestHandler = (err: any, req: BackendRequest, res: Ba
 export type BackendRouter = IRouter;
 export type BackendApplication = Application;
 declare module 'http' {
-    interface IncomingMessage {
-        debug: CommonLogFunction;
-        log: CommonLogFunction;
-        warn: CommonLogFunction;
-        error: CommonLogFunction;
+    interface IncomingMessage extends CommonLogger {
         requestId?: string;
         requestTimeout?: NodeJS.Timeout;
         bodyParserTimeout?: NodeJS.Timeout;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/backend-lib",
   "type": "module",
-  "version": "9.73.0",
+  "version": "9.74.0",
   "dependencies": {
     "@naturalcycles/db-lib": "^10",
     "@naturalcycles/js-lib": "^15",

package/src/admin/base.admin.service.ts

@@ -220,7 +220,7 @@ export class BaseAdminService {
         return // skip logging, expected error
       }
 
-      req.error(`getEmailByToken error:`, err)
+      req.error({ msg: `getEmailByToken error:`, err })
     }
   }
 
@@ -257,12 +257,12 @@ export class BaseAdminService {
     granted: boolean,
     meta: AnyObject = {},
   ): Promise<void> {
-    req.log(
-      `${dimGrey(email)} ${required ? 'required' : 'optional'} permissions check [${dimGrey(
+    req.log({
+      ...meta,
+      msg: `${dimGrey(email)} ${required ? 'required' : 'optional'} permissions check [${dimGrey(
         reqPermissions.join(', '),
       )}]: ${granted ? green('GRANTED') : red('DENIED')}`,
-      meta,
-    )
+    })
   }
 
   /**

package/src/express/createDefaultApp.ts

@@ -6,7 +6,6 @@ import { compressionMiddleware } from '../server/compressionMiddleware.js'
 import { genericErrorMiddleware } from '../server/genericErrorMiddleware.js'
 import type { GenericErrorMiddlewareCfg } from '../server/genericErrorMiddleware.js'
 import { logMiddleware } from '../server/logMiddleware.js'
-import { methodOverrideMiddleware } from '../server/methodOverrideMiddleware.js'
 import { notFoundMiddleware } from '../server/notFoundMiddleware.js'
 import { requestTimeoutMiddleware } from '../server/requestTimeoutMiddleware.js'
 import type {
@@ -42,7 +41,6 @@ export async function createDefaultApp(cfg: DefaultAppCfg): Promise<BackendAppli
     app.use(asyncLocalStorageMiddleware())
   }
 
-  app.use(methodOverrideMiddleware())
   app.use(requestTimeoutMiddleware())
   // app.use(serverStatsMiddleware()) // disabled by default
   // app.use(bodyParserTimeout()) // removed by default

package/src/index.ts

@@ -7,7 +7,6 @@ export * from './server/compressionMiddleware.js'
 export * from './server/eventLoop.util.js'
 export * from './server/genericErrorMiddleware.js'
 export * from './server/logMiddleware.js'
-export * from './server/methodOverrideMiddleware.js'
 export * from './server/notFoundMiddleware.js'
 export * from './server/okMiddleware.js'
 export * from './server/request.log.util.js'

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

@@ -1,8 +1,10 @@
 import { _anyToError, _isErrorObject } from '@naturalcycles/js-lib/error'
+import { commonLoggerCreate } from '@naturalcycles/js-lib/log'
 import type { CommonLogger, CommonLogLevel } from '@naturalcycles/js-lib/log'
+import { _omit } from '@naturalcycles/js-lib/object/object.util.js'
 import type { Primitive, StringMap } from '@naturalcycles/js-lib/types'
 import type { InspectAnyOptions } from '@naturalcycles/nodejs-lib'
-import { _inspect } from '@naturalcycles/nodejs-lib'
+import { _inspect, logEntryToString } from '@naturalcycles/nodejs-lib'
 import type { Breadcrumb, SeverityLevel } from '@sentry/node-core/light'
 import type * as SentryLib from '@sentry/node-core/light'
 import { getRequestLogger } from '../server/asyncLocalStorageMiddleware.js'
@@ -78,7 +80,7 @@ export class SentrySharedService {
 
     // Using request-aware logger here
     // Log both the error and attached ErrorData (if any)
-    getRequestLogger().error(...[err_, data].filter(Boolean))
+    getRequestLogger().error({ err: err_, ...data })
 
     if (data?.report === false) {
       // Skip reporting the error
@@ -106,7 +108,7 @@ export class SentrySharedService {
    * Returns "eventId"
    */
   captureMessage(msg: string, level?: SeverityLevel): string {
-    getRequestLogger()[sentrySeverityMap[level!] || 'log']('captureMessage:', msg)
+    getRequestLogger()[sentrySeverityMap[level!] || 'log'](`captureMessage: ${msg}`)
     return this.sentry.captureMessage(msg, level)
   }
 
@@ -122,19 +124,15 @@ export class SentrySharedService {
    * @experimental
    */
   getCommonLogger(): CommonLogger {
-    return {
-      debug: () => {}, // noop
-      log: () => {}, // noop
-      warn: () => {}, // noop
-      error: (...args) => {
-        const message = args.map(arg => _inspect(arg, INSPECT_OPT)).join(' ')
-
-        this.sentry.addBreadcrumb({
-          message,
-        })
-
-        this.sentry.captureException(_anyToError(args.length === 1 ? args[0] : args))
-      },
-    }
+    return commonLoggerCreate(entry => {
+      if (entry.level !== 'error') return // noop
+      const { msg, err } = entry
+
+      this.sentry.addBreadcrumb({
+        message: logEntryToString(entry, INSPECT_OPT),
+      })
+
+      this.sentry.captureException(_anyToError(err ?? msg ?? _omit(entry, ['level'])))
+    })
   }
 }

package/src/server/asyncLocalStorageMiddleware.ts

@@ -1,5 +1,6 @@
 import { AsyncLocalStorage } from 'node:async_hooks'
 import { _lazyValue } from '@naturalcycles/js-lib'
+import { commonLoggerCreate } from '@naturalcycles/js-lib/log'
 import type { CommonLogger } from '@naturalcycles/js-lib/log'
 import { ciLogger, devLogger, gcpStructuredLogger } from './logMiddleware.js'
 import type { BackendRequest, BackendRequestHandler } from './server.model.js'
@@ -53,9 +54,6 @@ export function getRequestLogger(): CommonLogger {
  *
  * @experimental
  */
-export const requestLogger: CommonLogger = {
-  debug: (...args) => getRequestLogger().debug(...args),
-  log: (...args) => getRequestLogger().log(...args),
-  warn: (...args) => getRequestLogger().warn(...args),
-  error: (...args) => getRequestLogger().error(...args),
-}
+export const requestLogger: CommonLogger = commonLoggerCreate(({ level, ...data }) =>
+  getRequestLogger()[level](data),
+)

package/src/server/genericErrorMiddleware.ts

@@ -75,9 +75,9 @@ export function respondWithError(req: BackendRequest, res: BackendResponse, err:
     // because errorService was not provided - we are going to log the error here
 
     if (headersSent) {
-      req.error(`error after headersSent:`, err)
+      req.error({ msg: `error after headersSent:`, err })
     } else {
-      req.error(err)
+      req.error({ err })
     }
 
     // todo: add endpoint to the log

package/src/server/logMiddleware.ts

@@ -1,11 +1,11 @@
 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 { commonLoggerCreate } from '@naturalcycles/js-lib/log'
+import type { CommonLogger, CommonLogLevel, LogEntry } 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'
+import { logEntryToString } from '@naturalcycles/nodejs-lib'
 import { dimGrey } from '@naturalcycles/nodejs-lib/colors'
 import type { BackendRequestHandler } from './server.model.js'
 
@@ -22,85 +22,54 @@ let reqCounter = 0
  * Logger that logs in "GCP structured log" format.
  * To be used in outside-of-request situations (otherwise req.log should be used).
  */
-export const gcpStructuredLogger: CommonLogger = {
-  debug: (...args) => writeGCPStructuredLog({ severity: 'DEBUG' }, args),
-  log: (...args) => writeGCPStructuredLog({}, args),
-  warn: (...args) => writeGCPStructuredLog({ severity: 'WARNING' }, args),
-  error: (...args) => writeGCPStructuredLog({ severity: 'ERROR' }, args),
-}
+export const gcpStructuredLogger: CommonLogger = commonLoggerCreate(entry =>
+  writeGCPStructuredLog({}, entry),
+)
 
 /**
  * Fancy development logger, to be used in outside-of-request situations
  * (otherwise req.log should be used).
  */
-export const devLogger: CommonLogger = {
-  debug: (...args) => logToDev(null, args),
-  log: (...args) => logToDev(null, args),
-  warn: (...args) => logToDev(null, args),
-  error: (...args) => logToDev(null, args),
-}
+export const devLogger: CommonLogger = commonLoggerCreate(entry => logToDev(null, entry))
 
 /**
  * Same as devLogger, but without colors (e.g to not confuse Sentry).
  */
-export const ciLogger: CommonLogger = {
-  debug: (...args) => logToCI(args),
-  log: (...args) => logToCI(args),
-  warn: (...args) => logToCI(args),
-  error: (...args) => logToCI(args),
+export const ciLogger: CommonLogger = commonLoggerCreate(logToCI)
+
+const gcpSeverityByLevel: Record<CommonLogLevel, string> = {
+  debug: 'DEBUG',
+  log: 'INFO',
+  warn: 'WARNING',
+  error: 'ERROR',
 }
 
 // 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 {
-  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]
+function writeGCPStructuredLog(meta: AnyObject, entry: LogEntry): void {
+  const { level, msg, err, ...fields } = entry
   if (err instanceof Error) {
-    entry['err'] = _anyToErrorObject(err)
-    entry['message'] = msg ? `${msg}\n${inspect(err)}` : inspect(err)
+    fields['err'] = _anyToErrorObject(err)
+    fields['message'] = msg ? `${msg}\n${inspect(err)}` : inspect(err)
   } else {
-    if (err !== undefined) entry['err'] = err
-    if (msg !== undefined) entry['message'] = msg
+    if (err !== undefined) fields['err'] = err
+    if (msg !== undefined) fields['message'] = msg
   }
-  console.log(_safeJsonStringify({ ...entry, ...meta }))
+  console.log(_safeJsonStringify({ ...fields, ...meta, severity: gcpSeverityByLevel[level] }))
 }
 
-function logToDev(requestId: string | null, args: any[]): void {
+function logToDev(requestId: string | null, entry: LogEntry): void {
   // Run on local machine
-  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(' '))
+  const line = logEntryToString(entry, { colors: true })
+  console.log(requestId ? `${dimGrey(`[${requestId}]`)} ${line}` : line)
 }
 
 /**
  * Same as logToDev, but without request and without colors.
  * This is to not confuse e.g Sentry when it picks up messages with colors
  */
-function logToCI(args: any[]): void {
-  console.log(args.map(a => _inspect(a, { includeErrorStack: true, colors: false })).join(' '))
+function logToCI(entry: LogEntry): void {
+  console.log(logEntryToString(entry, { colors: false }))
 }
 
 export function logMiddleware(): BackendRequestHandler {
@@ -130,12 +99,10 @@ export function logMiddleware(): BackendRequestHandler {
         meta['appengine.googleapis.com/request_id'] = req.header('x-appengine-request-log-id')
       }
 
-      _objectAssign(req, {
-        debug: (...args: any[]) => writeGCPStructuredLog({ ...meta, severity: 'DEBUG' }, args),
-        log: (...args: any[]) => writeGCPStructuredLog({ ...meta, severity: 'INFO' }, args),
-        warn: (...args: any[]) => writeGCPStructuredLog({ ...meta, severity: 'WARNING' }, args),
-        error: (...args: any[]) => writeGCPStructuredLog({ ...meta, severity: 'ERROR' }, args),
-      } satisfies CommonLogger)
+      _objectAssign(
+        req,
+        commonLoggerCreate(entry => writeGCPStructuredLog(meta, entry)),
+      )
 
       next()
     }
@@ -146,11 +113,10 @@ export function logMiddleware(): BackendRequestHandler {
     return function devLogHandler(req, _res, next) {
       // Local machine
       req.requestId = String(++reqCounter)
-      req.debug =
-        req.log =
-        req.warn =
-        req.error =
-          (...args: any[]) => logToDev(req.requestId!, args)
+      _objectAssign(
+        req,
+        commonLoggerCreate(entry => logToDev(req.requestId!, entry)),
+      )
       next()
     }
   }
@@ -158,7 +124,7 @@ export function logMiddleware(): BackendRequestHandler {
   // Otherwise, return "simple" logger
   // This includes: unit tests, CI environments
   return function simpleLogHandler(req, _res, next) {
-    req.debug = req.log = req.warn = req.error = (...args: any[]) => logToCI(args)
+    _objectAssign(req, ciLogger)
     next()
   }
 }

package/src/server/notFoundMiddleware.ts

@@ -3,6 +3,9 @@ import type { BackendRequestHandler } from './server.model.js'
 
 export function notFoundMiddleware(): BackendRequestHandler {
   return (req, res) => {
-    res.status(404).send(`404 Not Found: ${getRequestEndpoint(req)}`)
+    res
+      .status(404)
+      .type('text/plain')
+      .send(`404 Not Found: ${getRequestEndpoint(req)}`)
   }
 }

package/src/server/server.model.ts

@@ -1,4 +1,4 @@
-import type { CommonLogFunction } from '@naturalcycles/js-lib/log'
+import type { CommonLogger } from '@naturalcycles/js-lib/log'
 import type { Promisable } from '@naturalcycles/js-lib/types'
 import type { Application, IRouter, NextFunction, Request, Response } from 'express'
 
@@ -9,12 +9,7 @@ import type { Application, IRouter, NextFunction, Request, Response } from 'expr
  * `BackendRequest` seems to not conflict with anything right now.
  * Previous name `ExpressRequest` was clashing with Sentry.
  */
-export interface BackendRequest<BODY = unknown> extends Request {
-  debug: CommonLogFunction
-  log: CommonLogFunction
-  warn: CommonLogFunction
-  error: CommonLogFunction
-
+export interface BackendRequest<BODY = unknown> extends Request, CommonLogger {
   requestId?: string
   /**
    * Only used for request logging purposes.
@@ -71,12 +66,7 @@ export type BackendRouter = IRouter
 export type BackendApplication = Application
 
 declare module 'http' {
-  interface IncomingMessage {
-    debug: CommonLogFunction
-    log: CommonLogFunction
-    warn: CommonLogFunction
-    error: CommonLogFunction
-
+  interface IncomingMessage extends CommonLogger {
     requestId?: string
 
     requestTimeout?: NodeJS.Timeout

package/dist/server/methodOverrideMiddleware.d.ts

@@ -1,8 +0,0 @@
-import type { BackendRequestHandler } from './server.model.js';
-export interface MethodOverrideMiddlewareCfg {
-    /**
-     * @default _method
-     */
-    methodKey?: string;
-}
-export declare function methodOverrideMiddleware(cfg?: MethodOverrideMiddlewareCfg): BackendRequestHandler;

package/dist/server/methodOverrideMiddleware.js

@@ -1,13 +0,0 @@
-export function methodOverrideMiddleware(cfg = {}) {
-    const { methodKey } = {
-        methodKey: '_method',
-        ...cfg,
-    };
-    return (req, _res, next) => {
-        if (req.query[methodKey]) {
-            req.method = req.query[methodKey];
-            // delete req.query[methodKey]
-        }
-        next();
-    };
-}

package/src/server/methodOverrideMiddleware.ts

@@ -1,26 +0,0 @@
-import type { BackendRequestHandler } from './server.model.js'
-
-export interface MethodOverrideMiddlewareCfg {
-  /**
-   * @default _method
-   */
-  methodKey?: string
-}
-
-export function methodOverrideMiddleware(
-  cfg: MethodOverrideMiddlewareCfg = {},
-): BackendRequestHandler {
-  const { methodKey } = {
-    methodKey: '_method',
-    ...cfg,
-  }
-
-  return (req, _res, next) => {
-    if (req.query[methodKey]) {
-      req.method = req.query[methodKey] as string
-      // delete req.query[methodKey]
-    }
-
-    next()
-  }
-}