fix: default port

nxtedition · Dec 10, 2024 · c462dda · c462dda
1 parent 30f2bef
commit c462dda
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/lib/request.js b/lib/request.js
@@ -151,17 +151,17 @@ export class RequestHandler {
 export function request(dispatch, url, opts) {
   return new Promise((resolve) => {
     if (typeof url === 'string') {
-      opts = { url: new URL(url), ...opts }
+      opts = { ...opts, url: new URL(url) }
     } 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
+      opts = { ...opts, url: new URL(url) }
+    } else if (typeof url.origin === 'string' && url.length > 0) {
+      opts = { ...opts, url }
+    } else {
+      throw new Error('invalid url')
     }
 
-    if (opts == null && typeof url === 'object' && url != null) {
-      url.protocol ??= 'http:'
-      opts = { protocol: 'http:', ...url }
-    }
+    opts.url.protocol ??= 'http'
+    opts.url.port ??= opts.url.protocol === 'https:' ? '443' : '80'
 
     dispatch(opts, new RequestHandler(opts, resolve))
   })