@nxtedition/lib 26.0.18 → 26.0.20

package/errors.js

@@ -30,10 +30,10 @@ export function parseError(error) {
     fp.isEmpty(error.message) &&
     fp.isEmpty(error.cause) &&
     fp.isEmpty(error) &&
-    Array.isArray(errors) &&
-    errors.length === 1
+    Array.isArray(error) &&
+    error.length === 1
   ) {
-    error = errors[0]
+    error = error[0]
   }
 
   const { msg, message = msg, errors, cause, data, ...properties } = error

package/http.js

@@ -74,14 +74,7 @@ export class Context {
     if (this.#req.target) {
       return this.#req.target
     }
-
-    this.#target ??= Object.freeze(requestTarget(this.#req))
-
-    if (!this.#target) {
-      throw new createError.BadRequest('invalid url')
-    }
-
-    return this.#target
+    return (this.#target ??= Object.freeze(requestTarget(this.#req)))
   }
 
   get query() {
@@ -205,7 +198,7 @@ export async function upgradeMiddleware(ctx, next) {
 }
 
 export async function requestMiddleware(ctx, next) {
-  const { req, res } = ctx
+  const { req, res, target } = ctx
   const startTime = performance.now()
 
   try {
@@ -214,6 +207,10 @@ export async function requestMiddleware(ctx, next) {
       ctx.logger?.debug({ req }, 'request started')
     }
 
+    if (!target) {
+      throw new createError.BadRequest('invalid url')
+    }
+
     if (ctx.id) {
       res.setHeader('request-id', ctx.id)
     }
@@ -370,13 +367,7 @@ export class IncomingMessage extends http.IncomingMessage {
       this.#target = undefined
     }
 
-    this.#target ??= Object.freeze(requestTarget(this))
-
-    if (!this.#target) {
-      throw new createError.BadRequest('invalid url')
-    }
-
-    return this.#target
+    return (this.#target ??= Object.freeze(requestTarget(this)))
   }
 
   get query() {
@@ -618,7 +609,7 @@ export class Http2ServerRequest extends http2.Http2ServerRequest {
       this.#target = undefined
     }
 
-    return (this.#target ??= requestTarget(this))
+    return (this.#target ??= Object.freeze(requestTarget(this)))
   }
 
   get query() {

package/package.json

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

package/serializers.js

@@ -83,12 +83,17 @@ 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 })
+
+  try {
+    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 })
+    }
+  } catch {
+    return undefined
   }
 
   // TODO(fix): What if url is instanceof URL?