refactor: alternative solution

nodejs · Dec 18, 2024 · 46c6d06 · 46c6d06
1 parent 171f6fc
commit 46c6d06
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 11 deletions.
diff --git a/lib/dispatcher/client.js b/lib/dispatcher/client.js
@@ -351,6 +351,16 @@ class Client extends DispatcherBase {
       this[kResume]()
     })
   }
+
+  request (opts, callback) {
+    if (!opts?.origin) {
+      const origin = this[kUrl]?.origin
+      if (origin) {
+        opts = { ...opts, origin }
+      }
+    }
+    return super.request(opts, callback)
+  }
 }
 
 function onError (client, err) {

diff --git a/lib/dispatcher/dispatcher.js b/lib/dispatcher/dispatcher.js
@@ -1,6 +1,5 @@
 'use strict'
 const EventEmitter = require('node:events')
-const { kUrl } = require('../core/symbols')
 const WrapHandler = require('../handler/wrap-handler')
 
 const wrapInterceptor = (dispatch) => (opts, handler) => dispatch(opts, WrapHandler.wrap(handler))
@@ -32,7 +31,7 @@ class Dispatcher extends EventEmitter {
         throw new TypeError(`invalid interceptor, expected function received ${typeof interceptor}`)
       }
 
-      dispatch = interceptor(dispatch, { url: this[kUrl] })
+      dispatch = interceptor(dispatch)
       dispatch = wrapInterceptor(dispatch)
 
       if (dispatch == null || typeof dispatch !== 'function' || dispatch.length !== 2) {

diff --git a/lib/dispatcher/pool.js b/lib/dispatcher/pool.js
@@ -85,6 +85,16 @@ class Pool extends PoolBase {
       return dispatcher
     }
   }
+
+  request (opts, callback) {
+    if (!opts?.origin) {
+      const origin = this[kUrl]?.origin
+      if (origin) {
+        opts = { ...opts, origin }
+      }
+    }
+    return super.request(opts, callback)
+  }
 }
 
 module.exports = Pool
diff --git a/lib/interceptor/dns.js b/lib/interceptor/dns.js
@@ -338,17 +338,14 @@ module.exports = interceptorOpts => {
 
   return (dispatch, opts) => {
     return function dnsInterceptor (origDispatchOpts, handler) {
-      let origin
-      if (origDispatchOpts.origin) {
-        origin = origDispatchOpts.origin.constructor === URL
-          ? origDispatchOpts.origin
-          : new URL(origDispatchOpts.origin)
-      } else if (opts.url) {
-        origin = opts.url
-      } else {
-        return handler.onError(new InvalidArgumentError('Origin missing'))
+      if (!origDispatchOpts.origin) {
+        return handler.onResponseError(null, new InvalidArgumentError('Origin Missing'))
       }
 
+      const origin = origDispatchOpts.origin.constructor === URL
+        ? origDispatchOpts.origin
+        : new URL(origDispatchOpts.origin)
+
       if (isIP(origin.hostname) !== 0) {
         return dispatch(origDispatchOpts, handler)
       }