@nxtedition/lib 23.5.9 → 23.5.11

package/cache.js

@@ -58,11 +58,13 @@ export class AsyncCache {
     let cached = this.#lru.get(key)
 
     if (cached) {
-      if (Date.now() < cached.expire) {
+      const now = Date.now()
+
+      if (now < cached.expire) {
         return cached.value
       }
 
-      if (Date.now() - cached.expire >= this.#stale(cached.value, key)) {
+      if (now - cached.expire >= this.#stale(cached.value, key)) {
         // stale-while-revalidate has also expired, dont use cached value
         cached = null
       }

package/errors.js

@@ -95,9 +95,9 @@ function _serializeError(error, { depth }) {
     message = msg,
     errors,
     code,
-    exitCode = /^([A-Z]+|[a-z]+|[0-9]+)$/.test(code) ? code : undefined,
+    exitCode = Number(code),
     signal,
-    signalCode = signal,
+    signalCode = Number(signal),
     cause,
     body,
     status,
@@ -106,6 +106,26 @@ function _serializeError(error, { depth }) {
     ...properties
   } = error
 
+  if (typeof message !== 'string') {
+    message = undefined
+  }
+
+  if (!Number.isInteger(exitCode)) {
+    exitCode = undefined
+  }
+
+  if (!Number.isInteger(signalCode)) {
+    signalCode = undefined
+  }
+
+  if (!Number.isInteger(statusCode)) {
+    statusCode = undefined
+  }
+
+  if (!fp.isPlainObject(headers)) {
+    headers = undefined
+  }
+
   if (typeof signal === 'number') {
     signal = SIGNALS[signal] ?? signal
   }
@@ -128,7 +148,7 @@ function _serializeError(error, { depth }) {
           ...properties,
           message: message ?? 'Unknown error',
           type: type !== 'Object' ? type : undefined,
-          code: code ?? undefined,
+          code: code ? `${code}` : undefined,
           exitCode: exitCode ?? undefined,
           signalCode: signalCode ?? undefined,
           statusCode: statusCode ?? undefined,

package/http.js

@@ -168,15 +168,15 @@ export async function requestMiddleware(ctx, next) {
     if (isHealthcheck) {
       // Do nothing...
     } else if (res.errored) {
-      logger.error({ err: res.errored, req, res, elapsedTime }, 'request error')
+      logger.error({ err: res.errored, res, elapsedTime }, 'request error')
     } else if (!res.writableEnded) {
-      logger.debug({ req, res, elapsedTime }, 'request aborted')
+      logger.debug({ res, elapsedTime }, 'request aborted')
     } else if (res.statusCode >= 500) {
-      logger.error({ req, res, elapsedTime }, 'request error')
+      logger.error({ res, elapsedTime }, 'request error')
     } else if (res.statusCode >= 400) {
-      logger.warn({ req, res, elapsedTime }, 'request failed')
+      logger.warn({ res, elapsedTime }, 'request failed')
     } else {
-      logger.debug({ req, res, elapsedTime }, 'request completed')
+      logger.debug({ res, elapsedTime }, 'request completed')
     }
   } catch (err) {
     ctx[kAbortController]?.abort(err)
@@ -231,17 +231,17 @@ export async function requestMiddleware(ctx, next) {
       }
 
       if (statusCode < 500) {
-        logger.warn({ req, res, err, elapsedTime }, 'request failed')
+        logger.warn({ res, err, elapsedTime }, 'request failed')
       } else {
-        logger.error({ req, res, err, elapsedTime }, 'request error')
+        logger.error({ res, err, elapsedTime }, 'request error')
       }
     } else {
       if (req.aborted || err.name === 'AbortError') {
-        logger.debug({ req, res, err, elapsedTime }, 'request aborted')
+        logger.debug({ res, err, elapsedTime }, 'request aborted')
       } else if (statusCode < 500) {
-        logger.warn({ req, res, err, elapsedTime }, 'request failed')
+        logger.warn({ res, err, elapsedTime }, 'request failed')
       } else {
-        logger.error({ req, res, err, elapsedTime }, 'request error')
+        logger.error({ res, err, elapsedTime }, 'request error')
       }
       res.destroy(err)
     }

package/package.json

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