@nxtedition/lib 19.3.5 → 19.4.0

package/app.js

@@ -1,5 +1,6 @@
 import os from 'node:os'
 import net from 'node:net'
+import assert from 'node:assert'
 import stream from 'node:stream'
 import { Buffer } from 'node:buffer'
 import { getDockerSecretsSync } from './docker-secrets.js'
@@ -100,6 +101,8 @@ export function makeApp(appConfig, onTerminate) {
     }
   }
 
+  assert(appConfig.name, 'name is required')
+
   const appDestroyers = []
 
   const serviceName = appConfig.name
@@ -389,7 +392,7 @@ export function makeApp(appConfig, onTerminate) {
             memory: process.memoryUsage(),
             utilization: performance.eventLoopUtilization?.(elu2, elu1),
             heap: v8.getHeapStatistics(),
-            ...stats,
+            [serviceName]: stats,
           },
           'STATS',
         )

package/couch.js

@@ -925,7 +925,6 @@ class ErrorHandler extends undici.DecoratorHandler {
   #str
   #decoder
   #statusCode
-  #statusText
   #contentType
   #opts
   #handler
@@ -947,12 +946,11 @@ class ErrorHandler extends undici.DecoratorHandler {
 
   onHeaders(statusCode, headers, resume, statusText) {
     this.#statusCode = statusCode
-    this.#statusText = statusText
 
     if (this.#statusCode < 200 || this.#statusCode > 300) {
       this.#headers = Array.isArray(headers) ? undiciUtil.parseHeaders(headers) : headers
 
-      this.#error = new Error(this.#statusText ?? this.#statusCode)
+      this.#error = new Error(statusText ?? statusCode)
 
       this.#contentType = parseContentType(this.#headers['content-type'] ?? '')?.type
       if (this.#contentType !== 'application/json' && this.#contentType !== 'plain/text') {
@@ -1069,6 +1067,9 @@ class StreamOutput extends stream.Readable {
 
     let ret = true
     for (const line of lines) {
+      if (!line) {
+        continue
+      }
       if (this.#state === 0) {
         if (line.endsWith('[')) {
           this.#state = 1
@@ -1151,13 +1152,14 @@ export function request(
   if (url.search) {
     throw new Error('invalid url: ' + url.href)
   }
+
   const opts = {
     origin: url.origin,
     path: url.pathname + '?' + querystring.stringify(query),
     method,
     headers: {
       'content-type': body != null && typeof body === 'object' ? 'application/json' : 'plain/text',
-      'user-agent': globalThis.userAgent,
+      'user-agent': globalThis.userAgent ?? 'nxt-lib',
       'request-id': genReqId(),
       accept: 'application/json',
       ...headers,

package/errors.js

@@ -126,7 +126,7 @@ function _serializeError(error, { depth }) {
       JSON.stringify({
         ...properties,
         message,
-        type,
+        type: type !== 'Object' ? type : undefined,
         code,
         exitCode,
         signalCode,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "19.3.5",
+  "version": "19.4.0",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",
@@ -18,6 +18,7 @@
     "http.js",
     "s3.js",
     "deepstream.js",
+    "sequence.js",
     "logger.js",
     "mime.js",
     "proxy.js",

package/sequence.js

@@ -0,0 +1,71 @@
+import assert from 'node:assert'
+
+export const ID_SEP = '~'
+
+export class Sequence {
+  #value
+  #parts = []
+
+  constructor(value) {
+    try {
+      if (Array.isArray(value)) {
+        for (const part of value) {
+          if (typeof part === 'string') {
+            const [sequenceStr, id] = part.split(ID_SEP)
+            const sequence = parseInt(sequenceStr)
+            assert(Number.isFinite(sequence) && sequence >= 0)
+            this.#parts.push(id, sequence)
+          } else {
+            assert(Number.isFinite(part.sequence) && part.sequence >= 0)
+            assert(typeof part.id === 'string' && part.id.length > 0)
+            this.#parts.push(part.id, part.sequence)
+          }
+        }
+      } else if (typeof value === 'string') {
+        const [countStr, token] = value.split('-')
+        const count = parseInt(countStr)
+        assert(Number.isFinite(count) && count >= 0)
+        for (const str of token.split('_')) {
+          const [sequenceStr, id] = str.split(ID_SEP)
+          const sequence = parseInt(sequenceStr)
+          assert(Number.isFinite(sequence) && sequence >= 0)
+          this.#parts.push(id, sequence)
+        }
+        this.#value = value
+      } else {
+        assert(false)
+      }
+    } catch (err) {
+      throw Object.assign(new Error('Invalid sequence value'), { cause: err, data: value })
+    }
+  }
+
+  get length() {
+    return this.#parts.length / 2
+  }
+
+  at(index) {
+    assert(Number.isFinite(index) && index >= 0 && index * 2 < this.#parts.length)
+    return this.#parts[index * 2 + 1]
+  }
+
+  set(index, sequence) {
+    assert(Number.isFinite(index) && index >= 0 && index < this.#parts.length)
+    assert(Number.isFinite(sequence) && sequence >= 0)
+    this.#parts[index * 2 + 1] = sequence
+    this.#value = undefined
+  }
+
+  toString() {
+    if (!this.#value) {
+      let count = 0
+      let token = ''
+      for (let n = 0; n < this.#parts.length; n += 2) {
+        count += this.#parts[n + 1]
+        token += (n === 0 ? '-' : '_') + this.#parts[n + 1] + ID_SEP + this.#parts[n]
+      }
+      this.#value = String(count) + token
+    }
+    return this.#value
+  }
+}