urllib 3.12.0 → 3.13.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "urllib",
-  "version": "3.12.0",
+  "version": "3.13.0",
   "publishConfig": {
     "tag": "latest"
   },
@@ -41,7 +41,7 @@
     "url": "git://github.com/node-modules/urllib.git"
   },
   "scripts": {
-    "lint": "eslint src --ext .ts",
+    "lint": "eslint src test --ext .ts",
     "build": "npm run build:dist",
     "build:cjs": "tsc -p ./tsconfig.build.cjs.json",
     "build:esm": "tsc -p ./tsconfig.build.esm.json && node ./scripts/esm_import_fix.js",
@@ -74,7 +74,7 @@
     "@types/pump": "^1.1.1",
     "@types/selfsigned": "^2.0.1",
     "@types/tar-stream": "^2.2.2",
-    "@vitest/coverage-c8": "^0.23.4",
+    "@vitest/coverage-c8": "^0.29.7",
     "busboy": "^1.6.0",
     "eslint": "^8.25.0",
     "eslint-config-egg": "^12.1.0",
@@ -84,10 +84,10 @@
     "selfsigned": "^2.0.1",
     "tar-stream": "^2.2.0",
     "typescript": "^4.8.3",
-    "vitest": "^0.28.5"
+    "vitest": "^0.29.7"
   },
   "engines": {
-    "node": ">= 14.17.0"
+    "node": ">= 14.19.3"
   },
   "license": "MIT"
 }

package/src/HttpAgent.ts

@@ -1,5 +1,5 @@
-import dns from 'dns';
-import { LookupFunction, isIP } from 'net';
+import dns from 'node:dns';
+import { LookupFunction, isIP } from 'node:net';
 import {
   Agent,
 } from 'undici';

package/src/HttpClient.ts

@@ -1,20 +1,21 @@
-import { EventEmitter } from 'events';
-import { LookupFunction } from 'net';
-import { STATUS_CODES } from 'http';
-import { debuglog } from 'util';
+import { EventEmitter } from 'node:events';
+import { LookupFunction } from 'node:net';
+import { STATUS_CODES } from 'node:http';
+import type { IncomingHttpHeaders } from 'node:http';
+import { debuglog } from 'node:util';
 import {
   createGunzip,
   createBrotliDecompress,
   gunzipSync,
   brotliDecompressSync,
-} from 'zlib';
-import { Blob } from 'buffer';
-import { Readable, pipeline } from 'stream';
-import stream from 'stream';
-import { basename } from 'path';
-import { createReadStream } from 'fs';
-import { format as urlFormat } from 'url';
-import { performance } from 'perf_hooks';
+} from 'node:zlib';
+import { Blob } from 'node:buffer';
+import { Readable, pipeline } from 'node:stream';
+import stream from 'node:stream';
+import { basename } from 'node:path';
+import { createReadStream } from 'node:fs';
+import { format as urlFormat } from 'node:url';
+import { performance } from 'node:perf_hooks';
 import {
   FormData as FormDataNative,
   request as undiciRequest,
@@ -33,7 +34,6 @@ import { RawResponseWithMeta, HttpClientResponse, SocketInfo } from './Response'
 import { parseJSON, sleep, digestAuthHeader, globalId, performanceTime, isReadable } from './utils';
 import symbols from './symbols';
 import { initDiagnosticsChannel } from './diagnosticsChannel';
-import type { IncomingHttpHeaders } from 'http';
 
 type Exists<T> = T extends undefined ? never : T;
 type UndiciRequestOption = Exists<Parameters<typeof undiciRequest>[1]>;

package/src/Request.ts

@@ -1,5 +1,5 @@
-import { Readable, Writable } from 'stream';
-import type { IncomingHttpHeaders } from 'http';
+import { Readable, Writable } from 'node:stream';
+import type { IncomingHttpHeaders } from 'node:http';
 import type Dispatcher from 'undici/types/dispatcher';
 import type {
   HttpClientResponse,

package/src/Response.ts

@@ -1,5 +1,5 @@
-import { Readable } from 'stream';
-import { IncomingHttpHeaders } from 'http';
+import { Readable } from 'node:stream';
+import { IncomingHttpHeaders } from 'node:http';
 
 export type SocketInfo = {
   id: number;

package/src/cjs/HttpAgent.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { LookupFunction } from 'net';
+import { LookupFunction } from 'node:net';
 import { Agent } from 'undici';
 import type Dispatcher from 'undici/types/dispatcher';
 import type buildConnector from 'undici/types/connector';

package/src/cjs/HttpAgent.js

@@ -1,25 +1,16 @@
 "use strict";
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _HttpAgent_checkAddress;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HttpAgent = void 0;
-const dns_1 = __importDefault(require("dns"));
-const net_1 = require("net");
+const node_dns_1 = __importDefault(require("node:dns"));
+const node_net_1 = require("node:net");
 const undici_1 = require("undici");
 class IllegalAddressError extends Error {
+    hostname;
+    ip;
+    family;
     constructor(hostname, ip, family) {
         const message = 'illegal address';
         super(message);
@@ -31,9 +22,10 @@ class IllegalAddressError extends Error {
     }
 }
 class HttpAgent extends undici_1.Agent {
+    #checkAddress;
     constructor(options) {
         /* eslint node/prefer-promises/dns: off*/
-        const _lookup = options.lookup ?? dns_1.default.lookup;
+        const _lookup = options.lookup ?? node_dns_1.default.lookup;
         const lookup = (hostname, dnsOptions, callback) => {
             _lookup(hostname, dnsOptions, (err, address, family) => {
                 if (err)
@@ -47,21 +39,20 @@ class HttpAgent extends undici_1.Agent {
         super({
             connect: { ...options.connect, lookup },
         });
-        _HttpAgent_checkAddress.set(this, void 0);
-        __classPrivateFieldSet(this, _HttpAgent_checkAddress, options.checkAddress, "f");
+        this.#checkAddress = options.checkAddress;
     }
     dispatch(options, handler) {
-        if (__classPrivateFieldGet(this, _HttpAgent_checkAddress, "f") && options.origin) {
+        if (this.#checkAddress && options.origin) {
             const originUrl = typeof options.origin === 'string' ? new URL(options.origin) : options.origin;
             let hostname = originUrl.hostname;
             // [2001:db8:2de::e13] => 2001:db8:2de::e13
             if (hostname.startsWith('[') && hostname.endsWith(']')) {
                 hostname = hostname.substring(1, hostname.length - 1);
             }
-            const family = (0, net_1.isIP)(hostname);
+            const family = (0, node_net_1.isIP)(hostname);
             if (family === 4 || family === 6) {
                 // if request hostname is ip, custom lookup won't excute
-                if (!__classPrivateFieldGet(this, _HttpAgent_checkAddress, "f").call(this, hostname, family)) {
+                if (!this.#checkAddress(hostname, family)) {
                     throw new IllegalAddressError(hostname, hostname, family);
                 }
             }
@@ -70,5 +61,4 @@ class HttpAgent extends undici_1.Agent {
     }
 }
 exports.HttpAgent = HttpAgent;
-_HttpAgent_checkAddress = new WeakMap();
 //# sourceMappingURL=HttpAgent.js.map

package/src/cjs/HttpAgent.js.map

@@ -1 +1 @@
-{"version":3,"file":"HttpAgent.js","sourceRoot":"","sources":["../HttpAgent.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,8CAAsB;AACtB,6BAA2C;AAC3C,mCAEgB;AAYhB,MAAM,mBAAoB,SAAQ,KAAK;IAKrC,YAAY,QAAgB,EAAE,EAAU,EAAE,MAAc;QACtD,MAAM,OAAO,GAAG,iBAAiB,CAAC;QAClC,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;QAClC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,KAAK,CAAC,iBAAiB,CAAC,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;IAClD,CAAC;CACF;AAED,MAAa,SAAU,SAAQ,cAAK;IAGlC,YAAY,OAAyB;QACnC,yCAAyC;QACzC,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,IAAI,aAAG,CAAC,MAAM,CAAC;QAC7C,MAAM,MAAM,GAAmB,CAAC,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,EAAE;YAChE,OAAO,CAAC,QAAQ,EAAE,UAAU,EAAE,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;gBACrD,IAAI,GAAG;oBAAE,OAAO,QAAQ,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;gBAC/C,IAAI,OAAO,CAAC,YAAY,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE;oBAClE,GAAG,GAAG,IAAI,mBAAmB,CAAC,QAAQ,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;iBAC1D;gBACD,QAAQ,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;YACjC,CAAC,CAAC,CAAC;QACL,CAAC,CAAC;QACF,KAAK,CAAC;YACJ,OAAO,EAAE,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE;SACxC,CAAC,CAAC;QAhBL,0CAAqC;QAiBnC,uBAAA,IAAI,2BAAiB,OAAO,CAAC,YAAY,MAAA,CAAC;IAC5C,CAAC;IAED,QAAQ,CAAC,OAA8B,EAAE,OAAoC;QAC3E,IAAI,uBAAA,IAAI,+BAAc,IAAI,OAAO,CAAC,MAAM,EAAE;YACxC,MAAM,SAAS,GAAG,OAAO,OAAO,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC;YAChG,IAAI,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC;YAClC,2CAA2C;YAC3C,IAAI,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBACtD,QAAQ,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAE,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;aACvD;YACD,MAAM,MAAM,GAAG,IAAA,UAAI,EAAC,QAAQ,CAAC,CAAC;YAC9B,IAAI,MAAM,KAAK,CAAC,IAAI,MAAM,KAAK,CAAC,EAAE;gBAChC,wDAAwD;gBACxD,IAAI,CAAC,uBAAA,IAAI,+BAAc,MAAlB,IAAI,EAAe,QAAQ,EAAE,MAAM,CAAC,EAAE;oBACzC,MAAM,IAAI,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;iBAC3D;aACF;SACF;QACD,OAAO,KAAK,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC1C,CAAC;CACF;AAvCD,8BAuCC"}
+{"version":3,"file":"HttpAgent.js","sourceRoot":"","sources":["../HttpAgent.ts"],"names":[],"mappings":";;;;;;AAAA,wDAA2B;AAC3B,uCAAgD;AAChD,mCAEgB;AAYhB,MAAM,mBAAoB,SAAQ,KAAK;IACrC,QAAQ,CAAS;IACjB,EAAE,CAAS;IACX,MAAM,CAAS;IAEf,YAAY,QAAgB,EAAE,EAAU,EAAE,MAAc;QACtD,MAAM,OAAO,GAAG,iBAAiB,CAAC;QAClC,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;QAClC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,KAAK,CAAC,iBAAiB,CAAC,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;IAClD,CAAC;CACF;AAED,MAAa,SAAU,SAAQ,cAAK;IAClC,aAAa,CAAwB;IAErC,YAAY,OAAyB;QACnC,yCAAyC;QACzC,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,IAAI,kBAAG,CAAC,MAAM,CAAC;QAC7C,MAAM,MAAM,GAAmB,CAAC,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,EAAE;YAChE,OAAO,CAAC,QAAQ,EAAE,UAAU,EAAE,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;gBACrD,IAAI,GAAG;oBAAE,OAAO,QAAQ,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;gBAC/C,IAAI,OAAO,CAAC,YAAY,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE;oBAClE,GAAG,GAAG,IAAI,mBAAmB,CAAC,QAAQ,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;iBAC1D;gBACD,QAAQ,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;YACjC,CAAC,CAAC,CAAC;QACL,CAAC,CAAC;QACF,KAAK,CAAC;YACJ,OAAO,EAAE,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE;SACxC,CAAC,CAAC;QACH,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,YAAY,CAAC;IAC5C,CAAC;IAED,QAAQ,CAAC,OAA8B,EAAE,OAAoC;QAC3E,IAAI,IAAI,CAAC,aAAa,IAAI,OAAO,CAAC,MAAM,EAAE;YACxC,MAAM,SAAS,GAAG,OAAO,OAAO,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC;YAChG,IAAI,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC;YAClC,2CAA2C;YAC3C,IAAI,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBACtD,QAAQ,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAE,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;aACvD;YACD,MAAM,MAAM,GAAG,IAAA,eAAI,EAAC,QAAQ,CAAC,CAAC;YAC9B,IAAI,MAAM,KAAK,CAAC,IAAI,MAAM,KAAK,CAAC,EAAE;gBAChC,wDAAwD;gBACxD,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE;oBACzC,MAAM,IAAI,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;iBAC3D;aACF;SACF;QACD,OAAO,KAAK,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC1C,CAAC;CACF;AAvCD,8BAuCC"}

package/src/cjs/HttpClient.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="node" />
 /// <reference types="node" />
 /// <reference types="node" />
-import { EventEmitter } from 'events';
-import { LookupFunction } from 'net';
+import { EventEmitter } from 'node:events';
+import { LookupFunction } from 'node:net';
 import { CheckAddressFunction } from './HttpAgent';
 import { RequestURL, RequestOptions } from './Request';
 import { HttpClientResponse } from './Response';