@nxtedition/lib 19.1.0 → 19.1.2

package/couch.js

@@ -1,14 +1,15 @@
 import assert from 'node:assert'
+import stream from 'node:stream'
 import querystring from 'node:querystring'
 import createError from 'http-errors'
 import { makeWeakCache } from './weakCache.js'
 import tp from 'timers/promises'
 import { defaultDelay as delay } from './http.js'
 import urljoin from 'url-join'
-import undici from 'undici'
+import undici, { util as undiciUtil } from 'undici'
 import { AbortError } from './errors.js'
 import split2 from 'split2'
-import stream from 'node:stream'
+import { parse as parseContentType } from 'content-type'
 
 // 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).
@@ -886,101 +887,96 @@ function _normalizeAllDocsOptions({
   }
 }
 
-class Handler {
-  #state = 0
-  #str = ''
-  #decoder = new TextDecoder()
-  #resolve
-  #reject
-  #resume
-  #abort
-  #onAbort
+class SignalHandler extends undici.DecoratorHandler {
   #signal
-  #next
-  #statusCode
-  #statusText
-  #opts
+  #handler
+  #abort
 
-  constructor({ opts, signal, resolve, reject, next }) {
-    this.#next = next
-    this.#opts = opts
-    this.#resolve = resolve
-    this.#reject = reject
+  constructor({ signal, handler }) {
+    super(handler)
     this.#signal = signal
+    this.#handler = handler
   }
 
   onConnect(abort) {
     if (this.#signal?.aborted) {
       abort(this.#signal.reason)
     } else {
-      this.#abort = abort
       if (this.#signal) {
-        this.#onAbort = () => abort(this.#signal.reason)
-        this.#signal.addEventListener('abort', this.#onAbort)
+        this.#abort = () => abort(this.#signal.reason)
+        this.#signal.addEventListener('abort', this.#abort)
       }
+      this.#handler.onConnect?.(abort)
     }
   }
 
-  onHeaders(statusCode, rawHeaders, resume, statusText) {
-    this.#statusCode = statusCode
-    this.#statusText = statusText
-    this.#resume = resume
+  onComplete(...args) {
+    this.#signal?.removeEventListener('abort', this.#abort)
+    this.#handler.onComplete?.(...args)
+  }
 
-    if (this.#statusCode >= 200 && this.#statusCode < 300) {
-      this.#next = null
-    }
+  onError(...args) {
+    this.#signal?.removeEventListener('abort', this.#abort)
+    this.#handler.onError?.(...args)
   }
+}
 
-  onData(data) {
-    if (!this.#next) {
-      this.#str += this.#decoder.decode(data, { stream: true })
-    } else {
-      const lines = this.#decoder.decode(data, { stream: true }).split(/\r?\n+/)
-      lines[0] = this.#str + lines[0]
-      this.#str = lines.pop() ?? ''
-
-      const rows = []
-      for (const line of lines) {
-        if (this.#state === 0) {
-          if (line.endsWith('[')) {
-            this.#state = 1
-          } else {
-            throw new Error('unexpected data')
-          }
-        } else if (this.#state === 1) {
-          if (line.startsWith(']')) {
-            this.#state = 2
-          } else {
-            rows.push(JSON.parse(line.slice(0, line.lastIndexOf('}') + 1)))
-          }
-        }
-      }
+class ErrorHandler extends undici.DecoratorHandler {
+  #str
+  #decoder
+  #statusCode
+  #statusText
+  #contentType
+  #opts
+  #handler
+  #error
 
-      if (rows.length === 0) {
-        return true
-      }
+  constructor({ opts, handler }) {
+    super(handler)
 
-      const thenable = this.#next(rows)
+    this.#handler = handler
+    this.#opts = opts
+  }
 
-      if (!thenable) {
-        return true
-      }
+  onConnect(...args) {
+    this.#str = ''
+    this.#decoder = null
+    this.#handler.onConnect?.(...args)
+  }
 
-      thenable.then(this.#resume, this.#abort)
+  onHeaders(statusCode, headers, resume, statusText) {
+    this.#statusCode = statusCode
+    this.#statusText = statusText
+
+    if (this.#statusCode < 200 || this.#statusCode > 300) {
+      headers = Array.isArray(headers) ? undiciUtil.parseHeaders(headers) : headers
+
+      this.#error = new Error(this.#statusText ?? this.#statusCode)
 
-      return false
+      this.#contentType = parseContentType(headers['content-type'] ?? '')?.type
+      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)
     }
   }
 
-  onComplete() {
-    assert(!this.#next || this.#state === 2)
+  onData(data) {
+    if (this.#error) {
+      this.#str += this.#decoder?.decode(data, { stream: true }) ?? ''
+    } else {
+      return this.#handler?.onData(data)
+    }
+  }
 
-    if (!this.#next) {
-      this.#str += this.#decoder.decode(undefined, { stream: false })
+  onComplete(...args) {
+    if (this.#error) {
+      this.#str += this.#decoder?.decode(undefined, { stream: false }) ?? ''
 
-      if (this.#statusCode >= 200 && this.#statusCode < 300) {
-        this.onFinally(null, this.#next ? null : JSON.parse(this.#str))
-      } else {
+      if (this.#contentType === 'application/json') {
         let body
         let reason
         let error
@@ -989,46 +985,167 @@ class Handler {
           reason = body.reason
           error = body.error
         } catch {
+          body = this.#str
           // Do nothing...
         }
 
-        this.onFinally(
-          Object.assign(new Error(this.#statusText ?? reason), {
-            reason,
-            error,
-            data: {
-              req: this.#opts,
-              res: {
-                body,
-                statusCode: this.#statusCode,
-              },
+        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: {
+            req: this.#opts,
+            res: {
+              body: this.#str,
+              statusCode: this.#statusCode,
             },
-          }),
-        )
+          },
+        })
       }
+
+      assert(false)
     } else {
-      this.onFinally(null)
+      this.#handler.onComplete?.(...args)
     }
   }
+}
 
-  onError(err) {
-    this.onFinally(err)
+class StreamOutput extends stream.Readable {
+  #str
+  #resume
+  #abort
+  #state
+  #decoder
+  #batched
+  #didPush = false
+
+  constructor({ batched = false, highWaterMark = batched ? 2 : 128 }) {
+    super({ objectMode: true, highWaterMark })
+    this.#batched = batched
   }
 
-  onFinally(err, val) {
-    if (this.#signal) {
-      this.#signal.removeEventListener('abort', this.#onAbort)
-    }
+  _read() {
+    this.#resume?.()
+  }
 
-    if (err) {
-      this.#reject(err)
+  _destroy(err, callback) {
+    this.#abort?.(err)
+    callback(err)
+  }
+
+  onConnect(abort) {
+    if (this.destroyed) {
+      abort(this.errored)
+    } else if (!this.#didPush) {
+      this.#state = 0
+      this.#str = ''
+      this.#abort = abort
+      this.#decoder = new TextDecoder()
     } else {
-      this.#resolve(val)
+      throw new Error('unusable')
     }
   }
+
+  onHeaders(statusCode, rawHeaders, resume, statusText) {
+    if (statusCode >= 300 || statusCode < 200) {
+      throw new Error('invalid status code: ' + statusCode)
+    }
+
+    this.#resume = resume
+  }
+
+  onData(data) {
+    const lines = this.#decoder.decode(data, { stream: true }).split(/\r?\n+/)
+    lines[0] = this.#str + lines[0]
+    this.#str = lines.pop() ?? ''
+
+    const rows = this.#batched ? [] : null
+    for (const line of lines) {
+      if (this.#state === 0) {
+        if (line.endsWith('[')) {
+          this.#state = 1
+        } else {
+          throw new Error('unexpected data')
+        }
+      } else if (this.#state === 1) {
+        if (line.startsWith(']')) {
+          this.#state = 2
+        } else {
+          const row = JSON.parse(line.slice(0, line.lastIndexOf('}') + 1))
+          if (rows) {
+            rows.push(row)
+          } else {
+            this.push(row)
+            this.#didPush = true
+          }
+        }
+      }
+    }
+
+    if (rows) {
+      this.push(rows)
+      this.#didPush = true
+    }
+
+    return this.readableLength < this.readableHighWaterMark
+  }
+
+  onComplete() {
+    assert(this.#state === 2)
+    this.push(null)
+  }
+
+  onError(err) {
+    this.destroy(err)
+  }
 }
 
-export async function request(
+class PromiseOutput {
+  #resolve
+  #reject
+  #str
+  #decoder
+
+  constructor({ resolve, reject }) {
+    this.#resolve = resolve
+    this.#reject = reject
+  }
+
+  onConnect() {
+    this.#decoder = new TextDecoder()
+    this.#str = ''
+  }
+
+  onHeaders(statusCode, rawHeaders, resume, statusText) {
+    if (statusCode >= 300 || statusCode < 200) {
+      throw new Error('invalid status code: ' + statusCode)
+    }
+  }
+
+  onData(data) {
+    this.#str += this.#decoder.decode(data, { stream: true })
+  }
+
+  onComplete() {
+    this.#str += this.#decoder.decode(undefined, { stream: false })
+    this.#resolve(JSON.parse(this.#str))
+  }
+
+  onError(err) {
+    this.#reject(err)
+  }
+}
+
+export function request(
   url,
   {
     body,
@@ -1037,8 +1154,8 @@ export async function request(
     headers,
     dispatcher = undici.getGlobalDispatcher(),
     signal,
+    stream,
   },
-  next,
 ) {
   url = new URL(url)
   if (url.search) {
@@ -1050,12 +1167,27 @@ export async function request(
     method,
     headers: {
       'content-type': body != null && typeof body === 'object' ? 'application/json' : 'plain/text',
+      'user-agent': globalThis.userAgent,
+      'request-id': genReqId(),
       accept: 'application/json',
       ...headers,
     },
     body: body != null && typeof body === 'object' ? JSON.stringify(body) : body,
   }
-  return new Promise((resolve, reject) => {
-    dispatcher.dispatch(opts, new Handler({ opts, signal, resolve, reject, next }))
-  })
+
+  dispatcher = dispatcher.compose(
+    (dispatch) => (opts, handler) => dispatch(opts, new ErrorHandler({ opts, handler })),
+    (dispatch) => (opts, handler) => dispatch(opts, new SignalHandler({ signal, handler })),
+  )
+
+  if (stream) {
+    const handler = new StreamOutput(stream)
+    dispatcher.dispatch(opts, handler)
+    return handler
+  } else {
+    return new Promise((resolve, reject) => {
+      const handler = new PromiseOutput({ resolve, reject })
+      dispatcher.dispatch(opts, handler)
+    })
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "19.1.0",
+  "version": "19.1.2",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",
@@ -75,10 +75,11 @@
     "/__tests__"
   ],
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.552.0",
+    "@aws-sdk/client-s3": "^3.554.0",
     "@elastic/elasticsearch": "^8.13.1",
-    "@elastic/transport": "^8.5.0",
-    "@nxtedition/nxt-undici": "^2.0.45",
+    "@elastic/transport": "^8.5.1",
+    "@nxtedition/nxt-undici": "^2.0.46",
+    "content-type": "^1.0.5",
     "date-fns": "^3.6.0",
     "fast-querystring": "^1.1.1",
     "hasha": "^6.0.0",
@@ -94,13 +95,13 @@
     "p-queue": "^8.0.1",
     "pino": "^8.20.0",
     "pino-std-serializers": "^6.2.2",
-    "qs": "^6.12.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.12.0",
+    "undici": "^6.13.0",
     "url-join": "^5.0.0"
   },
   "devDependencies": {
@@ -111,7 +112,7 @@
     "eslint-config-prettier": "^9.1.0",
     "eslint-config-standard": "^17.0.0",
     "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-n": "^17.1.0",
+    "eslint-plugin-n": "^17.2.1",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^6.0.0",
     "husky": "^9.0.11",