urllib 3.27.0 → 3.27.2

package/dist/commonjs/HttpClient.d.ts

@@ -26,8 +26,9 @@ export type ClientOptions = {
         */
         cert?: string | Buffer;
         /**
-        * If true, the server certificate is verified against the list of supplied CAs.
-        * An 'error' event is emitted if verification fails.Default: true.
+        * If `true`, the server certificate is verified against the list of supplied CAs.
+        * An 'error' event is emitted if verification fails.
+        * Default: `true`
         */
         rejectUnauthorized?: boolean;
         /**

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.0');
+exports.HEADER_USER_AGENT = (0, default_user_agent_1.default)('node-urllib', '3.27.2');
 function getFileName(stream) {
     const filePath = stream.path;
     if (filePath) {
@@ -490,6 +490,8 @@ class HttpClient extends node_events_1.EventEmitter {
                         // FIXME: merge exists cookie header
                         requestOptions.headers.cookie = response.headers['set-cookie'].join(';');
                     }
+                    // Ensure the previous response is consumed as we re-use the same variable
+                    await response.body.arrayBuffer();
                     response = await (0, undici_1.request)(requestUrl, requestOptions);
                 }
             }

package/dist/commonjs/index.d.ts

@@ -1,8 +1,18 @@
 import { HttpClient } from './HttpClient.js';
 import { RequestOptions, RequestURL } from './Request.js';
-export declare function getDefaultHttpClient(): HttpClient;
-export declare function request<T = any>(url: RequestURL, options?: RequestOptions): Promise<import("./Response.js").HttpClientResponse<T>>;
-export declare function curl<T = any>(url: RequestURL, options?: RequestOptions): Promise<import("./Response.js").HttpClientResponse<T>>;
+export declare function getDefaultHttpClient(rejectUnauthorized?: boolean, allowH2?: boolean): HttpClient;
+export interface UrllibRequestOptions extends RequestOptions {
+    /**
+     * If `true`, the server certificate is verified against the list of supplied CAs.
+     * An 'error' event is emitted if verification fails.
+     * Default: `true`
+     */
+    rejectUnauthorized?: boolean;
+    /** Allow to use HTTP2 first. Default is `false` */
+    allowH2?: boolean;
+}
+export declare function request<T = any>(url: RequestURL, options?: UrllibRequestOptions): Promise<import("./Response.js").HttpClientResponse<T>>;
+export declare function curl<T = any>(url: RequestURL, options?: UrllibRequestOptions): Promise<import("./Response.js").HttpClientResponse<T>>;
 export { MockAgent, ProxyAgent, Agent, Dispatcher, setGlobalDispatcher, getGlobalDispatcher, } from 'undici';
 export { HttpClient, HttpClient as HttpClient2, HEADER_USER_AGENT as USER_AGENT, RequestDiagnosticsMessage, ResponseDiagnosticsMessage, } from './HttpClient.js';
 export { RequestOptions, RequestOptions as RequestOptions2, RequestURL, HttpMethod, FixJSONCtlCharsHandler, FixJSONCtlChars, } from './Request.js';

package/dist/commonjs/index.js

@@ -24,8 +24,40 @@ exports.curl = curl;
 const ylru_1 = __importDefault(require("ylru"));
 const HttpClient_js_1 = require("./HttpClient.js");
 let httpClient;
+let allowH2HttpClient;
+let allowUnauthorizedHttpClient;
+let allowH2AndUnauthorizedHttpClient;
 const domainSocketHttpClients = new ylru_1.default(50);
-function getDefaultHttpClient() {
+function getDefaultHttpClient(rejectUnauthorized, allowH2) {
+    if (rejectUnauthorized === false) {
+        if (allowH2) {
+            if (!allowH2AndUnauthorizedHttpClient) {
+                allowH2AndUnauthorizedHttpClient = new HttpClient_js_1.HttpClient({
+                    allowH2,
+                    connect: {
+                        rejectUnauthorized,
+                    },
+                });
+            }
+            return allowH2AndUnauthorizedHttpClient;
+        }
+        if (!allowUnauthorizedHttpClient) {
+            allowUnauthorizedHttpClient = new HttpClient_js_1.HttpClient({
+                connect: {
+                    rejectUnauthorized,
+                },
+            });
+        }
+        return allowUnauthorizedHttpClient;
+    }
+    if (allowH2) {
+        if (!allowH2HttpClient) {
+            allowH2HttpClient = new HttpClient_js_1.HttpClient({
+                allowH2,
+            });
+        }
+        return allowH2HttpClient;
+    }
     if (!httpClient) {
         httpClient = new HttpClient_js_1.HttpClient();
     }
@@ -42,7 +74,7 @@ async function request(url, options) {
         }
         return await domainSocketHttpclient.request(url, options);
     }
-    return await getDefaultHttpClient().request(url, options);
+    return await getDefaultHttpClient(options?.rejectUnauthorized, options?.allowH2).request(url, options);
 }
 // export curl method is keep compatible with urllib.curl()
 // ```ts

package/dist/esm/HttpClient.d.ts

@@ -26,8 +26,9 @@ export type ClientOptions = {
         */
         cert?: string | Buffer;
         /**
-        * If true, the server certificate is verified against the list of supplied CAs.
-        * An 'error' event is emitted if verification fails.Default: true.
+        * If `true`, the server certificate is verified against the list of supplied CAs.
+        * An 'error' event is emitted if verification fails.
+        * Default: `true`
         */
         rejectUnauthorized?: boolean;
         /**

package/dist/esm/HttpClient.js

@@ -62,7 +62,7 @@ class BlobFromStream {
         return 'Blob';
     }
 }
-export const HEADER_USER_AGENT = createUserAgent('node-urllib', '3.27.0');
+export const HEADER_USER_AGENT = createUserAgent('node-urllib', '3.27.2');
 function getFileName(stream) {
     const filePath = stream.path;
     if (filePath) {
@@ -484,6 +484,8 @@ export class HttpClient extends EventEmitter {
                         // FIXME: merge exists cookie header
                         requestOptions.headers.cookie = response.headers['set-cookie'].join(';');
                     }
+                    // Ensure the previous response is consumed as we re-use the same variable
+                    await response.body.arrayBuffer();
                     response = await undiciRequest(requestUrl, requestOptions);
                 }
             }

package/dist/esm/index.d.ts

@@ -1,8 +1,18 @@
 import { HttpClient } from './HttpClient.js';
 import { RequestOptions, RequestURL } from './Request.js';
-export declare function getDefaultHttpClient(): HttpClient;
-export declare function request<T = any>(url: RequestURL, options?: RequestOptions): Promise<import("./Response.js").HttpClientResponse<T>>;
-export declare function curl<T = any>(url: RequestURL, options?: RequestOptions): Promise<import("./Response.js").HttpClientResponse<T>>;
+export declare function getDefaultHttpClient(rejectUnauthorized?: boolean, allowH2?: boolean): HttpClient;
+export interface UrllibRequestOptions extends RequestOptions {
+    /**
+     * If `true`, the server certificate is verified against the list of supplied CAs.
+     * An 'error' event is emitted if verification fails.
+     * Default: `true`
+     */
+    rejectUnauthorized?: boolean;
+    /** Allow to use HTTP2 first. Default is `false` */
+    allowH2?: boolean;
+}
+export declare function request<T = any>(url: RequestURL, options?: UrllibRequestOptions): Promise<import("./Response.js").HttpClientResponse<T>>;
+export declare function curl<T = any>(url: RequestURL, options?: UrllibRequestOptions): Promise<import("./Response.js").HttpClientResponse<T>>;
 export { MockAgent, ProxyAgent, Agent, Dispatcher, setGlobalDispatcher, getGlobalDispatcher, } from 'undici';
 export { HttpClient, HttpClient as HttpClient2, HEADER_USER_AGENT as USER_AGENT, RequestDiagnosticsMessage, ResponseDiagnosticsMessage, } from './HttpClient.js';
 export { RequestOptions, RequestOptions as RequestOptions2, RequestURL, HttpMethod, FixJSONCtlCharsHandler, FixJSONCtlChars, } from './Request.js';

package/dist/esm/index.js

@@ -1,8 +1,40 @@
 import LRU from 'ylru';
 import { HttpClient, HEADER_USER_AGENT } from './HttpClient.js';
 let httpClient;
+let allowH2HttpClient;
+let allowUnauthorizedHttpClient;
+let allowH2AndUnauthorizedHttpClient;
 const domainSocketHttpClients = new LRU(50);
-export function getDefaultHttpClient() {
+export function getDefaultHttpClient(rejectUnauthorized, allowH2) {
+    if (rejectUnauthorized === false) {
+        if (allowH2) {
+            if (!allowH2AndUnauthorizedHttpClient) {
+                allowH2AndUnauthorizedHttpClient = new HttpClient({
+                    allowH2,
+                    connect: {
+                        rejectUnauthorized,
+                    },
+                });
+            }
+            return allowH2AndUnauthorizedHttpClient;
+        }
+        if (!allowUnauthorizedHttpClient) {
+            allowUnauthorizedHttpClient = new HttpClient({
+                connect: {
+                    rejectUnauthorized,
+                },
+            });
+        }
+        return allowUnauthorizedHttpClient;
+    }
+    if (allowH2) {
+        if (!allowH2HttpClient) {
+            allowH2HttpClient = new HttpClient({
+                allowH2,
+            });
+        }
+        return allowH2HttpClient;
+    }
     if (!httpClient) {
         httpClient = new HttpClient();
     }
@@ -19,7 +51,7 @@ export async function request(url, options) {
         }
         return await domainSocketHttpclient.request(url, options);
     }
-    return await getDefaultHttpClient().request(url, options);
+    return await getDefaultHttpClient(options?.rejectUnauthorized, options?.allowH2).request(url, options);
 }
 // export curl method is keep compatible with urllib.curl()
 // ```ts

package/dist/package.json

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "urllib",
-  "version": "3.27.0",
+  "version": "3.27.2",
   "publishConfig": {
     "access": "public"
   },
@@ -78,7 +78,7 @@
     "git-contributor": "^2.0.0",
     "iconv-lite": "^0.6.3",
     "proxy": "^1.0.2",
-    "selfsigned": "^2.0.1",
+    "selfsigned": "^2.4.1",
     "tar-stream": "^2.2.0",
     "tshy": "^1.0.0",
     "tshy-after": "^1.0.0",

package/src/HttpClient.ts

@@ -90,8 +90,9 @@ export type ClientOptions = {
     */
     cert?: string | Buffer;
     /**
-    * If true, the server certificate is verified against the list of supplied CAs.
-    * An 'error' event is emitted if verification fails.Default: true.
+    * If `true`, the server certificate is verified against the list of supplied CAs.
+    * An 'error' event is emitted if verification fails.
+    * Default: `true`
     */
     rejectUnauthorized?: boolean;
     /**
@@ -581,6 +582,8 @@ export class HttpClient extends EventEmitter {
             // FIXME: merge exists cookie header
             requestOptions.headers.cookie = response.headers['set-cookie'].join(';');
           }
+          // Ensure the previous response is consumed as we re-use the same variable
+          await response.body.arrayBuffer();
           response = await undiciRequest(requestUrl, requestOptions as UndiciRequestOption);
         }
       }

package/src/index.ts

@@ -3,16 +3,62 @@ import { HttpClient, HEADER_USER_AGENT } from './HttpClient.js';
 import { RequestOptions, RequestURL } from './Request.js';
 
 let httpClient: HttpClient;
+let allowH2HttpClient: HttpClient;
+let allowUnauthorizedHttpClient: HttpClient;
+let allowH2AndUnauthorizedHttpClient: HttpClient;
 const domainSocketHttpClients = new LRU(50);
 
-export function getDefaultHttpClient(): HttpClient {
+export function getDefaultHttpClient(rejectUnauthorized?: boolean, allowH2?: boolean): HttpClient {
+  if (rejectUnauthorized === false) {
+    if (allowH2) {
+      if (!allowH2AndUnauthorizedHttpClient) {
+        allowH2AndUnauthorizedHttpClient = new HttpClient({
+          allowH2,
+          connect: {
+            rejectUnauthorized,
+          },
+        });
+      }
+      return allowH2AndUnauthorizedHttpClient;
+    }
+
+    if (!allowUnauthorizedHttpClient) {
+      allowUnauthorizedHttpClient = new HttpClient({
+        connect: {
+          rejectUnauthorized,
+        },
+      });
+    }
+    return allowUnauthorizedHttpClient;
+  }
+
+  if (allowH2) {
+    if (!allowH2HttpClient) {
+      allowH2HttpClient = new HttpClient({
+        allowH2,
+      });
+    }
+    return allowH2HttpClient;
+  }
+
   if (!httpClient) {
     httpClient = new HttpClient();
   }
   return httpClient;
 }
 
-export async function request<T = any>(url: RequestURL, options?: RequestOptions) {
+export interface UrllibRequestOptions extends RequestOptions {
+  /**
+   * If `true`, the server certificate is verified against the list of supplied CAs.
+   * An 'error' event is emitted if verification fails.
+   * Default: `true`
+   */
+  rejectUnauthorized?: boolean;
+  /** Allow to use HTTP2 first. Default is `false` */
+  allowH2?: boolean;
+}
+
+export async function request<T = any>(url: RequestURL, options?: UrllibRequestOptions) {
   if (options?.socketPath) {
     let domainSocketHttpclient = domainSocketHttpClients.get<HttpClient>(options.socketPath);
     if (!domainSocketHttpclient) {
@@ -24,7 +70,7 @@ export async function request<T = any>(url: RequestURL, options?: RequestOptions
     return await domainSocketHttpclient.request<T>(url, options);
   }
 
-  return await getDefaultHttpClient().request<T>(url, options);
+  return await getDefaultHttpClient(options?.rejectUnauthorized, options?.allowH2).request<T>(url, options);
 }
 
 // export curl method is keep compatible with urllib.curl()
@@ -32,7 +78,7 @@ export async function request<T = any>(url: RequestURL, options?: RequestOptions
 // import * as urllib from 'urllib';
 // urllib.curl(url);
 // ```
-export async function curl<T = any>(url: RequestURL, options?: RequestOptions) {
+export async function curl<T = any>(url: RequestURL, options?: UrllibRequestOptions) {
   return await request<T>(url, options);
 }