@nxtedition/lib 21.10.2 → 22.0.1

package/app.js

@@ -329,7 +329,7 @@ export function makeApp(appConfig, onTerminate) {
   if (appConfig.couchdb || appConfig.couch) {
     const couchConfig = fp.mergeAll(
       [
-        { userAgent, url: isProduction ? null : 'ws://127.0.0.1:5984/nxt' },
+        { userAgent, url: isProduction ? 'http://couchdb:5984/nxt' : 'http://127.0.0.1:5984/nxt' },
         appConfig.couchdb,
         appConfig.couch,
         config.couchdb,
@@ -356,7 +356,10 @@ export function makeApp(appConfig, onTerminate) {
   if (appConfig.deepstream) {
     let dsConfig = fp.mergeAll(
       [
-        { userAgent, url: isProduction ? null : 'ws://127.0.0.1:6020/deepstream' },
+        {
+          userAgent,
+          url: isProduction ? 'ws://deepstream:6020/deepstream' : 'ws://127.0.0.1:6020/deepstream',
+        },
         appConfig.deepstream,
         config.deepstream,
       ].map((x) => {
@@ -582,6 +585,7 @@ export function makeApp(appConfig, onTerminate) {
         [
           status$.pipe(
             rx.filter(Boolean),
+            rx.map((xs) => (Array.isArray(xs) ? { messages: xs } : xs)),
             rx.catchError((err) => {
               logger.error({ err }, 'monitor.status')
               return rxjs.of([

package/http.js

@@ -53,8 +53,6 @@ export class Context {
     this.#req = req
     this.#res = res
     this.#logger = logger.child({ reqId: this.#id, url: req.url, userAgent: this.#userAgent })
-
-    res.setHeader('request-id', this.id)
   }
 
   get id() {
@@ -65,20 +63,20 @@ export class Context {
     return this.#userAgent
   }
 
-  get [kAbortController]() {
-    return this.#ac
-  }
-
-  get signal() {
-    this.#ac ??= new AbortController()
-    return this.#ac.signal
+  /** @deprecated */
+  get method() {
+    return this.#req.method
   }
 
+  /** @deprecated */
   get url() {
-    this.#url ??= requestTarget(this.#req)
+    if (this.#url === undefined) {
+      this.#url = requestTarget(this.#req)
+    }
     return this.#url
   }
 
+  /** @deprecated */
   set url(value) {
     if (typeof value !== 'string') {
       throw new Error('url must be a string')
@@ -89,6 +87,7 @@ export class Context {
     this.#query = undefined
   }
 
+  /** @deprecated */
   get query() {
     if (this.#query === undefined) {
       this.#query = this.url.search.length > 1 ? querystring.parse(this.url.search.slice(1)) : {}
@@ -108,8 +107,13 @@ export class Context {
     return this.#res
   }
 
-  get method() {
-    return this.#req.method
+  get [kAbortController]() {
+    return this.#ac
+  }
+
+  get signal() {
+    this.#ac ??= new AbortController()
+    return this.#ac.signal
   }
 }
 
@@ -117,7 +121,7 @@ function noop() {}
 
 const pendingSet = (globalThis._nxt_lib_http_pending ??= new Set())
 
-export async function request2(ctx, next) {
+export async function requestMiddleware(ctx, next) {
   const { req, res, logger } = ctx
   const startTime = performance.now()
 
@@ -138,20 +142,28 @@ export async function request2(ctx, next) {
       logger.debug({ req }, 'request started')
     }
 
+    if (ctx.id) {
+      res.setHeader('request-id', ctx.id)
+    }
+
     const thenable = next()
 
     if (thenable?.then) {
       await thenable
     }
 
-    const elapsedTime = Math.ceil(performance.now() - startTime)
+    assert(res.destroyed, 'response not completed')
+
+    const elapsedTime = performance.now() - startTime
 
     if (isHealthcheck) {
       // Do nothing...
+    } else if (res.errored) {
+      logger.error({ err: res.errored, res, elapsedTime }, 'request error')
     } else if (!res.writableEnded) {
       logger.debug({ res, elapsedTime }, 'request aborted')
-    } else if (res.statusCode >= 500 || res.errored) {
-      logger.error({ err: res.errored, res, elapsedTime }, 'request error')
+    } else if (res.statusCode >= 500) {
+      logger.error({ res, elapsedTime }, 'request error')
     } else if (res.statusCode >= 400) {
       logger.warn({ res, elapsedTime }, 'request failed')
     } else {
@@ -161,21 +173,19 @@ export async function request2(ctx, next) {
     ctx[kAbortController]?.abort(err)
 
     const statusCode = err.statusCode || err.$metadata?.httpStatusCode || 500
-    const elapsedTime = Math.ceil(performance.now() - startTime)
+    const elapsedTime = performance.now() - startTime
 
-    if (!res.headersSent && !res.destroyed) {
+    // res.destroyed is not properly set by http2 compat so we need to
+    // also check res.closed.
+    if (!res.headersSent && !res.destroyed && !res.closed) {
       res.statusCode = statusCode
 
-      let reqId = ctx.id || req?.id || err.id
       for (const name of res.getHeaderNames()) {
-        if (!reqId && name === 'request-id') {
-          reqId = res.getHeader(name)
-        }
         res.removeHeader(name)
       }
 
-      if (reqId) {
-        res.setHeader('request-id', reqId)
+      if (ctx.id) {
+        res.setHeader('request-id', ctx.id)
       }
 
       const { headers } = err
@@ -196,6 +206,8 @@ export async function request2(ctx, next) {
             res.setHeader(key, val)
           }
         }
+      } else if (err.headers != null) {
+        logger.warn({ err }, 'invalid headers')
       }
 
       if (fp.isPlainObject(err.body)) {
@@ -285,7 +297,7 @@ export async function request(ctx, next) {
       await responsePromise
     }
 
-    const elapsedTime = Math.ceil(performance.now() - startTime)
+    const elapsedTime = performance.now() - startTime
 
     if (isHealthcheck) {
       // Do nothing...
@@ -302,7 +314,7 @@ export async function request(ctx, next) {
     ac?.abort(err)
 
     const statusCode = err.statusCode || err.$metadata?.httpStatusCode || 500
-    const elapsedTime = Math.ceil(performance.now() - startTime)
+    const elapsedTime = performance.now() - startTime
 
     if (!res.headersSent && !res.destroyed) {
       res.statusCode = statusCode

package/package.json

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