Comparing version 3.25.1 to 4.0.0
@@ -6,3 +6,3 @@ "use strict"; | ||
Object.defineProperty(exports, "__esModule", { value: true }); | ||
exports.initDiagnosticsChannel = void 0; | ||
exports.initDiagnosticsChannel = initDiagnosticsChannel; | ||
const node_diagnostics_channel_1 = __importDefault(require("node:diagnostics_channel")); | ||
@@ -27,9 +27,3 @@ const node_perf_hooks_1 = require("node:perf_hooks"); | ||
function subscribe(name, listener) { | ||
if (typeof node_diagnostics_channel_1.default.subscribe === 'function') { | ||
node_diagnostics_channel_1.default.subscribe(name, listener); | ||
} | ||
else { | ||
// TODO: support Node.js 14, will be removed on the next major version | ||
node_diagnostics_channel_1.default.channel(name).subscribe(listener); | ||
} | ||
node_diagnostics_channel_1.default.subscribe(name, listener); | ||
} | ||
@@ -49,4 +43,3 @@ function formatSocket(socket) { | ||
// make sure error contains socket info | ||
const kDestroy = Symbol('kDestroy'); | ||
node_net_1.Socket.prototype[kDestroy] = node_net_1.Socket.prototype.destroy; | ||
const destroySocket = node_net_1.Socket.prototype.destroy; | ||
node_net_1.Socket.prototype.destroy = function (err) { | ||
@@ -60,3 +53,3 @@ if (err) { | ||
} | ||
return this[kDestroy](err); | ||
return destroySocket.call(this, err); | ||
}; | ||
@@ -66,3 +59,3 @@ function getRequestOpaque(request, kHandler) { | ||
return; | ||
const handler = request[kHandler]; | ||
const handler = Reflect.get(request, kHandler); | ||
// maxRedirects = 0 will get [Symbol(handler)]: RequestHandler { | ||
@@ -80,3 +73,3 @@ // responseHeaders: null, | ||
function initDiagnosticsChannel() { | ||
// makre sure init global DiagnosticsChannel once | ||
// make sure init global DiagnosticsChannel once | ||
if (initedDiagnosticsChannel) | ||
@@ -108,23 +101,22 @@ return; | ||
}); | ||
// diagnosticsChannel.channel('undici:client:beforeConnect') | ||
subscribe('undici:client:connectError', (message, name) => { | ||
const { error, connectParams } = message; | ||
let { socket } = message; | ||
if (!socket && error[symbols_js_1.default.kErrorSocket]) { | ||
socket = error[symbols_js_1.default.kErrorSocket]; | ||
const { error, connectParams, socket } = message; | ||
let sock = socket; | ||
if (!sock && error[symbols_js_1.default.kErrorSocket]) { | ||
sock = error[symbols_js_1.default.kErrorSocket]; | ||
} | ||
if (socket) { | ||
socket[symbols_js_1.default.kSocketId] = (0, utils_js_1.globalId)('UndiciSocket'); | ||
socket[symbols_js_1.default.kSocketConnectErrorTime] = new Date(); | ||
socket[symbols_js_1.default.kHandledRequests] = 0; | ||
socket[symbols_js_1.default.kHandledResponses] = 0; | ||
if (sock) { | ||
sock[symbols_js_1.default.kSocketId] = (0, utils_js_1.globalId)('UndiciSocket'); | ||
sock[symbols_js_1.default.kSocketConnectErrorTime] = new Date(); | ||
sock[symbols_js_1.default.kHandledRequests] = 0; | ||
sock[symbols_js_1.default.kHandledResponses] = 0; | ||
// copy local address to symbol, avoid them be reset after request error throw | ||
if (socket.localAddress) { | ||
socket[symbols_js_1.default.kSocketLocalAddress] = socket.localAddress; | ||
socket[symbols_js_1.default.kSocketLocalPort] = socket.localPort; | ||
if (sock.localAddress) { | ||
sock[symbols_js_1.default.kSocketLocalAddress] = sock.localAddress; | ||
sock[symbols_js_1.default.kSocketLocalPort] = sock.localPort; | ||
} | ||
socket[symbols_js_1.default.kSocketConnectProtocol] = connectParams.protocol; | ||
socket[symbols_js_1.default.kSocketConnectHost] = connectParams.host; | ||
socket[symbols_js_1.default.kSocketConnectPort] = connectParams.port; | ||
debug('[%s] Socket#%d connectError, connectParams: %o, error: %s, (sock: %o)', name, socket[symbols_js_1.default.kSocketId], connectParams, error.message, formatSocket(socket)); | ||
sock[symbols_js_1.default.kSocketConnectProtocol] = connectParams.protocol; | ||
sock[symbols_js_1.default.kSocketConnectHost] = connectParams.host; | ||
sock[symbols_js_1.default.kSocketConnectPort] = connectParams.port; | ||
debug('[%s] Socket#%d connectError, connectParams: %o, error: %s, (sock: %o)', name, sock[symbols_js_1.default.kSocketId], connectParams, error.message, formatSocket(sock)); | ||
} | ||
@@ -164,3 +156,3 @@ else { | ||
opaque[symbols_js_1.default.kRequestTiming].requestHeadersSent = (0, utils_js_1.performanceTime)(opaque[symbols_js_1.default.kRequestStartTime]); | ||
// first socket need to caculate the connected time | ||
// first socket need to calculate the connected time | ||
if (socket[symbols_js_1.default.kHandledRequests] === 1) { | ||
@@ -224,2 +216,2 @@ // kSocketStartTime - kRequestStartTime = connected time | ||
} | ||
exports.initDiagnosticsChannel = initDiagnosticsChannel; | ||
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"diagnosticsChannel.js","sourceRoot":"","sources":["../../src/diagnosticsChannel.ts"],"names":[],"mappings":"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"} |
@@ -1,2 +0,1 @@ | ||
/// <reference types="node" /> | ||
import { LookupFunction } from 'node:net'; | ||
@@ -3,0 +2,0 @@ import { Agent, Dispatcher, buildConnector } from 'undici'; |
@@ -81,1 +81,2 @@ "use strict"; | ||
exports.HttpAgent = HttpAgent; | ||
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSHR0cEFnZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0h0dHBBZ2VudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSx3REFBMkI7QUFDM0IsdUNBQWdEO0FBQ2hELG1DQUlnQjtBQVVoQixNQUFNLG1CQUFvQixTQUFRLEtBQUs7SUFDckMsUUFBUSxDQUFTO0lBQ2pCLEVBQUUsQ0FBUztJQUNYLE1BQU0sQ0FBUztJQUVmLFlBQVksUUFBZ0IsRUFBRSxFQUFVLEVBQUUsTUFBYztRQUN0RCxNQUFNLE9BQU8sR0FBRyxpQkFBaUIsQ0FBQztRQUNsQyxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDZixJQUFJLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQyxXQUFXLENBQUMsSUFBSSxDQUFDO1FBQ2xDLElBQUksQ0FBQyxRQUFRLEdBQUcsUUFBUSxDQUFDO1FBQ3pCLElBQUksQ0FBQyxFQUFFLEdBQUcsRUFBRSxDQUFDO1FBQ2IsSUFBSSxDQUFDLE1BQU0sR0FBRyxNQUFNLENBQUM7UUFDckIsS0FBSyxDQUFDLGlCQUFpQixDQUFDLElBQUksRUFBRSxJQUFJLENBQUMsV0FBVyxDQUFDLENBQUM7SUFDbEQsQ0FBQztDQUNGO0FBRUQsTUFBYSxTQUFVLFNBQVEsY0FBSztJQUNsQyxhQUFhLENBQXdCO0lBRXJDLFlBQVksT0FBeUI7UUFDbkMseUNBQXlDO1FBQ3pDLE1BQU0sT0FBTyxHQUFHLE9BQU8sQ0FBQyxNQUFNLElBQUksa0JBQUcsQ0FBQyxNQUFNLENBQUM7UUFDN0MsTUFBTSxNQUFNLEdBQW1CLENBQUMsUUFBUSxFQUFFLFVBQVUsRUFBRSxRQUFRLEVBQUUsRUFBRTtZQUNoRSxPQUFPLENBQUMsUUFBUSxFQUFFLFVBQVUsRUFBRSxDQUFDLEdBQUcsRUFBRSxHQUFHLElBQVcsRUFBRSxFQUFFO2dCQUNwRCx5Q0FBeUM7Z0JBQ3pDLE1BQU0sT0FBTyxHQUFHLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztn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 |
@@ -1,4 +0,1 @@ | ||
/// <reference types="node" /> | ||
/// <reference types="node" /> | ||
/// <reference types="node" /> | ||
import { EventEmitter } from 'node:events'; | ||
@@ -44,2 +41,3 @@ import { LookupFunction } from 'node:net'; | ||
}; | ||
export declare const VERSION = "VERSION"; | ||
export declare const HEADER_USER_AGENT: string; | ||
@@ -46,0 +44,0 @@ export type RequestContext = { |
@@ -6,3 +6,3 @@ "use strict"; | ||
Object.defineProperty(exports, "__esModule", { value: true }); | ||
exports.HttpClient = exports.HEADER_USER_AGENT = void 0; | ||
exports.HttpClient = exports.HEADER_USER_AGENT = exports.VERSION = void 0; | ||
const node_diagnostics_channel_1 = __importDefault(require("node:diagnostics_channel")); | ||
@@ -15,3 +15,3 @@ const node_events_1 = require("node:events"); | ||
const node_stream_1 = require("node:stream"); | ||
const node_stream_2 = __importDefault(require("node:stream")); | ||
const promises_1 = require("node:stream/promises"); | ||
const node_path_1 = require("node:path"); | ||
@@ -22,10 +22,9 @@ const node_fs_1 = require("node:fs"); | ||
const node_querystring_1 = __importDefault(require("node:querystring")); | ||
const promises_2 = require("node:timers/promises"); | ||
const undici_1 = require("undici"); | ||
// eslint-disable-next-line @typescript-eslint/ban-ts-comment | ||
// @ts-ignore | ||
const symbols_js_1 = __importDefault(require("undici/lib/core/symbols.js")); | ||
const formdata_node_1 = require("formdata-node"); | ||
const form_data_encoder_1 = require("form-data-encoder"); | ||
const default_user_agent_1 = __importDefault(require("default-user-agent")); | ||
const mime_types_1 = __importDefault(require("mime-types")); | ||
const qs_1 = __importDefault(require("qs")); | ||
const pump_1 = __importDefault(require("pump")); | ||
// Compatible with old style formstream | ||
@@ -39,13 +38,2 @@ const formstream_1 = __importDefault(require("formstream")); | ||
const PROTO_RE = /^https?:\/\//i; | ||
const FormData = undici_1.FormData ?? formdata_node_1.FormData; | ||
// impl promise pipeline on Node.js 14 | ||
const pipelinePromise = node_stream_2.default.promises?.pipeline ?? function pipeline(...args) { | ||
return new Promise((resolve, reject) => { | ||
(0, pump_1.default)(...args, (err) => { | ||
if (err) | ||
return reject(err); | ||
resolve(); | ||
}); | ||
}); | ||
}; | ||
function noop() { | ||
@@ -55,4 +43,2 @@ // noop | ||
const debug = (0, node_util_1.debuglog)('urllib:HttpClient'); | ||
// Node.js 14 or 16 | ||
const isNode14Or16 = /v1[46]\./.test(process.version); | ||
// https://github.com/octet-stream/form-data | ||
@@ -76,3 +62,5 @@ class BlobFromStream { | ||
} | ||
exports.HEADER_USER_AGENT = (0, default_user_agent_1.default)('node-urllib', '3.25.1'); | ||
exports.VERSION = 'VERSION'; | ||
// 'node-urllib/4.0.0 Node.js/18.19.0 (darwin; x64)' | ||
exports.HEADER_USER_AGENT = `node-urllib/${exports.VERSION} Node.js/${process.version.substring(1)} (${process.platform}; ${process.arch})`; | ||
function getFileName(stream) { | ||
@@ -121,3 +109,3 @@ const filePath = stream.path; | ||
// origin => Pool Instance | ||
const clients = agent[symbols_js_1.default.kClients]; | ||
const clients = Reflect.get(agent, symbols_js_1.default.kClients); | ||
const poolStatsMap = {}; | ||
@@ -128,3 +116,3 @@ if (!clients) { | ||
for (const [key, ref] of clients) { | ||
const pool = ref.deref(); | ||
const pool = typeof ref.deref === 'function' ? ref.deref() : ref; | ||
const stats = pool?.stats; | ||
@@ -351,3 +339,3 @@ if (!stats) | ||
} | ||
const formData = new FormData(); | ||
const formData = new undici_1.FormData(); | ||
const uploadFiles = []; | ||
@@ -367,5 +355,7 @@ if (Array.isArray(args.files)) { | ||
else if (typeof args.files === 'object') { | ||
for (const field in args.files) { | ||
const files = args.files; | ||
for (const field in files) { | ||
// set custom fileName | ||
uploadFiles.push([field, args.files[field], field]); | ||
const file = files[field]; | ||
uploadFiles.push([field, file, field]); | ||
} | ||
@@ -397,14 +387,3 @@ } | ||
} | ||
if (undici_1.FormData) { | ||
requestOptions.body = formData; | ||
} | ||
else { | ||
// Node.js 14 does not support spec-compliant FormData | ||
// https://github.com/octet-stream/form-data#usage | ||
const encoder = new form_data_encoder_1.FormDataEncoder(formData); | ||
Object.assign(headers, encoder.headers); | ||
// fix "Content-Length":"NaN" | ||
delete headers['Content-Length']; | ||
requestOptions.body = node_stream_1.Readable.from(encoder); | ||
} | ||
requestOptions.body = formData; | ||
} | ||
@@ -532,11 +511,8 @@ else if (args.content) { | ||
else if (args.writeStream) { | ||
if (isNode14Or16 && args.writeStream.destroyed) { | ||
throw new Error('writeStream is destroyed'); | ||
} | ||
if (args.compressed === true && isCompressedContent) { | ||
const decoder = contentEncoding === 'gzip' ? (0, node_zlib_1.createGunzip)() : (0, node_zlib_1.createBrotliDecompress)(); | ||
await pipelinePromise(response.body, decoder, args.writeStream); | ||
await (0, promises_1.pipeline)(response.body, decoder, args.writeStream); | ||
} | ||
else { | ||
await pipelinePromise(response.body, args.writeStream); | ||
await (0, promises_1.pipeline)(response.body, args.writeStream); | ||
} | ||
@@ -589,3 +565,3 @@ } | ||
if (args.retryDelay) { | ||
await (0, utils_js_1.sleep)(args.retryDelay); | ||
await (0, promises_2.setTimeout)(args.retryDelay); | ||
} | ||
@@ -706,1 +682,2 @@ requestContext.retries++; | ||
exports.HttpClient = HttpClient; | ||
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"HttpClient.js","sourceRoot":"","sources":["../../src/HttpClient.ts"],"names":[],"mappings":"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"} |
@@ -30,1 +30,2 @@ "use strict"; | ||
exports.HttpClientConnectTimeoutError = HttpClientConnectTimeoutError; | ||
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSHR0cENsaWVudEVycm9yLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0h0dHBDbGllbnRFcnJvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFRQSxNQUFhLHNCQUF1QixTQUFRLEtBQUs7SUFDL0MsTUFBTSxDQUFVO0lBQ2hCLE9BQU8sQ0FBdUI7SUFDOUIsTUFBTSxDQUFjO0lBQ3BCLEdBQUcsQ0FBdUI7Q0FDM0I7QUFMRCx3REFLQztBQUVELE1BQWEsNkJBQThCLFNBQVEsc0JBQXNCO0lBQ3ZFLFlBQVksT0FBZSxFQUFFLE9BQXFCO1FBQ2hELE1BQU0sT0FBTyxHQUFHLHVCQUF1QixPQUFPLEtBQUssQ0FBQztRQUNwRCxLQUFLLENBQUMsT0FBTyxFQUFFLE9BQU8sQ0FBQyxDQUFDO1FBQ3hCLElBQUksQ0FBQyxJQUFJLEdBQUcsSUFBSSxDQUFDLFdBQVcsQ0FBQyxJQUFJLENBQUM7UUFDbEMsS0FBSyxDQUFDLGlCQUFpQixDQUFDLElBQUksRUFBRSxJQUFJLENBQUMsV0FBVyxDQUFDLENBQUM7SUFDbEQsQ0FBQztDQUNGO0FBUEQsc0VBT0M7QUFFRCxNQUFhLDZCQUE4QixTQUFRLHNCQUFzQjtJQUN2RSxJQUFJLENBQVM7SUFFYixZQUFZLE9BQWUsRUFBRSxJQUFZLEVBQUUsT0FBcUI7UUFDOUQsS0FBSyxDQUFDLE9BQU8sRUFBRSxPQUFPLENBQUMsQ0FBQztRQUN4QixJQUFJLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQyxXQUFXLENBQUMsSUFBSSxDQUFDO1FBQ2xDLElBQUksQ0FBQyxJQUFJLEdBQUcsSUFBSSxDQUFDO1FBQ2pCLEtBQUssQ0FBQyxpQkFBaUIsQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLFdBQVcsQ0FBQyxDQUFDO0lBQ2xELENBQUM7Q0FDRjtBQVRELHNFQVNDIn0= |
@@ -1,2 +0,1 @@ | ||
/// <reference types="node" /> | ||
import type { Except } from 'type-fest'; | ||
@@ -3,0 +2,0 @@ import type { IncomingHttpHeaders as HTTPIncomingHttpHeaders } from 'node:http'; |
"use strict"; | ||
Object.defineProperty(exports, "__esModule", { value: true }); | ||
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSW5jb21pbmdIdHRwSGVhZGVycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9JbmNvbWluZ0h0dHBIZWFkZXJzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiIifQ== |
@@ -16,11 +16,11 @@ "use strict"; | ||
}; | ||
var __importDefault = (this && this.__importDefault) || function (mod) { | ||
return (mod && mod.__esModule) ? mod : { "default": mod }; | ||
}; | ||
Object.defineProperty(exports, "__esModule", { value: true }); | ||
exports.USER_AGENT = exports.HttpClient2 = exports.HttpClient = exports.getGlobalDispatcher = exports.setGlobalDispatcher = exports.Dispatcher = exports.Agent = exports.ProxyAgent = exports.MockAgent = exports.curl = exports.request = exports.getDefaultHttpClient = void 0; | ||
const ylru_1 = __importDefault(require("ylru")); | ||
exports.USER_AGENT = exports.HttpClient2 = exports.HttpClient = exports.getGlobalDispatcher = exports.setGlobalDispatcher = exports.Dispatcher = exports.Agent = exports.ProxyAgent = exports.MockAgent = void 0; | ||
exports.getDefaultHttpClient = getDefaultHttpClient; | ||
exports.request = request; | ||
exports.curl = curl; | ||
const ylru_1 = require("ylru"); | ||
const HttpClient_js_1 = require("./HttpClient.js"); | ||
let httpClient; | ||
const domainSocketHttpClients = new ylru_1.default(50); | ||
const domainSocketHttpClients = new ylru_1.LRU(50); | ||
function getDefaultHttpClient() { | ||
@@ -32,3 +32,2 @@ if (!httpClient) { | ||
} | ||
exports.getDefaultHttpClient = getDefaultHttpClient; | ||
async function request(url, options) { | ||
@@ -47,3 +46,2 @@ if (options?.socketPath) { | ||
} | ||
exports.request = request; | ||
// export curl method is keep compatible with urllib.curl() | ||
@@ -57,3 +55,2 @@ // ```ts | ||
} | ||
exports.curl = curl; | ||
var undici_1 = require("undici"); | ||
@@ -77,1 +74,2 @@ Object.defineProperty(exports, "MockAgent", { enumerable: true, get: function () { return undici_1.MockAgent; } }); | ||
}; | ||
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFPQSxvREFLQztBQUVELDBCQWFDO0FBT0Qsb0JBRUM7QUFwQ0QsK0JBQTJCO0FBQzNCLG1EQUFnRTtBQUdoRSxJQUFJLFVBQXNCLENBQUM7QUFDM0IsTUFBTSx1QkFBdUIsR0FBRyxJQUFJLFVBQUcsQ0FBQyxFQUFFLENBQUMsQ0FBQztBQUU1QyxTQUFnQixvQkFBb0I7SUFDbEMsSUFBSSxDQUFDLFVBQVUsRUFBRSxDQUFDO1FBQ2hCLFVBQVUsR0FBRyxJQUFJLDBCQUFVLEVBQUUsQ0FBQztJQUNoQyxDQUFDO0lBQ0QsT0FBTyxVQUFVLENBQUM7QUFDcEIsQ0FBQztBQUVNLEtBQUssVUFBVSxPQUFPLENBQVUsR0FBZSxFQUFFLE9BQXdCO0lBQzlFLElBQUksT0FBTyxFQUFFLFVBQVUsRUFBRSxDQUFDO1FBQ3hCLElBQUksc0JBQXNCLEdBQUcsdUJBQXVCLENBQUMsR0FBRyxDQUFhLE9BQU8sQ0FBQyxVQUFVLENBQUMsQ0FBQztRQUN6RixJQUFJLENBQUMsc0JBQXNCLEVBQUUsQ0FBQztZQUM1QixzQkFBc0IsR0FBRyxJQUFJLDBCQUFVLENBQUM7Z0JBQ3RDLE9BQU8sRUFBRSxFQUFFLFVBQVUsRUFBRSxPQUFPLENBQUMsVUFBVSxFQUFFO2FBQzVDLENBQUMsQ0FBQztZQUNILHVCQUF1QixDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsVUFBVSxFQUFFLHNCQUFzQixDQUFDLENBQUM7UUFDMUUsQ0FBQztRQUNELE9BQU8sTUFBTSxzQkFBc0IsQ0FBQyxPQUFPLENBQUksR0FBRyxFQUFFLE9BQU8sQ0FBQyxDQUFDO0lBQy9ELENBQUM7SUFFRCxPQUFPLE1BQU0sb0JBQW9CLEVBQUUsQ0FBQyxPQUFPLENBQUksR0FBRyxFQUFFLE9BQU8sQ0FBQyxDQUFDO0FBQy9ELENBQUM7QUFFRCwyREFBMkQ7QUFDM0QsUUFBUTtBQUNSLG9DQUFvQztBQUNwQyxvQkFBb0I7QUFDcEIsTUFBTTtBQUNDLEtBQUssVUFBVSxJQUFJLENBQVUsR0FBZSxFQUFFLE9BQXdCO0lBQzNFLE9BQU8sTUFBTSxPQUFPLENBQUksR0FBRyxFQUFFLE9BQU8sQ0FBQyxDQUFDO0FBQ3hDLENBQUM7QUFFRCxpQ0FHZ0I7QUFGZCxtR0FBQSxTQUFTLE9BQUE7QUFBRSxvR0FBQSxVQUFVLE9BQUE7QUFBRSwrRkFBQSxLQUFLLE9BQUE7QUFBRSxvR0FBQSxVQUFVLE9BQUE7QUFDeEMsNkdBQUEsbUJBQW1CLE9BQUE7QUFBRSw2R0FBQSxtQkFBbUIsT0FBQTtBQUUxQywyREFBMkQ7QUFDM0QsaURBR3lCO0FBRnZCLDJHQUFBLFVBQVUsT0FBQTtBQUFFLDRHQUFBLFVBQVUsT0FBZTtBQUFFLDJHQUFBLGlCQUFpQixPQUFjO0FBZXhFLHVEQUFxQztBQUVyQyxrQkFBZTtJQUNiLE9BQU87SUFDUCxJQUFJO0lBQ0osVUFBVSxFQUFFLGlDQUFpQjtDQUM5QixDQUFDIn0= |
@@ -1,5 +0,1 @@ | ||
/// <reference types="node" /> | ||
/// <reference types="node" /> | ||
/// <reference types="node" /> | ||
/// <reference types="node" /> | ||
import type { Readable, Writable } from 'node:stream'; | ||
@@ -6,0 +2,0 @@ import type { EventEmitter } from 'node:events'; |
"use strict"; | ||
Object.defineProperty(exports, "__esModule", { value: true }); | ||
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVxdWVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9SZXF1ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiIifQ== |
@@ -1,2 +0,1 @@ | ||
/// <reference types="node" /> | ||
import type { Readable } from 'node:stream'; | ||
@@ -3,0 +2,0 @@ import type { IncomingHttpHeaders } from './IncomingHttpHeaders.js'; |
"use strict"; | ||
Object.defineProperty(exports, "__esModule", { value: true }); | ||
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVzcG9uc2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvUmVzcG9uc2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiJ9 |
@@ -24,1 +24,2 @@ "use strict"; | ||
}; | ||
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3ltYm9scy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zeW1ib2xzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsa0JBQWU7SUFDYixTQUFTLEVBQUUsTUFBTSxDQUFDLFdBQVcsQ0FBQztJQUM5QixnQkFBZ0IsRUFBRSxNQUFNLENBQUMsbUJBQW1CLENBQUM7SUFDN0Msb0JBQW9CLEVBQUUsTUFBTSxDQUFDLHVCQUF1QixDQUFDO0lBQ3JELHVCQUF1QixFQUFFLE1BQU0sQ0FBQywwQkFBMEIsQ0FBQztJQUMzRCxxQkFBcUIsRUFBRSxNQUFNLENBQUMseUJBQXlCLENBQUM7SUFDeEQsbUJBQW1CLEVBQUUsTUFBTSxDQUFDLHNCQUFzQixDQUFDO0lBQ25ELGdCQUFnQixFQUFFLE1BQU0sQ0FBQyxtQkFBbUIsQ0FBQztJQUM3QyxrQkFBa0IsRUFBRSxNQUFNLENBQUMsNkJBQTZCLENBQUM7SUFDekQsa0JBQWtCLEVBQUUsTUFBTSxDQUFDLDZCQUE2QixDQUFDO0lBQ3pELHNCQUFzQixFQUFFLE1BQU0sQ0FBQyxpQ0FBaUMsQ0FBQztJQUNqRSxnQkFBZ0IsRUFBRSxNQUFNLENBQUMsNkJBQTZCLENBQUM7SUFDdkQsaUJBQWlCLEVBQUUsTUFBTSxDQUFDLDhCQUE4QixDQUFDO0lBQ3pELGNBQWMsRUFBRSxNQUFNLENBQUMsdUJBQXVCLENBQUM7SUFDL0MsVUFBVSxFQUFFLE1BQU0sQ0FBQyxZQUFZLENBQUM7SUFDaEMsaUJBQWlCLEVBQUUsTUFBTSxDQUFDLG9CQUFvQixDQUFDO0lBQy9DLG9CQUFvQixFQUFFLE1BQU0sQ0FBQyw4QkFBOEIsQ0FBQztJQUM1RCxjQUFjLEVBQUUsTUFBTSxDQUFDLGdCQUFnQixDQUFDO0lBQ3hDLHNCQUFzQixFQUFFLE1BQU0sQ0FBQyx5QkFBeUIsQ0FBQztJQUN6RCxZQUFZLEVBQUUsTUFBTSxDQUFDLGlCQUFpQixDQUFDO0NBQ3hDLENBQUMifQ== |
import type { FixJSONCtlChars } from './Request.js'; | ||
export declare function parseJSON(data: string, fixJSONCtlChars?: FixJSONCtlChars): string; | ||
export declare function sleep(ms: number): Promise<void>; | ||
export declare function digestAuthHeader(method: string, uri: string, wwwAuthenticate: string, userpass: string): string; | ||
@@ -5,0 +4,0 @@ export declare function globalId(category: string): number; |
"use strict"; | ||
Object.defineProperty(exports, "__esModule", { value: true }); | ||
exports.isReadable = exports.performanceTime = exports.globalId = exports.digestAuthHeader = exports.sleep = exports.parseJSON = void 0; | ||
exports.parseJSON = parseJSON; | ||
exports.digestAuthHeader = digestAuthHeader; | ||
exports.globalId = globalId; | ||
exports.performanceTime = performanceTime; | ||
exports.isReadable = isReadable; | ||
const node_crypto_1 = require("node:crypto"); | ||
@@ -52,9 +56,2 @@ const node_stream_1 = require("node:stream"); | ||
} | ||
exports.parseJSON = parseJSON; | ||
function sleep(ms) { | ||
return new Promise(resolve => { | ||
setTimeout(resolve, ms); | ||
}); | ||
} | ||
exports.sleep = sleep; | ||
function md5(s) { | ||
@@ -127,3 +124,2 @@ const sum = (0, node_crypto_1.createHash)('md5'); | ||
} | ||
exports.digestAuthHeader = digestAuthHeader; | ||
const MAX_ID_VALUE = Math.pow(2, 31) - 10; | ||
@@ -137,7 +133,5 @@ const globalIds = {}; | ||
} | ||
exports.globalId = globalId; | ||
function performanceTime(startTime, now) { | ||
return Math.floor(((now ?? node_perf_hooks_1.performance.now()) - startTime) * 1000) / 1000; | ||
} | ||
exports.performanceTime = performanceTime; | ||
function isReadable(stream) { | ||
@@ -156,2 +150,2 @@ if (typeof node_stream_1.Readable.isReadable === 'function') | ||
} | ||
exports.isReadable = isReadable; | ||
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUF5QkEsOEJBd0JDO0FBWUQsNENBOERDO0FBS0QsNEJBS0M7QUFFRCwwQ0FFQztBQUVELGdDQVdDO0FBdEpELDZDQUFzRDtBQUN0RCw2Q0FBdUM7QUFDdkMscURBQThDO0FBRzlDLE1BQU0sZUFBZSxHQUEyQjtJQUM5QyxHQUFHLEVBQUUsS0FBSyxFQUFFLFNBQVM7SUFDckIsSUFBSSxFQUFFLE1BQU0sRUFBRSxTQUFTO0lBQ3ZCLElBQUksRUFBRSxLQUFLLEVBQUUsU0FBUztJQUN0QixJQUFJLEVBQUUsS0FBSyxFQUFFLFNBQVM7SUFDdEIsSUFBSSxFQUFFLEtBQUssRUFBRSxTQUFTO0lBQ3RCLElBQUksRUFBRSxLQUFLLEVBQUUsU0FBUztJQUN0QixJQUFJLEVBQUUsS0FBSyxFQUFFLFNBQVM7Q0FDdkIsQ0FBQztBQUNGLG1DQUFtQztBQUNuQyxNQUFNLGNBQWMsR0FBRyx3QkFBd0IsQ0FBQztBQUVoRCxTQUFTLGNBQWMsQ0FBQyxDQUFTO0lBQy9CLE9BQU8sZUFBZSxDQUFDLENBQUMsQ0FBQyxJQUFJLEtBQUssR0FBRyxDQUFDLENBQUMsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDLEdBQUcsT0FBTyxDQUFDLENBQUMsUUFBUSxDQUFDLEVBQUUsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUM3RixDQUFDO0FBRUQsU0FBUyxtQkFBbUIsQ0FBQyxLQUFhO0lBQ3hDLE9BQU8sS0FBSyxDQUFDLE9BQU8sQ0FBQyxjQUFjLEVBQUUsY0FBYyxDQUFDLENBQUM7QUFDdkQsQ0FBQztBQUVELFNBQWdCLFNBQVMsQ0FBQyxJQUFZLEVBQUUsZUFBaUM7SUFDdkUsSUFBSSxPQUFPLGVBQWUsS0FBSyxVQUFVLEVBQUUsQ0FBQztRQUMxQyxJQUFJLEdBQUcsZUFBZSxDQUFDLElBQUksQ0FBQyxDQUFDO0lB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 |
@@ -20,9 +20,3 @@ import diagnosticsChannel from 'node:diagnostics_channel'; | ||
function subscribe(name, listener) { | ||
if (typeof diagnosticsChannel.subscribe === 'function') { | ||
diagnosticsChannel.subscribe(name, listener); | ||
} | ||
else { | ||
// TODO: support Node.js 14, will be removed on the next major version | ||
diagnosticsChannel.channel(name).subscribe(listener); | ||
} | ||
diagnosticsChannel.subscribe(name, listener); | ||
} | ||
@@ -42,4 +36,3 @@ function formatSocket(socket) { | ||
// make sure error contains socket info | ||
const kDestroy = Symbol('kDestroy'); | ||
Socket.prototype[kDestroy] = Socket.prototype.destroy; | ||
const destroySocket = Socket.prototype.destroy; | ||
Socket.prototype.destroy = function (err) { | ||
@@ -53,3 +46,3 @@ if (err) { | ||
} | ||
return this[kDestroy](err); | ||
return destroySocket.call(this, err); | ||
}; | ||
@@ -59,3 +52,3 @@ function getRequestOpaque(request, kHandler) { | ||
return; | ||
const handler = request[kHandler]; | ||
const handler = Reflect.get(request, kHandler); | ||
// maxRedirects = 0 will get [Symbol(handler)]: RequestHandler { | ||
@@ -73,3 +66,3 @@ // responseHeaders: null, | ||
export function initDiagnosticsChannel() { | ||
// makre sure init global DiagnosticsChannel once | ||
// make sure init global DiagnosticsChannel once | ||
if (initedDiagnosticsChannel) | ||
@@ -101,23 +94,22 @@ return; | ||
}); | ||
// diagnosticsChannel.channel('undici:client:beforeConnect') | ||
subscribe('undici:client:connectError', (message, name) => { | ||
const { error, connectParams } = message; | ||
let { socket } = message; | ||
if (!socket && error[symbols.kErrorSocket]) { | ||
socket = error[symbols.kErrorSocket]; | ||
const { error, connectParams, socket } = message; | ||
let sock = socket; | ||
if (!sock && error[symbols.kErrorSocket]) { | ||
sock = error[symbols.kErrorSocket]; | ||
} | ||
if (socket) { | ||
socket[symbols.kSocketId] = globalId('UndiciSocket'); | ||
socket[symbols.kSocketConnectErrorTime] = new Date(); | ||
socket[symbols.kHandledRequests] = 0; | ||
socket[symbols.kHandledResponses] = 0; | ||
if (sock) { | ||
sock[symbols.kSocketId] = globalId('UndiciSocket'); | ||
sock[symbols.kSocketConnectErrorTime] = new Date(); | ||
sock[symbols.kHandledRequests] = 0; | ||
sock[symbols.kHandledResponses] = 0; | ||
// copy local address to symbol, avoid them be reset after request error throw | ||
if (socket.localAddress) { | ||
socket[symbols.kSocketLocalAddress] = socket.localAddress; | ||
socket[symbols.kSocketLocalPort] = socket.localPort; | ||
if (sock.localAddress) { | ||
sock[symbols.kSocketLocalAddress] = sock.localAddress; | ||
sock[symbols.kSocketLocalPort] = sock.localPort; | ||
} | ||
socket[symbols.kSocketConnectProtocol] = connectParams.protocol; | ||
socket[symbols.kSocketConnectHost] = connectParams.host; | ||
socket[symbols.kSocketConnectPort] = connectParams.port; | ||
debug('[%s] Socket#%d connectError, connectParams: %o, error: %s, (sock: %o)', name, socket[symbols.kSocketId], connectParams, error.message, formatSocket(socket)); | ||
sock[symbols.kSocketConnectProtocol] = connectParams.protocol; | ||
sock[symbols.kSocketConnectHost] = connectParams.host; | ||
sock[symbols.kSocketConnectPort] = connectParams.port; | ||
debug('[%s] Socket#%d connectError, connectParams: %o, error: %s, (sock: %o)', name, sock[symbols.kSocketId], connectParams, error.message, formatSocket(sock)); | ||
} | ||
@@ -157,3 +149,3 @@ else { | ||
opaque[symbols.kRequestTiming].requestHeadersSent = performanceTime(opaque[symbols.kRequestStartTime]); | ||
// first socket need to caculate the connected time | ||
// first socket need to calculate the connected time | ||
if (socket[symbols.kHandledRequests] === 1) { | ||
@@ -217,1 +209,2 @@ // kSocketStartTime - kRequestStartTime = connected time | ||
} | ||
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"diagnosticsChannel.js","sourceRoot":"","sources":["../../src/diagnosticsChannel.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,OAAO,OAAO,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAEvD,MAAM,KAAK,GAAG,QAAQ,CAAC,2BAA2B,CAAC,CAAC;AACpD,IAAI,wBAAwB,GAAG,KAAK,CAAC;AACrC,0DAA0D;AAC1D,oBAAoB;AACpB,uCAAuC;AACvC,2FAA2F;AAC3F,wDAAwD;AACxD,gDAAgD;AAChD,EAAE;AACF,oBAAoB;AACpB,kDAAkD;AAClD,wDAAwD;AAExD,SAAS,SAAS,CAAC,IAAY,EAAE,QAAkE;IACjG,kBAAkB,CAAC,SAAS,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;AAC/C,CAAC;AAMD,SAAS,YAAY,CAAC,MAAoB;IACxC,IAAI,CAAC,MAAM;QAAE,OAAO,MAAM,CAAC;IAC3B,OAAO;QACL,YAAY,EAAE,MAAM,CAAC,OAAO,CAAC,mBAAmB,CAAC;QACjD,SAAS,EAAE,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC;QAC3C,aAAa,EAAE,MAAM,CAAC,aAAa;QACnC,UAAU,EAAE,MAAM,CAAC,UAAU;QAC7B,kBAAkB,EAAE,MAAM,CAAC,kCAAkC;QAC7D,UAAU,EAAE,MAAM,CAAC,UAAU;KAC9B,CAAC;AACJ,CAAC;AAED,uCAAuC;AACvC,MAAM,aAAa,GAAG,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC;AAC/C,MAAM,CAAC,SAAS,CAAC,OAAO,GAAG,UAAS,GAAS;IAC3C,IAAI,GAAG,EAAE,CAAC;QACR,MAAM,CAAC,cAAc,CAAC,GAAG,EAAE,OAAO,CAAC,YAAY,EAAE;YAC/C,4BAA4B;YAC5B,UAAU,EAAE,KAAK;YACjB,KAAK,EAAE,IAAI;SACZ,CAAC,CAAC;IACL,CAAC;IACD,OAAO,aAAa,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;AACvC,CAAC,CAAC;AAEF,SAAS,gBAAgB,CAAC,OAAmC,EAAE,QAAiB;IAC9E,IAAI,CAAC,QAAQ;QAAE,OAAO;IACtB,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IAC/C,gEAAgE;IAChE,yBAAyB;IACzB,YAAY;IACZ,6BAA6B;IAC7B,qDAAqD;IACrD,kDAAkD;IAClD,wCAAwC;IACxC,iDAAiD;IACjD,IAAI;IACJ,OAAO,OAAO,EAAE,IAAI,EAAE,MAAM,IAAI,OAAO,EAAE,MAAM,CAAC;AAClD,CAAC;AAED,MAAM,UAAU,sBAAsB;IACpC,gDAAgD;IAChD,IAAI,wBAAwB;QAAE,OAAO;IACrC,wBAAwB,GAAG,IAAI,CAAC;IAEhC,IAAI,QAAgB,CAAC;IACrB,oEAAoE;IACpE,+DAA+D;IAC/D,SAAS,CAAC,uBAAuB,EAAE,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE;QACnD,MAAM,EAAE,OAAO,EAAE,GAAG,OAAkD,CAAC;QACvE,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,OAAO,GAAG,MAAM,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC;YACtD,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;gBAC7B,IAAI,MAAM,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;oBACrC,QAAQ,GAAG,MAAM,CAAC;oBAClB,MAAM;gBACR,CAAC;YACH,CAAC;QACH,CAAC;QACD,MAAM,MAAM,GAAG,gBAAgB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QACnD,gCAAgC;QAChC,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC;YAAE,OAAO;QACnD,KAAK,CAAC,8CAA8C,EAClD,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QACnG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,oBAAoB,CAAC;YAAE,OAAO;QAClD,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,OAAO,GAAG,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC;IAC9F,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,4BAA4B,EAAE,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE;QACxD,MAAM,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,EAAE,GAAG,OAA8F,CAAC;QACxI,IAAI,IAAI,GAAG,MAAM,CAAC;QAClB,IAAI,CAAC,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;YACzC,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QACrC,CAAC;QACD,IAAI,IAAI,EAAE,CAAC;YACT,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,QAAQ,CAAC,cAAc,CAAC,CAAC;YACnD,IAAI,CAAC,OAAO,CAAC,uBAAuB,CAAC,GAAG,IAAI,IAAI,EAAE,CAAC;YACnD,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;YACnC,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;YACpC,8EAA8E;YAC9E,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;gBACtB,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,GAAG,IAAI,CAAC,YAAY,CAAC;gBACtD,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC;YAClD,CAAC;YACD,IAAI,CAAC,OAAO,CAAC,sBAAsB,CAAC,GAAG,aAAa,CAAC,QAAQ,CAAC;YAC9D,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,GAAG,aAAa,CAAC,IAAI,CAAC;YACtD,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,GAAG,aAAa,CAAC,IAAI,CAAC;YACtD,KAAK,CAAC,uEAAuE,EAC3E,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,aAAa,EAAG,KAAe,CAAC,OAAO,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC;QAChG,CAAC;aAAM,CAAC;YACN,KAAK,CAAC,iDAAiD,EACrD,IAAI,EAAE,aAAa,EAAE,KAAK,CAAC,CAAC;QAChC,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,+DAA+D;IAC/D,SAAS,CAAC,yBAAyB,EAAE,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE;QACrD,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,OAA+E,CAAC;QAClH,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,QAAQ,CAAC,cAAc,CAAC,CAAC;QACrD,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC;QACrD,MAAM,CAAC,OAAO,CAAC,oBAAoB,CAAC,GAAG,IAAI,IAAI,EAAE,CAAC;QAClD,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;QACrC,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;QACtC,8EAA8E;QAC9E,MAAM,CAAC,OAAO,CAAC,mBAAmB,CAAC,GAAG,MAAM,CAAC,YAAY,CAAC;QAC1D,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,GAAG,MAAM,CAAC,SAAS,CAAC;QACpD,MAAM,CAAC,OAAO,CAAC,sBAAsB,CAAC,GAAG,aAAa,CAAC,QAAQ,CAAC;QAChE,MAAM,CAAC,OAAO,CAAC,kBAAkB,CAAC,GAAG,aAAa,CAAC,IAAI,CAAC;QACxD,MAAM,CAAC,OAAO,CAAC,kBAAkB,CAAC,GAAG,aAAa,CAAC,IAAI,CAAC;QACxD,KAAK,CAAC,qCAAqC,EAAE,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC;IACtG,CAAC,CAAC,CAAC;IAEH,iGAAiG;IACjG,SAAS,CAAC,2BAA2B,EAAE,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE;QACvD,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAiF,CAAC;QAC9G,MAAM,MAAM,GAAG,gBAAgB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QACnD,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC;YAAE,OAAO;QAElD,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAY,EAAE,CAAC;QAC/C,0BAA0B;QAC1B,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,MAAM,CAAC;QACxC,KAAK,CAAC,2EAA2E,EAC/E,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAC7F,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC;QAExB,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,oBAAoB,CAAC;YAAE,OAAO;QAClD,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,kBAAkB,GAAG,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC;QACvG,oDAAoD;QACpD,IAAI,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE,CAAC;YAC3C,wDAAwD;YACxD,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,SAAS;gBACtC,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAW,CAAC,CAAC;QACnG,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,yBAAyB,EAAE,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE;QACrD,MAAM,EAAE,OAAO,EAAE,GAAG,OAAoD,CAAC;QACzE,MAAM,MAAM,GAAG,gBAAgB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QACnD,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC;YAAE,OAAO;QAEnD,KAAK,CAAC,2BAA2B,EAAE,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;QACrE,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,oBAAoB,CAAC;YAAE,OAAO;QAClD,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,WAAW,GAAG,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC;IAClG,CAAC,CAAC,CAAC;IAEH,iHAAiH;IACjH,SAAS,CAAC,wBAAwB,EAAE,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE;QACpD,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,OAAmD,CAAC;QAClF,MAAM,MAAM,GAAG,gBAAgB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QACnD,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC;YAAE,OAAO;QAEnD,yBAAyB;QACzB,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QAC9C,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE,CAAC;YACpC,KAAK,CAAC,uFAAuF,EAC3F,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,EACnH,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC;QAC1B,CAAC;aAAM,CAAC;YACN,KAAK,CAAC,2DAA2D,EAC/D,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC;QAC3D,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,oBAAoB,CAAC;YAAE,OAAO;QAClD,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,OAAO,GAAG,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC;IAC9F,CAAC,CAAC,CAAC;IAEH,2HAA2H;IAC3H,SAAS,CAAC,yBAAyB,EAAE,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE;QACrD,MAAM,EAAE,OAAO,EAAE,GAAG,OAAoD,CAAC;QACzE,MAAM,MAAM,GAAG,gBAAgB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QACnD,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;YAC3C,OAAO;QACT,CAAC;QAED,KAAK,CAAC,gDAAgD,EAAE,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;QAE1F,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,oBAAoB,CAAC;YAAE,OAAO;QAClD,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,eAAe,GAAG,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC;IACtG,CAAC,CAAC,CAAC;IAEH,0FAA0F;IAC1F,yDAAyD;IACzD,kFAAkF;IAClF,oDAAoD;IACpD,wDAAwD;IACxD,mDAAmD;IACnD,4FAA4F;IAC5F,sGAAsG;IACtG,oCAAoC;IACpC,MAAM;AACR,CAAC"} |
@@ -1,2 +0,1 @@ | ||
/// <reference types="node" resolution-mode="require"/> | ||
import { LookupFunction } from 'node:net'; | ||
@@ -3,0 +2,0 @@ import { Agent, Dispatcher, buildConnector } from 'undici'; |
@@ -74,1 +74,2 @@ import dns from 'node:dns'; | ||
} | ||
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSHR0cEFnZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0h0dHBBZ2VudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEdBQUcsTUFBTSxVQUFVLENBQUM7QUFDM0IsT0FBTyxFQUFrQixJQUFJLEVBQUUsTUFBTSxVQUFVLENBQUM7QUFDaEQsT0FBTyxFQUNMLEtBQUssR0FHTixNQUFNLFFBQVEsQ0FBQztBQVVoQixNQUFNLG1CQUFvQixTQUFRLEtBQUs7SUFDckMsUUFBUSxDQUFTO0lBQ2pCLEVBQUUsQ0FBUztJQUNYLE1BQU0sQ0FBUztJQUVmLFlBQVksUUFBZ0IsRUFBRSxFQUFVLEVBQUUsTUFBYztRQUN0RCxNQUFNLE9BQU8sR0FBRyxpQkFBaUIsQ0FBQztRQUNsQyxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDZixJQUFJLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQyxXQUFXLENBQUMsSUFBSSxDQUFDO1FBQ2xDLElBQUksQ0FBQyxRQUFRLEdBQUcsUUFBUSxDQUFDO1FBQ3pCLElBQUksQ0FBQyxFQUFFLEdBQUcsRUFBRSxDQUFDO1FBQ2IsSUFBSSxDQUFDLE1BQU0sR0FBRyxNQUFNLENBQUM7UUFDckIsS0FBSyxDQUFDLGlCQUFpQixDQUFDLElBQUksRUFBRSxJQUFJLENBQUMsV0FBVyxDQUFDLENBQUM7SUFDbEQsQ0FBQztDQUNGO0FBRUQsTUFBTSxPQUFPLFNBQVUsU0FBUSxLQUFLO0lBQ2xDLGFBQWEsQ0FBd0I7SUFFckMsWUFBWSxPQUF5QjtRQUNuQyx5Q0FBeUM7UUFDekMsTUFBTSxPQUFPLEdBQUcsT0FBTyxDQUFDLE1BQU0sSUFBSSxHQUFHLENBQUMsTUFBTSxDQUFDO1FBQzdDLE1BQU0sTUFBTSxHQUFtQixDQUFDLFFBQVEsRUFBRSxVQUFVLEVBQUUsUUFBUSxFQUFFLEVBQUU7WUFDaEUsT0FBTyxDQUFDLFFBQVEsRUFBRSxVQUFVLEVBQUUsQ0FBQyxHQUFHLEVBQUUsR0FBRyxJQUFX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 |
@@ -1,4 +0,1 @@ | ||
/// <reference types="node" resolution-mode="require"/> | ||
/// <reference types="node" resolution-mode="require"/> | ||
/// <reference types="node" resolution-mode="require"/> | ||
import { EventEmitter } from 'node:events'; | ||
@@ -44,2 +41,3 @@ import { LookupFunction } from 'node:net'; | ||
}; | ||
export declare const VERSION = "VERSION"; | ||
export declare const HEADER_USER_AGENT: string; | ||
@@ -46,0 +44,0 @@ export type RequestContext = { |
@@ -8,3 +8,3 @@ import diagnosticsChannel from 'node:diagnostics_channel'; | ||
import { Readable, pipeline } from 'node:stream'; | ||
import stream from 'node:stream'; | ||
import { pipeline as pipelinePromise } from 'node:stream/promises'; | ||
import { basename } from 'node:path'; | ||
@@ -15,14 +15,13 @@ import { createReadStream } from 'node:fs'; | ||
import querystring from 'node:querystring'; | ||
import { FormData as FormDataNative, request as undiciRequest, Agent, getGlobalDispatcher, } from 'undici'; | ||
import { setTimeout as sleep } from 'node:timers/promises'; | ||
import { FormData, request as undiciRequest, Agent, getGlobalDispatcher, } from 'undici'; | ||
// eslint-disable-next-line @typescript-eslint/ban-ts-comment | ||
// @ts-ignore | ||
import undiciSymbols from 'undici/lib/core/symbols.js'; | ||
import { FormData as FormDataNode } from 'formdata-node'; | ||
import { FormDataEncoder } from 'form-data-encoder'; | ||
import createUserAgent from 'default-user-agent'; | ||
import mime from 'mime-types'; | ||
import qs from 'qs'; | ||
import pump from 'pump'; | ||
// Compatible with old style formstream | ||
import FormStream from 'formstream'; | ||
import { HttpAgent } from './HttpAgent.js'; | ||
import { parseJSON, sleep, digestAuthHeader, globalId, performanceTime, isReadable } from './utils.js'; | ||
import { parseJSON, digestAuthHeader, globalId, performanceTime, isReadable } from './utils.js'; | ||
import symbols from './symbols.js'; | ||
@@ -32,13 +31,2 @@ import { initDiagnosticsChannel } from './diagnosticsChannel.js'; | ||
const PROTO_RE = /^https?:\/\//i; | ||
const FormData = FormDataNative ?? FormDataNode; | ||
// impl promise pipeline on Node.js 14 | ||
const pipelinePromise = stream.promises?.pipeline ?? function pipeline(...args) { | ||
return new Promise((resolve, reject) => { | ||
pump(...args, (err) => { | ||
if (err) | ||
return reject(err); | ||
resolve(); | ||
}); | ||
}); | ||
}; | ||
function noop() { | ||
@@ -48,4 +36,2 @@ // noop | ||
const debug = debuglog('urllib:HttpClient'); | ||
// Node.js 14 or 16 | ||
const isNode14Or16 = /v1[46]\./.test(process.version); | ||
// https://github.com/octet-stream/form-data | ||
@@ -69,3 +55,5 @@ class BlobFromStream { | ||
} | ||
export const HEADER_USER_AGENT = createUserAgent('node-urllib', '3.25.1'); | ||
export const VERSION = '4.0.0'; | ||
// 'node-urllib/4.0.0 Node.js/18.19.0 (darwin; x64)' | ||
export const HEADER_USER_AGENT = `node-urllib/${VERSION} Node.js/${process.version.substring(1)} (${process.platform}; ${process.arch})`; | ||
function getFileName(stream) { | ||
@@ -114,3 +102,3 @@ const filePath = stream.path; | ||
// origin => Pool Instance | ||
const clients = agent[undiciSymbols.kClients]; | ||
const clients = Reflect.get(agent, undiciSymbols.kClients); | ||
const poolStatsMap = {}; | ||
@@ -121,3 +109,3 @@ if (!clients) { | ||
for (const [key, ref] of clients) { | ||
const pool = ref.deref(); | ||
const pool = typeof ref.deref === 'function' ? ref.deref() : ref; | ||
const stats = pool?.stats; | ||
@@ -359,5 +347,7 @@ if (!stats) | ||
else if (typeof args.files === 'object') { | ||
for (const field in args.files) { | ||
const files = args.files; | ||
for (const field in files) { | ||
// set custom fileName | ||
uploadFiles.push([field, args.files[field], field]); | ||
const file = files[field]; | ||
uploadFiles.push([field, file, field]); | ||
} | ||
@@ -389,14 +379,3 @@ } | ||
} | ||
if (FormDataNative) { | ||
requestOptions.body = formData; | ||
} | ||
else { | ||
// Node.js 14 does not support spec-compliant FormData | ||
// https://github.com/octet-stream/form-data#usage | ||
const encoder = new FormDataEncoder(formData); | ||
Object.assign(headers, encoder.headers); | ||
// fix "Content-Length":"NaN" | ||
delete headers['Content-Length']; | ||
requestOptions.body = Readable.from(encoder); | ||
} | ||
requestOptions.body = formData; | ||
} | ||
@@ -524,5 +503,2 @@ else if (args.content) { | ||
else if (args.writeStream) { | ||
if (isNode14Or16 && args.writeStream.destroyed) { | ||
throw new Error('writeStream is destroyed'); | ||
} | ||
if (args.compressed === true && isCompressedContent) { | ||
@@ -696,1 +672,2 @@ const decoder = contentEncoding === 'gzip' ? createGunzip() : createBrotliDecompress(); | ||
} | ||
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"HttpClient.js","sourceRoot":"","sources":["../../src/HttpClient.ts"],"names":[],"mappings":"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"} |
@@ -24,1 +24,2 @@ export class HttpClientRequestError extends Error { | ||
} | ||
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSHR0cENsaWVudEVycm9yLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0h0dHBDbGllbnRFcnJvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFRQSxNQUFNLE9BQU8sc0JBQXVCLFNBQVEsS0FBSztJQUMvQyxNQUFNLENBQVU7SUFDaEIsT0FBTyxDQUF1QjtJQUM5QixNQUFNLENBQWM7SUFDcEIsR0FBRyxDQUF1QjtDQUMzQjtBQUVELE1BQU0sT0FBTyw2QkFBOEIsU0FBUSxzQkFBc0I7SUFDdkUsWUFBWSxPQUFlLEVBQUUsT0FBcUI7UUFDaEQsTUFBTSxPQUFPLEdBQUcsdUJBQXVCLE9BQU8sS0FBSyxDQUFDO1FBQ3BELEtBQUssQ0FBQyxPQUFPLEVBQUUsT0FBTyxDQUFDLENBQUM7UUFDeEIsSUFBSSxDQUFDLElBQUksR0FBRyxJQUFJLENBQUMsV0FBVyxDQUFDLElBQUksQ0FBQztRQUNsQyxLQUFLLENBQUMsaUJBQWlCLENBQUMsSUFBSSxFQUFFLElBQUksQ0FBQyxXQUFXLENBQUMsQ0FBQztJQUNsRCxDQUFDO0NBQ0Y7QUFFRCxNQUFNLE9BQU8sNkJBQThCLFNBQVEsc0JBQXNCO0lBQ3ZFLElBQUksQ0FBUztJQUViLFlBQVksT0FBZSxFQUFFLElBQVksRUFBRSxPQUFxQjtRQUM5RCxLQUFLLENBQUMsT0FBTyxFQUFFLE9BQU8sQ0FBQyxDQUFDO1FBQ3hCLElBQUksQ0FBQyxJQUFJLEdBQUcsSUFBSSxDQUFDLFdBQVcsQ0FBQyxJQUFJLENBQUM7UUFDbEMsSUFBSSxDQUFDLElBQUksR0FBRyxJQUFJLENBQUM7UUFDakIsS0FBSyxDQUFDLGlCQUFpQixDQUFDLElBQUksRUFBRSxJQUFJLENBQUMsV0FBVyxDQUFDLENBQUM7SUFDbEQsQ0FBQztDQUNGIn0= |
@@ -1,2 +0,1 @@ | ||
/// <reference types="node" resolution-mode="require"/> | ||
import type { Except } from 'type-fest'; | ||
@@ -3,0 +2,0 @@ import type { IncomingHttpHeaders as HTTPIncomingHttpHeaders } from 'node:http'; |
export {}; | ||
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSW5jb21pbmdIdHRwSGVhZGVycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9JbmNvbWluZ0h0dHBIZWFkZXJzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiIifQ== |
@@ -1,2 +0,2 @@ | ||
import LRU from 'ylru'; | ||
import { LRU } from 'ylru'; | ||
import { HttpClient, HEADER_USER_AGENT } from './HttpClient.js'; | ||
@@ -41,1 +41,2 @@ let httpClient; | ||
}; | ||
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEdBQUcsRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUMzQixPQUFPLEVBQUUsVUFBVSxFQUFFLGlCQUFpQixFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFHaEUsSUFBSSxVQUFzQixDQUFDO0FBQzNCLE1BQU0sdUJBQXVCLEdBQUcsSUFBSSxHQUFHLENBQUMsRUFBRSxDQUFDLENBQUM7QUFFNUMsTUFBTSxVQUFVLG9CQUFvQjtJQUNsQyxJQUFJLENBQUMsVUFBVSxFQUFFLENBQUM7UUFDaEIsVUFBVSxHQUFHLElBQUksVUFBVSxFQUFFLENBQUM7SUFDaEMsQ0FBQztJQUNELE9BQU8sVUFBVSxDQUFDO0FBQ3BCLENBQUM7QUFFRCxNQUFNLENBQUMsS0FBSyxVQUFVLE9BQU8sQ0FBVSxHQUFlLEVBQUUsT0FBd0I7SUFDOUUsSUFBSSxPQUFPLEVBQUUsVUFBVSxFQUFFLENBQUM7UUFDeEIsSUFBSSxzQkFBc0IsR0FBRyx1QkFBdUIsQ0FBQyxHQUFHLENBQWEsT0FBTyxDQUFDLFVBQVUsQ0FBQyxDQUFDO1FBQ3pGLElBQUksQ0FBQyxzQkFBc0IsRUFBRSxDQUFDO1lBQzVCLHNCQUFzQixHQUFHLElBQUksVUFBVSxDQUFDO2dCQUN0QyxPQUFPLEVBQUUsRUFBRSxVQUFVLEVBQUUsT0FBTyxDQUFDLFVBQVUsRUFBRTthQUM1QyxDQUFDLENBQUM7WUFDSCx1QkFBdUIsQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLFVBQVUsRUFBRSxzQkFBc0IsQ0FBQyxDQUFDO1FBQzFFLENBQUM7UUFDRCxPQUFPLE1BQU0sc0JBQXNCLENBQUMsT0FBTyxDQUFJLEdBQUcsRUFBRSxPQUFPLENBQUMsQ0FBQztJQUMvRCxDQUFDO0lBRUQsT0FBTyxNQUFNLG9CQUFvQixFQUFFLENBQUMsT0FBTyxDQUFJLEdBQUcsRUFBRSxPQUFPLENBQUMsQ0FBQztBQUMvRCxDQUFDO0FBRUQsMkRBQTJEO0FBQzNELFFBQVE7QUFDUixvQ0FBb0M7QUFDcEMsb0JBQW9CO0FBQ3BCLE1BQU07QUFDTixNQUFNLENBQUMsS0FBSyxVQUFVLElBQUksQ0FBVSxHQUFlLEVBQUUsT0FBd0I7SUFDM0UsT0FBTyxNQUFNLE9BQU8sQ0FBSSxHQUFHLEVBQUUsT0FBTyxDQUFDLENBQUM7QUFDeEMsQ0FBQztBQUVELE9BQU8sRUFDTCxTQUFTLEVBQUUsVUFBVSxFQUFFLEtBQUssRUFBRSxVQUFVLEVBQ3hDLG1CQUFtQixFQUFFLG1CQUFtQixHQUN6QyxNQUFNLFFBQVEsQ0FBQztBQUNoQiwyREFBMkQ7QUFDM0QsT0FBTyxFQUNMLFVBQVUsRUFBRSxVQUFVLElBQUksV0FBVyxFQUFFLGlCQUFpQixJQUFJLFVBQVUsR0FFdkUsTUFBTSxpQkFBaUIsQ0FBQztBQWF6QixjQUFjLHNCQUFzQixDQUFDO0FBRXJDLGVBQWU7SUFDYixPQUFPO0lBQ1AsSUFBSTtJQUNKLFVBQVUsRUFBRSxpQkFBaUI7Q0FDOUIsQ0FBQyJ9 |
@@ -1,5 +0,1 @@ | ||
/// <reference types="node" resolution-mode="require"/> | ||
/// <reference types="node" resolution-mode="require"/> | ||
/// <reference types="node" resolution-mode="require"/> | ||
/// <reference types="node" resolution-mode="require"/> | ||
import type { Readable, Writable } from 'node:stream'; | ||
@@ -6,0 +2,0 @@ import type { EventEmitter } from 'node:events'; |
export {}; | ||
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVxdWVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9SZXF1ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiIifQ== |
@@ -1,2 +0,1 @@ | ||
/// <reference types="node" resolution-mode="require"/> | ||
import type { Readable } from 'node:stream'; | ||
@@ -3,0 +2,0 @@ import type { IncomingHttpHeaders } from './IncomingHttpHeaders.js'; |
export {}; | ||
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVzcG9uc2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvUmVzcG9uc2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiJ9 |
@@ -22,1 +22,2 @@ export default { | ||
}; | ||
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3ltYm9scy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zeW1ib2xzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGVBQWU7SUFDYixTQUFTLEVBQUUsTUFBTSxDQUFDLFdBQVcsQ0FBQztJQUM5QixnQkFBZ0IsRUFBRSxNQUFNLENBQUMsbUJBQW1CLENBQUM7SUFDN0Msb0JBQW9CLEVBQUUsTUFBTSxDQUFDLHVCQUF1QixDQUFDO0lBQ3JELHVCQUF1QixFQUFFLE1BQU0sQ0FBQywwQkFBMEIsQ0FBQztJQUMzRCxxQkFBcUIsRUFBRSxNQUFNLENBQUMseUJBQXlCLENBQUM7SUFDeEQsbUJBQW1CLEVBQUUsTUFBTSxDQUFDLHNCQUFzQixDQUFDO0lBQ25ELGdCQUFnQixFQUFFLE1BQU0sQ0FBQyxtQkFBbUIsQ0FBQztJQUM3QyxrQkFBa0IsRUFBRSxNQUFNLENBQUMsNkJBQTZCLENBQUM7SUFDekQsa0JBQWtCLEVBQUUsTUFBTSxDQUFDLDZCQUE2QixDQUFDO0lBQ3pELHNCQUFzQixFQUFFLE1BQU0sQ0FBQyxpQ0FBaUMsQ0FBQztJQUNqRSxnQkFBZ0IsRUFBRSxNQUFNLENBQUMsNkJBQTZCLENBQUM7SUFDdkQsaUJBQWlCLEVBQUUsTUFBTSxDQUFDLDhCQUE4QixDQUFDO0lBQ3pELGNBQWMsRUFBRSxNQUFNLENBQUMsdUJBQXVCLENBQUM7SUFDL0MsVUFBVSxFQUFFLE1BQU0sQ0FBQyxZQUFZLENBQUM7SUFDaEMsaUJBQWlCLEVBQUUsTUFBTSxDQUFDLG9CQUFvQixDQUFDO0lBQy9DLG9CQUFvQixFQUFFLE1BQU0sQ0FBQyw4QkFBOEIsQ0FBQztJQUM1RCxjQUFjLEVBQUUsTUFBTSxDQUFDLGdCQUFnQixDQUFDO0lBQ3hDLHNCQUFzQixFQUFFLE1BQU0sQ0FBQyx5QkFBeUIsQ0FBQztJQUN6RCxZQUFZLEVBQUUsTUFBTSxDQUFDLGlCQUFpQixDQUFDO0NBQ3hDLENBQUMifQ== |
import type { FixJSONCtlChars } from './Request.js'; | ||
export declare function parseJSON(data: string, fixJSONCtlChars?: FixJSONCtlChars): string; | ||
export declare function sleep(ms: number): Promise<void>; | ||
export declare function digestAuthHeader(method: string, uri: string, wwwAuthenticate: string, userpass: string): string; | ||
@@ -5,0 +4,0 @@ export declare function globalId(category: string): number; |
@@ -49,7 +49,2 @@ import { randomBytes, createHash } from 'node:crypto'; | ||
} | ||
export function sleep(ms) { | ||
return new Promise(resolve => { | ||
setTimeout(resolve, ms); | ||
}); | ||
} | ||
function md5(s) { | ||
@@ -146,1 +141,2 @@ const sum = createHash('md5'); | ||
} | ||
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFdBQVcsRUFBRSxVQUFVLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFDdEQsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUN2QyxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFHOUMsTUFBTSxlQUFlLEdBQTJCO0lBQzlDLEdBQUcsRUFBRSxLQUFLLEVBQUUsU0FBUztJQUNyQixJQUFJLEVBQUUsTUFBTSxFQUFFLFNBQVM7SUFDdkIsSUFBSSxFQUFFLEtBQUssRUFBRSxTQUFTO0lBQ3RCLElBQUksRUFBRSxLQUFLLEVBQUUsU0FBUztJQUN0QixJQUFJLEVBQUUsS0FBSyxFQUFFLFNBQVM7SUFDdEIsSUFBSSxFQUFFLEtBQUssRUFBRSxTQUFTO0lBQ3RCLElBQUksRUFBRSxLQUFLLEVBQUUsU0FBUztDQUN2QixDQUFDO0FBQ0YsbUNBQW1DO0FBQ25DLE1BQU0sY0FBYyxHQUFHLHdCQUF3QixDQUFDO0FBRWhELFNBQVMsY0FBYyxDQUFDLENBQVM7SUFDL0IsT0FBTyxlQUFlLENBQUMsQ0FBQyxDQUFDLElBQUksS0FBSyxHQUFHLENBQUMsQ0FBQyxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUMsR0FBRyxPQUFPLENBQUMsQ0FBQyxRQUFRLENBQUMsRUFBRSxDQUFDLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQzdGLENBQUM7QUFFRCxTQUFTLG1CQUFtQixDQUFDLEtBQWE7SUFDeEMsT0FBTyxLQUFLLENBQUMsT0FBTyxDQUFDLGNBQWMsRUFBRSxjQUFjLENBQUMsQ0FBQztBQUN2RCxDQUFDO0FBRUQsTUFBTSxVQUFVLFNBQVMsQ0FBQyxJQUFZLEVBQUUsZUFBaUM7SUFDdkUsSUFBSSxPQUFPLGVBQWUsS0FBSyxVQUFVLEVBQUUsQ0FBQztRQUMxQyxJQUFJLEdBQUcsZUFBZSxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQy9CLENBQUM7U0FBTSxJQUFJLGVBQWUsRUFBRSxDQUFDO1FBQzNCLGlEQUFpRDtRQUNqRCx3REFBd0Q7UUFDeEQsSUFBSSxHQUFHLG1CQUFtQixDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ25DLENBQUM7SUFDRCxJQUFJLENBQUM7UUFDSCxJQUFJLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUMxQixDQUFDO0lBQUMsT0FBTyxHQUFRLEVBQUUsQ0FBQztRQUNsQixJQUFJLEdBQUcsQ0FBQyxJQUFJLEtBQUssYUFBYSxFQUFFLENBQUM7WUFDL0IsR0FBRyxDQUFDLElBQUksR0FBRyx5QkFBeUIsQ0FBQztRQUN2QyxDQUFDO1FBQ0QsSUFBSSxJQUFJLENBQUMsTUFBTSxHQUFHLElBQUksRUFBRSxDQUFDO1lBQ3ZCLCtCQUErQjtZQUMvQixHQUFHLENBQUMsT0FBTyxJQUFJLHNCQUFzQjtnQkFDbkMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUMsRUFBRSxHQUFHLENBQUMsQ0FBQyxHQUFHLGNBQWMsR0FBRyxJQUFJLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLE1BQU0sR0FBRyxHQUFHLENBQUMsQ0FBQyxHQUFHLEdBQUcsQ0FBQztRQUM5RyxDQUFDO2FBQU0sQ0FBQztZQUNOLEdBQUcsQ0FBQyxPQUFPLElBQUksc0JBQXNCLEdBQUcsSUFBSSxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsR0FBRyxHQUFHLENBQUM7UUFDckUsQ0FBQztRQUNELE1BQU0sR0FBRyxDQUFDO0lBQ1osQ0FBQztJQUNELE9BQU8sSUFBSSxDQUFDO0FBQ2QsQ0FBQztBQUVELFNBQVMsR0FBRyxDQUFDLENBQVM7SUFDcEIsTUFBTSxHQUFHLEdBQUcsVUFBVSxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBQzlCLEdBQUcsQ0FBQyxNQUFNLENBQUMsQ0FBQyxFQUFFLE1BQU0sQ0FBQyxDQUFDO0lBQ3RCLE9BQU8sR0FBRyxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQztBQUMzQixDQUFDO0FBRUQsTUFBTSxpQkFBaUIsR0FBRyxnQ0FBZ0MsQ0FBQztBQUMzRCxJQUFJLEVBQUUsR0FBRyxDQUFDLENBQUM7QUFDWCxNQUFNLE1BQU0sR0FBRyxVQUFVLENBQUM7QUFFMUIsTUFBTSxVQUFVLGdCQUFnQixDQUFDLE1BQWMsRUFBRSxHQUFXLEVBQUUsZUFBdUIsRUFBRSxRQUFnQjtJQUNyRyx1REFBdUQ7SUFDdkQsNkNBQTZDO0lBQzdDLG9FQUFvRTtJQUNwRSxrRUFBa0U7SUFDbEUsMkNBQTJDO0lBQzNDLGlEQUFpRDtJQUNqRCxpRUFBaUU7SUFDakUsNENBQTRDO0lBQzVDLCtCQUErQjtJQUMvQixrQ0FBa0M7SUFDbEMsd0NBQXdDO0lBQ3hDLGtFQUFrRTtJQUNsRSwrREFBK0Q7SUFDL0QsMERBQTBEO0lBQzFELDBDQUEwQztJQUMxQyxFQUFFO0lBQ0Ysc0NBQXNDO0lBQ3RDLDBDQUEwQztJQUMxQyxFQUFFO0lBQ0YsdURBQXVEO0lBQ3ZELHlEQUF5RDtJQUN6RCw2Q0FBNkM7SUFDN0Msd0RBQXdEO0lBQ3hELCtDQUErQztJQUMvQyxNQUFNLEtBQUssR0FBRyxlQUFlLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQ3pDLE1BQU0sSUFBSSxHQUEyQixFQUFFLENBQUM7SUFDeEMsS0FBSyxNQUFNLElBQUksSUFBSSxLQUFLLEVBQUUsQ0FBQztRQUN6QixNQUFNLENBQUMsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLGlCQUFpQixDQUFDLENBQUM7UUFDeEMsSUFBSSxDQUFDLEVBQUUsQ0FBQztZQUNOLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLE9BQU8sRUFBRSxFQUFFLENBQUMsQ0FBQztRQUN6QyxDQUFDO0lBQ0gsQ0FBQztJQUVELElBQUksQ0FBQyxJQUFJLENBQUMsS0FBSyxJQUFJLENBQUMsSUFBSSxDQUFDLEtBQUssRUFBRSxDQUFDO1FBQy9CLE9BQU8sRUFBRSxDQUFDO0lBQ1osQ0FBQztJQUVELElBQUksR0FBRyxHQUFHLElBQUksQ0FBQyxHQUFHLElBQUksRUFBRSxDQUFDO0lBQ3pCLE1BQU0sQ0FBRSxJQUFJLEVBQUUsSUFBSSxDQUFFLEdBQUcsUUFBUSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUUzQyxJQUFJLEVBQUUsR0FBRyxNQUFNLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQztJQUN0QixFQUFFLEdBQUcsR0FBRyxNQUFNLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQyxNQUFNLENBQUMsR0FBRyxFQUFFLEVBQUUsQ0FBQztJQUMzQyxNQUFNLE1BQU0sR0FBRyxXQUFXLENBQUMsQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBRTlDLE1BQU0sR0FBRyxHQUFHLEdBQUcsQ0FBQyxHQUFHLElBQUksSUFBSSxJQUFJLENBQUMsS0FBSyxJQUFJLElBQUksRUFBRSxDQUFDLENBQUM7SUFDakQsTUFBTSxHQUFHLEdBQUcsR0FBRyxDQUFDLEdBQUcsTUFBTSxDQUFDLFdBQVcsRUFBRSxJQUFJLEdBQUcsRUFBRSxDQUFDLENBQUM7SUFDbEQsSUFBSSxDQUFDLEdBQUcsR0FBRyxHQUFHLElBQUksSUFBSSxDQUFDLEtBQUssRUFBRSxDQUFDO0lBQy9CLElBQUksR0FBRyxFQUFFLENBQUM7UUFDUixHQUFHLEdBQUcsR0FBRyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUN4QixDQUFDLElBQUksSUFBSSxFQUFFLElBQUksTUFBTSxJQUFJLEdBQUcsRUFBRSxDQUFDO0lBQ2pDLENBQUM7SUFDRCxDQUFDLElBQUksSUFBSSxHQUFHLEVBQUUsQ0FBQztJQUNmLE1BQU0sUUFBUSxHQUFHLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUN4QixJQUFJLFVBQVUsR0FBRyxvQkFBb0IsSUFBSSxhQUFhLElBQUksQ0FBQyxLQUFLLGFBQWEsSUFBSSxDQUFDLEtBQUssV0FBVyxHQUFHLGdCQUFnQixRQUFRLEdBQUcsQ0FBQztJQUNqSSxJQUFJLElBQUksQ0FBQyxNQUFNLEVBQUUsQ0FBQztRQUNoQixVQUFVLElBQUksYUFBYSxJQUFJLENBQUMsTUFBTSxHQUFHLENBQUM7SUFDNUMsQ0FBQztJQUNELElBQUksR0FBRyxFQUFFLENBQUM7UUFDUixVQUFVLElBQUksU0FBUyxHQUFHLFFBQVEsRUFBRSxhQUFhLE1BQU0sR0FBRyxDQUFDO0lBQzdELENBQUM7SUFDRCxPQUFPLFVBQVUsQ0FBQztBQUNwQixDQUFDO0FBRUQsTUFBTSxZQUFZLEdBQUcsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLEdBQUcsRUFBRSxDQUFDO0FBQzFDLE1BQU0sU0FBUyxHQUEyQixFQUFFLENBQUM7QUFFN0MsTUFBTSxVQUFVLFFBQVEsQ0FBQyxRQUFnQjtJQUN2QyxJQUFJLENBQUMsU0FBUyxDQUFDLFFBQVEsQ0FBQyxJQUFJLFNBQVMsQ0FBQyxRQUFRLENBQUMsSUFBSSxZQUFZLEVBQUUsQ0FBQztRQUNoRSxTQUFTLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQzFCLENBQUM7SUFDRCxPQUFPLEVBQUUsU0FBUyxDQUFDLFFBQVEsQ0FBQyxDQUFDO0FBQy9CLENBQUM7QUFFRCxNQUFNLFVBQVUsZUFBZSxDQUFDLFNBQWlCLEVBQUUsR0FBWTtJQUM3RCxPQUFPLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLEdBQUcsSUFBSSxXQUFXLENBQUMsR0FBRyxFQUFFLENBQUMsR0FBRyxTQUFTLENBQUMsR0FBRyxJQUFJLENBQUMsR0FBRyxJQUFJLENBQUM7QUFDNUUsQ0FBQztBQUVELE1BQU0sVUFBVSxVQUFVLENBQUMsTUFBVztJQUNwQyxJQUFJLE9BQU8sUUFBUSxDQUFDLFVBQVUsS0FBSyxVQUFVO1FBQUUsT0FBTyxRQUFRLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBQ2xGLGtCQUFrQjtJQUNsQixrSEFBa0g7SUFDbEgsMEVBQTBFO0lBQzFFLE9BQU8sTUFBTSxLQUFLLElBQUk7V0FDakIsT0FBTyxNQUFNLEtBQUssUUFBUTtXQUMxQixPQUFPLE1BQU0sQ0FBQyxJQUFJLEtBQUssVUFBVTtXQUNqQyxNQUFNLENBQUMsUUFBUSxLQUFLLEtBQUs7V0FDekIsT0FBTyxNQUFNLENBQUMsS0FBSyxLQUFLLFVBQVU7V0FDbEMsT0FBTyxNQUFNLENBQUMsY0FBYyxLQUFLLFFBQVEsQ0FBQztBQUNqRCxDQUFDIn0= |
{ | ||
"name": "urllib", | ||
"version": "3.25.1", | ||
"version": "4.0.0", | ||
"publishConfig": { | ||
"tag": "latest" | ||
}, | ||
"description": "Help in opening URLs (mostly HTTP) in a complex world — basic and digest authentication, redirections, cookies and more. Base undici fetch API.", | ||
"description": "Help in opening URLs (mostly HTTP) in a complex world — basic and digest authentication, redirections, timeout and more. Base undici API.", | ||
"keywords": [ | ||
@@ -42,5 +42,3 @@ "urllib", | ||
"cov": "vitest run --coverage", | ||
"preci": "node scripts/pre_test.js", | ||
"ci": "npm run lint && npm run cov && node scripts/build_test.js", | ||
"contributor": "git-contributor", | ||
"ci": "npm run lint && npm run cov && npm run prepublishOnly && attw --pack", | ||
"clean": "rm -rf dist", | ||
@@ -50,31 +48,26 @@ "prepublishOnly": "npm run build" | ||
"dependencies": { | ||
"default-user-agent": "^1.0.0", | ||
"digest-header": "^1.0.0", | ||
"form-data-encoder": "^1.7.2", | ||
"formdata-node": "^4.3.3", | ||
"formstream": "^1.1.1", | ||
"formstream": "^1.5.1", | ||
"mime-types": "^2.1.35", | ||
"pump": "^3.0.0", | ||
"qs": "^6.11.2", | ||
"type-fest": "^4.3.1", | ||
"undici": "^5.28.2", | ||
"ylru": "^1.3.2" | ||
"qs": "^6.12.1", | ||
"type-fest": "^4.20.1", | ||
"undici": "^6.19.2", | ||
"ylru": "^2.0.0" | ||
}, | ||
"devDependencies": { | ||
"@arethetypeswrong/cli": "^0.15.3", | ||
"@eggjs/tsconfig": "^1.3.3", | ||
"@tsconfig/node18": "^18.2.1", | ||
"@tsconfig/strictest": "^2.0.2", | ||
"@types/busboy": "^1.5.0", | ||
"@types/default-user-agent": "^1.0.0", | ||
"@types/mime-types": "^2.1.1", | ||
"@types/node": "^20.2.1", | ||
"@types/pump": "^1.1.1", | ||
"@types/proxy": "^1.0.4", | ||
"@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": "^1.6.0", | ||
"busboy": "^1.6.0", | ||
"cross-env": "^7.0.3", | ||
"eslint": "^8.25.0", | ||
"eslint-config-egg": "^12.1.0", | ||
"git-contributor": "^2.0.0", | ||
"eslint": "8", | ||
"eslint-config-egg": "13", | ||
"iconv-lite": "^0.6.3", | ||
@@ -87,6 +80,6 @@ "proxy": "^1.0.2", | ||
"typescript": "^5.0.4", | ||
"vitest": "^1.3.1" | ||
"vitest": "^1.6.0" | ||
}, | ||
"engines": { | ||
"node": ">= 14.19.3" | ||
"node": ">= 18.19.0" | ||
}, | ||
@@ -104,2 +97,3 @@ "license": "MIT", | ||
"import": { | ||
"source": "./src/index.ts", | ||
"types": "./dist/esm/index.d.ts", | ||
@@ -109,2 +103,3 @@ "default": "./dist/esm/index.js" | ||
"require": { | ||
"source": "./src/index.ts", | ||
"types": "./dist/commonjs/index.d.ts", | ||
@@ -111,0 +106,0 @@ "default": "./dist/commonjs/index.js" |
@@ -286,3 +286,6 @@ # urllib | ||
## License | ||
[MIT](LICENSE) | ||
<!-- GITCONTRIBUTOR_START --> | ||
@@ -292,18 +295,4 @@ | ||
|[<img src="https://avatars.githubusercontent.com/u/156269?v=4" width="100px;"/><br/><sub><b>fengmk2</b></sub>](https://github.com/fengmk2)<br/>|[<img src="https://avatars.githubusercontent.com/u/985607?v=4" width="100px;"/><br/><sub><b>dead-horse</b></sub>](https://github.com/dead-horse)<br/>|[<img src="https://avatars.githubusercontent.com/u/32174276?v=4" width="100px;"/><br/><sub><b>semantic-release-bot</b></sub>](https://github.com/semantic-release-bot)<br/>|[<img src="https://avatars.githubusercontent.com/u/288288?v=4" width="100px;"/><br/><sub><b>xingrz</b></sub>](https://github.com/xingrz)<br/>|[<img src="https://avatars.githubusercontent.com/u/360661?v=4" width="100px;"/><br/><sub><b>popomore</b></sub>](https://github.com/popomore)<br/>|[<img src="https://avatars.githubusercontent.com/u/327019?v=4" width="100px;"/><br/><sub><b>JacksonTian</b></sub>](https://github.com/JacksonTian)<br/>| | ||
| :---: | :---: | :---: | :---: | :---: | :---: | | ||
|[<img src="https://avatars.githubusercontent.com/u/543405?v=4" width="100px;"/><br/><sub><b>ibigbug</b></sub>](https://github.com/ibigbug)<br/>|[<img src="https://avatars.githubusercontent.com/u/14790466?v=4" width="100px;"/><br/><sub><b>greenkeeperio-bot</b></sub>](https://github.com/greenkeeperio-bot)<br/>|[<img src="https://avatars.githubusercontent.com/u/227713?v=4" width="100px;"/><br/><sub><b>atian25</b></sub>](https://github.com/atian25)<br/>|[<img src="https://avatars.githubusercontent.com/u/6897780?v=4" width="100px;"/><br/><sub><b>killagu</b></sub>](https://github.com/killagu)<br/>|[<img src="https://avatars.githubusercontent.com/u/5381764?v=4" width="100px;"/><br/><sub><b>paambaati</b></sub>](https://github.com/paambaati)<br/>|[<img src="https://avatars.githubusercontent.com/u/199635?v=4" width="100px;"/><br/><sub><b>tremby</b></sub>](https://github.com/tremby)<br/>| | ||
|[<img src="https://avatars.githubusercontent.com/u/1433247?v=4" width="100px;"/><br/><sub><b>denghongcai</b></sub>](https://github.com/denghongcai)<br/>|[<img src="https://avatars.githubusercontent.com/u/4635838?v=4" width="100px;"/><br/><sub><b>gemwuu</b></sub>](https://github.com/gemwuu)<br/>|[<img src="https://avatars.githubusercontent.com/u/2842176?v=4" width="100px;"/><br/><sub><b>XadillaX</b></sub>](https://github.com/XadillaX)<br/>|[<img src="https://avatars.githubusercontent.com/u/1147375?v=4" width="100px;"/><br/><sub><b>alsotang</b></sub>](https://github.com/alsotang)<br/>|[<img src="https://avatars.githubusercontent.com/u/546535?v=4" width="100px;"/><br/><sub><b>leoner</b></sub>](https://github.com/leoner)<br/>|[<img src="https://avatars.githubusercontent.com/u/19908330?v=4" width="100px;"/><br/><sub><b>hyj1991</b></sub>](https://github.com/hyj1991)<br/>| | ||
|[<img src="https://avatars.githubusercontent.com/u/1747852?v=4" width="100px;"/><br/><sub><b>isayme</b></sub>](https://github.com/isayme)<br/>|[<img src="https://avatars.githubusercontent.com/u/252317?v=4" width="100px;"/><br/><sub><b>cyjake</b></sub>](https://github.com/cyjake)<br/>|[<img src="https://avatars.githubusercontent.com/u/5856440?v=4" width="100px;"/><br/><sub><b>whxaxes</b></sub>](https://github.com/whxaxes)<br/>|[<img src="https://avatars.githubusercontent.com/u/309219?v=4" width="100px;"/><br/><sub><b>chadxz</b></sub>](https://github.com/chadxz)<br/>|[<img src="https://avatars.githubusercontent.com/u/2055702?v=4" width="100px;"/><br/><sub><b>adapt0</b></sub>](https://github.com/adapt0)<br/>|[<img src="https://avatars.githubusercontent.com/u/5139554?v=4" width="100px;"/><br/><sub><b>danielwpz</b></sub>](https://github.com/danielwpz)<br/>| | ||
|[<img src="https://avatars.githubusercontent.com/u/5127897?v=4" width="100px;"/><br/><sub><b>danielsss</b></sub>](https://github.com/danielsss)<br/>|[<img src="https://avatars.githubusercontent.com/u/3367820?v=4" width="100px;"/><br/><sub><b>Jeff-Tian</b></sub>](https://github.com/Jeff-Tian)<br/>|[<img src="https://avatars.githubusercontent.com/u/17075261?v=4" width="100px;"/><br/><sub><b>nick-ng</b></sub>](https://github.com/nick-ng)<br/>|[<img src="https://avatars.githubusercontent.com/u/1706595?v=4" width="100px;"/><br/><sub><b>rishavsharan</b></sub>](https://github.com/rishavsharan)<br/>|[<img src="https://avatars.githubusercontent.com/u/1886161?v=4" width="100px;"/><br/><sub><b>willizm</b></sub>](https://github.com/willizm)<br/>|[<img src="https://avatars.githubusercontent.com/u/7227589?v=4" width="100px;"/><br/><sub><b>davidkhala</b></sub>](https://github.com/davidkhala)<br/>| | ||
|[<img src="https://avatars.githubusercontent.com/u/535479?v=4" width="100px;"/><br/><sub><b>aleafs</b></sub>](https://github.com/aleafs)<br/>|[<img src="https://avatars.githubusercontent.com/u/3689968?v=4" width="100px;"/><br/><sub><b>Amunu</b></sub>](https://github.com/Amunu)<br/>|[<img src="https://avatars.githubusercontent.com/in/9426?v=4" width="100px;"/><br/><sub><b>azure-pipelines[bot]</b></sub>](https://github.com/apps/azure-pipelines)<br/>|[<img src="https://avatars.githubusercontent.com/u/108602490?v=4" width="100px;"/><br/><sub><b>capsice</b></sub>](https://github.com/capsice)<br/>|[<img src="https://avatars.githubusercontent.com/u/1281323?v=4" width="100px;"/><br/><sub><b>changzhiwin</b></sub>](https://github.com/changzhiwin)<br/>|[<img src="https://avatars.githubusercontent.com/u/929503?v=4" width="100px;"/><br/><sub><b>yuzhigang33</b></sub>](https://github.com/yuzhigang33)<br/>| | ||
|[<img src="https://avatars.githubusercontent.com/u/5574625?v=4" width="100px;"/><br/><sub><b>elrrrrrrr</b></sub>](https://github.com/elrrrrrrr)<br/>|[<img src="https://avatars.githubusercontent.com/u/981128?v=4" width="100px;"/><br/><sub><b>fishbar</b></sub>](https://github.com/fishbar)<br/>|[<img src="https://avatars.githubusercontent.com/u/1207064?v=4" width="100px;"/><br/><sub><b>gxcsoccer</b></sub>](https://github.com/gxcsoccer)<br/>|[<img src="https://avatars.githubusercontent.com/u/17476119?v=4" width="100px;"/><br/><sub><b>mars-coder</b></sub>](https://github.com/mars-coder)<br/>|[<img src="https://avatars.githubusercontent.com/u/929179?v=4" width="100px;"/><br/><sub><b>rockdai</b></sub>](https://github.com/rockdai)<br/>|[<img src="https://avatars.githubusercontent.com/u/2196373?v=4" width="100px;"/><br/><sub><b>dickeylth</b></sub>](https://github.com/dickeylth)<br/>| | ||
[<img src="https://avatars.githubusercontent.com/u/13050025?v=4" width="100px;"/><br/><sub><b>aladdin-add</b></sub>](https://github.com/aladdin-add)<br/> | ||
[![Contributors](https://contrib.rocks/image?repo=node-modules/urllib)](https://github.com/node-modules/urllib/graphs/contributors) | ||
This project follows the git-contributor [spec](https://github.com/xudafeng/git-contributor), auto updated at `Mon Dec 04 2023 00:13:39 GMT+0800`. | ||
<!-- GITCONTRIBUTOR_END --> | ||
## License | ||
[MIT](LICENSE) | ||
Made with [contributors-img](https://contrib.rocks). |
@@ -23,11 +23,10 @@ import diagnosticsChannel from 'node:diagnostics_channel'; | ||
function subscribe(name: string, listener: (message: unknown, channelName: string | symbol) => void) { | ||
if (typeof diagnosticsChannel.subscribe === 'function') { | ||
diagnosticsChannel.subscribe(name, listener); | ||
} else { | ||
// TODO: support Node.js 14, will be removed on the next major version | ||
diagnosticsChannel.channel(name).subscribe(listener); | ||
} | ||
diagnosticsChannel.subscribe(name, listener); | ||
} | ||
function formatSocket(socket: Socket) { | ||
type SocketExtend = Socket & { | ||
[key: symbol]: string | number | Date | undefined; | ||
}; | ||
function formatSocket(socket: SocketExtend) { | ||
if (!socket) return socket; | ||
@@ -45,4 +44,3 @@ return { | ||
// make sure error contains socket info | ||
const kDestroy = Symbol('kDestroy'); | ||
Socket.prototype[kDestroy] = Socket.prototype.destroy; | ||
const destroySocket = Socket.prototype.destroy; | ||
Socket.prototype.destroy = function(err?: any) { | ||
@@ -56,3 +54,3 @@ if (err) { | ||
} | ||
return this[kDestroy](err); | ||
return destroySocket.call(this, err); | ||
}; | ||
@@ -62,3 +60,3 @@ | ||
if (!kHandler) return; | ||
const handler = request[kHandler]; | ||
const handler = Reflect.get(request, kHandler); | ||
// maxRedirects = 0 will get [Symbol(handler)]: RequestHandler { | ||
@@ -77,3 +75,3 @@ // responseHeaders: null, | ||
export function initDiagnosticsChannel() { | ||
// makre sure init global DiagnosticsChannel once | ||
// make sure init global DiagnosticsChannel once | ||
if (initedDiagnosticsChannel) return; | ||
@@ -105,25 +103,23 @@ initedDiagnosticsChannel = true; | ||
// diagnosticsChannel.channel('undici:client:beforeConnect') | ||
subscribe('undici:client:connectError', (message, name) => { | ||
const { error, connectParams } = message as DiagnosticsChannel.ClientConnectErrorMessage & { error: any }; | ||
let { socket } = message as DiagnosticsChannel.ClientConnectErrorMessage; | ||
if (!socket && error[symbols.kErrorSocket]) { | ||
socket = error[symbols.kErrorSocket]; | ||
const { error, connectParams, socket } = message as DiagnosticsChannel.ClientConnectErrorMessage & { error: any, socket: SocketExtend }; | ||
let sock = socket; | ||
if (!sock && error[symbols.kErrorSocket]) { | ||
sock = error[symbols.kErrorSocket]; | ||
} | ||
if (socket) { | ||
socket[symbols.kSocketId] = globalId('UndiciSocket'); | ||
socket[symbols.kSocketConnectErrorTime] = new Date(); | ||
socket[symbols.kHandledRequests] = 0; | ||
socket[symbols.kHandledResponses] = 0; | ||
if (sock) { | ||
sock[symbols.kSocketId] = globalId('UndiciSocket'); | ||
sock[symbols.kSocketConnectErrorTime] = new Date(); | ||
sock[symbols.kHandledRequests] = 0; | ||
sock[symbols.kHandledResponses] = 0; | ||
// copy local address to symbol, avoid them be reset after request error throw | ||
if (socket.localAddress) { | ||
socket[symbols.kSocketLocalAddress] = socket.localAddress; | ||
socket[symbols.kSocketLocalPort] = socket.localPort; | ||
if (sock.localAddress) { | ||
sock[symbols.kSocketLocalAddress] = sock.localAddress; | ||
sock[symbols.kSocketLocalPort] = sock.localPort; | ||
} | ||
socket[symbols.kSocketConnectProtocol] = connectParams.protocol; | ||
socket[symbols.kSocketConnectHost] = connectParams.host; | ||
socket[symbols.kSocketConnectPort] = connectParams.port; | ||
sock[symbols.kSocketConnectProtocol] = connectParams.protocol; | ||
sock[symbols.kSocketConnectHost] = connectParams.host; | ||
sock[symbols.kSocketConnectPort] = connectParams.port; | ||
debug('[%s] Socket#%d connectError, connectParams: %o, error: %s, (sock: %o)', | ||
name, socket[symbols.kSocketId], connectParams, (error as Error).message, formatSocket(socket)); | ||
name, sock[symbols.kSocketId], connectParams, (error as Error).message, formatSocket(sock)); | ||
} else { | ||
@@ -137,3 +133,3 @@ debug('[%s] connectError, connectParams: %o, error: %o', | ||
subscribe('undici:client:connected', (message, name) => { | ||
const { socket, connectParams } = message as DiagnosticsChannel.ClientConnectedMessage; | ||
const { socket, connectParams } = message as DiagnosticsChannel.ClientConnectedMessage & { socket: SocketExtend }; | ||
socket[symbols.kSocketId] = globalId('UndiciSocket'); | ||
@@ -155,7 +151,7 @@ socket[symbols.kSocketStartTime] = performance.now(); | ||
subscribe('undici:client:sendHeaders', (message, name) => { | ||
const { request, socket } = message as DiagnosticsChannel.ClientSendHeadersMessage; | ||
const { request, socket } = message as DiagnosticsChannel.ClientSendHeadersMessage & { socket: SocketExtend }; | ||
const opaque = getRequestOpaque(request, kHandler); | ||
if (!opaque || !opaque[symbols.kRequestId]) return; | ||
socket[symbols.kHandledRequests]++; | ||
(socket[symbols.kHandledRequests] as number)++; | ||
// attach socket to opaque | ||
@@ -169,7 +165,7 @@ opaque[symbols.kRequestSocket] = socket; | ||
opaque[symbols.kRequestTiming].requestHeadersSent = performanceTime(opaque[symbols.kRequestStartTime]); | ||
// first socket need to caculate the connected time | ||
// first socket need to calculate the connected time | ||
if (socket[symbols.kHandledRequests] === 1) { | ||
// kSocketStartTime - kRequestStartTime = connected time | ||
opaque[symbols.kRequestTiming].connected = | ||
performanceTime(opaque[symbols.kRequestStartTime], socket[symbols.kSocketStartTime]); | ||
performanceTime(opaque[symbols.kRequestStartTime], socket[symbols.kSocketStartTime] as number); | ||
} | ||
@@ -176,0 +172,0 @@ }); |
@@ -14,3 +14,3 @@ import diagnosticsChannel from 'node:diagnostics_channel'; | ||
import { Readable, pipeline } from 'node:stream'; | ||
import stream from 'node:stream'; | ||
import { pipeline as pipelinePromise } from 'node:stream/promises'; | ||
import { basename } from 'node:path'; | ||
@@ -21,4 +21,5 @@ import { createReadStream } from 'node:fs'; | ||
import querystring from 'node:querystring'; | ||
import { setTimeout as sleep } from 'node:timers/promises'; | ||
import { | ||
FormData as FormDataNative, | ||
FormData, | ||
request as undiciRequest, | ||
@@ -30,9 +31,7 @@ Dispatcher, | ||
} from 'undici'; | ||
// eslint-disable-next-line @typescript-eslint/ban-ts-comment | ||
// @ts-ignore | ||
import undiciSymbols from 'undici/lib/core/symbols.js'; | ||
import { FormData as FormDataNode } from 'formdata-node'; | ||
import { FormDataEncoder } from 'form-data-encoder'; | ||
import createUserAgent from 'default-user-agent'; | ||
import mime from 'mime-types'; | ||
import qs from 'qs'; | ||
import pump from 'pump'; | ||
// Compatible with old style formstream | ||
@@ -44,3 +43,3 @@ import FormStream from 'formstream'; | ||
import { RawResponseWithMeta, HttpClientResponse, SocketInfo } from './Response.js'; | ||
import { parseJSON, sleep, digestAuthHeader, globalId, performanceTime, isReadable } from './utils.js'; | ||
import { parseJSON, digestAuthHeader, globalId, performanceTime, isReadable } from './utils.js'; | ||
import symbols from './symbols.js'; | ||
@@ -56,12 +55,2 @@ import { initDiagnosticsChannel } from './diagnosticsChannel.js'; | ||
const PROTO_RE = /^https?:\/\//i; | ||
const FormData = FormDataNative ?? FormDataNode; | ||
// impl promise pipeline on Node.js 14 | ||
const pipelinePromise = stream.promises?.pipeline ?? function pipeline(...args: any[]) { | ||
return new Promise<void>((resolve, reject) => { | ||
pump(...args, (err?: Error) => { | ||
if (err) return reject(err); | ||
resolve(); | ||
}); | ||
}); | ||
}; | ||
@@ -73,4 +62,2 @@ function noop() { | ||
const debug = debuglog('urllib:HttpClient'); | ||
// Node.js 14 or 16 | ||
const isNode14Or16 = /v1[46]\./.test(process.version); | ||
@@ -134,3 +121,6 @@ export type ClientOptions = { | ||
export const HEADER_USER_AGENT = createUserAgent('node-urllib', 'VERSION'); | ||
export const VERSION = 'VERSION'; | ||
// 'node-urllib/4.0.0 Node.js/18.19.0 (darwin; x64)' | ||
export const HEADER_USER_AGENT = | ||
`node-urllib/${VERSION} Node.js/${process.version.substring(1)} (${process.platform}; ${process.arch})`; | ||
@@ -217,3 +207,3 @@ function getFileName(stream: Readable) { | ||
// origin => Pool Instance | ||
const clients: Map<string, WeakRef<Pool>> | undefined = agent[undiciSymbols.kClients]; | ||
const clients: Map<string, WeakRef<Pool>> | undefined = Reflect.get(agent, undiciSymbols.kClients); | ||
const poolStatsMap: Record<string, PoolStat> = {}; | ||
@@ -224,3 +214,3 @@ if (!clients) { | ||
for (const [ key, ref ] of clients) { | ||
const pool = ref.deref(); | ||
const pool = typeof ref.deref === 'function' ? ref.deref() : ref as unknown as Pool; | ||
const stats = pool?.stats; | ||
@@ -463,5 +453,7 @@ if (!stats) continue; | ||
} else if (typeof args.files === 'object') { | ||
for (const field in args.files) { | ||
const files = args.files as Record<string, string | Readable | Buffer>; | ||
for (const field in files) { | ||
// set custom fileName | ||
uploadFiles.push([ field, args.files[field], field ]); | ||
const file = files[field]; | ||
uploadFiles.push([ field, file, field ]); | ||
} | ||
@@ -491,14 +483,3 @@ } | ||
} | ||
if (FormDataNative) { | ||
requestOptions.body = formData; | ||
} else { | ||
// Node.js 14 does not support spec-compliant FormData | ||
// https://github.com/octet-stream/form-data#usage | ||
const encoder = new FormDataEncoder(formData as any); | ||
Object.assign(headers, encoder.headers); | ||
// fix "Content-Length":"NaN" | ||
delete headers['Content-Length']; | ||
requestOptions.body = Readable.from(encoder); | ||
} | ||
requestOptions.body = formData; | ||
} else if (args.content) { | ||
@@ -521,3 +502,3 @@ if (!isGETOrHEAD) { | ||
if (!isStringOrBufferOrReadable) { | ||
let query; | ||
let query: string; | ||
if (args.nestedQuerystring) { | ||
@@ -623,5 +604,2 @@ query = qs.stringify(args.data); | ||
} else if (args.writeStream) { | ||
if (isNode14Or16 && args.writeStream.destroyed) { | ||
throw new Error('writeStream is destroyed'); | ||
} | ||
if (args.compressed === true && isCompressedContent) { | ||
@@ -628,0 +606,0 @@ const decoder = contentEncoding === 'gzip' ? createGunzip() : createBrotliDecompress(); |
@@ -1,2 +0,2 @@ | ||
import LRU from 'ylru'; | ||
import { LRU } from 'ylru'; | ||
import { HttpClient, HEADER_USER_AGENT } from './HttpClient.js'; | ||
@@ -3,0 +3,0 @@ import { RequestOptions, RequestURL } from './Request.js'; |
@@ -6,3 +6,3 @@ import { randomBytes, createHash } from 'node:crypto'; | ||
const JSONCtlCharsMap = { | ||
const JSONCtlCharsMap: Record<string, string> = { | ||
'"': '\\"', // \u0022 | ||
@@ -53,8 +53,2 @@ '\\': '\\\\', // \u005c | ||
export function sleep(ms: number) { | ||
return new Promise<void>(resolve => { | ||
setTimeout(resolve, ms); | ||
}); | ||
} | ||
function md5(s: string) { | ||
@@ -61,0 +55,0 @@ const sum = createHash('md5'); |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
320362
6
4633
297
+ Addedundici@6.20.1(transitive)
+ Addedylru@2.0.0(transitive)
- Removeddefault-user-agent@^1.0.0
- Removeddigest-header@^1.0.0
- Removedform-data-encoder@^1.7.2
- Removedformdata-node@^4.3.3
- Removedpump@^3.0.0
- Removed@fastify/busboy@2.1.1(transitive)
- Removeddefault-user-agent@1.0.0(transitive)
- Removeddigest-header@1.1.0(transitive)
- Removedend-of-stream@1.4.4(transitive)
- Removedform-data-encoder@1.9.0(transitive)
- Removedformdata-node@4.4.1(transitive)
- Removedminimist@1.2.8(transitive)
- Removednode-domexception@1.0.0(transitive)
- Removedonce@1.4.0(transitive)
- Removedos-name@1.0.3(transitive)
- Removedosx-release@1.1.0(transitive)
- Removedpump@3.0.2(transitive)
- Removedsemver@5.7.2(transitive)
- Removedundici@5.28.4(transitive)
- Removedweb-streams-polyfill@4.0.0-beta.3(transitive)
- Removedwin-release@1.1.1(transitive)
- Removedwrappy@1.0.2(transitive)
- Removedylru@1.4.0(transitive)
Updatedformstream@^1.5.1
Updatedqs@^6.12.1
Updatedtype-fest@^4.20.1
Updatedundici@^6.19.2
Updatedylru@^2.0.0