@nxtedition/lib 20.3.1 → 20.3.4

package/couch.js

@@ -1147,13 +1147,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 +1167,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

@@ -170,7 +170,6 @@ export class ServerResponse extends http.ServerResponse {
     headers: -1,
     data: -1,
     complete: -1,
-    error: -1,
   }
 
   get timing() {
@@ -216,16 +215,12 @@ export class ServerResponse extends http.ServerResponse {
       this.#timing.headers = this.#timing.data
     }
 
-    if (this.#timing.complete === -1) {
-      this.#timing.complete = performance.now() - this.#created
-    }
-
     return super.end(chunk, encoding, callback)
   }
 
   destroy(err) {
-    if (err != null && this.#timing.error === -1) {
-      this.#timing.error = performance.now() - this.#created
+    if (this.#timing.complete === -1) {
+      this.#timing.complete = performance.now() - this.#created
     }
 
     return super.destroy(err)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "20.3.1",
+  "version": "20.3.4",
   "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,
     }