@nxtedition/lib 19.8.0 → 19.8.2

package/couch.js

@@ -9,7 +9,7 @@ import urljoin from 'url-join'
 import undici, { util as undiciUtil } from 'undici'
 import { AbortError } from './errors.js'
 import split2 from 'split2'
-import { parse as parseContentType } from 'content-type'
+import { interceptors } from '@nxtedition/nxt-undici'
 
 // https://github.com/fastify/fastify/blob/main/lib/reqIdGenFactory.js
 // 2,147,483,647 (2^31 − 1) stands for max SMI value (an internal optimization of V8).
@@ -887,141 +887,6 @@ function _normalizeAllDocsOptions({
   }
 }
 
-class SignalHandler extends undici.DecoratorHandler {
-  #signal
-  #handler
-  #abort
-
-  constructor({ signal, handler }) {
-    super(handler)
-    this.#signal = signal
-    this.#handler = handler
-  }
-
-  onConnect(abort) {
-    if (this.#signal?.aborted) {
-      abort(this.#signal.reason)
-    } else {
-      if (this.#signal) {
-        this.#abort = () => abort(this.#signal.reason)
-        this.#signal.addEventListener('abort', this.#abort)
-      }
-      this.#handler.onConnect?.(abort)
-    }
-  }
-
-  onComplete(...args) {
-    this.#signal?.removeEventListener('abort', this.#abort)
-    this.#handler.onComplete?.(...args)
-  }
-
-  onError(...args) {
-    this.#signal?.removeEventListener('abort', this.#abort)
-    this.#handler.onError?.(...args)
-  }
-}
-
-class ErrorHandler extends undici.DecoratorHandler {
-  #str
-  #decoder
-  #statusCode
-  #contentType
-  #opts
-  #handler
-  #error
-  #headers
-
-  constructor({ opts, handler }) {
-    super(handler)
-
-    this.#handler = handler
-    this.#opts = opts
-  }
-
-  onConnect(...args) {
-    this.#str = ''
-    this.#decoder = null
-    this.#handler.onConnect?.(...args)
-  }
-
-  onHeaders(statusCode, headers, resume, statusText) {
-    this.#statusCode = statusCode
-
-    if (this.#statusCode < 200 || this.#statusCode > 300) {
-      this.#headers = Array.isArray(headers) ? undiciUtil.parseHeaders(headers) : headers
-
-      this.#error = new Error(statusText ?? statusCode)
-
-      this.#contentType = this.#headers['content-type']
-        ? parseContentType(this.#headers['content-type'] ?? '')?.type
-        : null
-
-      if (this.#contentType !== 'application/json' && this.#contentType !== 'plain/text') {
-        throw this.#error
-      }
-
-      this.#decoder = new TextDecoder()
-    } else {
-      return this.#handler.onHeaders?.(statusCode, headers, resume, statusText)
-    }
-  }
-
-  onData(data) {
-    if (this.#error) {
-      this.#str += this.#decoder?.decode(data, { stream: true }) ?? ''
-    } else {
-      return this.#handler?.onData(data)
-    }
-  }
-
-  onComplete(...args) {
-    if (this.#error) {
-      this.#str += this.#decoder?.decode(undefined, { stream: false }) ?? ''
-
-      if (this.#contentType === 'application/json') {
-        let body
-        let reason
-        let error
-        try {
-          body = JSON.parse(this.#str)
-          reason = body.reason
-          error = body.error
-        } catch {
-          body = this.#str
-          // Do nothing...
-        }
-
-        throw Object.assign(this.#error, {
-          reason,
-          error,
-          data: {
-            req: this.#opts,
-            res: {
-              body,
-              statusCode: this.#statusCode,
-            },
-          },
-        })
-      } else if (this.#contentType === 'plain/text') {
-        throw Object.assign(this.#error, {
-          data: {
-            ureq: this.#opts,
-            ures: {
-              body: this.#str,
-              statusCode: this.#statusCode,
-              headers: this.#headers,
-            },
-          },
-        })
-      }
-
-      assert(false)
-    } else {
-      this.#handler.onComplete?.(...args)
-    }
-  }
-}
-
 class StreamOutput extends stream.Readable {
   #str
   #resume
@@ -1036,8 +901,8 @@ class StreamOutput extends stream.Readable {
     ttfb: -1,
   }
 
-  constructor({ highWaterMark = 256 }) {
-    super({ objectMode: true, highWaterMark })
+  constructor({ signal, highWaterMark = 256 }) {
+    super({ objectMode: true, highWaterMark, signal })
   }
 
   get headers() {
@@ -1136,21 +1001,33 @@ class PromiseOutput {
   #decoder
   #headers
   #startTime = performance.now()
+  #signal
+  #abort
   #stats = {
     connect: -1,
     headers: -1,
-    ttfb: -1,
+    data: -1,
+    complete: -1,
+    error: -1,
   }
 
-  constructor({ resolve, reject }) {
+  constructor({ resolve, reject, signal }) {
     this.#resolve = resolve
     this.#reject = reject
+    this.#signal = signal
   }
 
-  onConnect() {
+  onConnect(abort) {
     this.#stats.connect = performance.now() - this.#startTime
     this.#decoder = new TextDecoder()
     this.#str = ''
+
+    if (this.#signal?.aborted) {
+      abort()
+    } else {
+      this.#abort = abort
+      this.#signal?.addEventListener('abort', this.#abort)
+    }
   }
 
   onHeaders(statusCode, rawHeaders, resume, statusText) {
@@ -1165,26 +1042,46 @@ class PromiseOutput {
   }
 
   onData(data) {
-    if (this.#stats.ttfb === -1) {
-      this.#stats.ttfb = performance.now() - this.#startTime - this.#stats.headers
+    if (this.#stats.data === -1) {
+      this.#stats.data = performance.now() - this.#startTime - this.#stats.headers
     }
 
     this.#str += this.#decoder.decode(data, { stream: true })
   }
 
   onComplete() {
+    if (this.#stats.complete === -1) {
+      this.#stats.complete = performance.now() - this.#startTime - this.#stats.data
+    }
+
     this.#str += this.#decoder.decode(undefined, { stream: false })
 
-    this.#resolve(
-      Object.assign(JSON.parse(this.#str), { headers: this.#headers, stats: this.#stats }),
-    )
+    const val = Object.assign(JSON.parse(this.#str), { headers: this.#headers, stats: this.#stats })
+    this.#onDone(null, val)
   }
 
   onError(err) {
-    this.#reject(err)
+    if (this.#stats.error === -1) {
+      this.#stats.error = performance.now() - this.#startTime - this.#stats.data
+    }
+
+    this.#onDone(err)
+  }
+
+  #onDone(err, val) {
+    if (err) {
+      this.#reject(err)
+    } else {
+      this.#resolve(val)
+    }
+
+    if (this.#abort) {
+      this.#signal?.removeEventListener('abort', this.#abort)
+    }
   }
 }
 
+const dispatcherCache = new WeakMap()
 export function request(
   url,
   {
@@ -1194,6 +1091,7 @@ export function request(
     headers,
     dispatcher = undici.getGlobalDispatcher(),
     signal,
+    logger,
     stream,
   },
 ) {
@@ -1211,26 +1109,36 @@ export function request(
     headers: {
       'content-type': body != null && typeof body === 'object' ? 'application/json' : 'plain/text',
       'user-agent': globalThis.userAgent ?? 'nxt-lib',
-      'request-id': genReqId(),
       accept: 'application/json',
       ...headers,
     },
+    logger,
     body: body != null && typeof body === 'object' ? JSON.stringify(body) : body,
   }
 
-  dispatcher = dispatcher.compose(
-    (dispatch) => (opts, handler) => dispatch(opts, new ErrorHandler({ opts, handler })),
-    (dispatch) => (opts, handler) => dispatch(opts, new SignalHandler({ signal, handler })),
-  )
+  let wrappedDispatcher = dispatcherCache.get(dispatcher)
+  if (!wrappedDispatcher) {
+    wrappedDispatcher = dispatcher.compose(
+      interceptors.responseError,
+      interceptors.log,
+      interceptors.requestId,
+      interceptors.responseRetry,
+      interceptors.responseVerify,
+      interceptors.redirect,
+      interceptors.cache,
+      interceptors.proxy,
+    )
+    dispatcherCache.set(dispatcher, wrappedDispatcher)
+  }
 
   if (stream) {
-    const handler = new StreamOutput(stream)
-    dispatcher.dispatch(opts, handler)
+    const handler = new StreamOutput({ signal, ...stream })
+    wrappedDispatcher.dispatch(opts, handler)
     return handler
   } else {
     return new Promise((resolve, reject) => {
-      const handler = new PromiseOutput({ resolve, reject })
-      dispatcher.dispatch(opts, handler)
+      const handler = new PromiseOutput({ resolve, reject, signal })
+      wrappedDispatcher.dispatch(opts, handler)
     })
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "19.8.0",
+  "version": "19.8.2",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",
@@ -26,6 +26,7 @@
     "timers.js",
     "trace.js",
     "weakCache.js",
+    "weakCache.d.ts",
     "couch.js",
     "app.js",
     "errors.js",
@@ -74,13 +75,14 @@
     }
   },
   "eslintIgnore": [
-    "/__tests__"
+    "/__tests__",
+    "**/*.d.ts"
   ],
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.554.0",
+    "@aws-sdk/client-s3": "^3.596.0",
     "@elastic/elasticsearch": "^8.13.1",
-    "@elastic/transport": "^8.5.1",
-    "@nxtedition/nxt-undici": "^2.0.46",
+    "@elastic/transport": "^8.6.0",
+    "@nxtedition/nxt-undici": "^2.2.5",
     "content-type": "^1.0.5",
     "date-fns": "^3.6.0",
     "fast-querystring": "^1.1.1",
@@ -95,31 +97,31 @@
     "nested-error-stacks": "^2.1.1",
     "object-hash": "^3.0.0",
     "p-queue": "^8.0.1",
-    "pino": "^8.20.0",
+    "pino": "^9.2.0",
     "qs": "^6.12.1",
     "request-target": "^1.0.2",
     "smpte-timecode": "^1.3.5",
     "split-string": "^6.0.0",
     "split2": "^4.2.0",
     "toobusy-js": "^0.5.1",
-    "undici": "^6.13.0",
+    "undici": "^6.18.2",
     "url-join": "^5.0.0"
   },
   "devDependencies": {
-    "@nxtedition/deepstream.io-client-js": ">=24.1.20",
-    "@types/lodash": "^4.17.0",
-    "@types/node": "^20.12.7",
+    "@nxtedition/deepstream.io-client-js": ">=24.2.4",
+    "@types/lodash": "^4.17.5",
+    "@types/node": "^20.14.2",
     "eslint": "^8.0.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-config-standard": "^17.0.0",
     "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-n": "^17.2.1",
+    "eslint-plugin-n": "^17.9.0",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^6.0.0",
+    "eslint-plugin-promise": "^6.2.0",
     "husky": "^9.0.11",
-    "lint-staged": "^15.2.2",
+    "lint-staged": "^15.2.7",
     "pinst": "^3.0.0",
-    "prettier": "^3.2.5",
+    "prettier": "^3.3.2",
     "rxjs": "^7.5.6",
     "send": "^0.18.0"
   },

package/weakCache.d.ts

@@ -0,0 +1,4 @@
+export function makeWeakCache<FactoryArgs extends any[], CachedType>(
+  valueSelector: (...args: FactoryArgs) => CachedType,
+  keySelector?: (...args: FactoryArgs) => string,
+): (...args: FactoryArgs) => CachedType