@nxtedition/lib 22.0.1 → 22.0.3

package/package.json

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

package/serializers.js

@@ -17,7 +17,8 @@ function getHeaders(obj) {
   return (
     (obj.headers?.entries && Object.fromEntries(obj.headers.entries())) ||
     obj.headers ||
-    obj.getHeaders?.()
+    obj.getHeaders?.() ||
+    undefined
   )
 }
 
@@ -59,6 +60,9 @@ export default {
           : undefined),
       headers: getHeaders(res),
       headersSent: res.headersSent,
+      aborted: res.aborted,
+      closed: res.closed,
+      destroyed: res.destroyed,
     },
   req: (req) =>
     req && {
@@ -81,6 +85,9 @@ export default {
           : undefined),
       remoteAddress: req.socket?.remoteAddress,
       remotePort: req.socket?.remotePort,
+      aborted: req.aborted,
+      closed: req.closed,
+      destroyed: req.destroyed,
     },
   ures: (ures) =>
     ures && {

package/worker.js

@@ -1,6 +1,6 @@
 import { once } from 'node:events'
 
-export async function terminate(worker, { logger = null, timeout = 10e3 } = {}) {
+export async function terminate(worker, { timeout = 10e3 } = {}) {
   try {
     worker.postMessage({ type: 'nxt:worker:terminate' })
     await Promise.race([
@@ -10,7 +10,11 @@ export async function terminate(worker, { logger = null, timeout = 10e3 } = {})
       ),
     ])
   } catch (err) {
-    worker.terminate()
-    logger?.error({ err })
+    try {
+      await worker.terminate()
+      throw err
+    } catch (er) {
+      throw new AggregateError([err, er])
+    }
   }
 }