@nxtedition/lib 20.3.4 → 20.3.6

package/couch.js

@@ -14,19 +14,6 @@ import {
   request as undiciRequest,
 } from '@nxtedition/nxt-undici'
 
-// 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).
-// With this upper bound, if you'll be generating 1k ids/sec, you're going to hit it in ~25 days.
-// This is very likely to happen in real-world applications, hence the limit is enforced.
-// Growing beyond this value will make the id generation slower and cause a deopt.
-// In the worst cases, it will become a float, losing accuracy.
-const maxInt = 2147483647
-let nextReqId = Math.floor(Math.random() * maxInt)
-function genReqId() {
-  nextReqId = (nextReqId + 1) & maxInt
-  return `req-${nextReqId.toString(36)}`
-}
-
 export function makeCouch(opts) {
   let config
   if (typeof opts === 'string') {
@@ -228,36 +215,16 @@ export function makeCouch(opts) {
         return next()
       })
 
-    const limit = options.limit
-
     try {
-      // Limit request duration to allow server to load balance.
-      const socketCount = 64 * 1024
-      let remaining = Number(limit) || Infinity
-      while (remaining > 0) {
-        let count = 0
-        const limit = Math.min(remaining, socketCount)
-        for await (const changes of _changes({
-          live,
-          retry,
-          limit,
-          params,
-          method,
-          body,
-          signal: ac.signal,
-          client,
-        })) {
-          yield changes
-          if (changes != null) {
-            count += changes.length
-            remaining -= changes.length
-          }
-        }
-        assert(remaining >= 0)
-        if (!live && count < socketCount) {
-          return
-        }
-      }
+      yield* _changes({
+        method,
+        live,
+        retry,
+        params,
+        body,
+        signal: ac.signal,
+        client,
+      })
     } finally {
       ac.abort()
       if (signal) {
@@ -273,39 +240,35 @@ export function makeCouch(opts) {
   async function* _changes({
     live,
     retry,
-    limit,
     params,
     method,
     body,
     signal,
     client,
-    blocking = live || !limit || limit > 256,
+    blocking = live || !params.limit || params.limit > 256,
   }) {
     let retryCount = 0
-    let remaining = Number(limit) || Infinity
     while (true) {
       let src
       try {
         const query = { ...params, feed: live ? 'continuous' : 'normal' }
 
-        if (Number.isFinite(remaining)) {
-          query.limit = remaining
-        }
-
         const ureq = {
           path: `${dbPathname}/_changes`,
           origin: dbOrigin,
           query,
-          idempotent: false,
+          headers: body
+            ? {
+                'content-type': 'application/json',
+              }
+            : null,
           blocking,
           method,
           body: JSON.stringify(body),
+          retry: false,
+          idempotent: false,
           signal,
-          headers: {
-            'user-agent': userAgent,
-            'request-id': genReqId(),
-            ...(body ? { 'content-type': 'application/json' } : {}),
-          },
+          headersTimeout: 2 * 60e3,
           bodyTimeout: 2 * (params.heartbeat || 60e3),
           highWaterMark: 256 * 1024,
           dispatcher: client,
@@ -404,9 +367,6 @@ export function makeCouch(opts) {
               }
             }
           } else if (changes.length) {
-            remaining -= changes.length
-            assert(remaining >= 0, 'invalid remaining: ' + remaining)
-
             const ret = changes.splice(0)
             ret.lastSeq = params.since
             yield ret
@@ -943,12 +903,6 @@ class StreamOutput extends stream.Readable {
   #state
   #decoder
   #headers
-  #startTime = performance.now()
-  #stats = {
-    connect: -1,
-    headers: -1,
-    ttfb: -1,
-  }
 
   constructor({ signal, highWaterMark = 256 }) {
     super({ objectMode: true, highWaterMark, signal })
@@ -958,10 +912,6 @@ class StreamOutput extends stream.Readable {
     return this.#headers
   }
 
-  get stats() {
-    return this.#stats
-  }
-
   _read() {
     this.#resume?.()
   }
@@ -972,8 +922,6 @@ class StreamOutput extends stream.Readable {
   }
 
   onConnect(abort) {
-    this.#stats.connect = performance.now() - this.#startTime
-
     if (this.destroyed) {
       abort(this.errored)
     } else if (this.#state) {
@@ -987,10 +935,6 @@ class StreamOutput extends stream.Readable {
   }
 
   onHeaders(statusCode, rawHeaders, resume, statusText, headers = parseHeaders(rawHeaders)) {
-    if (this.#stats.headers === -1) {
-      this.#stats.headers = performance.now() - this.#startTime - this.#stats.connect
-    }
-
     if (statusCode >= 300 || statusCode < 200) {
       throw new Error('invalid status code: ' + statusCode)
     }
@@ -1000,10 +944,6 @@ class StreamOutput extends stream.Readable {
   }
 
   onData(data) {
-    if (this.#stats.ttfb === -1) {
-      this.#stats.ttfb = performance.now() - this.#startTime - this.#stats.headers
-    }
-
     const lines = this.#decoder.decode(data, { stream: true }).split(/\r?\n+/)
     lines[0] = this.#str + lines[0]
     this.#str = lines.pop() ?? ''
@@ -1049,16 +989,8 @@ class PromiseOutput {
   #str
   #decoder
   #headers
-  #startTime = performance.now()
   #signal
   #abort
-  #stats = {
-    connect: -1,
-    headers: -1,
-    data: -1,
-    complete: -1,
-    error: -1,
-  }
 
   constructor({ resolve, reject, signal }) {
     this.#resolve = resolve
@@ -1067,7 +999,6 @@ class PromiseOutput {
   }
 
   onConnect(abort) {
-    this.#stats.connect = performance.now() - this.#startTime
     this.#decoder = new TextDecoder()
     this.#str = ''
 
@@ -1080,10 +1011,6 @@ class PromiseOutput {
   }
 
   onHeaders(statusCode, rawHeaders, resume, statusText, headers = parseHeaders(rawHeaders)) {
-    if (this.#stats.headers === -1) {
-      this.#stats.headers = performance.now() - this.#startTime - this.#stats.connect
-    }
-
     if (statusCode >= 300 || statusCode < 200) {
       throw new Error('invalid status code: ' + statusCode)
     }
@@ -1092,29 +1019,17 @@ class PromiseOutput {
   }
 
   onData(data) {
-    if (this.#stats.data === -1) {
-      this.#stats.data = performance.now() - this.#startTime - this.#stats.headers
-    }
-
     this.#str += this.#decoder.decode(data, { stream: true })
   }
 
   onComplete() {
-    if (this.#stats.complete === -1) {
-      this.#stats.complete = performance.now() - this.#startTime - this.#stats.data
-    }
-
     this.#str += this.#decoder.decode(undefined, { stream: false })
 
-    const val = Object.assign(JSON.parse(this.#str), { headers: this.#headers, stats: this.#stats })
+    const val = Object.assign(JSON.parse(this.#str), { headers: this.#headers })
     this.#onDone(null, val)
   }
 
   onError(err) {
-    if (this.#stats.error === -1) {
-      this.#stats.error = performance.now() - this.#startTime - this.#stats.data
-    }
-
     this.#onDone(err)
   }
 

package/http.js

@@ -138,8 +138,6 @@ export async function request(ctx, next) {
         reqLogger.error('request error')
       }
 
-      reqLogger.debug('request ended')
-
       res.end()
     } else {
       reqLogger = reqLogger.child({ res, err, responseTime })
@@ -152,10 +150,7 @@ export async function request(ctx, next) {
         reqLogger.error('request error')
       }
 
-      if (res.writableEnded) {
-        reqLogger.debug('response completed')
-      } else {
-        reqLogger.debug('response destroyed')
+      if (!res.writableEnded) {
         res.destroy()
       }
     }

package/package.json

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