@naturalcycles/backend-lib 2.73.2 → 2.73.3

package/dist/index.d.ts

@@ -30,5 +30,6 @@ import { createAsyncLocalStorage, getRequest, getRequestLogger, requestLogger }
 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, getRequest, getRequestLogger, requestLogger, serverStatsHTMLHandler, serverStatsMiddleware, safeJsonMiddleware, };

package/dist/index.js

@@ -69,3 +69,4 @@ Object.defineProperty(exports, "requestLogger", { enumerable: true, get: functio
 (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/server/handlers/createGaeLogMiddleware.js

@@ -52,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),

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/backend-lib",
-  "version": "2.73.2",
+  "version": "2.73.3",
   "scripts": {
     "prepare": "husky install && patch-package",
     "serve": "APP_ENV=dev nodemon",

package/src/index.ts

@@ -54,6 +54,7 @@ import {
 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,

package/src/server/handlers/createGaeLogMiddleware.ts

@@ -85,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),

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
-  }
-}