@e-mc/request 0.8.10 → 0.9.1

package/LICENSE

@@ -1,7 +1,11 @@
 Copyright 2024 An Pham
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+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,7 +1,7 @@
 # @e-mc/request
 
-* NodeJS 14
-* ES2019
+* NodeJS 16
+* ES2020
 
 ## General Usage
 
@@ -9,7 +9,7 @@
 
 ## Interface
 
-- https://www.unpkg.com/@e-mc/types@0.8.10/lib/index.d.ts
+* [View Source](https://www.unpkg.com/@e-mc/types@0.9.1/lib/index.d.ts)
 
 ```typescript
 import type { IModule, ModuleConstructor } from "./index";
@@ -32,13 +32,13 @@ interface IRequest extends IModule {
     init(config?: RequestInit): this;
     apply(options: ApplyOptions): this;
     addDns(hostname: string, address: string, timeout: number): void;
-    addDns(hostname: string, address: string, family?: number | 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[], patternUrl: string, callback: StatusOnCallback): void;
+    statusOn(name: number | number[], globUrl: string, callback: StatusOnCallback): void;
     headersOn(name: string | string[], callback: HeadersOnCallback): void;
-    headersOn(name: string | string[], patternUrl: 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[]>;
@@ -80,12 +80,133 @@ interface RequestConstructor extends ModuleConstructor {
 }
 ```
 
+## 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[];
+    };
+    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;
+        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.8.10/lib/http.d.ts
-- https://www.unpkg.com/@e-mc/types@0.8.10/lib/request.d.ts
-- https://www.unpkg.com/@e-mc/types@0.8.10/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.1/lib/http.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.1/lib/request.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.1/lib/settings.d.ts
+
+* https://www.npmjs.com/package/@types/node
 
 ## LICENSE
 
-MIT
+BSD 3-Clause

package/http/host/index.js

@@ -1,8 +1,6 @@
 "use strict";
 var _a, _b, _c, _d;
-Object.defineProperty(exports, "__esModule", { value: true });
 const tls = require("tls");
-const types_1 = require("@e-mc/types");
 const kProtocol = Symbol('protocol');
 const kSecure = Symbol('secure');
 const kHostname = Symbol('hostname');
@@ -27,7 +25,7 @@ const HOST_ALPN_H2 = [];
 })();
 class HttpHost {
     static normalizeOrigin(value) {
-        return value.replace(/\/+$/, '') + (!/:\d+$/.test(value) ? ':' + (value.startsWith('https') ? '443' : '80') : '');
+        return (value = value.trim()).replace(/\/+$/, '') + (!/:\d+$/.test(value) ? ':' + (value.startsWith('https') ? '443' : '80') : '');
     }
     static formatBasicAuth(url) {
         return url.username ? decodeURIComponent(url.username) + (url.password ? ':' + decodeURIComponent(url.password) : '') : '';
@@ -40,19 +38,19 @@ class HttpHost {
     }
     static defineLocalHost(value) {
         HOST_LOCAL.clear();
-        value.forEach(address => (0, types_1.isString)(address) && HOST_LOCAL.add(address.trim()));
+        value.forEach(address => HOST_LOCAL.add(address));
     }
     static defineProtocolNegotiation(value) {
         const { h2c, h2 } = value;
         const http11 = value['http/1.1'];
         if (Array.isArray(http11)) {
-            HOST_HTTP_1_1.push(...http11.map(address => this.normalizeOrigin(address.trim())));
+            HOST_HTTP_1_1.push(...http11.map(address => this.normalizeOrigin(address)));
         }
         if (Array.isArray(h2c)) {
-            HOST_ALPN_H2C.push(...h2c.map(address => this.normalizeOrigin(address.trim())));
+            HOST_ALPN_H2C.push(...h2c.map(address => this.normalizeOrigin(address)));
         }
         if (Array.isArray(h2)) {
-            HOST_ALPN_H2.push(...h2.map(address => this.normalizeOrigin(address.trim())));
+            HOST_ALPN_H2.push(...h2.map(address => this.normalizeOrigin(address)));
         }
     }
     constructor(url, httpVersion = 1) {
@@ -154,7 +152,6 @@ class HttpHost {
         return ++data[2];
     }
     upgrade(version, altSvc) {
-        var _e;
         if (altSvc && this.secure) {
             if (altSvc === 'clear') {
                 this.clearAltSvc();
@@ -174,13 +171,11 @@ class HttpHost {
                     }
                     return false;
                 };
-                const pattern = new RegExp(`h${i + 1}(?:-\\d+)?="([^:]*):(\\d+)"([^,]*)`, 'g');
                 const addresses = [];
                 const time = Date.now();
                 const hostname = this[kHostname];
                 const excluded = this[kAltSvcError];
-                let match;
-                while (match = pattern.exec(altSvc)) {
+                for (const match of altSvc.matchAll(new RegExp(`h${i + 1}(?:-\\d+)?="([^:]*):(\\d+)"([^,]*)`, 'g'))) {
                     const port = match[2];
                     if (!match[1] && port === this.port) {
                         increment(2);
@@ -188,7 +183,7 @@ class HttpHost {
                         break;
                     }
                     const address = match[1] || hostname;
-                    const ma = +(((_e = /ma=(\d+)/.exec(match[3])) === null || _e === void 0 ? void 0 : _e[1]) || 86400);
+                    const ma = +(/ma=(\d+)/.exec(match[3])?.[1] || 86400);
                     if (!excluded.includes(`h${i + 1}:${address}:${port}`)) {
                         addresses.push([
                             address,
@@ -328,9 +323,5 @@ class HttpHost {
     }
 }
 _a = kVersionData, _b = kAltSvc, _c = kAltSvcQueue, _d = kAltSvcError;
-exports.default = HttpHost;
 
-if (exports.default) {
-    module.exports = exports.default;
-    module.exports.default = exports.default;
-}
+module.exports = HttpHost;

package/index.js

@@ -1,6 +1,5 @@
 "use strict";
 var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
-Object.defineProperty(exports, "__esModule", { value: true });
 const path = require("path");
 const fs = require("fs");
 const child_process = require("child_process");
@@ -16,7 +15,6 @@ const combined = require("combined-stream");
 const pm = require("picomatch");
 const yaml = require("js-yaml");
 const which = require("which");
-const lib_v4_1 = require("@e-mc/module/lib-v4");
 const types_1 = require("@e-mc/types");
 const module_1 = require("@e-mc/module");
 const host_1 = require("@e-mc/request/http/host");
@@ -36,8 +34,7 @@ const kConnectHttp = Symbol('connectHttp');
 const kStatusOn = Symbol('statusOn');
 const kHeadersOn = Symbol('headersOn');
 const PLATFORM_WIN32 = process.platform === 'win32';
-const SUPPORT_NODEJS20 = module_1.default.supported(20);
-const SUPPORT_ABORTSIGNAL = module_1.default.supported(15, 4);
+const SUPPORT_NODEJS20 = module_1.supported(20);
 const HTTP = {
     HOST: {},
     HEADERS: {},
@@ -106,7 +103,7 @@ function getBaseHeaders(uri, headers) {
     }
 }
 function setDnsCache(hostname, value, expires) {
-    expires !== null && expires !== void 0 ? expires : (expires = DNS.EXPIRES);
+    expires ?? (expires = DNS.EXPIRES);
     if (expires > 0 && !DNS.CACHE[hostname]) {
         DNS.CACHE[hostname] = value;
         if (expires !== Infinity) {
@@ -137,12 +134,12 @@ function setOutgoingHeaders(output, headers) {
 }
 function getProxySettings(request, agentTimeout) {
     const proxy = request.proxy;
-    if ((proxy === null || proxy === void 0 ? void 0 : proxy.address) && proxy.port) {
+    if (proxy?.address && proxy.port) {
         const port = (0, util_1.asInt)(proxy.port);
-        const address = (!module_1.default.isURL(proxy.address) ? port === 80 ? 'http://' : 'https://' : '') + proxy.address;
+        const address = (!module_1.isURL(proxy.address) ? port === 80 ? 'http://' : 'https://' : '') + proxy.address;
         try {
             let host = new URL(address + ':' + port), include, exclude;
-            if ((0, types_1.isString)(proxy.username)) {
+            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)) {
@@ -199,7 +196,7 @@ function validateCerts(certs) {
     const file = {};
     const checkFile = (values) => {
         for (let pathname of values) {
-            if (module_1.default.isPath(pathname = path.resolve(pathname))) {
+            if (module_1.isPath(pathname = path.resolve(pathname))) {
                 return pathname;
             }
         }
@@ -270,7 +267,7 @@ function abortHeaders(href, request, options) {
     }
     request.destroy(reason);
 }
-class Request extends module_1.default {
+class Request extends module_1 {
     static async purgeMemory(percent = 1, limit = 0, parent) {
         if (percent >= 1) {
             resetHttpHost();
@@ -285,7 +282,6 @@ class Request extends module_1.default {
         return parent ? super.purgeMemory(percent, limit) : 0;
     }
     static loadSettings(settings, password) {
-        var _o;
         if (this.enabled("process.password") && !super.loadSettings({ process: settings.process }, password)) {
             return false;
         }
@@ -404,7 +400,7 @@ class Request extends module_1.default {
                 [TLS.TEXT, TLS.FILE] = validateCerts(certs);
             }
             HTTP.PROXY = getProxySettings(request, agent_timeout);
-            const time_format = (_o = request.settings) === null || _o === void 0 ? void 0 : _o.time_format;
+            const time_format = request.settings?.time_format;
             switch (time_format) {
                 case 'readable':
                 case 'relative':
@@ -415,7 +411,7 @@ class Request extends module_1.default {
         }
         LOG_HTTP = this.hasLogType(1024);
         LOG_TIMEPROCESS = this.hasLogType(256);
-        LOG_STDOUT = module_1.default.hasLogType(32768);
+        LOG_STDOUT = module_1.hasLogType(32768);
         return true;
     }
     static readCACert(value, cache) {
@@ -434,7 +430,7 @@ class Request extends module_1.default {
         if (this.isURL(value)) {
             return value;
         }
-        const auth = host_1.default.formatBasicAuth(url);
+        const auth = host_1.formatBasicAuth(url);
         return url.protocol + '//' + (auth && (auth + '@')) + url.hostname + (url.port ? ':' + url.port : '') + (value.startsWith('/') ? '' : '/') + value;
     }
     static fromStatusCode(value) {
@@ -629,7 +625,6 @@ class Request extends module_1.default {
         return ARIA2.BIN;
     }
     constructor(data) {
-        var _o;
         super();
         this.startTime = Date.now();
         this.readExpect = 'none';
@@ -661,13 +656,13 @@ class Request extends module_1.default {
             const timeout = (0, util_1.fromSeconds)(data.timeout);
             let value;
             this.readTimeout = (value = (0, util_1.fromSeconds)(read_timeout)) >= 0 ? value : READ_TIMEOUT;
-            this.keepAlive = typeof (value = agent === null || agent === void 0 ? void 0 : agent.keep_alive) === 'boolean' ? value : KEEP_ALIVE;
-            this.acceptEncoding = typeof (value = use === null || use === void 0 ? void 0 : use.accept_encoding) === 'boolean' ? value : ACCEPT_ENCODING;
-            if ((value = (0, util_1.asInt)(use === null || use === void 0 ? void 0 : use.http_version)) === 1 || value === 2) {
+            this.keepAlive = typeof (value = agent?.keep_alive) === 'boolean' ? value : KEEP_ALIVE;
+            this.acceptEncoding = typeof (value = use?.accept_encoding) === 'boolean' ? value : ACCEPT_ENCODING;
+            if ((value = (0, util_1.asInt)(use?.http_version)) === 1 || value === 2) {
                 this[kHttpVersion] = value;
             }
-            this[kIpVersion] = (value = (0, util_1.asInt)((_o = data.dns) === null || _o === void 0 ? void 0 : _o.family)) && (value === 4 || value === 6) ? value : 0;
-            if ((value = (0, util_1.fromSeconds)(agent === null || agent === void 0 ? void 0 : agent.timeout)) >= 0) {
+            this[kIpVersion] = (value = (0, util_1.asInt)(data.dns?.family)) && (value === 4 || value === 6) ? value : 0;
+            if ((value = (0, util_1.fromSeconds)(agent?.timeout)) >= 0) {
                 this[kAgentTimeout] = value;
             }
             else {
@@ -709,13 +704,12 @@ class Request extends module_1.default {
         this.module = data;
     }
     flushLog() {
-        var _o;
         const log = this._logQueued;
         if (this[kSingleton]) {
             log.length = 0;
         }
         else {
-            if (log.length && !((_o = this.host) === null || _o === void 0 ? void 0 : _o.aborted)) {
+            if (log.length && !this.host?.aborted) {
                 const output = [];
                 let count = 0;
                 this[kConnectHttp].forEach((protocol, index) => {
@@ -748,19 +742,19 @@ class Request extends module_1.default {
                     const width = count.toString().length;
                     output.forEach(item => {
                         const [title, origin, downloads, messages] = item;
-                        const options = { ...title === 'HTTP1' ? module_1.default.LOG_STYLE_NOTICE : module_1.default.LOG_STYLE_INFO };
+                        const options = { ...title === 'HTTP1' ? module_1.LOG_STYLE_NOTICE : module_1.LOG_STYLE_INFO };
                         if (messages.length === 1) {
                             const message = messages[0];
                             message[1] = title;
                             message[2] = [origin + message[2][0], message[2][1]];
                             message[4] = Object.assign(message[4], options);
-                            module_1.default.formatMessage(...message);
+                            module_1.formatMessage(...message);
                         }
                         else {
                             this.formatMessage(1024, title, [origin, 'downloads: ' + downloads.toString().padStart(width)], '', options);
                             messages.forEach(args => {
                                 args[4].titleIndent = true;
-                                module_1.default.formatMessage(...args);
+                                module_1.formatMessage(...args);
                             });
                         }
                     });
@@ -787,7 +781,7 @@ class Request extends module_1.default {
     }
     init(config) {
         if (config) {
-            const { headers, httpVersion, ipVersion, requestTimeout, readTimeout = requestTimeout } = config;
+            const { headers, httpVersion, ipVersion, readTimeout } = config;
             if ((0, types_1.isObject)(headers)) {
                 setOutgoingHeaders(this[kHeaders] || (this[kHeaders] = {}), headers);
             }
@@ -822,7 +816,7 @@ class Request extends module_1.default {
                         this._config.retryWait = Math.min(retryWait, 600 * 1000);
                     }
                     if (retryAfter >= 0) {
-                        this._config.retryAfter = Math.min(retryAfter, module_1.default.MAX_TIMEOUT);
+                        this._config.retryAfter = Math.min(retryAfter, module_1.MAX_TIMEOUT);
                     }
                     if (retryLimit >= 0) {
                         this._config.retryLimit = retryLimit;
@@ -998,7 +992,7 @@ class Request extends module_1.default {
         if (!ARIA2.BIN) {
             return Promise.reject((0, types_1.errorMessage)("aria2", "Binary not found"));
         }
-        if (typeof uri === 'string' && module_1.default.isURL(uri)) {
+        if (typeof uri === 'string' && module_1.isURL(uri)) {
             try {
                 uri = new URL(uri);
             }
@@ -1017,7 +1011,7 @@ class Request extends module_1.default {
                     let next = false;
                     binOpts = binOpts.filter(opt => !((0, types_1.isString)(opt) && /^-[a-z][\S\s]*$/i.test(opt.trim()))).map((opt) => {
                         if (next) {
-                            if (!module_1.default.asString(opt).startsWith('--')) {
+                            if (!module_1.asString(opt).startsWith('--')) {
                                 return [];
                             }
                             next = false;
@@ -1039,12 +1033,12 @@ class Request extends module_1.default {
                                                 }
                                                 break;
                                             default:
-                                                return match[3] ? [match[1], module_1.default.sanitizeArgs(match[3])] : [match[1]];
+                                                return match[3] ? [match[1], module_1.sanitizeArgs(match[3])] : [match[1]];
                                         }
                                     }
                                 }
                                 else if (value) {
-                                    return [module_1.default.sanitizeArgs(value)];
+                                    return [module_1.sanitizeArgs(value)];
                                 }
                                 break;
                             }
@@ -1053,7 +1047,7 @@ class Request extends module_1.default {
                                 return [opt.toString()];
                             default:
                                 if ((0, types_1.isArray)(opt)) {
-                                    return opt.filter(item => (0, types_1.isString)(item)).map((item) => module_1.default.sanitizeArgs(item));
+                                    return opt.filter(item => (0, types_1.isString)(item)).map((item) => module_1.sanitizeArgs(item));
                                 }
                                 break;
                         }
@@ -1062,7 +1056,7 @@ class Request extends module_1.default {
                 }
             }
         }
-        if (!(0, types_1.isString)(pathname)) {
+        if (!pathname) {
             if (this.host) {
                 return Promise.reject((0, types_1.errorMessage)("aria2", "Invalid parameters", 'pathname'));
             }
@@ -1071,12 +1065,11 @@ class Request extends module_1.default {
         if ((this.host || this.hasOwnPermission()) && !this.canWrite(pathname = path.resolve(pathname.trim()))) {
             return Promise.reject((0, types_1.errorMessage)("aria2", "Unsupported access", pathname));
         }
-        if (!module_1.default.createDir(pathname)) {
+        if (!module_1.createDir(pathname)) {
             return Promise.reject((0, types_1.errorMessage)("aria2", "Path is not a directory", pathname));
         }
-        silent !== null && silent !== void 0 ? silent : (silent = this[kSingleton]);
+        silent ?? (silent = this[kSingleton]);
         return new Promise((resolve, reject) => {
-            var _o;
             let protocol, origin, username, password;
             if (uri instanceof URL) {
                 ({ protocol, origin, username, password, href: uri } = uri);
@@ -1134,7 +1127,7 @@ class Request extends module_1.default {
                 '--file-allocation=' + ARIA2.FILE_ALLOCATION,
                 '--max-tries=' + (retryLimit + 1)
             ];
-            const ignoreOpt = (...values) => !(binOpts === null || binOpts === void 0 ? void 0 : binOpts.some(item => values.includes(item)));
+            const ignoreOpt = (...values) => !binOpts?.some(item => values.includes(item));
             if (ARIA2.MAX_CONCURRENT_DOWNLOADS) {
                 opts.push('--max-concurrent-downloads=' + ARIA2.MAX_CONCURRENT_DOWNLOADS);
             }
@@ -1183,7 +1176,7 @@ class Request extends module_1.default {
                     }
                 }
                 if (origin) {
-                    const secure = ((_o = this[kCerts]) === null || _o === void 0 ? void 0 : _o[1][origin]) || (this.host ? TLS.FILE[origin] : null);
+                    const secure = this[kCerts]?.[1][origin] || this.host && TLS.FILE[origin];
                     if (secure) {
                         if (secure.ca && ignoreOpt('--ca-certificate')) {
                             args.push(`--ca-certificate="${escapeQuote(secure.ca)}"`);
@@ -1238,8 +1231,8 @@ class Request extends module_1.default {
                 args = binOpts.concat(args);
             }
             if (args.length) {
-                if (module_1.default.hasLogType(32768)) {
-                    this.formatMessage(32768, 'ARIA2', ARIA2.BIN, args.join(' '), { ...module_1.default.LOG_STYLE_WARN });
+                if (module_1.hasLogType(32768)) {
+                    this.formatMessage(32768, 'ARIA2', ARIA2.BIN, args.join(' '), { ...module_1.LOG_STYLE_WARN });
                 }
                 else {
                     this.addLog(types_1.STATUS_TYPE.INFO, path.basename(ARIA2.BIN) + ' ' + args.join(' '), "aria2");
@@ -1254,7 +1247,7 @@ class Request extends module_1.default {
                 closeTorrent(pid);
                 reject(err);
             };
-            const { pid, stdout, stderr } = child_process.spawn(module_1.default.sanitizeCmd(ARIA2.BIN), args, { cwd: pathname, shell: true, signal: this.signal, uid: ARIA2.EXEC_UID, gid: ARIA2.EXEC_GID })
+            const { pid, stdout, stderr } = child_process.spawn(module_1.sanitizeCmd(ARIA2.BIN), args, { cwd: pathname, shell: true, signal: this.signal, uid: ARIA2.EXEC_UID, gid: ARIA2.EXEC_GID })
                 .on('exit', code => {
                 closeTorrent(pid);
                 if (aborted) {
@@ -1264,15 +1257,15 @@ class Request extends module_1.default {
                     errorResponse(pid, (0, types_1.createAbortError)());
                     return;
                 }
-                if (!code) {
-                    const currentTime = Date.now();
-                    const pattern = /\|(OK|ERR|INPR)\s*\|\s*([^|]+)\|\s*(\d+)\|([^\n]+)/g;
-                    const result = [];
-                    let messageUnit, match;
-                    while (match = pattern.exec(out)) {
-                        if (match[4].startsWith('[MEMORY]')) {
-                            continue;
-                        }
+                if (code) {
+                    reject((0, types_1.errorValue)(message || "Unknown", 'Exit status: ' + code));
+                    return;
+                }
+                const currentTime = Date.now();
+                const result = [];
+                let messageUnit;
+                for (const match of out.matchAll(/\|(OK|ERR|INPR)\s*\|\s*([^|]+)\|\s*(\d+)\|([^\n]+)/g)) {
+                    if (!match[4].startsWith('[MEMORY]')) {
                         const file = path.normalize(match[4].trim());
                         switch (match[1]) {
                             case 'OK':
@@ -1290,20 +1283,17 @@ class Request extends module_1.default {
                                 break;
                         }
                     }
-                    if (result.length && !silent && LOG_HTTP && LOG_TIMEPROCESS) {
-                        this.writeTimeProcess("aria2", uri, startTime, { type: 1024, queue: true, messageUnit, messageUnitMinWidth: 9, bypassLog: true });
-                    }
-                    this.addLog(result.length ? types_1.STATUS_TYPE.INFO : types_1.STATUS_TYPE.ERROR, out, currentTime, currentTime - startTime, "aria2", uri);
-                    resolve(result);
                 }
-                else {
-                    reject((0, types_1.errorValue)(message || "Unknown", 'Exit status: ' + code));
+                if (result.length && !silent && LOG_HTTP && LOG_TIMEPROCESS) {
+                    this.writeTimeProcess("aria2", uri, startTime, { type: 1024, queue: true, messageUnit, messageUnitMinWidth: 9, bypassLog: true });
                 }
+                this.addLog(result.length ? types_1.STATUS_TYPE.INFO : types_1.STATUS_TYPE.ERROR, out, currentTime, currentTime - startTime, "aria2", uri);
+                resolve(result);
             })
                 .on('error', err => errorResponse(pid, err));
             stdout.setEncoding('utf-8').on('data', (value) => out += value);
             stderr.setEncoding('utf-8').on('data', (value) => message += value);
-            if (pid !== undefined && module_1.default.isFile(uri, 'torrent')) {
+            if (pid !== undefined && module_1.isFile(uri, 'torrent')) {
                 if (!ARIA2.PID_TIMER) {
                     const clearTimer = () => {
                         clearInterval(ARIA2.PID_TIMER);
@@ -1324,24 +1314,22 @@ class Request extends module_1.default {
                         }
                         if (ARIA2.UPDATE_STATUS && !silent) {
                             const item = ARIA2.PID_QUEUE.shift();
-                            if (item) {
-                                const broadcastId = item[2];
-                                if (!ARIA2.UPDATE_BROADCAST_ONLY || broadcastId) {
-                                    let progressBar;
-                                    if (item[2]) {
-                                        progressBar = true;
-                                    }
-                                    else {
-                                        const current = (0, types_1.getLogCurrent)();
-                                        progressBar = (current === null || current === void 0 ? void 0 : current.type) === 128 && current.title === "aria2";
-                                    }
-                                    this.formatMessage(128, "aria2", ['Downloading...', (0, types_1.formatTime)(startTime, true)], (PLATFORM_WIN32 ? 'taskkill /f /pid' : 'kill') + ` ${item[0]} -> ` + item[1], { ...module_1.default.LOG_STYLE_INFO, progressBar, broadcastId });
-                                }
-                                ARIA2.PID_QUEUE.push(item);
-                            }
-                            else {
+                            if (!item) {
                                 clearTimer();
+                                return;
                             }
+                            if ((!ARIA2.UPDATE_BROADCAST_ONLY || item[2]) && this.host?.logState !== 0) {
+                                let progressBar;
+                                if (item[2]) {
+                                    progressBar = true;
+                                }
+                                else {
+                                    const current = (0, types_1.getLogCurrent)();
+                                    progressBar = current?.type === 128 && current.title === "aria2";
+                                }
+                                this.formatMessage(128, "aria2", ['Downloading...', (0, types_1.formatTime)(startTime, true)], (PLATFORM_WIN32 ? 'taskkill /f /pid' : 'kill') + ` ${item[0]} -> ` + item[1], { ...module_1.LOG_STYLE_INFO, progressBar, broadcastId: item[2] });
+                            }
+                            ARIA2.PID_QUEUE.push(item);
                         }
                     }, (ARIA2.UPDATE_STATUS || 30) * 1000);
                 }
@@ -1364,17 +1352,16 @@ class Request extends module_1.default {
         }
         let host;
         if (this.host) {
-            host = (_o = HTTP.HOST)[_p = url.origin] || (_o[_p] = new host_1.default(url, HTTP.VERSION));
+            host = (_o = HTTP.HOST)[_p = url.origin] || (_o[_p] = new host_1(url, HTTP.VERSION));
         }
         else {
-            host = (_q = this[kHostInfo])[_r = url.origin] || (_q[_r] = new host_1.default(url, this.httpVersion || 1));
+            host = (_q = this[kHostInfo])[_r = url.origin] || (_q[_r] = new host_1(url, this.httpVersion || 1));
         }
         return { ...options, host, url };
     }
     open(uri, options) {
-        var _o;
-        var _p, _q;
-        let { host, url, httpVersion, method = 'GET', encoding, format, headers, postData, keepAlive, agentTimeout, socketPath, timeout = this._config.connectTimeout, outStream } = options;
+        var _o, _p;
+        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';
         if (format) {
@@ -1421,6 +1408,12 @@ class Request extends module_1.default {
             url = new URL(uri);
             options.url = url;
         }
+        if (search) {
+            for (const param in search) {
+                url.searchParams.append(param, search[param]);
+            }
+            uri = url.href;
+        }
         const checkEncoding = (response, statusCode, contentEncoding = '') => {
             switch (statusCode) {
                 case 206:
@@ -1428,7 +1421,7 @@ class Request extends module_1.default {
                 case 204:
                     return;
             }
-            const chunkSize = outStream === null || outStream === void 0 ? void 0 : outStream.writableHighWaterMark;
+            const chunkSize = outStream?.writableHighWaterMark;
             let pipeTo;
             switch (contentEncoding.trim().toLowerCase()) {
                 case 'gzip':
@@ -1464,17 +1457,17 @@ class Request extends module_1.default {
         const proxy = this.proxyOf(uri, localhost);
         const version = this.httpVersion;
         let request, ca, cert, key, minVersion, baseHeaders = this.headersOf(uri);
-        if (getting && this.acceptEncoding && !localhost && !(baseHeaders === null || baseHeaders === void 0 ? void 0 : baseHeaders['accept-encoding'])) {
-            (_p = (headers || (headers = {})))['accept-encoding'] || (_p['accept-encoding'] = 'gzip, deflate, br' + (LIB_ZSTD ? ', zstd' : ''));
+        if (getting && this.acceptEncoding && !localhost && !baseHeaders?.['accept-encoding']) {
+            (_o = (headers || (headers = {})))['accept-encoding'] || (_o['accept-encoding'] = 'gzip, deflate, br' + (LIB_ZSTD ? ', zstd' : ''));
         }
         if (secure) {
-            const certs = ((_o = this[kCerts]) === null || _o === void 0 ? void 0 : _o[0][origin]) || (this.host ? TLS.TEXT[origin] : null);
+            const certs = this[kCerts]?.[0][origin] || this.host && TLS.TEXT[origin];
             if (certs) {
                 ({ ca, cert, key, version: minVersion } = certs);
             }
         }
         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, minVersion, settings: localhost ? { maxFrameSize: 16777215, enablePush: false } : { enablePush: false } }))).request({ ...baseHeaders, ...host_1.default.getBasicAuth(url), ...headers, ':path': pathname, ':method': method });
+            request = ((_p = this[kSession][0])[origin] || (_p[origin] = http2.connect(origin, { lookup: this.lookupDns(hostname), ca, cert, key, 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);
@@ -1558,8 +1551,8 @@ class Request extends module_1.default {
                     const pkg = secure ? 'https-proxy-agent' : 'http-proxy-agent';
                     try {
                         const { protocol, hostname: proxyname, port, username, password, href } = proxy.host;
-                        keepAlive !== null && keepAlive !== void 0 ? keepAlive : (keepAlive = proxy.keepAlive || false);
-                        agentTimeout !== null && agentTimeout !== void 0 ? agentTimeout : (agentTimeout = proxy.agentTimeout);
+                        keepAlive ?? (keepAlive = proxy.keepAlive || false);
+                        agentTimeout ?? (agentTimeout = proxy.agentTimeout);
                         agent = require(pkg)(keepAlive || agentTimeout > 0 ? { protocol, hostname: proxyname, port, username, password, keepAlive, timeout: agentTimeout } : href);
                         const proxyHeaders = this[kHeaders] && getBaseHeaders(href, this[kHeaders]) || getBaseHeaders(href, HTTP.HEADERS);
                         if (proxyHeaders) {
@@ -1578,13 +1571,13 @@ class Request extends module_1.default {
                 }
                 else if (agentTimeout !== 0) {
                     keepAlive = this.keepAlive || false;
-                    agentTimeout !== null && agentTimeout !== void 0 ? agentTimeout : (agentTimeout = this.agentTimeout);
+                    agentTimeout ?? (agentTimeout = this.agentTimeout);
                     if (keepAlive || agentTimeout > 0) {
                         agent = new (secure ? https.Agent : http.Agent)({ keepAlive, timeout: agentTimeout });
                     }
                 }
             }
-            const basicAuth = host_1.default.getBasicAuth(url);
+            const basicAuth = host_1.getBasicAuth(url);
             if (baseHeaders || basicAuth) {
                 headers = { ...baseHeaders, ...basicAuth, ...headers };
             }
@@ -1602,7 +1595,6 @@ class Request extends module_1.default {
                 lookup: this.lookupDns(hostname),
                 agent
             }, response => {
-                var _o;
                 const statusCode = response.statusCode;
                 const incoming = response.headers;
                 if (this.matchStatus(statusCode, url, incoming, request, options) && (getting || posting) && statusCode >= 200 && statusCode < 300) {
@@ -1638,7 +1630,7 @@ class Request extends module_1.default {
                         source.on('error', err => request.emit('error', err));
                     }
                     if (!posting) {
-                        if (version === 2 && ((_o = incoming.upgrade) === null || _o === void 0 ? void 0 : _o.includes('h2'))) {
+                        if (version === 2 && incoming.upgrade?.includes('h2')) {
                             host.version = 2;
                         }
                         else if (!host.didAltSvc(1)) {
@@ -1665,7 +1657,7 @@ class Request extends module_1.default {
         if (timeout > 0) {
             request.setTimeout(timeout);
         }
-        if ((getting || posting) && SUPPORT_ABORTSIGNAL) {
+        if (getting || posting) {
             const ac = new AbortController();
             this[kDownloading].add(options.outAbort = ac);
             stream.addAbortSignal(ac.signal, request);
@@ -1741,7 +1733,7 @@ class Request extends module_1.default {
                 };
                 const addValue = (name, value) => {
                     if (value !== undefined) {
-                        const disposition = createPart(name) + module_1.default.asString(value) + "\r\n";
+                        const disposition = createPart(name) + module_1.asString(value) + "\r\n";
                         write.append(disposition);
                         contentLength += Buffer.byteLength(disposition);
                     }
@@ -1760,7 +1752,7 @@ class Request extends module_1.default {
                         try {
                             if (typeof target === 'string') {
                                 filename || (filename = path.basename(target));
-                                type || (type = module_1.default.lookupMime(filename));
+                                type || (type = module_1.lookupMime(filename));
                                 target = fs.readFileSync(target);
                             }
                             else if (target instanceof stream.Readable) {
@@ -1774,14 +1766,14 @@ class Request extends module_1.default {
                                 throw (0, types_1.errorMessage)('File', "Unknown", "multipart/form-data");
                             }
                             if (!type || !filename) {
-                                const result = await module_1.default.resolveMime(target);
+                                const result = await module_1.resolveMime(target);
                                 let ext;
                                 if (result) {
                                     type || (type = result.mime);
                                     ext = result.ext;
                                 }
                                 else if (type) {
-                                    ext = module_1.default.lookupMime(type, true);
+                                    ext = module_1.lookupMime(type, true);
                                 }
                                 if (ext && !filename) {
                                     filename = (0, types_1.generateUUID)() + '.' + ext;
@@ -1809,7 +1801,7 @@ class Request extends module_1.default {
                 }
             }
             if (!valid) {
-                return Promise.reject((0, types_1.errorValue)('No files were detected', "multipart/form-data"));
+                return Promise.reject((0, types_1.errorValue)("No files were attached", "multipart/form-data"));
             }
         }
         else {
@@ -1817,7 +1809,7 @@ class Request extends module_1.default {
                 contentType = 'application/' + contentType.trim();
             }
             if (!(0, types_1.isPlainObject)(data)) {
-                data = module_1.default.asString(data);
+                data = module_1.asString(data);
             }
             else if (contentType === "application/x-www-form-urlencoded") {
                 data = qs.stringify(data);
@@ -1848,7 +1840,7 @@ class Request extends module_1.default {
                 if (!closed) {
                     closed = true;
                     if (outStream && (0, types_1.isString)(pipeTo)) {
-                        (0, lib_v4_1.cleanupStream)(outStream, pipeTo);
+                        (0, util_1.cleanupStream)(outStream, pipeTo);
                     }
                     reject(typeof err === 'string' ? new Error(err) : err);
                 }
@@ -1865,10 +1857,10 @@ class Request extends module_1.default {
                 try {
                     const request = this.opts(href, opts);
                     if (outStream && (0, types_1.isString)(pipeTo)) {
-                        (0, lib_v4_1.cleanupStream)(outStream, pipeTo);
+                        (0, util_1.cleanupStream)(outStream, pipeTo);
                     }
                     if (pipeTo) {
-                        if ((0, types_1.isString)(pipeTo)) {
+                        if (typeof pipeTo === 'string') {
                             outStream = fs.createWriteStream(pipeTo, { emitClose: false, highWaterMark: request.host.localhost ? 65536 : 4096 });
                             request.outStream = outStream;
                         }
@@ -1880,7 +1872,7 @@ class Request extends module_1.default {
                         request.httpVersion = httpVersion;
                     }
                     const client = this.open(href, request);
-                    const { host, url, encoding, outFormat } = request;
+                    const { host, url, encoding, progressId, outFormat } = request;
                     let buffer, aborted;
                     ({ httpVersion, outAbort } = request);
                     const isAborted = () => client.destroyed || httpVersion === 2 && client.aborted;
@@ -1912,21 +1904,21 @@ class Request extends module_1.default {
                         downloadUri.call(this, href);
                     };
                     const acceptResponse = (headers) => {
-                        var _o;
                         if ('outHeaders' in opts) {
                             opts.outHeaders = headers;
                         }
                         if ('outFilename' in opts) {
                             opts.outFilename = (0, util_1.parseHeader)(headers, 'content-disposition');
                         }
-                        const buffering = (_o = request.connected) === null || _o === void 0 ? void 0 : _o.call(client, headers);
+                        const buffering = request.connected?.call(client, headers);
                         const pipeline = pipeTo ? !(0, types_1.isString)(pipeTo) : false;
                         const enabled = buffering !== false && !pipeline;
-                        const readTimeout = this.readTimeout;
-                        let mibsTime, delayTime;
-                        if (log || readTimeout > 0) {
+                        const maxBufferSize = request.maxBufferSize ? (0, types_1.alignSize)(request.maxBufferSize) : 0;
+                        const { host: parent, readTimeout } = this;
+                        const contentLength = parent && progressId !== undefined ? parseInt(headers['content-length'] || '0') : 0;
+                        let dataLength = 0, mibsTime, delayTime;
+                        if (log || readTimeout > 0 || contentLength > 0) {
                             client.once('readable', () => {
-                                var _o;
                                 if (readTimeout > 0) {
                                     timeout = setTimeout(() => {
                                         abortResponse();
@@ -1934,7 +1926,7 @@ class Request extends module_1.default {
                                     }, readTimeout);
                                 }
                                 if (log) {
-                                    switch (((_o = this.settings) === null || _o === void 0 ? void 0 : _o.time_format) || LOG_TIMEFORMAT) {
+                                    switch (this.settings?.time_format || LOG_TIMEFORMAT) {
                                         case 'readable':
                                             delayTime = process.hrtime(startTime);
                                             break;
@@ -1942,7 +1934,10 @@ class Request extends module_1.default {
                                             delayTime = Date.now() - this.startTime;
                                             break;
                                     }
-                                    mibsTime = process.hrtime();
+                                }
+                                mibsTime = process.hrtime();
+                                if (contentLength > 0) {
+                                    parent.updateProgress("request", progressId, 0, 0, mibsTime);
                                 }
                             });
                         }
@@ -1962,6 +1957,19 @@ class Request extends module_1.default {
                                 else {
                                     buffer = typeof chunk === 'string' ? chunk : [chunk];
                                 }
+                                if (contentLength > 0) {
+                                    dataLength += Buffer.byteLength(chunk, encoding);
+                                    parent.updateProgress("request", progressId, dataLength, contentLength);
+                                }
+                                if (maxBufferSize > 0) {
+                                    if (contentLength === 0) {
+                                        dataLength += Buffer.byteLength(chunk, encoding);
+                                    }
+                                    if (dataLength > maxBufferSize) {
+                                        abortResponse();
+                                        throwError((0, types_1.errorValue)("Size limit was exceeded", href.toString()));
+                                    }
+                                }
                             });
                         }
                         client.once('end', () => {
@@ -1984,20 +1992,15 @@ class Request extends module_1.default {
                                         buffer = buffer.toString(encoding);
                                     }
                                 }
+                                dataLength = Buffer.byteLength(buffer, encoding);
                                 if (mibsTime) {
-                                    const unit = (Buffer.byteLength(buffer, encoding) * 8) / ((0, types_1.convertTime)(process.hrtime(mibsTime)) * 1000);
-                                    if (unit < 1) {
-                                        messageUnit = Math.ceil(unit * 1000) + 'KiB/s';
-                                    }
-                                    else if (unit < 1000) {
-                                        messageUnit = unit.toPrecision(3) + 'MiB/s';
-                                    }
-                                    else {
-                                        messageUnit = (unit / 1000).toPrecision(3) + 'GiB/s';
-                                    }
+                                    messageUnit = (0, util_1.getTransferRate)(dataLength, (0, types_1.convertTime)(process.hrtime(mibsTime), false) * 1000);
+                                }
+                                if (contentLength > 0) {
+                                    parent.updateProgress("request", progressId, dataLength, dataLength);
                                 }
                                 if (typeof buffer === 'string') {
-                                    if (buffer.startsWith('\uFEFF') && encoding !== 'utf16le') {
+                                    if (buffer.startsWith('\uFEFF') && encoding !== 'utf16le' && encoding !== 'utf-16le') {
                                         buffer = buffer.substring(1);
                                     }
                                     if (outFormat) {
@@ -2037,11 +2040,14 @@ class Request extends module_1.default {
                                     result = buffer;
                                 }
                             }
-                            else if (enabled && this.readExpect === 'always') {
-                                throwError('No data received');
-                                return;
-                            }
                             else {
+                                if (contentLength > 0) {
+                                    parent.updateProgress("request", progressId, 0, contentLength);
+                                }
+                                if (enabled && this.readExpect === 'always') {
+                                    throwError('No data received');
+                                    return;
+                                }
                                 result = encoding && !pipeline ? '' : null;
                                 titleBgColor = 'bgBlue';
                             }
@@ -2055,7 +2061,10 @@ class Request extends module_1.default {
                     const redirectResponse = (statusCode, location) => {
                         abortResponse();
                         if (location) {
-                            if (++redirects <= this._config.redirectLimit) {
+                            if (request.follow_redirect === false) {
+                                throwError(formatStatus(statusCode, 'Follow redirect was disabled'));
+                            }
+                            else if (++redirects <= this._config.redirectLimit) {
                                 downloadUri.call(this, Request.fromURL(url, location));
                             }
                             else {
@@ -2264,8 +2273,7 @@ class Request extends module_1.default {
         this[kDownloading].clear();
     }
     matchStatus(code, url, headers, request, options) {
-        var _o;
-        const status = (_o = this[kStatusOn]) === null || _o === void 0 ? void 0 : _o.get(code);
+        const status = this[kStatusOn]?.get(code);
         if (status) {
             const href = url.href;
             const called = new Set();
@@ -2290,7 +2298,7 @@ class Request extends module_1.default {
     }
     matchHeaders(url, headers, request, options) {
         const on = this[kHeadersOn];
-        if (on === null || on === void 0 ? void 0 : on.size) {
+        if (on?.size) {
             const href = url.href;
             const called = new Map();
             for (const [name, item] of on) {
@@ -2321,14 +2329,13 @@ class Request extends module_1.default {
         return true;
     }
     set agentTimeout(value) {
-        var _o, _p;
         if (value > 0) {
             this[kAgentTimeout] = value;
-            (_o = this.keepAlive) !== null && _o !== void 0 ? _o : (this.keepAlive = true);
+            this.keepAlive ?? (this.keepAlive = true);
         }
         else {
             this[kAgentTimeout] = 0;
-            (_p = this.keepAlive) !== null && _p !== void 0 ? _p : (this.keepAlive = false);
+            this.keepAlive ?? (this.keepAlive = false);
         }
     }
     get agentTimeout() {
@@ -2363,9 +2370,5 @@ class Request extends module_1.default {
     }
 }
 _a = kSingleton, _b = kHttpVersion, _c = kHeaders, _d = kCerts, _e = kConnectDns, _f = kPendingDns, _g = kConnectHttp, _h = kStatusOn, _j = kHeadersOn, _k = kDownloading, _l = kHostInfo, _m = kSession;
-exports.default = Request;
 
-if (exports.default) {
-    module.exports = exports.default;
-    module.exports.default = exports.default;
-}
+module.exports = Request;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/request",
-  "version": "0.8.10",
+  "version": "0.9.1",
   "description": "Request constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -17,14 +17,14 @@
     "squared-functions"
   ],
   "author": "An Pham <anpham6@gmail.com>",
-  "license": "MIT",
+  "license": "BSD 3-Clause",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/module": "0.8.10",
-    "@e-mc/types": "0.8.10",
+    "@e-mc/module": "0.9.1",
+    "@e-mc/types": "0.9.1",
     "combined-stream": "^1.0.8",
     "js-yaml": "^4.1.0",
-    "picomatch": "^3.0.1",
+    "picomatch": "^4.0.2",
     "which": "^2.0.2"
   }
 }

package/util.d.ts

@@ -1,4 +1,7 @@
+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;
@@ -12,6 +15,12 @@ declare namespace util {
     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

@@ -1,6 +1,7 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.fromSeconds = exports.asFloat = exports.asInt = exports.trimPath = exports.isRetryable = exports.checkRetryable = exports.hasBasicAuth = exports.getBasicAuth = exports.normalizeHeaders = exports.parseHeader = void 0;
+exports.cleanupStream = exports.byteLength = exports.hasSameStat = exports.getSize = exports.hasSize = exports.getTransferRate = exports.fromSeconds = exports.asFloat = exports.asInt = exports.trimPath = exports.isRetryable = exports.checkRetryable = exports.hasBasicAuth = exports.getBasicAuth = exports.normalizeHeaders = exports.parseHeader = void 0;
+const path = require("path");
+const fs = require("fs");
 const module_1 = require("@e-mc/module");
 const types_1 = require("@e-mc/types");
 const safeInt = (value) => value >= 0 ? Math.min(value, Number.MAX_SAFE_INTEGER) : NaN;
@@ -9,9 +10,8 @@ function parseHeader(headers, name) {
     if (value) {
         switch (name.toLowerCase()) {
             case 'content-disposition': {
-                const pattern = /\bfilename(?:\*\s*=\s*UTF-8''([^\s;]+)|\s*=\s*(?:"([^"]+)"|([^\s;]+)))/gi;
-                let result, match;
-                while (match = pattern.exec(value)) {
+                let result;
+                for (const match of value.matchAll(/\bfilename(?:\*\s*=\s*UTF-8''([^\s;]+)|\s*=\s*(?:"([^"]+)"|([^\s;]+)))/gi)) {
                     if (match[1]) {
                         return decodeURIComponent(match[1]).trim();
                     }
@@ -36,7 +36,7 @@ function normalizeHeaders(headers) {
                 break;
             default:
                 if (Array.isArray(value)) {
-                    value = value.map(out => module_1.default.asString(out).trim());
+                    value = value.map(out => module_1.asString(out).trim());
                     break;
                 }
                 continue;
@@ -57,7 +57,7 @@ function getBasicAuth(username, password) {
 exports.getBasicAuth = getBasicAuth;
 function hasBasicAuth(value) {
     try {
-        return (0, types_1.isString)(new URL(value).username);
+        return new URL(value).username.length > 0;
     }
     catch {
     }
@@ -146,3 +146,75 @@ function fromSeconds(value) {
     }
 }
 exports.fromSeconds = fromSeconds;
+function getTransferRate(length, timeMs, unitSeparator = '') {
+    const unit = (length * 8) / timeMs;
+    if (unit < 1) {
+        return Math.ceil(unit * 1000) + unitSeparator + 'KiB/s';
+    }
+    if (unit < 1000) {
+        return unit.toPrecision(3) + unitSeparator + 'MiB/s';
+    }
+    return (unit / 1000).toPrecision(3) + unitSeparator + 'GiB/s';
+}
+exports.getTransferRate = getTransferRate;
+function hasSize(value, keepEmpty) {
+    try {
+        const statSrc = fs.statSync(value);
+        if (statSrc.size > 0) {
+            return true;
+        }
+        if (!keepEmpty) {
+            fs.unlinkSync(value);
+        }
+    }
+    catch {
+    }
+    return false;
+}
+exports.hasSize = hasSize;
+function getSize(value, diskUsed) {
+    try {
+        return (diskUsed ? fs.lstatSync(value) : fs.statSync(value)).size;
+    }
+    catch {
+        return 0;
+    }
+}
+exports.getSize = getSize;
+function hasSameStat(src, dest, keepEmpty) {
+    try {
+        if (fs.existsSync(dest)) {
+            const { size, mtimeMs } = fs.statSync(src);
+            if (size > 0) {
+                const statDest = fs.statSync(dest);
+                return size === statDest.size && mtimeMs === statDest.mtimeMs;
+            }
+            if (!keepEmpty) {
+                fs.unlinkSync(src);
+            }
+        }
+    }
+    catch {
+    }
+    return false;
+}
+exports.hasSameStat = hasSameStat;
+function byteLength(value, encoding) {
+    return typeof value === 'string' && (path.isAbsolute(value) || module_1.isPath(value)) ? getSize(value) : Buffer.byteLength(value, encoding && (0, types_1.getEncoding)(encoding));
+}
+exports.byteLength = byteLength;
+function cleanupStream(stream, uri) {
+    try {
+        stream.removeAllListeners();
+        stream.destroy();
+        if (uri && fs.existsSync(uri)) {
+            fs.unlinkSync(uri);
+        }
+    }
+    catch (err) {
+        if (!module_1.isErrorCode(err, 'ENOENT')) {
+            module_1.writeFail(["Unable to delete file", path.basename(uri)], err, 32);
+        }
+    }
+}
+exports.cleanupStream = cleanupStream;