@nxtedition/lib 21.2.1 → 21.3.0

package/couch.js

@@ -117,6 +117,7 @@ export function makeCouch(opts) {
    * @param {number} [options.heartbeat=60000] - The interval at which to send a heartbeat.
    * @param {function} [options.retry=null] - The function to retry the request on error.
    * @param {string} [options.since=null] - The sequence number to start from.
+   * @param {string} [options.highWaterMark=128 * 1024] - Buffering.
    * @yields {Array<{ id: string, seq?: string, doc?: Object, deleted?: boolean, changes: Array<{ rev: string }> }>}
    */
   async function* changes({ client = defaultClient, signal = null, logger, ...options } = {}) {
@@ -207,6 +208,7 @@ export function makeCouch(opts) {
       }
     }
 
+    const highWaterMark = options.highWaterMark
     const live = options.live == null || !!options.live
     const retry =
       options.retry ??
@@ -220,6 +222,7 @@ export function makeCouch(opts) {
         method,
         live,
         retry,
+        highWaterMark,
         params,
         body,
         signal: ac.signal,
@@ -245,6 +248,7 @@ export function makeCouch(opts) {
     body,
     signal,
     client,
+    highWaterMark = 128 * 1024,
     blocking = live || !params.limit || params.limit > 256,
   }) {
     let retryCount = 0
@@ -270,7 +274,7 @@ export function makeCouch(opts) {
           signal,
           headersTimeout: 2 * 60e3,
           bodyTimeout: 2 * (params.heartbeat || 60e3),
-          highWaterMark: 128 * 1024,
+          highWaterMark,
           dispatcher: client,
         }
 

package/http.js

@@ -7,10 +7,9 @@ import querystring from 'fast-querystring'
 import compose from 'koa-compose'
 import http from 'http'
 import fp from 'lodash/fp.js'
-import cookie from 'cookie'
 import tp from 'timers/promises'
 
-const kAbortController = Symbol('abortController')
+export const kAbortController = Symbol('abortController')
 
 const ERR_HEADER_EXPR =
   /^(content-length|content-type|te|host|upgrade|trailers|connection|keep-alive|http2-settings|transfer-encoding|proxy-connection|proxy-authenticate|proxy-authorization)$/i
@@ -41,9 +40,7 @@ export class Context {
   #ac
   #url
   #logger
-  #headers
   #query
-  #cookies
 
   constructor(req, res, logger) {
     assert(req)
@@ -54,17 +51,10 @@ export class Context {
     this.#req = req
     this.#res = res
     this.#logger = logger.child({ reqId: this.#id, url: req.url })
-    this.#headers = {
-      'request-id': this.#id,
-    }
-  }
-
-  setHeader(name, value) {
-    this.#headers[name.toLowerCase()] = value
   }
 
-  removeHeader(name) {
-    delete this.#headers[name.toLowerCase()]
+  get id() {
+    return this.#id
   }
 
   get [kAbortController]() {
@@ -82,8 +72,13 @@ export class Context {
   }
 
   set url(value) {
+    if (typeof value !== 'string') {
+      throw new Error('url must be a string')
+    }
+
     this.#req.url = value
-    this.#url = null
+    this.#url = undefined
+    this.#query = undefined
   }
 
   get query() {
@@ -108,18 +103,6 @@ export class Context {
   get method() {
     return this.#req.method
   }
-
-  get headers() {
-    return this.#headers
-  }
-
-  get cookies() {
-    if (this.#cookies === undefined) {
-      this.#cookies = this.req.headers.cookie ? cookie.parse(this.req.headers.cookie) : null
-    }
-
-    return this.#cookies
-  }
 }
 
 export async function request2(ctx, next) {
@@ -133,7 +116,9 @@ export async function request2(ctx, next) {
 
     const isHealthcheck = req.url === '/healthcheck' || req.url === '/_up'
 
-    if (!isHealthcheck) {
+    if (isHealthcheck) {
+      // Do nothing...
+    } else {
       logger.debug({ req }, 'request started')
     }
 
@@ -160,12 +145,12 @@ export async function request2(ctx, next) {
     ctx[kAbortController]?.abort(err)
 
     const statusCode = err.statusCode || err.$metadata?.httpStatusCode || 500
-    const responseTime = Math.ceil(performance.now() - startTime)
+    const elapsedTime = Math.ceil(performance.now() - startTime)
 
     if (!res.headersSent && !res.destroyed) {
       res.statusCode = statusCode
 
-      let reqId = req?.id || err.id
+      let reqId = ctx.id || req?.id || err.id
       for (const name of res.getHeaderNames()) {
         if (!reqId && name === 'request-id') {
           reqId = res.getHeader(name)
@@ -177,8 +162,20 @@ export async function request2(ctx, next) {
         res.setHeader('request-id', reqId)
       }
 
-      if (fp.isPlainObject(err.headers)) {
-        for (const [key, val] of Object.entries(err.headers)) {
+      const { headers } = err
+
+      if (fp.isPlainObject(headers)) {
+        for (const [key, val] of Object.entries(headers)) {
+          if (!ERR_HEADER_EXPR.test(key)) {
+            res.setHeader(key, val)
+          }
+        }
+      } else if (Array.isArray(err.headers)) {
+        assert(headers.length % 2 === 0)
+        assert(headers.length === 0 || typeof headers[0] === 'string')
+        for (let n = 0; n < headers.length; n += 2) {
+          const key = headers[n + 0]
+          const val = headers[n + 1]
           if (!ERR_HEADER_EXPR.test(key)) {
             res.setHeader(key, val)
           }
@@ -187,23 +184,27 @@ export async function request2(ctx, next) {
 
       if (fp.isPlainObject(err.body)) {
         res.setHeader('content-type', 'application/json')
-        res.write(JSON.stringify(err.body))
+        res.end(JSON.stringify(err.body))
+      } else if (typeof err.body === 'string') {
+        res.end(err.body)
+      } else if (Buffer.isBuffer(err.body)) {
+        res.end(err.body)
+      } else {
+        res.end()
       }
 
       if (statusCode < 500) {
-        logger.warn({ req, res, err, responseTime }, 'request failed')
+        logger.warn({ req, res, err, elapsedTime }, 'request failed')
       } else {
-        logger.error({ req, res, err, responseTime }, 'request error')
+        logger.error({ req, res, err, elapsedTime }, 'request error')
       }
-
-      res.end()
     } else {
       if (req.aborted || !res.writableEnded || err.name === 'AbortError') {
-        logger.debug({ req, res, err, responseTime }, 'request aborted')
+        logger.debug({ req, res, err, elapsedTime }, 'request aborted')
       } else if (statusCode < 500) {
-        logger.warn({ req, res, err, responseTime }, 'request failed')
+        logger.warn({ req, res, err, elapsedTime }, 'request failed')
       } else {
-        logger.error({ req, res, err, responseTime }, 'request error')
+        logger.error({ req, res, err, elapsedTime }, 'request error')
       }
 
       if (!res.writableEnded) {
@@ -276,7 +277,7 @@ export async function request(ctx, next) {
     ac?.abort(err)
 
     const statusCode = err.statusCode || err.$metadata?.httpStatusCode || 500
-    const responseTime = Math.ceil(performance.now() - startTime)
+    const elapsedTime = Math.ceil(performance.now() - startTime)
 
     if (!res.headersSent && !res.destroyed) {
       res.statusCode = statusCode
@@ -303,23 +304,27 @@ export async function request(ctx, next) {
 
       if (fp.isPlainObject(err.body)) {
         res.setHeader('content-type', 'application/json')
-        res.write(JSON.stringify(err.body))
+        res.end(JSON.stringify(err.body))
+      } else if (typeof err.body === 'string') {
+        res.end(err.body)
+      } else if (Buffer.isBuffer(err.body)) {
+        res.end(err.body)
+      } else {
+        res.end()
       }
 
       if (statusCode < 500) {
-        reqLogger.warn({ res, err, responseTime }, 'request failed')
+        reqLogger.warn({ res, err, elapsedTime }, 'request failed')
       } else {
-        reqLogger.error({ res, err, responseTime }, 'request error')
+        reqLogger.error({ res, err, elapsedTime }, 'request error')
       }
-
-      res.end()
     } else {
       if (req.aborted || !res.writableEnded || err.name === 'AbortError') {
-        reqLogger.debug({ res, err, responseTime }, 'request aborted')
+        reqLogger.debug({ res, err, elapsedTime }, 'request aborted')
       } else if (statusCode < 500) {
-        reqLogger.warn({ res, err, responseTime }, 'request failed')
+        reqLogger.warn({ res, err, elapsedTime }, 'request failed')
       } else {
-        reqLogger.error({ res, err, responseTime }, 'request error')
+        reqLogger.error({ res, err, elapsedTime }, 'request error')
       }
 
       if (!res.writableEnded) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "21.2.1",
+  "version": "21.3.0",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",
@@ -59,7 +59,6 @@
     "@elastic/transport": "^8.7.1",
     "@nxtedition/nxt-undici": "^4.2.13",
     "content-type": "^1.0.5",
-    "cookie": "^0.7.2",
     "date-fns": "^3.6.0",
     "fast-querystring": "^1.1.1",
     "hasha": "^6.0.0",