@e-mc/request 0.10.0 → 0.10.2

package/LICENSE

@@ -1,11 +1,11 @@
-Copyright 2024 An Pham
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
+Copyright 2024 An Pham
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

package/README.md

@@ -1,214 +1,215 @@
-# @e-mc/request
-
-* NodeJS 16
-* ES2020
-
-## General Usage
-
-* [Read the Docs](https://e-mc.readthedocs.io)
-
-## Interface
-
-* [View Source](https://www.unpkg.com/@e-mc/types@0.10.0/lib/index.d.ts)
-
-```typescript
-import type { IModule, ModuleConstructor } from "./index";
-import type { HttpAgentSettings, HttpProtocolVersion, HttpRequestClient, InternetProtocolVersion } from "./http";
-import type { ApplyOptions, Aria2Options, FormDataPart, HeadersOnCallback, HostConfig, OpenOptions, PostOptions, ProxySettings, ReadExpectType, RequestInit, StatusOnCallback } from "./request";
-import type { DnsLookupSettings, RequestModule, RequestSettings } from "./settings";
-
-import type { ClientRequest, OutgoingHttpHeaders } from "http";
-import type { LookupFunction } from "net";
-import type { Writable } from "stream";
-
-interface IRequest extends IModule {
-    module: RequestModule;
-    startTime: number;
-    acceptEncoding: boolean;
-    keepAlive: boolean | null;
-    readTimeout: number;
-    readExpect: ReadExpectType;
-    proxy: ProxySettings | null;
-    init(config?: RequestInit): this;
-    apply(options: ApplyOptions): this;
-    addDns(hostname: string, address: string, timeout: number): void;
-    addDns(hostname: string, address: string, family?: string, timeout?: number): void;
-    lookupDns(hostname: string): LookupFunction;
-    proxyOf(uri: string, localhost?: boolean): ProxySettings | undefined;
-    statusOn(name: number | number[], callback: StatusOnCallback): void;
-    statusOn(name: number | number[], globUrl: string, callback: StatusOnCallback): void;
-    headersOn(name: string | string[], callback: HeadersOnCallback): void;
-    headersOn(name: string | string[], globUrl: string, callback: HeadersOnCallback): void;
-    headersOf(uri: string): OutgoingHttpHeaders | undefined;
-    aria2c(uri: string | URL, pathname: string): Promise<string[]>;
-    aria2c(uri: string | URL, options?: Aria2Options): Promise<string[]>;
-    json(uri: string | URL, options?: OpenOptions): Promise<object | null>;
-    pipe(uri: string | URL, to: Writable, options?: OpenOptions): Promise<null>;
-    opts(url: string | URL, options?: OpenOptions): HostConfig;
-    open(uri: string | URL, options: OpenOptions): HttpRequestClient;
-    head(uri: string | URL, options?: OpenOptions): ClientRequest;
-    post(uri: string | URL, data: unknown, contentType: string): Promise<Buffer | string | null>;
-    post(uri: string | URL, parts: FormDataPart[]): Promise<Buffer | string | null>;
-    post(uri: string | URL, form: Record<string, unknown>, parts: FormDataPart[]): Promise<Buffer | string | null>;
-    post(uri: string | URL, data: unknown, options: PostOptions): Promise<Buffer | string | null>;
-    post(uri: string | URL, data: unknown, contentType?: string, options?: PostOptions): Promise<Buffer | string | null>;
-    get(uri: string | URL, options?: OpenOptions): Promise<Buffer | object | string | null>;
-    detach(singleton?: boolean): void;
-    reset(): void;
-    close(): void;
-    set agentTimeout(value);
-    get agentTimeout(): number;
-    set httpVersion(value);
-    get httpVersion(): HttpProtocolVersion | null;
-    set ipVersion(value);
-    get ipVersion(): InternetProtocolVersion;
-    get settings(): RequestSettings;
-}
-
-interface RequestConstructor extends ModuleConstructor {
-    readCACert(value: string, cache?: boolean): string;
-    readTLSKey(value: string, cache?: boolean): string;
-    readTLSCert(value: string, cache?: boolean): string;
-    isCert(value: string): boolean;
-    fromURL(url: URL, value: string): string;
-    fromStatusCode(value: number | string): string;
-    defineHttpAgent(options: HttpAgentSettings): void;
-    defineDnsLookup(options: DnsLookupSettings, clear?: boolean): void;
-    getAria2Path(): string;
-    readonly prototype: IRequest;
-    new(module?: RequestModule): IRequest;
-}
-```
-
-## Settings
-
-```typescript
-import type { PermittedDirectories } from "./core";
-import type { SecureConfig } from "./http";
-import type { PurgeComponent } from "./settings";
-
-import type { LookupAddress } from "dns";
-import type { OutgoingHttpHeaders } from "http";
-
-interface RequestModule {
-    handler: "@e-mc/request";
-    timeout?: number | string;
-    read_timeout?: number | string;
-    agent?: {
-        keep_alive?: boolean;
-        timeout?: number | string;
-    };
-    connect?: {
-        timeout?: number | string;
-        retry_wait?: number | string;
-        retry_after?: number | string;
-        retry_limit?: number;
-        redirect_limit?: number;
-    };
-    dns?: {
-        family?: number;
-        expires?: number | string;
-        resolve?: Record<string, Partial<LookupAddress>>;
-    };
-    use?: {
-        http_version?: 1 | 2;
-        accept_encoding?: boolean;
-    };
-    proxy?: {
-        address?: string;
-        port?: number;
-        username?: string;
-        password?: string;
-        include?: string[];
-        exclude?: string[];
-        keep_alive?: boolean;
-    };
-    headers: Record<string, OutgoingHttpHeaders>;
-    certs?: Record<string, SecureConfig<string | string[]>>;
-    localhost?: string[];
-    protocol?: {
-        "http/1.1"?: string[];
-        h2c?: string[];
-        h2?: string[];
-    };
-    write_stream?: Record<string, number | string>;
-    post_limit?: number | string;
-    settings?: {
-        broadcast_id?: string | string[];
-        time_format?: "readable" | "relative" | "none";
-        purge?: PurgeComponent;
-    }
-}
-
-interface DownloadModule {
-    expires?: number | string;
-    aria2?: {
-        bin?: string | false;
-        exec?: {
-            uid?: number;
-            gid?: number;
-        };
-        update_status?: number | { interval?: number; broadcast_only?: boolean };
-        max_concurrent_downloads?: number;
-        max_connection_per_server?: number;
-        check_integrity?: boolean;
-        bt_stop_timeout?: number;
-        bt_tracker_connect_timeout?: number;
-        bt_tracker_timeout?: number;
-        min_split_size?: string;
-        disk_cache?: number | string;
-        lowest_speed_limit?: number | string;
-        always_resume?: boolean;
-        file_allocation?: "none" | "prealloc" | "trunc" | "falloc";
-        conf_path?: string;
-    };
-}
-```
-
-### Example usage
-
-```javascript
-const Request = require("@e-mc/request");
-
-const instance = new Request({
-    read_timeout: 30,
-    connect: {
-        timeout: 20, // Seconds
-        retry_wait: 1,
-        retry_after: 30,
-        retry_limit: 3, // Max attempts
-        redirect_limit: 10
-    },
-    use: {
-        http_version: 2,
-        accept_encoding: true
-    },
-    dns: {
-        family: 4 // ipVersion
-    },
-    agent: { keep_alive: true }
-});
-request.init({ ipVersion: 6 });
-
-const options = {
-    format: "yaml",
-    httpVersion: 1,
-    silent: true,
-    headers: { "x-goog-user-project": "project-1" }
-};
-instance.get("http://hostname/path/config.yml", options).then(data => {
-    console.log(data.property);
-});
-```
-
-## References
-
-- https://www.unpkg.com/@e-mc/types@0.10.0/lib/http.d.ts
-- https://www.unpkg.com/@e-mc/types@0.10.0/lib/request.d.ts
-- https://www.unpkg.com/@e-mc/types@0.10.0/lib/settings.d.ts
-
-* https://www.npmjs.com/package/@types/node
-
-## LICENSE
-
+# @e-mc/request
+
+* NodeJS 16
+* ES2020
+
+## General Usage
+
+* [Read the Docs](https://e-mc.readthedocs.io)
+
+## Interface
+
+* [View Source](https://www.unpkg.com/@e-mc/types@0.10.2/lib/index.d.ts)
+
+```typescript
+import type { IModule, ModuleConstructor } from "./index";
+import type { HttpAgentSettings, HttpProtocolVersion, HttpRequestClient, InternetProtocolVersion } from "./http";
+import type { ApplyOptions, Aria2Options, FormDataPart, HeadersOnCallback, HostConfig, OpenOptions, PostOptions, ProxySettings, ReadExpectType, RequestInit, StatusOnCallback } from "./request";
+import type { DnsLookupSettings, RequestModule, RequestSettings } from "./settings";
+
+import type { ClientRequest, OutgoingHttpHeaders } from "http";
+import type { LookupFunction } from "net";
+import type { Writable } from "stream";
+
+interface IRequest extends IModule {
+    module: RequestModule;
+    startTime: number;
+    acceptEncoding: boolean;
+    keepAlive: boolean | null;
+    readTimeout: number;
+    readExpect: ReadExpectType;
+    proxy: ProxySettings | null;
+    init(config?: RequestInit): this;
+    apply(options: ApplyOptions): this;
+    addDns(hostname: string, address: string, timeout: number): void;
+    addDns(hostname: string, address: string, family?: string, timeout?: number): void;
+    lookupDns(hostname: string): LookupFunction;
+    proxyOf(uri: string, localhost?: boolean): ProxySettings | undefined;
+    statusOn(name: number | number[], callback: StatusOnCallback): void;
+    statusOn(name: number | number[], globUrl: string, callback: StatusOnCallback): void;
+    headersOn(name: string | string[], callback: HeadersOnCallback): void;
+    headersOn(name: string | string[], globUrl: string, callback: HeadersOnCallback): void;
+    headersOf(uri: string): OutgoingHttpHeaders | undefined;
+    aria2c(uri: string | URL, pathname: string): Promise<string[]>;
+    aria2c(uri: string | URL, options?: Aria2Options): Promise<string[]>;
+    json(uri: string | URL, options?: OpenOptions): Promise<object | null>;
+    pipe(uri: string | URL, to: Writable, options?: OpenOptions): Promise<null>;
+    opts(url: string | URL, options?: OpenOptions): HostConfig;
+    open(uri: string | URL, options: OpenOptions): HttpRequestClient;
+    head(uri: string | URL, options?: OpenOptions): ClientRequest;
+    post(uri: string | URL, data: unknown, contentType: string): Promise<Buffer | string | null>;
+    post(uri: string | URL, parts: FormDataPart[]): Promise<Buffer | string | null>;
+    post(uri: string | URL, form: Record<string, unknown>, parts: FormDataPart[]): Promise<Buffer | string | null>;
+    post(uri: string | URL, data: unknown, options: PostOptions): Promise<Buffer | string | null>;
+    post(uri: string | URL, data: unknown, contentType?: string, options?: PostOptions): Promise<Buffer | string | null>;
+    get(uri: string | URL, options?: OpenOptions): Promise<Buffer | object | string | null>;
+    detach(singleton?: boolean): void;
+    reset(): void;
+    close(): void;
+    set agentTimeout(value);
+    get agentTimeout(): number;
+    set httpVersion(value);
+    get httpVersion(): HttpProtocolVersion | null;
+    set ipVersion(value);
+    get ipVersion(): InternetProtocolVersion;
+    get settings(): RequestSettings;
+}
+
+interface RequestConstructor extends ModuleConstructor {
+    readCACert(value: string, cache?: boolean): string;
+    readTLSKey(value: string, cache?: boolean): string;
+    readTLSCert(value: string, cache?: boolean): string;
+    isCert(value: string): boolean;
+    fromURL(url: URL, value: string): string;
+    fromStatusCode(value: number | string): string;
+    defineHttpAgent(options: HttpAgentSettings): void;
+    defineDnsLookup(options: DnsLookupSettings, clear?: boolean): void;
+    getAria2Path(): string;
+    readonly prototype: IRequest;
+    new(module?: RequestModule): IRequest;
+}
+```
+
+## Settings
+
+```typescript
+import type { PermittedDirectories } from "./core";
+import type { SecureConfig } from "./http";
+import type { PurgeComponent } from "./settings";
+
+import type { LookupAddress } from "dns";
+import type { OutgoingHttpHeaders } from "http";
+
+interface RequestModule {
+    handler: "@e-mc/request";
+    timeout?: number | string;
+    read_timeout?: number | string;
+    agent?: {
+        keep_alive?: boolean;
+        timeout?: number | string;
+    };
+    connect?: {
+        timeout?: number | string;
+        retry_wait?: number | string;
+        retry_after?: number | string;
+        retry_limit?: number;
+        redirect_limit?: number;
+    };
+    dns?: {
+        family?: number;
+        expires?: number | string;
+        resolve?: Record<string, Partial<LookupAddress>>;
+    };
+    use?: {
+        http_version?: 1 | 2;
+        accept_encoding?: boolean;
+    };
+    proxy?: {
+        address?: string;
+        port?: number;
+        origin?: string;
+        username?: string;
+        password?: string;
+        include?: string[];
+        exclude?: string[];
+        keep_alive?: boolean;
+    };
+    headers: Record<string, OutgoingHttpHeaders>;
+    certs?: Record<string, SecureConfig<string | string[]>>;
+    localhost?: string[];
+    protocol?: {
+        "http/1.1"?: string[];
+        h2c?: string[];
+        h2?: string[];
+    };
+    write_stream?: Record<string, number | string>;
+    post_limit?: number | string;
+    settings?: {
+        broadcast_id?: string | string[];
+        time_format?: "readable" | "relative" | "none";
+        purge?: PurgeComponent;
+    }
+}
+
+interface DownloadModule {
+    expires?: number | string;
+    aria2?: {
+        bin?: string | false;
+        exec?: {
+            uid?: number;
+            gid?: number;
+        };
+        update_status?: number | { interval?: number; broadcast_only?: boolean };
+        max_concurrent_downloads?: number;
+        max_connection_per_server?: number;
+        check_integrity?: boolean;
+        bt_stop_timeout?: number;
+        bt_tracker_connect_timeout?: number;
+        bt_tracker_timeout?: number;
+        min_split_size?: string;
+        disk_cache?: number | string;
+        lowest_speed_limit?: number | string;
+        always_resume?: boolean;
+        file_allocation?: "none" | "prealloc" | "trunc" | "falloc";
+        conf_path?: string;
+    };
+}
+```
+
+### Example usage
+
+```javascript
+const Request = require("@e-mc/request");
+
+const instance = new Request({
+    read_timeout: 30,
+    connect: {
+        timeout: 20, // Seconds
+        retry_wait: 1,
+        retry_after: 30,
+        retry_limit: 3, // Max attempts
+        redirect_limit: 10
+    },
+    use: {
+        http_version: 2,
+        accept_encoding: true
+    },
+    dns: {
+        family: 4 // ipVersion
+    },
+    agent: { keep_alive: true }
+});
+request.init({ ipVersion: 6 });
+
+const options = {
+    format: "yaml",
+    httpVersion: 1,
+    silent: true,
+    headers: { "x-goog-user-project": "project-1" }
+};
+instance.get("http://hostname/path/config.yml", options).then(data => {
+    console.log(data.property);
+});
+```
+
+## References
+
+- https://www.unpkg.com/@e-mc/types@0.10.2/lib/http.d.ts
+- https://www.unpkg.com/@e-mc/types@0.10.2/lib/request.d.ts
+- https://www.unpkg.com/@e-mc/types@0.10.2/lib/settings.d.ts
+
+* https://www.npmjs.com/package/@types/node
+
+## LICENSE
+
 BSD 3-Clause

package/http/host/index.d.ts

@@ -1,5 +1,5 @@
-import type { HttpHostConstructor } from '../../../types/lib/request';
-
-declare const HttpHost: HttpHostConstructor;
-
+import type { HttpHostConstructor } from '../../../types/lib/request';
+
+declare const HttpHost: HttpHostConstructor;
+
 export = HttpHost;

package/http/host/index.js

@@ -120,7 +120,7 @@ class HttpHost {
                 case 1:
                     return status;
                 default:
-                    return this._tlsConnect || (this._tlsConnect = new Promise(resolve => {
+                    return this._tlsConnect ||= new Promise(resolve => {
                         const alpn = 'h' + version;
                         const socket = tls.connect(+this.port, this.hostname, { ALPNProtocols: [alpn], requestCert: true, rejectUnauthorized: false }, () => {
                             this._tlsConnect = null;
@@ -147,7 +147,7 @@ class HttpHost {
                             resolve(data[3] = 0);
                         })
                             .end();
-                    }));
+                    });
             }
         }
         return 1;

package/index.d.ts

@@ -1,5 +1,5 @@
-import type { RequestConstructor } from '../types/lib';
-
-declare const Request: RequestConstructor;
-
+import type { RequestConstructor } from '../types/lib';
+
+declare const Request: RequestConstructor;
+
 export = Request;

package/index.js

@@ -11,7 +11,7 @@ const dns = require("dns");
 const net = require("net");
 const stream = require("stream");
 const zlib = require("zlib");
-const qs = require("querystring");
+const qs = require("node:querystring");
 const combined = require("combined-stream");
 const pm = require("picomatch");
 const yaml = require("js-yaml");
@@ -96,7 +96,7 @@ function getBaseHeaders(uri, headers) {
     let result;
     for (const pathname in headers) {
         if (pathname === uri || uri.startsWith(pathname + '/')) {
-            (result || (result = [])).push([pathname, headers[pathname]]);
+            (result ||= []).push([pathname, headers[pathname]]);
         }
     }
     if (result) {
@@ -107,7 +107,7 @@ function getBaseHeaders(uri, headers) {
     }
 }
 function setDnsCache(hostname, value, expires) {
-    expires ?? (expires = DNS.EXPIRES);
+    expires ??= DNS.EXPIRES;
     if (expires > 0 && !DNS.CACHE[hostname]) {
         DNS.CACHE[hostname] = value;
         if (expires !== Infinity) {
@@ -129,18 +129,17 @@ function setOutgoingHeaders(output, headers) {
 }
 function getProxySettings(request, agentTimeout) {
     const proxy = request.proxy;
-    if (proxy?.address && proxy.port) {
-        const port = (0, util_1.asInt)(proxy.port);
-        const address = (!module_1.isURL(proxy.address) ? port === 80 ? 'http://' : 'https://' : '') + proxy.address;
+    if (proxy && (proxy.origin || proxy.address && proxy.port)) {
+        const origin = proxy.origin || ((!module_1.isURL(proxy.address) ? (0, util_1.asInt)(proxy.port) === 80 ? 'http://' : 'https://' : '') + proxy.address + ':' + proxy.port);
         try {
-            let host = new URL(address + ':' + port), include, exclude;
+            let host = new URL(origin), include, exclude;
             if (proxy.username) {
                 host = new URL(host.protocol + '//' + (0, util_1.getBasicAuth)(proxy.username, proxy.password) + host.host);
             }
             if ((0, types_1.isArray)(proxy.include)) {
                 include = proxy.include;
             }
-            else if ((0, types_1.isArray)(proxy.exclude)) {
+            if ((0, types_1.isArray)(proxy.exclude)) {
                 exclude = proxy.exclude;
             }
             return { host, include, exclude, keepAlive: proxy.keep_alive, agentTimeout };
@@ -760,7 +759,7 @@ class Fetch {
     redirectResponse(statusCode, location) {
         this.abortResponse();
         if (location) {
-            if (this.config.follow_redirect === false) {
+            if (this.config.follow_redirect === false || this.config.followRedirect === false) {
                 this.rejectError(this.formatStatus(statusCode, "Follow redirect was disabled"));
             }
             else if (++this.redirects <= this.redirectLimit) {
@@ -1343,7 +1342,6 @@ class Request extends module_1 {
                 const output = [];
                 let count = 0;
                 this[kConnectHttp].forEach((protocol, index) => {
-                    var _p;
                     const title = 'HTTP' + (index + 1);
                     for (const origin in protocol) {
                         const value = protocol[origin];
@@ -1353,7 +1351,7 @@ class Request extends module_1 {
                             if (item[1] === title && Array.isArray(item[2]) && item[2][0].startsWith(origin)) {
                                 item[1] = '';
                                 item[2][0] = item[2][0].substring(origin.length);
-                                (_p = item[4]).titleBgColor && (_p.titleBgColor = undefined);
+                                item[4].titleBgColor &&= undefined;
                                 item[4].titleJustify = 'right';
                                 args.push(item);
                                 log.splice(i--, 1);
@@ -1415,7 +1413,7 @@ class Request extends module_1 {
         if (config) {
             const { headers, httpVersion, ipVersion, readTimeout } = config;
             if ((0, types_1.isObject)(headers)) {
-                setOutgoingHeaders(this[kHeaders] || (this[kHeaders] = {}), headers);
+                setOutgoingHeaders(this[kHeaders] ||= {}, headers);
             }
             if (httpVersion !== undefined) {
                 this.httpVersion = httpVersion;
@@ -1505,7 +1503,6 @@ class Request extends module_1 {
         setDnsCache(hostname, this[kConnectDns][hostname] = [{ address, family }], timeout);
     }
     lookupDns(hostname) {
-        var _p;
         const resolved = this[kConnectDns][hostname] || DNS.CACHE[hostname];
         if (resolved) {
             return (...args) => {
@@ -1517,7 +1514,7 @@ class Request extends module_1 {
                 }
             };
         }
-        const pending = (_p = this[kPendingDns])[hostname] || (_p[hostname] = []);
+        const pending = this[kPendingDns][hostname] ||= [];
         return (value, options, callback) => {
             if (pending.push(callback) === 1) {
                 let ipVersion = this.ipVersion;
@@ -1566,7 +1563,7 @@ class Request extends module_1 {
                 return proxy;
             }
             if ((0, types_1.isArray)(include) && !include.some(value => REGEXP_GLOBWITHIN.test(value) ? pm.isMatch(uri, value) : uri.startsWith(value)) || (0, types_1.isArray)(exclude) && exclude.some(value => REGEXP_GLOBWITHIN.test(value) ? pm.isMatch(uri, value) : uri.startsWith(value))) {
-                return undefined;
+                return;
             }
             return proxy;
         }
@@ -1577,7 +1574,7 @@ class Request extends module_1 {
             globUrl = '*';
         }
         if ((0, types_1.isString)(globUrl) && typeof callback === 'function') {
-            const on = this[kStatusOn] || (this[kStatusOn] = new Map());
+            const on = this[kStatusOn] ||= new Map();
             for (const item of !Array.isArray(code) ? [code] : code) {
                 let status = on.get(item);
                 if (!status) {
@@ -1593,7 +1590,7 @@ class Request extends module_1 {
             globUrl = '*';
         }
         if ((0, types_1.isString)(globUrl) && typeof callback === 'function') {
-            const on = this[kHeadersOn] || (this[kHeadersOn] = new Map());
+            const on = this[kHeadersOn] ||= new Map();
             for (const item of !Array.isArray(name) ? [name] : name) {
                 let headers = on.get(item);
                 if (!headers) {
@@ -1682,7 +1679,7 @@ class Request extends module_1 {
         if (!module_1.createDir(pathname)) {
             return Promise.reject((0, types_1.errorMessage)("aria2", "Path is not a directory", pathname));
         }
-        silent ?? (silent = this[kSingleton]);
+        silent ??= this[kSingleton];
         return new Promise((resolve, reject) => {
             let protocol, origin, username, password;
             if (uri instanceof URL) {
@@ -1887,7 +1884,7 @@ class Request extends module_1 {
                                 if (match[3] === '100') {
                                     result.push(file);
                                 }
-                                messageUnit || (messageUnit = match[2]);
+                                messageUnit ||= match[2];
                                 break;
                             case 'INPR':
                                 if (ARIA2.ALWAYS_RESUME) {
@@ -1963,7 +1960,6 @@ class Request extends module_1 {
         return this.get(uri, options);
     }
     opts(url, options) {
-        var _p, _q, _r, _s;
         const base = this[kBaseURL];
         if (base) {
             if (typeof url === 'string') {
@@ -1978,15 +1974,14 @@ class Request extends module_1 {
         }
         let host;
         if (this.host) {
-            host = (_p = HTTP.HOST)[_q = url.origin] || (_p[_q] = new host_1(url, HTTP.VERSION));
+            host = HTTP.HOST[url.origin] ||= new host_1(url, HTTP.VERSION);
         }
         else {
-            host = (_r = this[kHostInfo])[_s = url.origin] || (_r[_s] = new host_1(url, this.httpVersion || 1));
+            host = this[kHostInfo][url.origin] ||= new host_1(url, this.httpVersion || 1);
         }
         return { ...options, host, url };
     }
     open(uri, options) {
-        var _p, _q;
         let { host, url, httpVersion, method = 'GET', search, encoding, format, headers, postData, keepAlive, agentTimeout, socketPath, timeout = this._config.connectTimeout, outStream } = options;
         const getting = method === 'GET';
         const posting = method === 'POST';
@@ -1998,7 +1993,7 @@ class Request extends module_1 {
             if (format.includes('/')) {
                 format = format.split('/').pop().split('-').pop();
             }
-            headers || (headers = {});
+            headers ||= {};
             switch (format = format.trim().toLowerCase()) {
                 case 'yaml':
                     headers.accept = 'application/yaml, application/x-yaml, text/yaml, text/x-yaml';
@@ -2047,7 +2042,7 @@ class Request extends module_1 {
             this[kBaseURL] = [url, httpVersion, headers];
         }
         else if (base) {
-            httpVersion ?? (httpVersion = base[1]);
+            httpVersion ??= base[1];
             if (base[2]) {
                 headers = { ...base[2], ...headers };
             }
@@ -2064,7 +2059,7 @@ class Request extends module_1 {
         const version = this.httpVersion;
         let request, ca, cert, key, ciphers, minVersion, baseHeaders = this.headersOf(uri);
         if (getting && this.acceptEncoding && !localhost && !baseHeaders?.['accept-encoding']) {
-            (_p = (headers || (headers = {})))['accept-encoding'] || (_p['accept-encoding'] = 'gzip, deflate, br' + (LIB_ZSTD ? ', zstd' : ''));
+            (headers ||= {})['accept-encoding'] ||= 'gzip, deflate, br' + (LIB_ZSTD ? ', zstd' : '');
         }
         if (secure) {
             const certs = this[kCerts]?.[0][origin] || this.host && TLS.TEXT[origin];
@@ -2073,7 +2068,7 @@ class Request extends module_1 {
             }
         }
         if (!proxy && httpVersion !== 1 && ((httpVersion || host.version) === 2 && version !== 1 || secure && version === 2 && host.failed(2, true) === 0)) {
-            request = ((_q = this[kSession][0])[origin] || (_q[origin] = http2.connect(origin, { lookup: this.lookupDns(hostname), ca, cert, key, ciphers, minVersion, settings: localhost ? { maxFrameSize: 16777215, enablePush: false } : { enablePush: false } }))).request({ ...baseHeaders, ...host_1.getBasicAuth(url), ...headers, ':path': pathname, ':method': method });
+            request = (this[kSession][0][origin] ||= http2.connect(origin, { lookup: this.lookupDns(hostname), ca, cert, key, ciphers, minVersion, settings: localhost ? { maxFrameSize: 16777215, enablePush: false } : { enablePush: false } })).request({ ...baseHeaders, ...host_1.getBasicAuth(url), ...headers, ':path': pathname, ':method': method });
             if (getting) {
                 const listenerMap = {};
                 const onEvent = request.on.bind(request);
@@ -2114,7 +2109,6 @@ class Request extends module_1 {
                     this.matchHeaders(url, response, request, options);
                 });
                 request.on = function (event, listener) {
-                    var _p;
                     switch (event) {
                         case 'data':
                         case 'error':
@@ -2124,7 +2118,7 @@ class Request extends module_1 {
                                 break;
                             }
                             if (!connected) {
-                                (listenerMap[_p = event + '-on'] || (listenerMap[_p] = [])).push(listener);
+                                (listenerMap[event + '-on'] ||= []).push(listener);
                             }
                         default:
                             onEvent(event, listener);
@@ -2133,7 +2127,6 @@ class Request extends module_1 {
                     return this;
                 };
                 request.once = function (event, listener) {
-                    var _p;
                     switch (event) {
                         case 'data':
                         case 'error':
@@ -2143,7 +2136,7 @@ class Request extends module_1 {
                                 break;
                             }
                             if (!connected) {
-                                (listenerMap[_p = event + '-once'] || (listenerMap[_p] = [])).push(listener);
+                                (listenerMap[event + '-once'] ||= []).push(listener);
                             }
                         default:
                             onceEvent(event, listener);
@@ -2160,11 +2153,10 @@ class Request extends module_1 {
                 if (proxy) {
                     const pkg = secure ? 'https-proxy-agent' : 'http-proxy-agent';
                     try {
-                        const { protocol, hostname: proxyname, port, username, password, href } = proxy.host;
-                        keepAlive ?? (keepAlive = proxy.keepAlive);
-                        agentTimeout ?? (agentTimeout = proxy.agentTimeout);
-                        agent = require(pkg)(keepAlive !== null || agentTimeout > 0 ? { protocol, hostname: proxyname, port, username, password, keepAlive: keepAlive ?? true, timeout: agentTimeout } : href);
-                        const proxyHeaders = this[kHeaders] && getBaseHeaders(href, this[kHeaders]) || getBaseHeaders(href, HTTP.HEADERS);
+                        keepAlive ??= proxy.keepAlive;
+                        agentTimeout ??= proxy.agentTimeout;
+                        const proxyHeaders = this[kHeaders] && getBaseHeaders(proxy.host.href, this[kHeaders]) || getBaseHeaders(proxy.host.href, HTTP.HEADERS);
+                        agent = require(pkg)(proxy.host, typeof keepAlive === 'boolean' || agentTimeout > 0 || proxyHeaders ? { keepAlive: keepAlive ?? true, timeout: agentTimeout, headers: proxyHeaders } : undefined);
                         if (proxyHeaders) {
                             baseHeaders = { ...baseHeaders, ...proxyHeaders };
                         }
@@ -2180,7 +2172,7 @@ class Request extends module_1 {
                     agent = new (secure ? https.Agent : http.Agent)({ keepAlive: true, timeout: agentTimeout });
                 }
                 else if (agentTimeout !== 0) {
-                    agentTimeout ?? (agentTimeout = this.agentTimeout);
+                    agentTimeout ??= this.agentTimeout;
                     if (this.keepAlive !== null || agentTimeout > 0) {
                         agent = new (secure ? https.Agent : http.Agent)({ keepAlive: this.keepAlive ?? true, timeout: agentTimeout });
                     }
@@ -2329,16 +2321,16 @@ class Request extends module_1 {
             let formData;
             ({ formData, dataEncoding } = options);
             if (formData) {
-                (parts || (parts = [])).push(...Array.isArray(formData) ? formData : [formData]);
+                (parts ||= []).push(...Array.isArray(formData) ? formData : [formData]);
             }
             else {
-                contentType || (contentType = options.contentType);
+                contentType ||= options.contentType;
             }
         }
         else {
             options = {};
         }
-        const headers = options.headers || (options.headers = {});
+        const headers = options.headers ||= {};
         for (const attr in headers) {
             const name = attr.toLowerCase();
             if (name === 'content-type' || name === 'content-length') {
@@ -2377,8 +2369,8 @@ class Request extends module_1 {
                     }
                     if (target) {
                         if (typeof target === 'string') {
-                            filename || (filename = path.basename(target));
-                            type || (type = module_1.lookupMime(filename));
+                            filename ||= path.basename(target);
+                            type ||= module_1.lookupMime(filename);
                             target = fs.readFileSync(target);
                         }
                         else if (target instanceof stream.Readable) {
@@ -2395,7 +2387,7 @@ class Request extends module_1 {
                             const result = await module_1.resolveMime(target);
                             let ext;
                             if (result) {
-                                type || (type = result.mime);
+                                type ||= result.mime;
                                 ext = result.ext;
                             }
                             else if (type) {
@@ -2438,7 +2430,7 @@ class Request extends module_1 {
             }
             else {
                 data = JSON.stringify(data);
-                contentType || (contentType = "application/json");
+                contentType ||= "application/json";
             }
             headers['content-length'] = Buffer.byteLength(data, (0, types_1.getEncoding)(dataEncoding)).toString();
         }
@@ -2528,11 +2520,11 @@ class Request extends module_1 {
     set agentTimeout(value) {
         if (value > 0) {
             this[kAgentTimeout] = value;
-            this.keepAlive ?? (this.keepAlive = true);
+            this.keepAlive ??= true;
         }
         else {
             this[kAgentTimeout] = 0;
-            this.keepAlive ?? (this.keepAlive = false);
+            this.keepAlive ??= false;
         }
     }
     get agentTimeout() {
@@ -2562,8 +2554,7 @@ class Request extends module_1 {
         return this[kIpVersion];
     }
     get settings() {
-        var _p;
-        return (_p = this.module).settings || (_p.settings = {});
+        return this.module.settings ||= {};
     }
 }
 _a = kSingleton, _b = kHttpVersion, _c = kHeaders, _d = kCerts, _e = kBaseURL, _f = kConnectDns, _g = kPendingDns, _h = kConnectHttp, _j = kStatusOn, _k = kHeadersOn, _l = kDownloading, _m = kHostInfo, _o = kSession;

package/package.json

@@ -1,30 +1,30 @@
-{
-  "name": "@e-mc/request",
-  "version": "0.10.0",
-  "description": "Request constructor for E-mc.",
-  "main": "index.js",
-  "types": "index.d.ts",
-  "publishConfig": {
-    "access": "public"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/anpham6/e-mc.git",
-    "directory": "src/request"
-  },
-  "keywords": [
-    "squared",
-    "squared-functions"
-  ],
-  "author": "An Pham <anpham6@gmail.com>",
-  "license": "BSD 3-Clause",
-  "homepage": "https://github.com/anpham6/e-mc#readme",
-  "dependencies": {
-    "@e-mc/module": "0.10.0",
-    "@e-mc/types": "0.10.0",
-    "combined-stream": "^1.0.8",
-    "js-yaml": "^4.1.0",
-    "picomatch": "^4.0.2",
-    "which": "^2.0.2"
-  }
-}
+{
+  "name": "@e-mc/request",
+  "version": "0.10.2",
+  "description": "Request constructor for E-mc.",
+  "main": "index.js",
+  "types": "index.d.ts",
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/anpham6/e-mc.git",
+    "directory": "src/request"
+  },
+  "keywords": [
+    "squared",
+    "squared-functions"
+  ],
+  "author": "An Pham <anpham6@gmail.com>",
+  "license": "BSD 3-Clause",
+  "homepage": "https://github.com/anpham6/e-mc#readme",
+  "dependencies": {
+    "@e-mc/module": "0.10.2",
+    "@e-mc/types": "0.10.2",
+    "combined-stream": "^1.0.8",
+    "js-yaml": "^4.1.0",
+    "picomatch": "^4.0.2",
+    "which": "^2.0.2"
+  }
+}

package/util.d.ts

@@ -1,26 +1,28 @@
-import type { AuthValue } from '../types/lib/http';
-
-import type { IncomingHttpHeaders, OutgoingHttpHeaders } from 'http';
-import type { Readable, Writable } from 'stream';
-
-declare namespace util {
-    function parseHeader<T = unknown>(headers: IncomingHttpHeaders, name: string): T | undefined;
-    function normalizeHeaders(headers: OutgoingHttpHeaders): OutgoingHttpHeaders;
-    function getBasicAuth(auth: AuthValue): string;
-    function getBasicAuth(username: unknown, password?: unknown): string;
-    function hasBasicAuth(value: string): boolean;
-    function checkRetryable(err: unknown): boolean;
-    function isRetryable(value: number, timeout?: boolean): boolean;
-    function trimPath(value: string): string;
-    function asInt(value: unknown): number;
-    function asFloat(value: unknown): number;
-    function fromSeconds(value: unknown): number;
-    function getTransferRate(length: number, timeMs: number, unitSeparator?: string): string;
-    function hasSameStat(src: string, dest: string, keepEmpty?: boolean): boolean;
-    function hasSize(value: string, keepEmpty?: boolean): boolean;
-    function getSize(value: string, diskUsed?: boolean): number;
-    function byteLength(value: Bufferable, encoding?: BufferEncoding): number;
-    function cleanupStream(target: Readable | Writable, pathname?: string): void;
-}
-
+import type { AuthValue } from '../types/lib/http';
+import type { HttpProxySettings } from '../types/lib/settings';
+
+import type { IncomingHttpHeaders, OutgoingHttpHeaders } from 'http';
+import type { Readable, Writable } from 'stream';
+
+declare namespace util {
+    function parseHeader<T = unknown>(headers: IncomingHttpHeaders, name: string): T | undefined;
+    function normalizeHeaders(headers: OutgoingHttpHeaders): OutgoingHttpHeaders;
+    function getBasicAuth(auth: AuthValue): string;
+    function getBasicAuth(username: unknown, password?: unknown): string;
+    function hasBasicAuth(value: string): boolean;
+    function checkRetryable(err: unknown): boolean;
+    function isRetryable(value: number, timeout?: boolean): boolean;
+    function parseHttpProxy(value?: string, ignoreEnv?: boolean): HttpProxySettings | undefined;
+    function trimPath(value: string): string;
+    function asInt(value: unknown): number;
+    function asFloat(value: unknown): number;
+    function fromSeconds(value: unknown): number;
+    function getTransferRate(length: number, timeMs: number, unitSeparator?: string): string;
+    function hasSameStat(src: string, dest: string, keepEmpty?: boolean): boolean;
+    function hasSize(value: string, keepEmpty?: boolean): boolean;
+    function getSize(value: string, diskUsed?: boolean): number;
+    function byteLength(value: Bufferable, encoding?: BufferEncoding): number;
+    function cleanupStream(target: Readable | Writable, pathname?: string): void;
+}
+
 export = util;

package/util.js

@@ -5,6 +5,7 @@ exports.getBasicAuth = getBasicAuth;
 exports.hasBasicAuth = hasBasicAuth;
 exports.checkRetryable = checkRetryable;
 exports.isRetryable = isRetryable;
+exports.parseHttpProxy = parseHttpProxy;
 exports.trimPath = trimPath;
 exports.asInt = asInt;
 exports.asFloat = asFloat;
@@ -17,8 +18,10 @@ exports.byteLength = byteLength;
 exports.cleanupStream = cleanupStream;
 const path = require("path");
 const fs = require("fs");
+const util = require("util");
 const module_1 = require("@e-mc/module");
 const types_1 = require("@e-mc/types");
+const SUPPORTED_USVSTRING = (0, types_1.supported)(16, 8);
 const safeInt = (value) => value >= 0 ? Math.min(value, Number.MAX_SAFE_INTEGER) : NaN;
 function parseHeader(headers, name) {
     const value = headers[name];
@@ -65,7 +68,7 @@ function getBasicAuth(username, password) {
     if ((0, types_1.isObject)(username)) {
         ({ username, password } = username);
     }
-    return (0, types_1.isString)(username) ? encodeURIComponent(username) + ((0, types_1.isString)(password) ? ':' + encodeURIComponent(password) : '') + '@' : '';
+    return (0, types_1.isString)(username) ? encodeURIComponent(SUPPORTED_USVSTRING ? util.toUSVString(username) : username) + ((0, types_1.isString)(password) ? ':' + encodeURIComponent(SUPPORTED_USVSTRING ? util.toUSVString(password) : password) : '') + '@' : '';
 }
 function hasBasicAuth(value) {
     try {
@@ -110,13 +113,53 @@ function isRetryable(value, timeout) {
         case 502:
         case 503:
         case 521:
-            if (!timeout) {
-                return true;
-            }
+            return !timeout;
         default:
             return false;
     }
 }
+function parseHttpProxy(value, ignoreEnv) {
+    if (!ignoreEnv) {
+        value ||= process.env.HTTP_PROXY || process.env.HTTPS_PROXY;
+    }
+    if (value) {
+        try {
+            const url = new URL(value);
+            if (url.port) {
+                let exclude;
+                if (process.env.NO_PROXY && !ignoreEnv) {
+                    exclude = [];
+                    for (let item of process.env.NO_PROXY.trim().split(/\s*,\s*/)) {
+                        if (item === '*') {
+                            exclude = ['**'];
+                            break;
+                        }
+                        if (module_1.isURL(item)) {
+                            exclude.push(item);
+                        }
+                        else {
+                            const negate = item.startsWith('!') ? (item = item.substring(1), '!') : '';
+                            if (!/^(?:[^.]+|(?:\d+\.){3}\d+)$/.test(item) && !item.includes('*')) {
+                                item = '*' + item;
+                            }
+                            exclude.push(`${negate}http?(s)://${item}?(/)**`);
+                        }
+                    }
+                }
+                return {
+                    address: url.protocol + '//' + url.hostname,
+                    port: url.port,
+                    origin: url.origin,
+                    username: url.username ? decodeURIComponent(url.username) : '',
+                    password: url.password ? decodeURIComponent(url.password) : '',
+                    exclude
+                };
+            }
+        }
+        catch {
+        }
+    }
+}
 function trimPath(value) {
     const length = value.length - 1;
     return value[length] === '/' ? value.substring(0, length) : value;