refactor: expose interceptor as is

nodejs · Feb 29, 2024 · 7656e1b · 7656e1b
1 parent 9048eb5
commit 7656e1b
Show file tree

Hide file tree

Showing 5 changed files with 250 additions and 128 deletions.
diff --git a/index.js b/index.js
@@ -37,7 +37,7 @@ module.exports.DecoratorHandler = DecoratorHandler
 module.exports.RedirectHandler = RedirectHandler
 module.exports.createRedirectInterceptor = createRedirectInterceptor
 module.exports.interceptors = {
-  proxy: require('./lib/interceptor/proxy'),
+  Proxy: require('./lib/interceptor/proxy'),
   redirect: require('./lib/interceptor/redirect'),
   retry: require('./lib/interceptor/retry')
 }

diff --git a/lib/interceptor/proxy.js b/lib/interceptor/proxy.js
@@ -2,10 +2,32 @@
 
 const { InvalidArgumentError } = require('../core/errors')
 const ProxyAgent = require('../dispatcher/proxy-agent')
-const DispatcherBase = require('../dispatcher/dispatcher-base')
+const Dispatcher = require('../dispatcher/dispatcher')
 
-class ProxyInterceptor extends DispatcherBase {
+class ProxyInterceptor extends Dispatcher {
   constructor (dispatcher, opts) {
+    if (dispatcher == null) {
+      throw new InvalidArgumentError(
+        'Dispatcher instance is mandatory for ProxyInterceptor'
+      )
+    }
+
+    if (typeof opts === 'string') {
+      opts = { uri: opts }
+    }
+
+    if (!opts || (!opts.uri && !(opts instanceof URL))) {
+      throw new InvalidArgumentError(
+        'Proxy opts.uri or instance of URL is mandatory'
+      )
+    }
+
+    if (opts.auth && opts.token) {
+      throw new InvalidArgumentError(
+        'opts.auth cannot be used in combination with opts.token'
+      )
+    }
+
     super()
     this.dispatcher = dispatcher
     this.agent = new ProxyAgent(opts)
@@ -20,20 +42,4 @@ class ProxyInterceptor extends DispatcherBase {
   }
 }
 
-module.exports = opts => {
-  if (typeof opts === 'string') {
-    opts = { uri: opts }
-  }
-
-  if (!opts || (!opts.uri && !(opts instanceof URL))) {
-    throw new InvalidArgumentError('Proxy opts.uri or instance of URL is mandatory')
-  }
-
-  if (opts.auth && opts.token) {
-    throw new InvalidArgumentError(
-      'opts.auth cannot be used in combination with opts.token'
-    )
-  }
-
-  return dispatcher => new ProxyInterceptor(dispatcher, opts)
-}
+module.exports = ProxyInterceptor
diff --git a/lib/interceptor/redirect.js b/lib/interceptor/redirect.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const { InvalidArgumentError } = require('../core/errors')
-const Dispatcher = require('../dispatcher/dispatcher-base')
+const Dispatcher = require('../dispatcher/dispatcher')
 const RedirectHandler = require('../handler/RedirectHandler')
 
 class RedirectDispatcher extends Dispatcher {

diff --git a/lib/interceptor/retry.js b/lib/interceptor/retry.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const Dispatcher = require('../dispatcher/dispatcher-base')
+const Dispatcher = require('../dispatcher/dispatcher')
 const RetryHandler = require('../handler/RetryHandler')
 
 class RetryDispatcher extends Dispatcher {