urllib 3.27.2 → 3.27.3

package/dist/commonjs/HttpClient.d.ts

@@ -73,7 +73,7 @@ export declare class HttpClient extends EventEmitter {
     #private;
     constructor(clientOptions?: ClientOptions);
     getDispatcher(): Dispatcher;
-    setDispatcher(dispatcher: Dispatcher): void;
+    setDispatcher(dispatcher?: Dispatcher): void;
     getDispatcherPoolStats(): Record<string, PoolStat>;
     request<T = any>(url: RequestURL, options?: RequestOptions): Promise<HttpClientResponse<T>>;
     curl<T = any>(url: RequestURL, options?: RequestOptions): Promise<HttpClientResponse<T>>;

package/dist/commonjs/HttpClient.js

@@ -68,7 +68,7 @@ class BlobFromStream {
         return 'Blob';
     }
 }
-exports.HEADER_USER_AGENT = (0, default_user_agent_1.default)('node-urllib', '3.27.2');
+exports.HEADER_USER_AGENT = (0, default_user_agent_1.default)('node-urllib', '3.27.3');
 function getFileName(stream) {
     const filePath = stream.path;
     if (filePath) {
@@ -112,7 +112,20 @@ class HttpClient extends node_events_1.EventEmitter {
         (0, diagnosticsChannel_js_1.initDiagnosticsChannel)();
     }
     getDispatcher() {
-        return this.#dispatcher ?? (0, undici_1.getGlobalDispatcher)();
+        if (this.#dispatcher) {
+            return this.#dispatcher;
+        }
+        // In a multi-version undici environment
+        // the global dispatcher is the highest version of undici
+        // which will conflict with the maxRedirects field and report an error
+        // so we need to create it that use 5.x version
+        const globalDispatcher = (0, undici_1.getGlobalDispatcher)();
+        if (!(globalDispatcher instanceof undici_1.Agent) && !(globalDispatcher instanceof undici_1.MockAgent)) {
+            const dispatcher = globalDispatcher.constructor.name === 'MockAgent' ? new undici_1.MockAgent() : new undici_1.Agent();
+            this.setDispatcher(dispatcher);
+            return dispatcher;
+        }
+        return globalDispatcher;
     }
     setDispatcher(dispatcher) {
         this.#dispatcher = dispatcher;
@@ -315,7 +328,7 @@ class HttpClient extends node_events_1.EventEmitter {
                 headers,
                 bodyTimeout,
                 opaque: internalOpaque,
-                dispatcher: args.dispatcher ?? this.#dispatcher,
+                dispatcher: args.dispatcher ?? this.getDispatcher(),
                 signal: args.signal,
             };
             if (typeof args.highWaterMark === 'number') {

package/dist/esm/HttpClient.d.ts

@@ -73,7 +73,7 @@ export declare class HttpClient extends EventEmitter {
     #private;
     constructor(clientOptions?: ClientOptions);
     getDispatcher(): Dispatcher;
-    setDispatcher(dispatcher: Dispatcher): void;
+    setDispatcher(dispatcher?: Dispatcher): void;
     getDispatcherPoolStats(): Record<string, PoolStat>;
     request<T = any>(url: RequestURL, options?: RequestOptions): Promise<HttpClientResponse<T>>;
     curl<T = any>(url: RequestURL, options?: RequestOptions): Promise<HttpClientResponse<T>>;

package/dist/esm/HttpClient.js

@@ -11,7 +11,7 @@ import { createReadStream } from 'node:fs';
 import { format as urlFormat } from 'node:url';
 import { performance } from 'node:perf_hooks';
 import querystring from 'node:querystring';
-import { FormData as FormDataNative, request as undiciRequest, Agent, getGlobalDispatcher, } from 'undici';
+import { FormData as FormDataNative, request as undiciRequest, Agent, getGlobalDispatcher, MockAgent, } from 'undici';
 import undiciSymbols from 'undici/lib/core/symbols.js';
 import { FormData as FormDataNode } from 'formdata-node';
 import { FormDataEncoder } from 'form-data-encoder';
@@ -62,7 +62,7 @@ class BlobFromStream {
         return 'Blob';
     }
 }
-export const HEADER_USER_AGENT = createUserAgent('node-urllib', '3.27.2');
+export const HEADER_USER_AGENT = createUserAgent('node-urllib', '3.27.3');
 function getFileName(stream) {
     const filePath = stream.path;
     if (filePath) {
@@ -106,7 +106,20 @@ export class HttpClient extends EventEmitter {
         initDiagnosticsChannel();
     }
     getDispatcher() {
-        return this.#dispatcher ?? getGlobalDispatcher();
+        if (this.#dispatcher) {
+            return this.#dispatcher;
+        }
+        // In a multi-version undici environment
+        // the global dispatcher is the highest version of undici
+        // which will conflict with the maxRedirects field and report an error
+        // so we need to create it that use 5.x version
+        const globalDispatcher = getGlobalDispatcher();
+        if (!(globalDispatcher instanceof Agent) && !(globalDispatcher instanceof MockAgent)) {
+            const dispatcher = globalDispatcher.constructor.name === 'MockAgent' ? new MockAgent() : new Agent();
+            this.setDispatcher(dispatcher);
+            return dispatcher;
+        }
+        return globalDispatcher;
     }
     setDispatcher(dispatcher) {
         this.#dispatcher = dispatcher;
@@ -309,7 +322,7 @@ export class HttpClient extends EventEmitter {
                 headers,
                 bodyTimeout,
                 opaque: internalOpaque,
-                dispatcher: args.dispatcher ?? this.#dispatcher,
+                dispatcher: args.dispatcher ?? this.getDispatcher(),
                 signal: args.signal,
             };
             if (typeof args.highWaterMark === 'number') {

package/dist/package.json

@@ -1,4 +1,4 @@
 {
   "name": "urllib",
-  "version": "3.27.2"
+  "version": "3.27.3"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "urllib",
-  "version": "3.27.2",
+  "version": "3.27.3",
   "publishConfig": {
     "access": "public"
   },
@@ -70,7 +70,7 @@
     "@types/qs": "^6.9.7",
     "@types/selfsigned": "^2.0.1",
     "@types/tar-stream": "^2.2.2",
-    "@vitest/coverage-v8": "^1.3.1",
+    "@vitest/coverage-v8": "^3.0.0",
     "busboy": "^1.6.0",
     "cross-env": "^7.0.3",
     "eslint": "^8.25.0",
@@ -83,7 +83,7 @@
     "tshy": "^1.0.0",
     "tshy-after": "^1.0.0",
     "typescript": "^5.0.4",
-    "vitest": "^1.3.1"
+    "vitest": "^3.0.0"
   },
   "engines": {
     "node": ">= 14.19.3"

package/src/HttpClient.ts

@@ -22,8 +22,9 @@ import {
   request as undiciRequest,
   Dispatcher,
   Agent,
-  getGlobalDispatcher,
   Pool,
+  getGlobalDispatcher,
+  MockAgent,
 } from 'undici';
 import undiciSymbols from 'undici/lib/core/symbols.js';
 import { FormData as FormDataNode } from 'formdata-node';
@@ -207,10 +208,23 @@ export class HttpClient extends EventEmitter {
   }
 
   getDispatcher() {
-    return this.#dispatcher ?? getGlobalDispatcher();
+    if (this.#dispatcher) {
+      return this.#dispatcher;
+    }
+    // In a multi-version undici environment
+    // the global dispatcher is the highest version of undici
+    // which will conflict with the maxRedirects field and report an error
+    // so we need to create it that use 5.x version
+    const globalDispatcher = getGlobalDispatcher();
+    if (!(globalDispatcher instanceof Agent) && !(globalDispatcher instanceof MockAgent)) {
+      const dispatcher = globalDispatcher.constructor.name === 'MockAgent' ? new MockAgent() : new Agent();
+      this.setDispatcher(dispatcher);
+      return dispatcher;
+    }
+    return globalDispatcher;
   }
 
-  setDispatcher(dispatcher: Dispatcher) {
+  setDispatcher(dispatcher?: Dispatcher) {
     this.#dispatcher = dispatcher;
   }
 
@@ -415,7 +429,7 @@ export class HttpClient extends EventEmitter {
         headers,
         bodyTimeout,
         opaque: internalOpaque,
-        dispatcher: args.dispatcher ?? this.#dispatcher,
+        dispatcher: args.dispatcher ?? this.getDispatcher(),
         signal: args.signal,
       };
       if (typeof args.highWaterMark === 'number') {