@nxtedition/lib 22.0.3 → 22.0.5

package/app.js

@@ -8,7 +8,6 @@ import stream from 'node:stream'
 import { Buffer } from 'node:buffer'
 import { getDockerSecretsSync } from './docker-secrets.js'
 import fp from 'lodash/fp.js'
-import { mkdirSync } from 'node:fs'
 import {
   isMainThread,
   parentPort,
@@ -46,14 +45,6 @@ export function makeApp(appConfig, onTerminate) {
   let logger
   let trace
 
-  try {
-    mkdirSync('./.nxt')
-  } catch (err) {
-    if (err.code !== 'EEXIST') {
-      throw err
-    }
-  }
-
   /** @type {Array<rxjs.Subscription|Function|AsyncFunction|Disposable|AsyncDisposable>} */
   const destroyers = []
 
@@ -885,7 +876,8 @@ export function makeApp(appConfig, onTerminate) {
 
       // TODO (fix): Determinisitc port also in dev mode... hash of something?
       const port =
-        appConfig.inspect?.port ?? (isProduction ? 38603 : Math.floor(38000 + Math.random() * 1000))
+        appConfig.inspect?.port ??
+        (isProduction ? 38603 : Math.floor(38000 + Math.random() * 10000))
       const server = http
         .createServer(async (req, res) => {
           try {

package/couch.js

@@ -43,9 +43,7 @@ export function makeCouch(opts) {
   )
 
   const defaultClientOpts = {
-    keepAliveTimeout: 2 * 60e3,
-    headersTimeout: 10 * 60e3,
-    bodyTimeout: 2 * 60e3,
+    connectTimeout: 2e3,
   }
 
   const userAgent = config.userAgent || globalThis.userAgent
@@ -116,7 +114,7 @@ export function makeCouch(opts) {
    * @param {boolean} [options.live=false]
    * @param {number} [options.heartbeat=60000]
    * @param {function} [options.retry=null]
-   * @param {string} [options.since=null]
+   * @param {string|null} [options.since=null]
    * @param {number} [options.highWaterMark=128 * 1024]
    * @param {object} [options.selector=null]
    * @param {import('pino').Logger} [options.logger=null]
@@ -1092,7 +1090,7 @@ export function request(url, opts) {
   const signal = opts.signal
 
   if (opts.stream) {
-    const handler = new StreamOutput({ signal, ...stream })
+    const handler = new StreamOutput({ signal, highWaterMark: stream.highWaterMark })
     dispatch(dispatcher, ureq, handler)
     return handler
   } else {

package/http.js

@@ -152,7 +152,7 @@ export async function requestMiddleware(ctx, next) {
       await thenable
     }
 
-    assert(res.destroyed, 'response not completed')
+    assert(res.destroyed || res.writableEnded, 'response not completed')
 
     const elapsedTime = performance.now() - startTime
 
@@ -391,7 +391,15 @@ export class ServerResponse extends http.ServerResponse {
     super(req)
 
     this.#created = performance.now()
-    this.#timing.connect = 0
+  }
+
+  assignSocket(socket) {
+    if (!this.destroyed) {
+      if (this.#timing.connect === -1) {
+        this.#timing.connect = performance.now() - this.#created
+      }
+    }
+    return super.assignSocket(socket)
   }
 
   flushHeaders() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "22.0.3",
+  "version": "22.0.5",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",
@@ -68,6 +68,7 @@
     "lodash": "^4.17.21",
     "lru-cache": "^11.0.1",
     "mime": "^4.0.4",
+    "mitata": "^1.0.11",
     "moment-timezone": "^0.5.46",
     "nconf": "^0.12.1",
     "nested-error-stacks": "^2.1.1",

package/sequence.js

@@ -20,10 +20,10 @@ const cyrb53 = (str, seed = 0) => {
 }
 
 export class Sequence {
-  #value
+  #value = ''
   #parts = []
   #identity
-  #count
+  #count = 0
 
   // TODO (perf): Optimize
   /**
@@ -139,7 +139,10 @@ export class Sequence {
         }
       }
     } catch (err) {
-      throw Object.assign(new Error('Invalid sequence value'), { cause: err, data: value })
+      throw Object.assign(new Error('Invalid sequence value: ' + err.message), {
+        cause: err,
+        data: value,
+      })
     }
   }
 
@@ -184,8 +187,8 @@ export class Sequence {
     assert(Number.isFinite(sequence) && sequence >= 0)
     if (this.#parts[index * 2 + 1] !== sequence) {
       this.#parts[index * 2 + 1] = sequence
-      this.#value = undefined
-      this.#count = undefined
+      this.#value = ''
+      this.#count = 0
     }
   }
 
@@ -220,7 +223,7 @@ export class Sequence {
       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]
+        token += (n === 0 ? '-' : '_') + this.#parts[n + 1] + ID_SEP + this.#parts[n + 0]
       }
       this.#value = String(count) + token
     }