@nxtedition/nxt-undici 5.1.1 → 5.1.2

package/lib/request.js

@@ -6,13 +6,7 @@ import { BodyReadable as Readable } from './readable.js'
 function noop() {}
 
 export class RequestHandler {
-  constructor(opts, resolve) {
-    if (!opts || typeof opts !== 'object') {
-      throw new InvalidArgumentError('invalid opts')
-    }
-
-    const { signal, method, body, highWaterMark } = opts
-
+  constructor({ signal, method, body, highWaterMark }, resolve) {
     try {
       if (typeof resolve !== 'function') {
         throw new InvalidArgumentError('invalid resolve')
@@ -149,20 +143,34 @@ export class RequestHandler {
 }
 
 export function request(dispatch, url, opts) {
-  return new Promise((resolve) => {
-    if (typeof url === 'string') {
-      opts = { url: new URL(url), ...opts }
-    } else if (url instanceof URL) {
-      opts = { url, ...opts }
-    } else if (typeof url.origin === 'string' && typeof (url.path ?? url.pathname) === 'string') {
-      opts = opts ? { ...url, ...opts } : url
-    }
+  if (!url || (typeof url !== 'string' && typeof url !== 'object' && !(url instanceof URL))) {
+    throw new InvalidArgumentError('invalid url')
+  }
 
-    if (opts == null && typeof url === 'object' && url != null) {
-      url.protocol ??= 'http:'
-      opts = { protocol: 'http:', ...url }
-    }
+  if (opts != null && typeof opts !== 'object') {
+    throw new InvalidArgumentError('invalid opts')
+  }
+
+  if (typeof url === 'string') {
+    url = new URL(url)
+  } else if (typeof url === 'object' && url != null && opts == null) {
+    opts = url
+  }
+
+  let origin = url.origin
+
+  if (!origin) {
+    const protocol = url.protocol ?? 'http:'
+    const host = url.host ?? `${url.hostname}:${url.port ?? (protocol === 'https:' ? 443 : 80)}`
+    origin = `${protocol}//${host}`
+  }
+
+  let path = url.path
+  if (!path) {
+    path = url.search ? `${url.pathname}${url.search}` : url
+  }
+
+  opts = { ...opts, origin, path }
 
-    dispatch(opts, new RequestHandler(opts, resolve))
-  })
+  return new Promise((resolve) => dispatch(opts, new RequestHandler(opts, resolve)))
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/nxt-undici",
-  "version": "5.1.1",
+  "version": "5.1.2",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "main": "lib/index.js",