@nxtedition/lib 20.3.2 → 20.3.5

package/couch.js

@@ -943,12 +943,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 +952,6 @@ class StreamOutput extends stream.Readable {
     return this.#headers
   }
 
-  get stats() {
-    return this.#stats
-  }
-
   _read() {
     this.#resume?.()
   }
@@ -972,8 +962,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 +975,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 +984,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 +1029,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 +1039,6 @@ class PromiseOutput {
   }
 
   onConnect(abort) {
-    this.#stats.connect = performance.now() - this.#startTime
     this.#decoder = new TextDecoder()
     this.#str = ''
 
@@ -1080,10 +1051,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 +1059,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)
   }
 
@@ -1147,13 +1102,13 @@ export function request(url, opts) {
 
   if (opts == null && typeof url === 'object' && url != null) {
     opts = url
+    url = null
   }
 
   const ureq = {
     ...opts,
-    url,
     method: opts.method ?? (opts.body ? 'POST' : 'GET'),
-    blocking: opts.blocking ?? Boolean(stream),
+    blocking: opts.blocking ?? Boolean(opts.stream),
     headers: {
       'content-type':
         opts.body != null && typeof opts.body === 'object' ? 'application/json' : 'plain/text',
@@ -1167,7 +1122,7 @@ export function request(url, opts) {
   const dispatcher = opts.dispatcher ?? defaultDispatcher
   const signal = opts.signal
 
-  if (stream) {
+  if (opts.stream) {
     const handler = new StreamOutput({ signal, ...stream })
     dispatch(dispatcher, ureq, handler)
     return handler

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.2",
+  "version": "20.3.5",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",

package/serializers.js

@@ -42,11 +42,11 @@ export default {
   err: (err) => errSerializer(err),
   socket: (socket) =>
     socket && {
-      id: socket.id || null,
-      version: socket.version ?? null,
-      user: socket.user ?? null,
-      userAgent: socket.userAgent ?? null,
-      remoteAddress: socket.remoteAddress ?? null,
+      id: socket.id || undefined,
+      version: socket.version || undefined,
+      user: socket.user || undefined,
+      userAgent: socket.userAgent || undefined,
+      remoteAddress: socket.remoteAddress || undefined,
       headers: socket.headers,
     },
   res: (res) =>
@@ -55,7 +55,11 @@ export default {
       timing: getTiming(res),
       statusCode: res.statusCode || res.status,
       bytesWritten: res.bytesWritten,
-      bytesWrittenPerSecond: res.bytesWrittenPerSecond,
+      bytesReadPerSecond:
+        res.bytesWrittenPerSecond ??
+        (res.timing?.complete > 0 && res.bytesWritten
+          ? (res.bytesWritten * 1e3) / res.timing.complete
+          : undefined),
       headers: getHeaders(res),
       headersSent: res.headersSent,
     },
@@ -67,7 +71,11 @@ export default {
       url: req.url,
       headers: getHeaders(req),
       bytesRead: req.bytesRead,
-      bytesReadPerSecond: req.bytesReadPerSecond,
+      bytesReadPerSecond:
+        req.bytesReadPerSecond ??
+        (req.timing?.complete > 0 && req.bytesRead
+          ? (req.bytesRead * 1e3) / req.timing.complete
+          : undefined),
       remoteAddress: req.socket?.remoteAddress,
       remotePort: req.socket?.remotePort,
     },
@@ -77,8 +85,12 @@ export default {
       timing: getTiming(ures),
       statusCode: ures.statusCode ?? ures.status,
       bytesRead: ures.bytesRead,
-      bytesReadPerSecond: ures.bytesReadPerSecond,
-      body: typeof ures.body === 'string' ? ures.body : null,
+      bytesReadPerSecond:
+        ures.bytesReadPerSecond ??
+        (ures.timing?.complete > 0 && ures.bytesRead
+          ? (ures.bytesRead * 1e3) / ures.timing.complete
+          : undefined),
+      body: typeof ures.body === 'string' ? ures.body : undefined,
       headers: getHeaders(ures),
     },
   ureq: (ureq) => {
@@ -103,9 +115,13 @@ export default {
       timing: getTiming(ureq),
       method: ureq.method,
       url,
-      body: typeof ureq.body === 'string' ? ureq.body : null,
+      body: typeof ureq.body === 'string' ? ureq.body : undefined,
       bytesWritten: ureq.bytesWritten,
-      bytesWrittenPerSecond: ureq.bytesWrittenPerSecond,
+      bytesReadPerSecond:
+        ureq.bytesWrittenPerSecond ??
+        (ureq.timing?.complete > 0 && ureq.bytesWritten
+          ? (ureq.bytesWritten * 1e3) / ureq.timing.complete
+          : undefined),
       headers: getHeaders(ureq),
       query: ureq.query,
     }