@nxtedition/lib 23.14.0 → 23.14.2

package/package.json

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

package/serializers.js

@@ -1,5 +1,6 @@
 import { SIGNALS } from './platform.js'
 import { parseHeaders } from '@nxtedition/nxt-undici'
+import requestTarget from 'request-target'
 
 function getHeader(obj, key) {
   return !obj || !key
@@ -71,13 +72,28 @@ function getTiming(obj) {
     return undefined
   }
   return {
-    connect: timing.connect ?? -1,
-    headers: timing.headers ?? -1,
-    data: timing.data ?? -1,
-    end: timing.end ?? timing.complete ?? timing.error ?? -1,
+    connect: timing.connect > 0 ? Math.ceil(timing.connect * 1e3) : undefined,
+    headers: timing.headers > 0 ? Math.ceil(timing.headers * 1e3) : undefined,
+    data: timing.data > 0 ? Math.ceil(timing.data * 1e3) : undefined,
+    end: timing.end > 0 ? Math.ceil(timing.end * 1e3) : undefined,
   }
 }
 
+function getTarget(obj) {
+  if (!obj) {
+    return undefined
+  }
+  if (obj.target) {
+    return obj.target
+  }
+  if (typeof obj.url === 'string') {
+    // TODO(fix): What if url is a full url?
+    return requestTarget({ url: obj.url, headers: obj.headers ?? {}, socket: obj.socket })
+  }
+
+  // TODO(fix): What if url is instanceof URL?
+}
+
 export default {
   err: (err) => errSerializer(err),
   error: (err) => errSerializer(err),
@@ -91,37 +107,16 @@ export default {
       remoteAddress: socket.remoteAddress || undefined,
       headers: socket.headers,
     },
-  res: (res) =>
-    res && {
-      id: res.id ?? res.req?.id ?? getHeader(res, 'request-id') ?? getHeader(res.req, 'request-id'),
-      url: res.req?.url,
-      method: res.req?.method,
-      headers: getHeaders(res),
-      statusCode: res.statusCode || res.status,
-      timing: getTiming(res),
-      bytesWritten: res.bytesWritten,
-      bytesWrittenPerSecond:
-        res.bytesWrittenPerSecond ??
-        (res.timing?.complete > 0 && res.bytesWritten
-          ? (res.bytesWritten * 1e3) / res.timing.complete
-          : undefined),
-      headersSent: res.headersSent,
-      aborted: res.aborted,
-      closed: res.closed,
-      destroyed: res.destroyed,
-    },
   req: (req) =>
     req && {
-      id: req.id || getHeader(req, 'request-id'),
-      url: req.url,
       method: req.method,
       headers: getHeaders(req),
-      target: req.target,
+      target: getTarget(req),
       timing: getTiming(req),
-      bytesRead: req.bytesRead,
+      bytesRead: req.bytesRead >= 0 ? req.bytesRead : undefined,
       bytesReadPerSecond:
         req.bytesReadPerSecond ??
-        (req.timing?.complete > 0 && req.bytesRead
+        (req.timing?.complete > 0 && req.bytesRead > 0
           ? (req.bytesRead * 1e3) / req.timing.complete
           : undefined),
       remoteAddress: req.socket?.remoteAddress,
@@ -130,20 +125,21 @@ export default {
       closed: req.closed,
       destroyed: req.destroyed,
     },
-  ures: (ures) =>
-    ures && {
-      id: ures.id || getHeader(ures, 'request-id') || getHeader(ures.req, 'request-id'),
-      userAgent: ures.userAgent ?? getHeader(ures, 'user-agent'),
-      timing: getTiming(ures),
-      statusCode: ures.statusCode ?? ures.status,
-      bytesRead: ures.bytesRead,
-      bytesReadPerSecond:
-        ures.bytesReadPerSecond ??
-        (ures.timing && ures.timing.data > 0 && ures.timing.end > 0
-          ? (ures.bytesRead * 1e3) / (ures.timing.end - ures.timing.data)
+  res: (res) =>
+    res && {
+      headers: getHeaders(res),
+      statusCode: res.statusCode || res.status,
+      timing: getTiming(res),
+      bytesWritten: res.bytesWritten >= 0 ? res.bytesWritten : undefined,
+      bytesWrittenPerSecond:
+        res.bytesWrittenPerSecond ??
+        (res.timing?.complete > 0 && res.bytesWritten > 0
+          ? (res.bytesWritten * 1e3) / res.timing.complete
           : undefined),
-      body: typeof ures.body === 'string' ? ures.body : undefined,
-      headers: getHeaders(ures),
+      headersSent: res.headersSent,
+      aborted: res.aborted,
+      closed: res.closed,
+      destroyed: res.destroyed,
     },
   ureq: (ureq) =>
     ureq && {
@@ -162,6 +158,21 @@ export default {
       headers: getHeaders(ureq),
       query: ureq.query,
     },
+  ures: (ures) =>
+    ures && {
+      id: ures.id || getHeader(ures, 'request-id') || getHeader(ures.req, 'request-id'),
+      userAgent: ures.userAgent ?? getHeader(ures, 'user-agent'),
+      timing: getTiming(ures),
+      statusCode: ures.statusCode ?? ures.status,
+      bytesRead: ures.bytesRead,
+      bytesReadPerSecond:
+        ures.bytesReadPerSecond ??
+        (ures.timing && ures.timing.data > 0 && ures.timing.end > 0
+          ? (ures.bytesRead * 1e3) / (ures.timing.end - ures.timing.data)
+          : undefined),
+      body: typeof ures.body === 'string' ? ures.body : undefined,
+      headers: getHeaders(ures),
+    },
 }
 
 // TODO (fix): Merge with errros/serializeError.

package/util/template/javascript.js

@@ -453,7 +453,7 @@ export default function ({ ds, proxify, compiler, logger, platform }) {
       }
 
       this._refreshing = true
-      queueMicrotask(this._refreshImpl)
+      setImmediate(this._refreshImpl)
     }
 
     _getEntry(key, Entry, opaque) {