@nxtedition/lib 23.17.7 → 23.17.9

package/app.js

@@ -33,11 +33,11 @@ import compose from 'koa-compose'
 import { createServer } from './http.js'
 import { json } from 'node:stream/consumers'
 import { monitorEventLoopDelay } from 'node:perf_hooks'
-import { LRUCache } from 'lru-cache'
 import xuid from 'xuid'
 import { isTimeBetween } from './time.js'
 import makeUnderPressure from './under-pressure.js'
 import undici from '@nxtedition/undici'
+import { isPrimary } from 'node:cluster'
 
 export function makeApp(appConfig, onTerminate) {
   let ds
@@ -289,7 +289,6 @@ export function makeApp(appConfig, onTerminate) {
     const resolution = appConfig.toobusy.resolution ?? 10
     const interval = appConfig.toobusy.interval ?? 500
     const maxLag = appConfig.toobusy.maxLag ?? 100
-    const id = xuid()
 
     const currentLag$ = new rxjs.BehaviorSubject(0)
     const appLag$ = new rxjs.BehaviorSubject(0)
@@ -297,21 +296,34 @@ export function makeApp(appConfig, onTerminate) {
     const histogram = monitorEventLoopDelay({ resolution })
     histogram.enable()
 
-    const lagMap = new LRUCache({ ttl: 10e3, max: 1024 })
-
     const lagBC = new BroadcastChannel('nxt:lag')
     lagBC.unref()
 
-    lagBC.onmessage = ({ data }) => {
-      lagMap.set(data.id, data.currentLag)
-    }
+    if (isMainThread && isPrimary) {
+      const lagMap = new Map()
 
-    process.on('message', (data) => {
-      if (data?.type === 'nxt:lag') {
+      lagBC.onmessage = ({ data }) => {
         lagMap.set(data.id, data.currentLag)
       }
-    })
 
+      process.on('message', (data) => {
+        if (data?.type === 'nxt:lag') {
+          lagMap.set(data.id, data.currentLag)
+        }
+      })
+
+      setInterval(() => {
+        let appLag = currentLag$.value
+        for (const lag of lagMap.values()) {
+          appLag = Math.max(appLag, lag)
+        }
+        lagMap.clear()
+
+        appLag$.next(appLag)
+      }, 500).unref()
+    }
+
+    const lagId = (process.pid << 16) | threadId
     setInterval(() => {
       let currentLag = Math.max(0, histogram.mean / 1e6 - resolution)
       if (Number.isNaN(currentLag)) {
@@ -320,20 +332,14 @@ export function makeApp(appConfig, onTerminate) {
       histogram.reset()
 
       if (currentLag > 1e3) {
-        logger?.error({ currentLag, elapsedTime: currentLag }, 'lag')
+        logger?.error({ currentLag, elapsedTime: currentLag }, 'Lag')
       } else if (currentLag > maxLag) {
-        logger?.warn({ currentLag, elapsedTime: currentLag }, 'lag')
+        logger?.warn({ currentLag, elapsedTime: currentLag }, 'Lag')
       }
 
       currentLag$.next(currentLag)
-      lagBC.postMessage({ id, currentLag })
-      process.send?.({ type: 'nxt:lag', id, currentLag })
-
-      let appLag = currentLag$.value ?? 0
-      for (const lag of lagMap.values()) {
-        appLag = Math.max(appLag, lag ?? 0)
-      }
-      appLag$.next(appLag)
+      lagBC.postMessage({ id: lagId, currentLag })
+      process.send?.({ type: 'nxt:lag', id: lagId, currentLag })
     }, interval).unref()
 
     toobusy = () => currentLag$.value > maxLag

package/couch.d.ts

@@ -8,6 +8,7 @@ export interface CouchOptions {
 export function makeCouch(opts: string | CouchOptions): CouchClient
 
 export interface CouchRequestOptions<Stream extends boolean = false> {
+  id?: string
   url?: URL
   pathname?: string
   path?: string

package/http.js

@@ -42,9 +42,6 @@ export class Context {
   #res
   #ac
   #logger
-
-  // deprecated fields
-  #userAgent
   #query
   #target
 
@@ -52,15 +49,14 @@ export class Context {
     assert(req)
     assert(res)
 
-    this.#id = req.headers['request-id'] || req.headers['Request-Id'] || genReqId()
-    this.#userAgent = req.headers['user-agent'] || req.headers['User-Agent'] || ''
+    this.#id = req.id || req.headers['request-id'] || req.headers['Request-Id'] || genReqId()
     this.#req = req
     this.#res = res
-    this.#logger = logger.child({ rid: this.#id, userAgent: this.#userAgent })
+    this.#logger = logger.child({ rid: this.#id })
   }
 
   get id() {
-    return this.#req.id ?? this.#id
+    return this.#id
   }
 
   get logger() {
@@ -75,6 +71,38 @@ export class Context {
     return this.#res
   }
 
+  get target() {
+    if (this.#req.target) {
+      return this.#req.target
+    }
+
+    this.#target ??= requestTarget(this.#req)
+
+    if (!this.#target) {
+      throw new createError.BadRequest('invalid url')
+    }
+
+    return this.#target
+  }
+
+  get query() {
+    if (this.#req.query) {
+      return this.#req.query
+    }
+
+    this.#target ??= requestTarget(this.#req)
+    this.#query ??=
+      this.#target.search.length > 1
+        ? Object.freeze(querystring.parse(this.#target.search.slice(1)))
+        : {}
+
+    return this.#query
+  }
+
+  get userAgent() {
+    return this.#req.headers['user-agent'] || this.#req.headers['User-Agent'] || ''
+  }
+
   get [kAbortController]() {
     return this.#ac
   }
@@ -84,11 +112,6 @@ export class Context {
     return this.#ac.signal
   }
 
-  /** @deprecated */
-  get userAgent() {
-    return this.#req.userAgent ?? this.#userAgent
-  }
-
   /** @deprecated */
   get method() {
     return this.#req.method
@@ -96,17 +119,7 @@ export class Context {
 
   /** @deprecated */
   get url() {
-    if (this.#req.target) {
-      return this.#req.target
-    }
-
-    this.#target ??= requestTarget(this.#req)
-
-    if (!this.#target) {
-      throw new createError.BadRequest('invalid url')
-    }
-
-    return this.#target
+    return this.target
   }
 
   /** @deprecated */
@@ -120,21 +133,6 @@ export class Context {
     this.#query = undefined
   }
 
-  /** @deprecated */
-  get query() {
-    if (this.#req.query) {
-      return this.#req.query
-    }
-
-    this.#target ??= requestTarget(this.#req)
-    this.#query ??=
-      this.#target.search.length > 1
-        ? Object.freeze(querystring.parse(this.#target.search.slice(1)))
-        : {}
-
-    return this.#query
-  }
-
   /** @deprecated */
   set logger(logger) {
     this.#logger = logger.child({ rid: this.#id })
@@ -349,15 +347,17 @@ export class IncomingMessage extends http.IncomingMessage {
   #socket
   #target
 
+  #id
   #search
   #query
 
   constructor(...args) {
     super(...args)
+    this.#id = this.headers['request-id'] || this.headers['Request-Id'] || genReqId()
   }
 
   get id() {
-    return this.headers['request-id'] || this.headers['Request-Id']
+    return this.#id
   }
 
   get target() {
@@ -493,15 +493,17 @@ export class Http2ServerRequest extends http2.Http2ServerRequest {
   #socket
   #target
 
+  #id
   #search
   #query
 
   constructor(...args) {
     super(...args)
+    this.#id = this.headers['request-id'] || this.headers['Request-Id'] || genReqId()
   }
 
   get id() {
-    return this.headers['request-id'] || this.headers['Request-Id']
+    return this.#id
   }
 
   get target() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "23.17.7",
+  "version": "23.17.9",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",