@naturalcycles/backend-lib 2.72.0 → 2.73.3

package/dist/index.d.ts

@@ -27,7 +27,9 @@ import { coloredHttpCode, logRequest } from './server/request.log.util';
 import { BackendServer, startServer } from './server/startServer';
 import { StartServerCfg, StartServerData } from './server/startServer.model';
 import { createAsyncLocalStorage, getRequest, getRequestLogger, requestLogger } from './server/handlers/asyncLocalStorage.mw';
-import { createGAELogMiddleware, RequestWithLog } from './server/handlers/createGaeLogMiddleware';
+import type { RequestWithLog } from './server/handlers/createGaeLogMiddleware';
+export * from './server/handlers/createGaeLogMiddleware';
 import { safeJsonMiddleware } from './server/handlers/safeJsonMiddleware';
+export * from './server/request.util';
 export type { MethodOverrideCfg, SentrySharedServiceCfg, RequestHandlerWithPath, RequestHandlerCfg, DefaultAppCfg, StartServerCfg, StartServerData, EnvSharedServiceCfg, BaseEnv, AdminMiddleware, AdminServiceCfg, AdminInfo, RequireAdminCfg, SecureHeaderMiddlewareCfg, BodyParserTimeoutCfg, RequestTimeoutCfg, SimpleRequestLoggerCfg, ReqValidationOptions, RequestWithLog, };
-export { BackendServer, SentrySharedService, EnvSharedService, reqValidation, notFoundHandler, genericErrorHandler, methodOverride, createDefaultApp, startServer, catchWrapper, getDefaultRouter, isGAE, statusHandler, statusHandlerData, okHandler, getDeployInfo, onFinished, respondWithError, logRequest, FirebaseSharedService, createAdminMiddleware, BaseAdminService, loginHtml, createSecureHeaderMiddleware, bodyParserTimeout, clearBodyParserTimeout, requestTimeout, simpleRequestLogger, coloredHttpCode, validateBody, validateParams, validateQuery, createAsyncLocalStorage, createGAELogMiddleware, getRequest, getRequestLogger, requestLogger, serverStatsHTMLHandler, serverStatsMiddleware, safeJsonMiddleware, };
+export { BackendServer, SentrySharedService, EnvSharedService, reqValidation, notFoundHandler, genericErrorHandler, methodOverride, createDefaultApp, startServer, catchWrapper, getDefaultRouter, isGAE, statusHandler, statusHandlerData, okHandler, getDeployInfo, onFinished, respondWithError, logRequest, FirebaseSharedService, createAdminMiddleware, BaseAdminService, loginHtml, createSecureHeaderMiddleware, bodyParserTimeout, clearBodyParserTimeout, requestTimeout, simpleRequestLogger, coloredHttpCode, validateBody, validateParams, validateQuery, createAsyncLocalStorage, getRequest, getRequestLogger, requestLogger, serverStatsHTMLHandler, serverStatsMiddleware, safeJsonMiddleware, };

package/dist/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.safeJsonMiddleware = exports.serverStatsMiddleware = exports.serverStatsHTMLHandler = exports.requestLogger = exports.getRequestLogger = exports.getRequest = exports.createGAELogMiddleware = exports.createAsyncLocalStorage = exports.validateQuery = exports.validateParams = exports.validateBody = exports.coloredHttpCode = exports.simpleRequestLogger = exports.requestTimeout = exports.clearBodyParserTimeout = exports.bodyParserTimeout = exports.createSecureHeaderMiddleware = exports.loginHtml = exports.BaseAdminService = exports.createAdminMiddleware = exports.FirebaseSharedService = exports.logRequest = exports.respondWithError = exports.onFinished = exports.getDeployInfo = exports.okHandler = exports.statusHandlerData = exports.statusHandler = exports.isGAE = exports.getDefaultRouter = exports.catchWrapper = exports.startServer = exports.createDefaultApp = exports.methodOverride = exports.genericErrorHandler = exports.notFoundHandler = exports.reqValidation = exports.EnvSharedService = exports.SentrySharedService = exports.BackendServer = void 0;
+exports.safeJsonMiddleware = exports.serverStatsMiddleware = exports.serverStatsHTMLHandler = exports.requestLogger = exports.getRequestLogger = exports.getRequest = exports.createAsyncLocalStorage = exports.validateQuery = exports.validateParams = exports.validateBody = exports.coloredHttpCode = exports.simpleRequestLogger = exports.requestTimeout = exports.clearBodyParserTimeout = exports.bodyParserTimeout = exports.createSecureHeaderMiddleware = exports.loginHtml = exports.BaseAdminService = exports.createAdminMiddleware = exports.FirebaseSharedService = exports.logRequest = exports.respondWithError = exports.onFinished = exports.getDeployInfo = exports.okHandler = exports.statusHandlerData = exports.statusHandler = exports.isGAE = exports.getDefaultRouter = exports.catchWrapper = exports.startServer = exports.createDefaultApp = exports.methodOverride = exports.genericErrorHandler = exports.notFoundHandler = exports.reqValidation = exports.EnvSharedService = exports.SentrySharedService = exports.BackendServer = void 0;
+const tslib_1 = require("tslib");
 const onFinished = require("on-finished");
 exports.onFinished = onFinished;
 const admin_mw_1 = require("./admin/admin.mw");
@@ -65,7 +66,7 @@ Object.defineProperty(exports, "createAsyncLocalStorage", { enumerable: true, ge
 Object.defineProperty(exports, "getRequest", { enumerable: true, get: function () { return asyncLocalStorage_mw_1.getRequest; } });
 Object.defineProperty(exports, "getRequestLogger", { enumerable: true, get: function () { return asyncLocalStorage_mw_1.getRequestLogger; } });
 Object.defineProperty(exports, "requestLogger", { enumerable: true, get: function () { return asyncLocalStorage_mw_1.requestLogger; } });
-const createGaeLogMiddleware_1 = require("./server/handlers/createGaeLogMiddleware");
-Object.defineProperty(exports, "createGAELogMiddleware", { enumerable: true, get: function () { return createGaeLogMiddleware_1.createGAELogMiddleware; } });
+(0, tslib_1.__exportStar)(require("./server/handlers/createGaeLogMiddleware"), exports);
 const safeJsonMiddleware_1 = require("./server/handlers/safeJsonMiddleware");
 Object.defineProperty(exports, "safeJsonMiddleware", { enumerable: true, get: function () { return safeJsonMiddleware_1.safeJsonMiddleware; } });
+(0, tslib_1.__exportStar)(require("./server/request.util"), exports);

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

@@ -1,3 +1,4 @@
+import { CommonLogger } from '@naturalcycles/js-lib';
 import { Severity } from '@sentry/node';
 import type { Breadcrumb, NodeOptions } from '@sentry/node';
 import type * as SentryLib from '@sentry/node';
@@ -35,4 +36,12 @@ export declare class SentrySharedService {
      */
     captureMessage(msg: string, level?: Severity): string;
     addBreadcrumb(breadcrumb: Breadcrumb): void;
+    /**
+     * Currently it will only use `logger.error` ("error" level) and ignore `log` and `warn`.
+     *
+     * For each `logger.error` - it'll do a captureException.
+     *
+     * @experimental
+     */
+    getCommonLogger(): CommonLogger;
 }

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

@@ -84,7 +84,7 @@ class SentrySharedService {
             }),
             // data: (err as AppError).data, // included in message
         });
-        return this.sentry().captureException((0, js_lib_1._anyToError)(err, {
+        return this.sentry().captureException((0, js_lib_1._anyToError)(err, Error, {
             stringifyFn: nodejs_lib_1.inspectAnyStringifyFn,
         }));
     }
@@ -98,6 +98,33 @@ class SentrySharedService {
     addBreadcrumb(breadcrumb) {
         this.sentry().addBreadcrumb(breadcrumb);
     }
+    /**
+     * Currently it will only use `logger.error` ("error" level) and ignore `log` and `warn`.
+     *
+     * For each `logger.error` - it'll do a captureException.
+     *
+     * @experimental
+     */
+    getCommonLogger() {
+        return {
+            log: () => { },
+            warn: () => { },
+            error: (...args) => {
+                const message = args
+                    .map(arg => (0, nodejs_lib_1.inspectAny)(arg, {
+                    includeErrorData: true,
+                    colors: false,
+                }))
+                    .join(' ');
+                this.sentry().addBreadcrumb({
+                    message,
+                });
+                this.sentry().captureException((0, js_lib_1._anyToError)(args.length === 1 ? args[0] : args, Error, {
+                    stringifyFn: nodejs_lib_1.inspectAnyStringifyFn,
+                }));
+            },
+        };
+    }
 }
 (0, tslib_1.__decorate)([
     (0, js_lib_1._Memo)()

package/dist/server/handlers/asyncLocalStorage.mw.d.ts

@@ -4,7 +4,7 @@ export interface RequestLocalStorage {
     req: Request;
 }
 export declare function createAsyncLocalStorage(): RequestHandler;
-export declare function getRequest(): Request;
+export declare function getRequest(): Request | undefined;
 /**
  * It requires both `createAsyncLocalStorage` and `createGAELogMiddleware` to be in use to work.
  *

package/dist/server/handlers/asyncLocalStorage.mw.js

@@ -19,7 +19,7 @@ function createAsyncLocalStorage() {
 }
 exports.createAsyncLocalStorage = createAsyncLocalStorage;
 function getRequest() {
-    return storage().getStore().req;
+    return storage().getStore()?.req;
 }
 exports.getRequest = getRequest;
 /**
@@ -28,7 +28,7 @@ exports.getRequest = getRequest;
  * @experimental
  */
 function getRequestLogger() {
-    return storage().getStore()?.req || (isGAE ? createGaeLogMiddleware_1.defaultAppEngineLogger : createGaeLogMiddleware_1.defaultDevLogger);
+    return storage().getStore()?.req || (isGAE ? createGaeLogMiddleware_1.gaeLogger : createGaeLogMiddleware_1.devLogger);
 }
 exports.getRequestLogger = getRequestLogger;
 /**

package/dist/server/handlers/createGaeLogMiddleware.d.ts

@@ -18,11 +18,13 @@ declare module 'http' {
     }
 }
 /**
- * Outside-of-request logger.
+ * Logger that logs in AppEngine format.
+ * To be used in outside-of-request situations (otherwise req.log should be used).
  */
-export declare const defaultAppEngineLogger: CommonLogger;
+export declare const gaeLogger: CommonLogger;
 /**
- * Outside-of-request local logger
+ * Fancy development logger, to be used in outside-of-request situations
+ * (otherwise req.log should be used).
  */
-export declare const defaultDevLogger: CommonLogger;
+export declare const devLogger: CommonLogger;
 export declare function createGAELogMiddleware(): RequestHandler;

package/dist/server/handlers/createGaeLogMiddleware.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createGAELogMiddleware = exports.defaultDevLogger = exports.defaultAppEngineLogger = void 0;
+exports.createGAELogMiddleware = exports.devLogger = exports.gaeLogger = void 0;
 const util_1 = require("util");
 const colors_1 = require("@naturalcycles/nodejs-lib/dist/colors");
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
@@ -9,17 +9,19 @@ const isGAE = !!GAE_INSTANCE;
 // Simple "request counter" (poor man's "correlation id") counter, to use on dev machine (not in the cloud)
 let reqCounter = 0;
 /**
- * Outside-of-request logger.
+ * Logger that logs in AppEngine format.
+ * To be used in outside-of-request situations (otherwise req.log should be used).
  */
-exports.defaultAppEngineLogger = {
+exports.gaeLogger = {
     log: (...args) => logToAppEngine({}, args),
     warn: (...args) => logToAppEngine({ severity: 'WARNING' }, args),
     error: (...args) => logToAppEngine({ severity: 'ERROR' }, args),
 };
 /**
- * Outside-of-request local logger
+ * Fancy development logger, to be used in outside-of-request situations
+ * (otherwise req.log should be used).
  */
-exports.defaultDevLogger = {
+exports.devLogger = {
     log: (...args) => logToDev(null, args),
     warn: (...args) => logToDev(null, args),
     error: (...args) => logToDev(null, args),
@@ -50,14 +52,13 @@ function createGAELogMiddleware() {
     }
     // Otherwise, we're in AppEngine
     return function gaeLogMiddleware(req, res, next) {
-        const meta = {};
         const traceHeader = req.header('x-cloud-trace-context');
         if (traceHeader) {
             const [trace] = traceHeader.split('/');
-            Object.assign(meta, {
+            const meta = {
                 'logging.googleapis.com/trace': `projects/${GOOGLE_CLOUD_PROJECT}/traces/${trace}`,
                 'appengine.googleapis.com/request_id': req.header('x-appengine-request-log-id'),
-            });
+            };
             Object.assign(req, {
                 log: (...args) => logToAppEngine({ ...meta, severity: 'INFO' }, args),
                 warn: (...args) => logToAppEngine({ ...meta, severity: 'WARNING' }, args),
@@ -66,7 +67,7 @@ function createGAELogMiddleware() {
             req.requestId = trace;
         }
         else {
-            Object.assign(req, exports.defaultAppEngineLogger);
+            Object.assign(req, exports.gaeLogger);
         }
         next();
     };

package/dist/server/handlers/genericErrorHandler.mw.js

@@ -37,26 +37,29 @@ function respondWithError(req, res, err) {
     var _a, _b;
     const { headersSent } = res;
     req.error(`genericErrorHandler${headersSent ? ' after headersSent' : ''}:\n`, err);
-    const error = (0, js_lib_1._anyToErrorObject)(err, {
+    const originalError = (0, js_lib_1._anyToError)(err, Error, {
         stringifyFn: nodejs_lib_1.inspectAnyStringifyFn,
-        includeErrorStack,
-        includeErrorData: true,
     });
-    (_a = error.data).httpStatusCode || (_a.httpStatusCode = 500); // default to 500
-    error.data.headersSent = headersSent || undefined;
-    (_b = error.data).report || (_b.report = undefined); // set to undefined if false
-    (0, js_lib_1._filterUndefinedValues)(error.data, true);
-    if (sentryService && shouldReportToSentry(error)) {
-        error.data.errorId = sentryService.captureException(error, false);
+    let errorId;
+    if (sentryService && shouldReportToSentry(originalError)) {
+        errorId = sentryService.captureException(originalError, false);
     }
     if (res.headersSent)
         return;
-    res.status(error.data.httpStatusCode).json({
-        error,
+    const httpError = (0, js_lib_1._errorToErrorObject)(originalError, includeErrorStack);
+    httpError.data.errorId = errorId;
+    (_a = httpError.data).httpStatusCode || (_a.httpStatusCode = 500); // default to 500
+    httpError.data.headersSent = headersSent || undefined;
+    (_b = httpError.data).report || (_b.report = undefined); // set to undefined if false
+    (0, js_lib_1._filterUndefinedValues)(httpError.data, true);
+    res.status(httpError.data.httpStatusCode).json({
+        error: httpError,
     });
 }
 exports.respondWithError = respondWithError;
 function shouldReportToSentry(err) {
     // Only report 5xx
-    return err.data.report || err.data.httpStatusCode >= 500;
+    return (err?.data?.report ||
+        !err?.data ||
+        err.data.httpStatusCode >= 500);
 }

package/dist/server/handlers/serverStatsMiddleware.js

@@ -23,8 +23,7 @@ const serverStatsHTMLHandler = (req, res) => {
     // calc things
     (0, js_lib_1._stringMapValues)(serverStatsMap).forEach(s => {
         s.total = s['2xx'] + s['4xx'] + s['5xx'];
-        s.pc = {};
-        percentiles.forEach(pc => (s.pc[pc] = Math.round((0, js_lib_1._percentile)(s.stack.items, pc))));
+        s.pc = (0, js_lib_1._mapValues)(s.stack.percentiles(percentiles), (_k, v) => Math.round(v), true);
     });
     const allLatencies = (0, js_lib_1._stringMapValues)(serverStatsMap).flatMap(s => s.stack.items);
     const all2xx = (0, js_lib_1._sum)((0, js_lib_1._stringMapValues)(serverStatsMap).flatMap(s => s['2xx']));
@@ -80,7 +79,7 @@ function serverStatsMiddleware() {
             const latency = now - started;
             const endpoint = (0, request_util_1.getRequestEndpoint)(req);
             serverStatsMap[endpoint] || (serverStatsMap[endpoint] = {
-                stack: new SizeLimitedStack(SIZE),
+                stack: new js_lib_1.NumberStack(SIZE),
                 '2xx': 0,
                 '4xx': 0,
                 '5xx': 0,
@@ -112,14 +111,3 @@ function getStatusFamily(statusCode) {
         return '4xx';
     return '5xx';
 }
-class SizeLimitedStack {
-    constructor(size) {
-        this.size = size;
-        this.index = 0;
-        this.items = [];
-    }
-    push(item) {
-        this.items[this.index] = item;
-        this.index = this.index === this.size ? 0 : this.index + 1;
-    }
-}

package/dist/server/handlers/simpleRequestLogger.mw.js

@@ -5,9 +5,11 @@ const js_lib_1 = require("@naturalcycles/js-lib");
 const colors_1 = require("@naturalcycles/nodejs-lib/dist/colors");
 const index_1 = require("../../index");
 const request_log_util_1 = require("../request.log.util");
+const { APP_ENV } = process.env;
 function simpleRequestLogger(_cfg = {}) {
     // Disable logger in AppEngine, as it doesn't make sense there
-    if ((0, index_1.isGAE)())
+    // UPD: Only log in dev environment
+    if (APP_ENV !== 'dev')
         return (req, res, next) => next();
     const cfg = {
         logStart: false,
@@ -18,7 +20,6 @@ function simpleRequestLogger(_cfg = {}) {
     return (req, res, next) => {
         const started = Date.now();
         if (logStart) {
-            ;
             req.log(['>>', req.method, (0, colors_1.boldGrey)(req.url)].join(' '));
         }
         if (logFinish) {

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@naturalcycles/backend-lib",
-  "version": "2.72.0",
+  "version": "2.73.3",
   "scripts": {
-    "prepare": "husky install",
+    "prepare": "husky install && patch-package",
     "serve": "APP_ENV=dev nodemon",
     "docs-serve": "vuepress dev docs",
     "docs-build": "vuepress build docs",
@@ -45,6 +45,8 @@
     "@types/ejs": "^3.0.0",
     "@types/js-yaml": "^4.0.0",
     "@types/node": "^16.4.1",
+    "esbuild": "^0.13.13",
+    "esbuild-register": "^3.1.2",
     "fastify": "^3.20.1",
     "jest": "^27.0.1",
     "nodemon": "^2.0.14",

package/src/index.ts

@@ -51,8 +51,10 @@ import {
   getRequestLogger,
   requestLogger,
 } from './server/handlers/asyncLocalStorage.mw'
-import { createGAELogMiddleware, RequestWithLog } from './server/handlers/createGaeLogMiddleware'
+import type { RequestWithLog } from './server/handlers/createGaeLogMiddleware'
+export * from './server/handlers/createGaeLogMiddleware'
 import { safeJsonMiddleware } from './server/handlers/safeJsonMiddleware'
+export * from './server/request.util'
 
 export type {
   MethodOverrideCfg,
@@ -110,7 +112,6 @@ export {
   validateParams,
   validateQuery,
   createAsyncLocalStorage,
-  createGAELogMiddleware,
   getRequest,
   getRequestLogger,
   requestLogger,

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

@@ -1,4 +1,4 @@
-import { _anyToError, _Memo, CommonLogLevel } from '@naturalcycles/js-lib'
+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'
@@ -98,7 +98,7 @@ export class SentrySharedService {
     })
 
     return this.sentry().captureException(
-      _anyToError(err, {
+      _anyToError(err, Error, {
         stringifyFn: inspectAnyStringifyFn,
       }),
     )
@@ -115,4 +115,38 @@ export class SentrySharedService {
   addBreadcrumb(breadcrumb: Breadcrumb): void {
     this.sentry().addBreadcrumb(breadcrumb)
   }
+
+  /**
+   * Currently it will only use `logger.error` ("error" level) and ignore `log` and `warn`.
+   *
+   * For each `logger.error` - it'll do a captureException.
+   *
+   * @experimental
+   */
+  getCommonLogger(): CommonLogger {
+    return {
+      log: () => {}, // noop
+      warn: () => {}, // noop
+      error: (...args) => {
+        const message = args
+          .map(arg =>
+            inspectAny(arg, {
+              includeErrorData: true,
+              colors: false,
+            }),
+          )
+          .join(' ')
+
+        this.sentry().addBreadcrumb({
+          message,
+        })
+
+        this.sentry().captureException(
+          _anyToError(args.length === 1 ? args[0] : args, Error, {
+            stringifyFn: inspectAnyStringifyFn,
+          }),
+        )
+      },
+    }
+  }
 }

package/src/server/handlers/asyncLocalStorage.mw.ts

@@ -1,7 +1,7 @@
 import { AsyncLocalStorage } from 'async_hooks'
 import { _lazyValue, CommonLogger } from '@naturalcycles/js-lib'
 import { Request, RequestHandler } from 'express'
-import { defaultAppEngineLogger, defaultDevLogger } from './createGaeLogMiddleware'
+import { gaeLogger, devLogger } from './createGaeLogMiddleware'
 
 const { GAE_INSTANCE } = process.env
 const isGAE = !!GAE_INSTANCE
@@ -24,8 +24,8 @@ export function createAsyncLocalStorage(): RequestHandler {
   }
 }
 
-export function getRequest(): Request {
-  return storage().getStore()!.req
+export function getRequest(): Request | undefined {
+  return storage().getStore()?.req
 }
 
 /**
@@ -34,7 +34,7 @@ export function getRequest(): Request {
  * @experimental
  */
 export function getRequestLogger(): CommonLogger {
-  return storage().getStore()?.req || (isGAE ? defaultAppEngineLogger : defaultDevLogger)
+  return storage().getStore()?.req || (isGAE ? gaeLogger : devLogger)
 }
 
 /**

package/src/server/handlers/createGaeLogMiddleware.ts

@@ -32,18 +32,20 @@ const isGAE = !!GAE_INSTANCE
 let reqCounter = 0
 
 /**
- * Outside-of-request logger.
+ * Logger that logs in AppEngine format.
+ * To be used in outside-of-request situations (otherwise req.log should be used).
  */
-export const defaultAppEngineLogger: CommonLogger = {
+export const gaeLogger: CommonLogger = {
   log: (...args) => logToAppEngine({}, args),
   warn: (...args) => logToAppEngine({ severity: 'WARNING' }, args),
   error: (...args) => logToAppEngine({ severity: 'ERROR' }, args),
 }
 
 /**
- * Outside-of-request local logger
+ * Fancy development logger, to be used in outside-of-request situations
+ * (otherwise req.log should be used).
  */
-export const defaultDevLogger: CommonLogger = {
+export const devLogger: CommonLogger = {
   log: (...args) => logToDev(null, args),
   warn: (...args) => logToDev(null, args),
   error: (...args) => logToDev(null, args),
@@ -83,15 +85,13 @@ export function createGAELogMiddleware(): RequestHandler {
   // Otherwise, we're in AppEngine
 
   return function gaeLogMiddleware(req, res, next) {
-    const meta: AnyObject = {}
-
     const traceHeader = req.header('x-cloud-trace-context')
     if (traceHeader) {
       const [trace] = traceHeader.split('/')
-      Object.assign(meta, {
+      const meta = {
         'logging.googleapis.com/trace': `projects/${GOOGLE_CLOUD_PROJECT}/traces/${trace}`,
         'appengine.googleapis.com/request_id': req.header('x-appengine-request-log-id'),
-      })
+      }
       Object.assign(req, {
         log: (...args: any[]) => logToAppEngine({ ...meta, severity: 'INFO' }, args),
         warn: (...args: any[]) => logToAppEngine({ ...meta, severity: 'WARNING' }, args),
@@ -99,7 +99,7 @@ export function createGAELogMiddleware(): RequestHandler {
       })
       req.requestId = trace
     } else {
-      Object.assign(req, defaultAppEngineLogger)
+      Object.assign(req, gaeLogger)
     }
 
     next()

package/src/server/handlers/genericErrorHandler.mw.ts

@@ -1,5 +1,6 @@
 import {
-  _anyToErrorObject,
+  _anyToError,
+  _errorToErrorObject,
   _filterUndefinedValues,
   HttpError,
   HttpErrorData,
@@ -53,29 +54,36 @@ export function respondWithError(req: RequestWithLog, res: Response, err: any):
 
   req.error(`genericErrorHandler${headersSent ? ' after headersSent' : ''}:\n`, err)
 
-  const error = _anyToErrorObject<HttpErrorData>(err, {
+  const originalError = _anyToError(err, Error, {
     stringifyFn: inspectAnyStringifyFn,
-    includeErrorStack,
-    includeErrorData: true,
-  }) as HttpError
+  })
 
-  error.data.httpStatusCode ||= 500 // default to 500
-  error.data.headersSent = headersSent || undefined
-  error.data.report ||= undefined // set to undefined if false
-  _filterUndefinedValues(error.data, true)
+  let errorId: string | undefined
 
-  if (sentryService && shouldReportToSentry(error)) {
-    error.data.errorId = sentryService.captureException(error, false)
+  if (sentryService && shouldReportToSentry(originalError)) {
+    errorId = sentryService.captureException(originalError, false)
   }
 
   if (res.headersSent) return
 
-  res.status(error.data.httpStatusCode).json({
-    error,
+  const httpError = _errorToErrorObject<HttpErrorData>(originalError, includeErrorStack)
+
+  httpError.data.errorId = errorId
+  httpError.data.httpStatusCode ||= 500 // default to 500
+  httpError.data.headersSent = headersSent || undefined
+  httpError.data.report ||= undefined // set to undefined if false
+  _filterUndefinedValues(httpError.data, true)
+
+  res.status(httpError.data.httpStatusCode).json({
+    error: httpError,
   } as HttpErrorResponse)
 }
 
-function shouldReportToSentry(err: HttpError): boolean {
+function shouldReportToSentry(err: Error): boolean {
   // Only report 5xx
-  return err.data.report || err.data.httpStatusCode >= 500
+  return (
+    (err as HttpError)?.data?.report ||
+    !(err as HttpError)?.data ||
+    (err as HttpError).data.httpStatusCode >= 500
+  )
 }

package/src/server/handlers/serverStatsMiddleware.ts

@@ -1,5 +1,6 @@
 import {
   _get,
+  _mapValues,
   _mb,
   _ms,
   _percentile,
@@ -7,6 +8,7 @@ import {
   _stringMapEntries,
   _stringMapValues,
   _sum,
+  NumberStack,
   StringMap,
 } from '@naturalcycles/js-lib'
 import { RequestHandler } from 'express'
@@ -17,14 +19,14 @@ const { GAE_INSTANCE } = process.env
 
 // Map from "endpoint" to latency
 interface Stat {
-  stack: SizeLimitedStack<number>
+  stack: NumberStack
   '2xx': number
   '4xx': number
   '5xx': number
 
   // calculated on the fly
   total?: number
-  pc?: StringMap<number> // e.g 50 => 123
+  pc?: Record<number, number> // e.g 50 => 123
 }
 
 const serverStatsMap: StringMap<Stat> = {}
@@ -49,8 +51,7 @@ export const serverStatsHTMLHandler: RequestHandler = (req, res) => {
   // calc things
   _stringMapValues(serverStatsMap).forEach(s => {
     s.total = s['2xx'] + s['4xx'] + s['5xx']
-    s.pc = {}
-    percentiles.forEach(pc => (s.pc![pc] = Math.round(_percentile(s.stack.items, pc))))
+    s.pc = _mapValues(s.stack.percentiles(percentiles), (_k, v) => Math.round(v), true)
   })
   const allLatencies = _stringMapValues(serverStatsMap).flatMap(s => s.stack.items)
   const all2xx = _sum(_stringMapValues(serverStatsMap).flatMap(s => s['2xx']))
@@ -121,7 +122,7 @@ export function serverStatsMiddleware(): RequestHandler {
       const endpoint = getRequestEndpoint(req)
 
       serverStatsMap[endpoint] ||= {
-        stack: new SizeLimitedStack<number>(SIZE),
+        stack: new NumberStack(SIZE),
         '2xx': 0,
         '4xx': 0,
         '5xx': 0,
@@ -155,15 +156,3 @@ function getStatusFamily(statusCode: number): '2xx' | '4xx' | '5xx' {
   if (statusCode < 500) return '4xx'
   return '5xx'
 }
-
-class SizeLimitedStack<T> {
-  constructor(public size: number) {}
-
-  index = 0
-  items: T[] = []
-
-  push(item: T): void {
-    this.items[this.index] = item
-    this.index = this.index === this.size ? 0 : this.index + 1
-  }
-}

package/src/server/handlers/simpleRequestLogger.mw.ts

@@ -1,9 +1,11 @@
 import { _since } from '@naturalcycles/js-lib'
 import { boldGrey, dimGrey } from '@naturalcycles/nodejs-lib/dist/colors'
 import { RequestHandler, Response } from 'express'
-import { isGAE, onFinished, RequestWithLog } from '../../index'
+import { onFinished } from '../../index'
 import { logRequest } from '../request.log.util'
 
+const { APP_ENV } = process.env
+
 export interface SimpleRequestLoggerCfg {
   /**
    * @default false
@@ -18,7 +20,8 @@ export interface SimpleRequestLoggerCfg {
 
 export function simpleRequestLogger(_cfg: Partial<SimpleRequestLoggerCfg> = {}): RequestHandler {
   // Disable logger in AppEngine, as it doesn't make sense there
-  if (isGAE()) return (req, res, next) => next()
+  // UPD: Only log in dev environment
+  if (APP_ENV !== 'dev') return (req, res, next) => next()
 
   const cfg: SimpleRequestLoggerCfg = {
     logStart: false,
@@ -31,7 +34,7 @@ export function simpleRequestLogger(_cfg: Partial<SimpleRequestLoggerCfg> = {}):
     const started = Date.now()
 
     if (logStart) {
-      ;(req as RequestWithLog).log(['>>', req.method, boldGrey(req.url)].join(' '))
+      req.log(['>>', req.method, boldGrey(req.url)].join(' '))
     }
 
     if (logFinish) {