@naturalcycles/backend-lib 9.85.1 → 9.87.0

package/dist/deploy/deployHealthCheck.js

@@ -1,5 +1,5 @@
 import { inspect } from 'node:util';
-import { _ms, _since } from '@naturalcycles/js-lib/datetime';
+import { _ms, _since, nowUnixMillis } from '@naturalcycles/js-lib/datetime';
 import { getFetcher } from '@naturalcycles/js-lib/http';
 import { _filterFalsyValues, _filterUndefinedValues, } from '@naturalcycles/js-lib/object/object.util.js';
 import { pDelay } from '@naturalcycles/js-lib/promise/pDelay.js';
@@ -60,7 +60,7 @@ export async function deployHealthCheck(url, opt = {}) {
     async function makeAttempt() {
         attempt++;
         console.log([`>>`, dimGrey(url), inspect({ attempt }, inspectOpt)].join(' '));
-        const started = Date.now();
+        const started = nowUnixMillis();
         const { err, statusCode = 0 } = await fetcher.doFetch(_filterUndefinedValues({
             url,
             responseType: 'json',

package/dist/server/compressionMiddleware.d.ts

@@ -56,7 +56,7 @@ export interface CompressionOptions {
  *
  * Encoding preference order: zstd > br > gzip > deflate
  */
-export declare function compressionMiddleware(options?: CompressionOptions): BackendRequestHandler;
+export declare function compressionMiddleware(opt?: CompressionOptions): BackendRequestHandler;
 /**
  * Default filter function.
  * Returns true if the Content-Type is compressible.

package/dist/server/compressionMiddleware.js

@@ -27,14 +27,13 @@ const cacheControlNoTransformRegExp = /(?:^|,)\s*?no-transform\s*?(?:,|$)/i;
  *
  * Encoding preference order: zstd > br > gzip > deflate
  */
-export function compressionMiddleware(options) {
-    const opts = options || {};
+export function compressionMiddleware(opt = {}) {
     // Brotli options
     const optsBrotli = {
-        ...opts.brotli,
+        ...opt.brotli,
         params: {
             [zlib.constants.BROTLI_PARAM_QUALITY]: 4,
-            ...opts.brotli?.params,
+            ...opt.brotli?.params,
         },
     };
     // Zstd options
@@ -43,29 +42,29 @@ export function compressionMiddleware(options) {
     // stream holds ~850 KB of native memory per in-flight response vs ~150 KB at level 1.
     // That per-response allocation churn is what MALLOC_ARENA_MAX=2 works around on Cloud Run.
     const optsZstd = {
-        ...opts.zstd,
+        ...opt.zstd,
         params: {
             [zlib.constants.ZSTD_c_compressionLevel]: 1,
-            ...opts.zstd?.params,
+            ...opt.zstd?.params,
         },
     };
     // General zlib options for gzip/deflate
     const zlibOpts = {};
-    if (opts.level !== undefined)
-        zlibOpts.level = opts.level;
-    if (opts.memLevel !== undefined)
-        zlibOpts.memLevel = opts.memLevel;
-    if (opts.strategy !== undefined)
-        zlibOpts.strategy = opts.strategy;
-    if (opts.windowBits !== undefined)
-        zlibOpts.windowBits = opts.windowBits;
-    if (opts.chunkSize !== undefined)
-        zlibOpts.chunkSize = opts.chunkSize;
+    if (opt.level !== undefined)
+        zlibOpts.level = opt.level;
+    if (opt.memLevel !== undefined)
+        zlibOpts.memLevel = opt.memLevel;
+    if (opt.strategy !== undefined)
+        zlibOpts.strategy = opt.strategy;
+    if (opt.windowBits !== undefined)
+        zlibOpts.windowBits = opt.windowBits;
+    if (opt.chunkSize !== undefined)
+        zlibOpts.chunkSize = opt.chunkSize;
     const codecOpts = { zstd: optsZstd, brotli: optsBrotli, zlib: zlibOpts };
-    const filter = opts.filter || shouldCompress;
-    const threshold = parseBytes(opts.threshold) ?? 1024;
-    const syncMaxBytes = parseBytes(opts.syncMaxBytes) ?? 128 * 1024;
-    const enforceEncoding = opts.enforceEncoding || 'identity';
+    const filter = opt.filter || shouldCompress;
+    const threshold = parseBytes(opt.threshold) ?? 1024;
+    const syncMaxBytes = parseBytes(opt.syncMaxBytes) ?? 128 * 1024;
+    const enforceEncoding = opt.enforceEncoding || 'identity';
     return function compression(req, res, next) {
         let ended = false;
         // Set by the first `res.write`: the body comes in several chunks, so only the stream path applies
@@ -281,14 +280,14 @@ export function shouldCompress(_req, res) {
  * Compresses a whole body in one call, on the event loop.
  * Same codec options as the streams, so the output is identical to the streamed one.
  */
-function compressSync(method, body, opts) {
+function compressSync(method, body, opt) {
     if (method === 'zstd')
-        return zlib.zstdCompressSync(body, opts.zstd);
+        return zlib.zstdCompressSync(body, opt.zstd);
     if (method === 'br')
-        return zlib.brotliCompressSync(body, opts.brotli);
+        return zlib.brotliCompressSync(body, opt.brotli);
     if (method === 'gzip')
-        return zlib.gzipSync(body, opts.zlib);
-    return zlib.deflateSync(body, opts.zlib);
+        return zlib.gzipSync(body, opt.zlib);
+    return zlib.deflateSync(body, opt.zlib);
 }
 function addListeners(stream, on, listeners) {
     for (const [type, listener] of listeners) {

package/dist/server/requestLoggerMiddleware.js

@@ -1,3 +1,4 @@
+import { nowUnixMillis } from '@naturalcycles/js-lib/datetime/localTime.js';
 import { _since } from '@naturalcycles/js-lib/datetime/time.util.js';
 import { onFinished } from '../onFinished.js';
 /**
@@ -12,7 +13,7 @@ export function requestLoggerMiddleware(cfg = {}) {
         if (predicate && !predicate(req)) {
             return next();
         }
-        const started = Date.now();
+        const started = nowUnixMillis();
         let url = req.originalUrl.split('?')[0];
         if (removeUrlPrefix && url.startsWith(removeUrlPrefix)) {
             url = url.slice(removeUrlPrefixLength);

package/dist/server/serverStatsMiddleware.js

@@ -1,6 +1,7 @@
 import { _mb } from '@naturalcycles/js-lib';
 import { _sum } from '@naturalcycles/js-lib/array/array.util.js';
 import { _sortBy } from '@naturalcycles/js-lib/array/sort.js';
+import { nowUnixMillis } from '@naturalcycles/js-lib/datetime/localTime.js';
 import { _ms } from '@naturalcycles/js-lib/datetime/time.util.js';
 import { _percentiles } from '@naturalcycles/js-lib/math/math.util.js';
 import { NumberStack } from '@naturalcycles/js-lib/math/stack.util.js';
@@ -79,11 +80,11 @@ export const serverStatsHTMLHandler = (req, res) => {
  * Unlocks serverStatsHTMLHandler
  */
 export function serverStatsMiddleware() {
-    let lastCleanup = Date.now();
+    let lastCleanup = nowUnixMillis();
     return function serverStatsHandler(req, res, next) {
-        const started = Date.now();
+        const started = nowUnixMillis();
         onFinished(res, () => {
-            const now = Date.now();
+            const now = nowUnixMillis();
             const latency = now - started;
             // Only requests that matched a route are recorded by their route pattern.
             // Unmatched requests (404s, requests rejected by router-level middleware) carry an

package/dist/server/simpleRequestLoggerMiddleware.js

@@ -1,3 +1,4 @@
+import { nowUnixMillis } from '@naturalcycles/js-lib/datetime/localTime.js';
 import { _since } from '@naturalcycles/js-lib/datetime/time.util.js';
 import { boldGrey, dimGrey } from '@naturalcycles/nodejs-lib/colors';
 import { onFinished } from '../onFinished.js';
@@ -5,7 +6,7 @@ import { logRequestWithColors } from './request.log.util.js';
 export function simpleRequestLoggerMiddleware(cfg = {}) {
     const { logStart = false, logFinish = true } = cfg;
     return (req, res, next) => {
-        const started = Date.now();
+        const started = nowUnixMillis();
         if (logStart) {
             req.log(['>>', req.method, boldGrey(req.url)].join(' '));
         }

package/dist/server/trace.util.js

@@ -10,12 +10,11 @@ const traceIdByRequest = new WeakMap();
  * every log line.
  */
 export function getRequestTraceId(req) {
-    let traceId = traceIdByRequest.get(req);
-    if (traceId === undefined) {
-        traceId = getRequestTraceContext(req)?.traceId ?? null;
-        traceIdByRequest.set(req, traceId);
-    }
-    return traceId ?? undefined;
+    return traceIdByRequest.getOrInsertComputed(req, getRequestTraceIdOrNull) ?? undefined;
+}
+// Passed by reference, so the per-log-line call allocates no closure
+function getRequestTraceIdOrNull(req) {
+    return getRequestTraceContext(req)?.traceId ?? null;
 }
 export function getRequestTraceContext(req) {
     // Reads from `req.headers` and not `req.header()`, so a bare request object (as in tests) works too

package/package.json

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

package/src/deploy/deployHealthCheck.ts

@@ -1,13 +1,12 @@
 import type { InspectOptions } from 'node:util'
 import { inspect } from 'node:util'
-import { _ms, _since } from '@naturalcycles/js-lib/datetime'
+import { _ms, _since, nowUnixMillis } from '@naturalcycles/js-lib/datetime'
 import { getFetcher } from '@naturalcycles/js-lib/http'
 import {
   _filterFalsyValues,
   _filterUndefinedValues,
 } from '@naturalcycles/js-lib/object/object.util.js'
 import { pDelay } from '@naturalcycles/js-lib/promise/pDelay.js'
-import type { UnixTimestampMillis } from '@naturalcycles/js-lib/types'
 import type { CliOptions } from '@naturalcycles/nodejs-lib/args'
 import { dimGrey, red } from '@naturalcycles/nodejs-lib/colors'
 import { coloredHttpCode } from '../server/request.log.util.js'
@@ -95,7 +94,7 @@ export async function deployHealthCheck(
 
     console.log([`>>`, dimGrey(url), inspect({ attempt }, inspectOpt)].join(' '))
 
-    const started = Date.now() as UnixTimestampMillis
+    const started = nowUnixMillis()
 
     const { err, statusCode = 0 } = await fetcher.doFetch(
       _filterUndefinedValues({

package/src/server/compressionMiddleware.ts

@@ -89,15 +89,13 @@ const cacheControlNoTransformRegExp = /(?:^|,)\s*?no-transform\s*?(?:,|$)/i
  *
  * Encoding preference order: zstd > br > gzip > deflate
  */
-export function compressionMiddleware(options?: CompressionOptions): BackendRequestHandler {
-  const opts = options || {}
-
+export function compressionMiddleware(opt: CompressionOptions = {}): BackendRequestHandler {
   // Brotli options
   const optsBrotli: zlib.BrotliOptions = {
-    ...opts.brotli,
+    ...opt.brotli,
     params: {
       [zlib.constants.BROTLI_PARAM_QUALITY]: 4,
-      ...opts.brotli?.params,
+      ...opt.brotli?.params,
     },
   }
 
@@ -107,27 +105,27 @@ export function compressionMiddleware(options?: CompressionOptions): BackendRequ
   // stream holds ~850 KB of native memory per in-flight response vs ~150 KB at level 1.
   // That per-response allocation churn is what MALLOC_ARENA_MAX=2 works around on Cloud Run.
   const optsZstd: zlib.ZstdOptions = {
-    ...opts.zstd,
+    ...opt.zstd,
     params: {
       [zlib.constants.ZSTD_c_compressionLevel]: 1,
-      ...opts.zstd?.params,
+      ...opt.zstd?.params,
     },
   }
 
   // General zlib options for gzip/deflate
   const zlibOpts: zlib.ZlibOptions = {}
-  if (opts.level !== undefined) zlibOpts.level = opts.level
-  if (opts.memLevel !== undefined) zlibOpts.memLevel = opts.memLevel
-  if (opts.strategy !== undefined) zlibOpts.strategy = opts.strategy
-  if (opts.windowBits !== undefined) zlibOpts.windowBits = opts.windowBits
-  if (opts.chunkSize !== undefined) zlibOpts.chunkSize = opts.chunkSize
+  if (opt.level !== undefined) zlibOpts.level = opt.level
+  if (opt.memLevel !== undefined) zlibOpts.memLevel = opt.memLevel
+  if (opt.strategy !== undefined) zlibOpts.strategy = opt.strategy
+  if (opt.windowBits !== undefined) zlibOpts.windowBits = opt.windowBits
+  if (opt.chunkSize !== undefined) zlibOpts.chunkSize = opt.chunkSize
 
   const codecOpts: CodecOptions = { zstd: optsZstd, brotli: optsBrotli, zlib: zlibOpts }
 
-  const filter = opts.filter || shouldCompress
-  const threshold = parseBytes(opts.threshold) ?? 1024
-  const syncMaxBytes = parseBytes(opts.syncMaxBytes) ?? 128 * 1024
-  const enforceEncoding = opts.enforceEncoding || 'identity'
+  const filter = opt.filter || shouldCompress
+  const threshold = parseBytes(opt.threshold) ?? 1024
+  const syncMaxBytes = parseBytes(opt.syncMaxBytes) ?? 128 * 1024
+  const enforceEncoding = opt.enforceEncoding || 'identity'
 
   return function compression(req, res, next) {
     let ended = false
@@ -403,11 +401,11 @@ interface CodecOptions {
  * Compresses a whole body in one call, on the event loop.
  * Same codec options as the streams, so the output is identical to the streamed one.
  */
-function compressSync(method: string, body: Buffer, opts: CodecOptions): Buffer {
-  if (method === 'zstd') return zlib.zstdCompressSync(body, opts.zstd)
-  if (method === 'br') return zlib.brotliCompressSync(body, opts.brotli)
-  if (method === 'gzip') return zlib.gzipSync(body, opts.zlib)
-  return zlib.deflateSync(body, opts.zlib)
+function compressSync(method: string, body: Buffer, opt: CodecOptions): Buffer {
+  if (method === 'zstd') return zlib.zstdCompressSync(body, opt.zstd)
+  if (method === 'br') return zlib.brotliCompressSync(body, opt.brotli)
+  if (method === 'gzip') return zlib.gzipSync(body, opt.zlib)
+  return zlib.deflateSync(body, opt.zlib)
 }
 
 function addListeners(

package/src/server/requestLoggerMiddleware.ts

@@ -1,5 +1,5 @@
+import { nowUnixMillis } from '@naturalcycles/js-lib/datetime/localTime.js'
 import { _since } from '@naturalcycles/js-lib/datetime/time.util.js'
-import type { UnixTimestampMillis } from '@naturalcycles/js-lib/types'
 import { onFinished } from '../onFinished.js'
 import type { BackendRequest, BackendRequestHandler } from './server.model.js'
 
@@ -32,7 +32,7 @@ export function requestLoggerMiddleware(
       return next()
     }
 
-    const started = Date.now() as UnixTimestampMillis
+    const started = nowUnixMillis()
 
     let url = req.originalUrl.split('?')[0]!
     if (removeUrlPrefix && url.startsWith(removeUrlPrefix)) {

package/src/server/serverStatsMiddleware.ts

@@ -1,6 +1,7 @@
 import { _mb } from '@naturalcycles/js-lib'
 import { _sum } from '@naturalcycles/js-lib/array/array.util.js'
 import { _sortBy } from '@naturalcycles/js-lib/array/sort.js'
+import { nowUnixMillis } from '@naturalcycles/js-lib/datetime/localTime.js'
 import { _ms } from '@naturalcycles/js-lib/datetime/time.util.js'
 import { _percentiles } from '@naturalcycles/js-lib/math/math.util.js'
 import { NumberStack } from '@naturalcycles/js-lib/math/stack.util.js'
@@ -106,13 +107,13 @@ export const serverStatsHTMLHandler: BackendRequestHandler = (req, res) => {
  * Unlocks serverStatsHTMLHandler
  */
 export function serverStatsMiddleware(): BackendRequestHandler {
-  let lastCleanup = Date.now()
+  let lastCleanup = nowUnixMillis()
 
   return function serverStatsHandler(req, res, next) {
-    const started = Date.now()
+    const started = nowUnixMillis()
 
     onFinished(res, () => {
-      const now = Date.now()
+      const now = nowUnixMillis()
       const latency = now - started
 
       // Only requests that matched a route are recorded by their route pattern.

package/src/server/simpleRequestLoggerMiddleware.ts

@@ -1,5 +1,5 @@
+import { nowUnixMillis } from '@naturalcycles/js-lib/datetime/localTime.js'
 import { _since } from '@naturalcycles/js-lib/datetime/time.util.js'
-import type { UnixTimestampMillis } from '@naturalcycles/js-lib/types'
 import { boldGrey, dimGrey } from '@naturalcycles/nodejs-lib/colors'
 import { onFinished } from '../onFinished.js'
 import { logRequestWithColors } from './request.log.util.js'
@@ -23,7 +23,7 @@ export function simpleRequestLoggerMiddleware(
   const { logStart = false, logFinish = true } = cfg
 
   return (req, res, next) => {
-    const started = Date.now() as UnixTimestampMillis
+    const started = nowUnixMillis()
 
     if (logStart) {
       req.log(['>>', req.method, boldGrey(req.url)].join(' '))

package/src/server/trace.util.ts

@@ -23,12 +23,12 @@ const traceIdByRequest = new WeakMap<BackendRequest, string | null>()
  * every log line.
  */
 export function getRequestTraceId(req: BackendRequest): string | undefined {
-  let traceId = traceIdByRequest.get(req)
-  if (traceId === undefined) {
-    traceId = getRequestTraceContext(req)?.traceId ?? null
-    traceIdByRequest.set(req, traceId)
-  }
-  return traceId ?? undefined
+  return traceIdByRequest.getOrInsertComputed(req, getRequestTraceIdOrNull) ?? undefined
+}
+
+// Passed by reference, so the per-log-line call allocates no closure
+function getRequestTraceIdOrNull(req: BackendRequest): string | null {
+  return getRequestTraceContext(req)?.traceId ?? null
 }
 
 export function getRequestTraceContext(req: BackendRequest): TraceContext | undefined {