@e-mc/request 0.13.10 → 0.14.1

package/index.js

@@ -1,30 +1,31 @@
 "use strict";
-const path = require("node:path");
-const fs = require("node:fs");
-const crypto = require("node:crypto");
-const child_process = require("node:child_process");
-const http = require("node:http");
-const https = require("node:https");
-const http2 = require("node:http2");
-const dns = require("node:dns");
-const net = require("node:net");
-const stream = require("node:stream");
-const zlib = require("node:zlib");
-const qs = require("node:querystring");
-const combined = require("combined-stream");
-const pm = require("picomatch");
-const which = require("which");
-const node_url_1 = require("node:url");
-const types_1 = require("@e-mc/types");
-const module_1 = require("@e-mc/module");
-const util_1 = require("@e-mc/request/util");
-const host_1 = require("@e-mc/request/http/host");
-const adapter_1 = require("@e-mc/request/http/adapter");
+
+const path = require('node:path');
+const fs = require('node:fs');
+const crypto = require('node:crypto');
+const child_process = require('node:child_process');
+const http = require('node:http');
+const https = require('node:https');
+const http2 = require('node:http2');
+const dns = require('node:dns');
+const net = require('node:net');
+const stream = require('node:stream');
+const zlib = require('node:zlib');
+const qs = require('node:querystring');
+const combined = require('combined-stream');
+const pm = require('picomatch');
+const which = require('which');
+const { fileURLToPath } = require('node:url');
+const { createAbortError, errorMessage, errorValue, formatTime, getEncoding, getLogCurrent, isArray, isObject, isPlainObject, isString, parseExpires, sanitizeArgs, sanitizeCmd, supported } = require('@e-mc/types');
+const Module = require('@e-mc/module');
+const { asInt, copyHeaders, fromSeconds, fromStatusCode, getBasicAuth, normalizeHeaders, trimPath } = require('@e-mc/request/util');
+const HttpHost = require('@e-mc/request/http/host');
+const HttpAdapter = require('@e-mc/request/http/adapter');
 const kRequest = Symbol.for('request:constructor');
-const SUPPORTED_NODE20 = (0, types_1.supported)(20);
-const SUPPORTED_ZSTD = (0, types_1.supported)(23, 8) || (0, types_1.supported)(22, 15, true);
-const SUPPORTED_FILE = (0, types_1.supported)(19, 2) || (0, types_1.supported)(18, 13, true);
-const SUPPORTED_PROXY = (0, types_1.supported)(24, 5);
+const SUPPORTED_NODE20 = supported(20);
+const SUPPORTED_ZSTD = supported(23, 8) || supported(22, 15, true);
+const SUPPORTED_FILE = supported(19, 2) || supported(18, 13, true);
+const SUPPORTED_PROXY = supported(24, 5);
 const REGEXP_GLOBWITHIN = /\\\?|(?:(?<!\\)(?:\*|\[!?[^!\]]+\]|\{(?:[^,]+,)+[^}]+\}|[!?+*@]\((?:[^|]+\|)*[^)]+\)|\?.*\?|\?$))/;
 const REGEXP_RCLONE = /^rclone:\?/i;
 const HTTP = {
@@ -45,7 +46,7 @@ const DNS = {
     FAMILY: 0
 };
 const ARIA2 = {
-    BIN: which.sync(module_1.PLATFORM_WIN32 ? 'aria2c.exe' : 'aria2c', { nothrow: true }) || '',
+    BIN: which.sync(Module.PLATFORM_WIN32 ? 'aria2c.exe' : 'aria2c', { nothrow: true }) || '',
     EXEC_UID: undefined,
     EXEC_GID: undefined,
     PID_TIMER: null,
@@ -68,7 +69,7 @@ const ARIA2 = {
     CONF_PATH: ''
 };
 const RCLONE = {
-    BIN: which.sync(module_1.PLATFORM_WIN32 ? 'rclone.exe' : 'rclone', { nothrow: true }) || '',
+    BIN: which.sync(Module.PLATFORM_WIN32 ? 'rclone.exe' : 'rclone', { nothrow: true }) || '',
     EXEC_UID: undefined,
     EXEC_GID: undefined,
     CHECK_FIRST: false,
@@ -78,6 +79,9 @@ const RCLONE = {
     CUTOFF_MODE: '',
     DIFFER: '',
     ERROR: '',
+    FORMAT: '',
+    SEPARATOR: '',
+    TIMEFORMAT: '',
     HASH: '',
     IGNORE_CASE_SYNC: false,
     IGNORE_CHECKSUM: false,
@@ -99,6 +103,7 @@ const RCLONE = {
     NO_TRAVERSE: false,
     NO_UPDATE_DIR_MODTIME: false,
     NO_UPDATE_MODTIME: false,
+    ORDER_BY: '',
     REFRESH_TIMES: false,
     SIZE_ONLY: false,
     STREAMING_UPLOAD_CUTOFF: '',
@@ -110,7 +115,7 @@ const RCLONE = {
     TIMEOUT: '',
     CONFIG: ''
 };
-let HTTP_ADAPTER = adapter_1;
+let HTTP_ADAPTER = HttpAdapter;
 let KEEP_ALIVE = null;
 let ACCEPT_ENCODING = false;
 let READ_TIMEOUT = 0;
@@ -137,19 +142,19 @@ function setDnsCache(hostname, value, expires) {
 function getProxySettings(request, agentTimeout) {
     const proxy = request.proxy;
     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);
+        const origin = proxy.origin || ((!Module.isURL(proxy.address) ? asInt(proxy.port) === 80 ? 'http://' : 'https://' : '') + proxy.address + ':' + proxy.port);
         try {
             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);
+                host = new URL(host.protocol + '//' + getBasicAuth(proxy.username, proxy.password) + host.host);
             }
-            if ((0, types_1.isArray)(proxy.include)) {
+            if (isArray(proxy.include)) {
                 include = proxy.include;
             }
-            if ((0, types_1.isArray)(proxy.exclude)) {
+            if (isArray(proxy.exclude)) {
                 exclude = proxy.exclude;
             }
-            const keepAliveMsecs = (0, util_1.asInt)(proxy.keep_alive_interval);
+            const keepAliveMsecs = asInt(proxy.keep_alive_interval);
             return { host, include, exclude, keepAlive: proxy.keep_alive, keepAliveMsecs: keepAliveMsecs > 0 ? keepAliveMsecs : undefined, agentTimeout };
         }
         catch {
@@ -257,7 +262,7 @@ function validateCerts(certs) {
 }
 function checkFile(values) {
     for (let pathname of values) {
-        if (module_1.isPath(pathname = path.resolve(pathname))) {
+        if (Module.isPath(pathname = path.resolve(pathname))) {
             return pathname;
         }
     }
@@ -266,7 +271,7 @@ function parseSize(value, zero) {
     if (zero && (value === '0' || value === 0)) {
         return 0;
     }
-    if ((0, types_1.isString)(value) && /^\d+[KM]$/.test(value = value.trim().toUpperCase())) {
+    if (isString(value) && /^\d+[KM]$/.test(value = value.trim().toUpperCase())) {
         return value;
     }
 }
@@ -280,7 +285,7 @@ function copySearchParams(url, base) {
 function checkEncoding(request, statusCode, contentEncoding) {
     switch (statusCode) {
         case 206:
-            request.emit('error', (0, types_1.errorValue)("Aborted", 'Partial content'));
+            request.emit('error', errorValue("Aborted", 'Partial content'));
         case 204:
         case 205:
         case 304:
@@ -290,7 +295,7 @@ function checkEncoding(request, statusCode, contentEncoding) {
 }
 function sendBody(request, options) {
     const postData = options.postData;
-    if ((0, types_1.isString)(postData) || Buffer.isBuffer(postData)) {
+    if (isString(postData) || Buffer.isBuffer(postData)) {
         request.write(postData);
     }
     else if (postData instanceof stream.Stream) {
@@ -306,7 +311,7 @@ function resetAria2() {
 }
 function escapeShellQuote(value) {
     value = value.replace(/(?<!\\)"/g, '\\"');
-    return module_1.PLATFORM_WIN32 ? value : value.replace(/(?<!\\)\$/g, '\\$');
+    return Module.PLATFORM_WIN32 ? value : value.replace(/(?<!\\)\$/g, '\\$');
 }
 function failedDns(err, pending) {
     for (const cb of pending) {
@@ -324,27 +329,27 @@ function setBinExec(settings, target) {
     if (bin === false) {
         target.BIN = '';
     }
-    else if (bin && module_1.isPath(bin = path.resolve(bin), true)) {
+    else if (bin && Module.isPath(bin = path.resolve(bin), true)) {
         target.BIN = bin;
     }
-    if ((0, types_1.isPlainObject)(exec)) {
+    if (isPlainObject(exec)) {
         let { uid, gid } = exec;
-        target.EXEC_UID = (uid = (0, util_1.asInt)(uid)) >= 0 ? uid : undefined;
-        target.EXEC_GID = (gid = (0, util_1.asInt)(gid)) >= 0 ? gid : undefined;
+        target.EXEC_UID = (uid = asInt(uid)) >= 0 ? uid : undefined;
+        target.EXEC_GID = (gid = asInt(gid)) >= 0 ? gid : undefined;
     }
 }
 function checkBinTarget(instance, name, uri, pathname, command, binOpts) {
     if (!pathname) {
-        throw (0, types_1.errorMessage)(name, "Invalid parameters", 'pathname');
+        throw errorMessage(name, "Invalid parameters", 'pathname');
     }
     pathname = path.resolve(pathname);
     if ((instance.host || instance.hasPermission('fs') || process.permission) && !instance.canWrite(pathname)) {
-        throw (0, types_1.errorMessage)(name, "Unsupported access", pathname);
+        throw errorMessage(name, "Unsupported access", pathname);
     }
     let target;
     switch (command) {
         case 'copyurl':
-            if (module_1.isDir(pathname) || isDirEnd(pathname)) {
+            if (Module.isDir(pathname) || isDirEnd(pathname)) {
                 target = pathname;
                 if (!binOpts || !binOpts.includes('--auto-filename') && !binOpts.includes('--header-filename')) {
                     pathname = path.join(pathname, path.basename(new URL(uri).pathname));
@@ -358,8 +363,8 @@ function checkBinTarget(instance, name, uri, pathname, command, binOpts) {
             target = pathname;
             break;
     }
-    if (!module_1.createDir(target)) {
-        throw (0, types_1.errorMessage)(name, "Path is not a directory", target);
+    if (!Module.createDir(target)) {
+        throw errorMessage(name, "Path is not a directory", target);
     }
     return pathname;
 }
@@ -398,12 +403,12 @@ function setBinHeaders(args, headers) {
 }
 function appendAria2Proxy(args, protocol, host) {
     const { origin, username, password } = host;
-    args.push(`--${protocol}-proxy="${origin}"`);
+    quoteOpt(args, `${protocol}-proxy`, origin);
     if (username) {
-        args.push(`--${protocol}-proxy-user="${escapeShellQuote(decodeURIComponent(username))}"`);
+        quoteOpt(args, `${protocol}-proxy-user`, decodeURIComponent(username));
     }
     if (password) {
-        args.push(`--${protocol}-proxy-passwd="${escapeShellQuote(decodeURIComponent(password))}"`);
+        quoteOpt(args, `${protocol}-proxy-passwd`, decodeURIComponent(password));
     }
 }
 function createAgentOptions(options) {
@@ -419,10 +424,11 @@ const hasResponse = (value) => value >= 200 && (value < 300 || value === 304);
 const isDirEnd = (value) => (value = value.at(-1), value === '/' || value === path.sep);
 const configureDns = (family, options) => family === 0 ? options : { family, hints: family === 6 ? dns.V4MAPPED : 0 };
 const ignoreOpt = (opts, ...values) => !opts?.some(opt => values.some(value => opt === value || opt.startsWith(value + '=')));
+const quoteOpt = (items, name, value) => isString(value) ? items.push(`--${name}="${escapeShellQuote(value)}"`) : 0;
 const escapeQuote = (value) => value.replace(/[\\"]/g, capture => '\\' + capture);
-const rcloneSize = (value) => (0, types_1.isString)(value) ? /^\d+(?:B|[KMGTP]i?)$/i.exec(value)?.[0] : undefined;
-const rcloneDuration = (value) => (0, types_1.isString)(value) ? /^\d+(?:h|m|s|ms|ns)$/.exec(value)?.[0] : undefined;
-class Request extends module_1 {
+const rcloneSize = (value) => isString(value) ? /^\d+(?:B|[KMGTP]i?)$/i.exec(value)?.[0] : undefined;
+const rcloneDuration = (value) => isString(value) ? /^\d+(?:h|m|s|ms|ns)$/.exec(value)?.[0] : undefined;
+class Request extends Module {
     static [kRequest] = true;
     static async purgeMemory(percent = 1, limit = 0, parent) {
         if (percent >= 1) {
@@ -446,20 +452,20 @@ class Request extends module_1 {
             const aria2 = download.aria2;
             let { update_status, check_integrity, bt_stop_timeout, min_split_size, disk_cache, lowest_speed_limit, always_resume, file_allocation, proxy, no_proxy, conf_path } = aria2;
             setBinExec(download.aria2, ARIA2);
-            if ((0, types_1.isPlainObject)(update_status)) {
+            if (isPlainObject(update_status)) {
                 const { interval, broadcast_only } = update_status;
                 if (typeof broadcast_only === 'boolean') {
                     ARIA2.UPDATE_BROADCAST_ONLY = broadcast_only;
                 }
                 update_status = interval;
             }
-            if ((update_status = (0, util_1.asInt)(update_status)) >= 0) {
+            if ((update_status = asInt(update_status)) >= 0) {
                 ARIA2.UPDATE_STATUS = update_status;
             }
             if (typeof check_integrity === 'boolean') {
                 ARIA2.CHECK_INTEGRITY = check_integrity;
             }
-            if ((bt_stop_timeout = (0, util_1.asInt)(bt_stop_timeout)) >= 0) {
+            if ((bt_stop_timeout = asInt(bt_stop_timeout)) >= 0) {
                 ARIA2.BT_STOP_TIMEOUT = bt_stop_timeout;
             }
             if (min_split_size = parseSize(min_split_size, false)) {
@@ -474,7 +480,7 @@ class Request extends module_1 {
             if (typeof always_resume === 'boolean') {
                 ARIA2.ALWAYS_RESUME = always_resume;
             }
-            if ((0, types_1.isString)(file_allocation)) {
+            if (isString(file_allocation)) {
                 const value = file_allocation.toLowerCase();
                 switch (value) {
                     case 'none':
@@ -501,21 +507,21 @@ class Request extends module_1 {
             if (typeof no_proxy === 'string') {
                 ARIA2.NO_PROXY = no_proxy;
             }
-            if (conf_path === '' || (0, types_1.isString)(conf_path) && this.isPath(conf_path = path.resolve(conf_path))) {
+            if (conf_path === '' || isString(conf_path) && this.isPath(conf_path = path.resolve(conf_path))) {
                 ARIA2.CONF_PATH = conf_path;
             }
             for (const name of ['max_concurrent_downloads', 'max_connection_per_server', 'bt_tracker_connect_timeout', 'bt_tracker_timeout']) {
                 let value = aria2[name];
-                if ((value = (0, util_1.asInt)(value)) > 0) {
+                if ((value = asInt(value)) > 0) {
                     ARIA2[name.toUpperCase()] = value;
                 }
             }
         }
         if (download?.rclone) {
             const rclone = download.rclone;
-            let { cutoff_mode, hash, max_backlog, max_duration, max_transfer, modify_window, multi_thread_chunk_size, multi_thread_cutoff, multi_thread_streams, multi_thread_write_buffer_size, streaming_upload_cutoff, bind, contimeout, timeout } = rclone;
+            let { cutoff_mode, format, separator, timeformat, hash, max_backlog, max_duration, max_transfer, modify_window, multi_thread_chunk_size, multi_thread_cutoff, multi_thread_streams, multi_thread_write_buffer_size, order_by, streaming_upload_cutoff, bind, contimeout, timeout } = rclone;
             setBinExec(download.rclone, RCLONE);
-            if ((0, types_1.isString)(cutoff_mode)) {
+            if (isString(cutoff_mode)) {
                 const value = cutoff_mode.toUpperCase();
                 switch (value) {
                     case 'HARD':
@@ -525,7 +531,7 @@ class Request extends module_1 {
                         break;
                 }
             }
-            if ((0, types_1.isString)(hash)) {
+            if (isString(hash)) {
                 switch (hash.toLowerCase()) {
                     case 'md5':
                         RCLONE.HASH = 'md5';
@@ -538,7 +544,16 @@ class Request extends module_1 {
                         break;
                 }
             }
-            if ((max_backlog = (0, util_1.asInt)(max_backlog)) > 0) {
+            if (format) {
+                RCLONE.FORMAT = format;
+            }
+            if (separator) {
+                RCLONE.SEPARATOR = separator;
+            }
+            if (timeformat) {
+                RCLONE.TIMEFORMAT = timeformat;
+            }
+            if ((max_backlog = asInt(max_backlog)) > 0) {
                 RCLONE.MAX_BACKLOG = max_backlog;
             }
             if (max_duration = rcloneDuration(max_duration)) {
@@ -556,12 +571,15 @@ class Request extends module_1 {
             if (multi_thread_cutoff = rcloneSize(multi_thread_cutoff)) {
                 RCLONE.MULTI_THREAD_CUTOFF = multi_thread_cutoff;
             }
-            if ((multi_thread_streams = (0, util_1.asInt)(multi_thread_streams)) > 0) {
+            if ((multi_thread_streams = asInt(multi_thread_streams)) > 0) {
                 RCLONE.MULTI_THREAD_STREAMS = multi_thread_streams;
             }
             if (multi_thread_write_buffer_size = rcloneSize(multi_thread_write_buffer_size)) {
                 RCLONE.MULTI_THREAD_WRITE_BUFFER_SIZE = multi_thread_write_buffer_size;
             }
+            if (order_by) {
+                RCLONE.ORDER_BY = order_by;
+            }
             if (streaming_upload_cutoff = rcloneSize(streaming_upload_cutoff)) {
                 RCLONE.STREAMING_UPLOAD_CUTOFF = streaming_upload_cutoff;
             }
@@ -582,22 +600,22 @@ class Request extends module_1 {
             }
             for (const name of ['combined', 'differ', 'error', 'config']) {
                 let value = rclone[name];
-                if (value === '' || (0, types_1.isString)(value) && this.isPath(value = path.resolve(value), true)) {
+                if (value === '' || isString(value) && this.isPath(value = path.resolve(value), true)) {
                     RCLONE[name.toUpperCase()] = value;
                 }
             }
         }
         if (request) {
             let { read_timeout, max_concurrent_streams, agent, use, headers, certs } = request, agent_timeout;
-            if ((read_timeout = (0, util_1.fromSeconds)(read_timeout)) >= 0) {
+            if ((read_timeout = fromSeconds(read_timeout)) >= 0) {
                 READ_TIMEOUT = read_timeout;
             }
-            if ((max_concurrent_streams = (0, util_1.asInt)(max_concurrent_streams)) > 0) {
+            if ((max_concurrent_streams = asInt(max_concurrent_streams)) > 0) {
                 MAX_CONCURRENT_STREAMS = max_concurrent_streams;
             }
             if (agent) {
                 let { keep_alive, timeout, proxy_env } = agent;
-                if ((agent_timeout = (0, util_1.fromSeconds)(timeout)) > 0) {
+                if ((agent_timeout = fromSeconds(timeout)) > 0) {
                     AGENT_TIMEOUT = agent_timeout;
                 }
                 else {
@@ -609,7 +627,7 @@ class Request extends module_1 {
                 else {
                     keep_alive = undefined;
                 }
-                const keepAliveMsecs = (0, util_1.asInt)(agent.keep_alive_interval);
+                const keepAliveMsecs = asInt(agent.keep_alive_interval);
                 this.defineHttpAgent({ keepAlive: keep_alive, timeout: agent_timeout, proxyEnv: proxy_env, keepAliveMsecs: keepAliveMsecs > 0 ? keepAliveMsecs : undefined });
             }
             if (use) {
@@ -617,7 +635,7 @@ class Request extends module_1 {
                 if (typeof accept_encoding === 'boolean') {
                     ACCEPT_ENCODING = accept_encoding;
                 }
-                switch (http_version = (0, util_1.asInt)(http_version)) {
+                switch (http_version = asInt(http_version)) {
                     case 1:
                     case 2:
                         HTTP.VERSION = http_version;
@@ -625,15 +643,15 @@ class Request extends module_1 {
                 }
             }
             for (const href in headers) {
-                if ((0, types_1.isObject)(headers[href])) {
-                    HTTP.HEADERS[href] = (0, util_1.normalizeHeaders)(headers[href]);
+                if (isObject(headers[href])) {
+                    HTTP.HEADERS[href] = normalizeHeaders(headers[href]);
                 }
             }
-            if ((0, types_1.isPlainObject)(certs)) {
+            if (isPlainObject(certs)) {
                 [TLS.TEXT, TLS.FILE] = validateCerts(certs);
             }
             HTTP.PROXY = getProxySettings(request, agent_timeout);
-            host_1.defineHostConfig(request);
+            HttpHost.defineHostConfig(request);
             if ('defineHostConfig' in HTTP_ADAPTER) {
                 HTTP_ADAPTER.defineHostConfig(request);
             }
@@ -681,7 +699,7 @@ class Request extends module_1 {
                 DNS.FAMILY = 6;
                 break;
             default:
-                switch (family = (0, util_1.asInt)(family)) {
+                switch (family = asInt(family)) {
                     case 0:
                     case 4:
                     case 6:
@@ -691,8 +709,8 @@ class Request extends module_1 {
                 break;
         }
         if (expires !== undefined) {
-            if ((0, types_1.isString)(expires)) {
-                expires = (0, types_1.parseExpires)(expires);
+            if (isString(expires)) {
+                expires = parseExpires(expires);
             }
             if (expires >= 0) {
                 DNS.EXPIRES = expires !== Infinity ? Math.min(expires, this.MAX_TIMEOUT) : Infinity;
@@ -700,13 +718,13 @@ class Request extends module_1 {
         }
         for (const hostname in resolve) {
             const { address, family: ipv } = resolve[hostname];
-            if (address && (family = (0, util_1.asInt)(ipv) && (family === 4 || family === 6) ? family : net.isIPv6(address) ? 6 : net.isIPv4(address) ? 4 : 0)) {
+            if (address && (family = asInt(ipv) && (family === 4 || family === 6) ? family : net.isIPv6(address) ? 6 : net.isIPv4(address) ? 4 : 0)) {
                 DNS.CACHE[hostname] = [{ address, family }];
             }
         }
     }
     static defineHttpAdapter(module) {
-        if (adapter_1.constructorOf(module)) {
+        if (HttpAdapter.constructorOf(module)) {
             HTTP_ADAPTER = module;
         }
     }
@@ -754,22 +772,22 @@ class Request extends module_1 {
     #session = [Object.create(null)];
     constructor(data) {
         super();
-        if ((0, types_1.isPlainObject)(data)) {
+        if (isPlainObject(data)) {
             const { headers, read_timeout, agent, use, connect, certs } = data;
-            const timeout = (0, util_1.fromSeconds)(data.timeout);
+            const timeout = fromSeconds(data.timeout);
             let value;
-            this.readTimeout = (value = (0, util_1.fromSeconds)(read_timeout)) >= 0 ? value : READ_TIMEOUT;
+            this.readTimeout = (value = fromSeconds(read_timeout)) >= 0 ? value : READ_TIMEOUT;
             this.keepAlive = typeof (value = agent?.keep_alive) === 'boolean' ? value : KEEP_ALIVE;
             this.acceptEncoding = typeof (value = use?.accept_encoding) === 'boolean' ? value : ACCEPT_ENCODING;
-            this.#ipVersion = (value = (0, util_1.asInt)(data.dns?.family)) && (value === 4 || value === 6) ? value : 0;
-            if ((value = (0, util_1.fromSeconds)(agent?.timeout)) >= 0) {
+            this.#ipVersion = (value = asInt(data.dns?.family)) && (value === 4 || value === 6) ? value : 0;
+            if ((value = fromSeconds(agent?.timeout)) >= 0) {
                 this.#agentTimeout = value;
             }
             else {
                 this.#agentTimeout = AGENT_TIMEOUT;
                 value = undefined;
             }
-            if ((value = (0, util_1.asInt)(use?.http_version)) === 1 || value === 2) {
+            if ((value = asInt(use?.http_version)) === 1 || value === 2) {
                 this.#httpVersion = value;
             }
             const proxy = getProxySettings(data, value);
@@ -777,18 +795,20 @@ class Request extends module_1 {
                 this.proxy = proxy;
             }
             this.parseHeaders(headers);
-            if ((0, types_1.isObject)(certs)) {
+            if (isObject(certs)) {
                 this.#certs = validateCerts(certs);
             }
-            if ((0, types_1.isObject)(connect)) {
-                this.apply({ client: {
+            if (isObject(connect)) {
+                this.apply({
+                    client: {
                         timeout,
-                        connectTimeout: (0, util_1.fromSeconds)(connect.timeout),
-                        redirectLimit: (0, util_1.asInt)(connect.redirect_limit),
-                        retryWait: (0, util_1.fromSeconds)(connect.retry_wait),
-                        retryAfter: (0, util_1.fromSeconds)(connect.retry_after),
-                        retryLimit: (0, util_1.asInt)(connect.retry_limit)
-                    } });
+                        connectTimeout: fromSeconds(connect.timeout),
+                        redirectLimit: asInt(connect.redirect_limit),
+                        retryWait: fromSeconds(connect.retry_wait),
+                        retryAfter: fromSeconds(connect.retry_after),
+                        retryLimit: asInt(connect.retry_limit)
+                    }
+                });
             }
             else if (timeout >= 0) {
                 this.apply({ client: { timeout } });
@@ -822,7 +842,7 @@ class Request extends module_1 {
                             const item = log[i];
                             if (item[1] === title && Array.isArray(item[2]) && item[2][0].startsWith(origin)) {
                                 item[1] = '';
-                                item[2][0] = item[2][0].substring(origin.length);
+                                item[2][0] = item[2][0].slice(origin.length);
                                 item[4].titleBgColor &&= undefined;
                                 item[4].titleJustify = 'right';
                                 args.push(item);
@@ -833,7 +853,7 @@ class Request extends module_1 {
                         count = Math.max(count, value);
                     }
                 });
-                if (module_1.hasLogType(32768)) {
+                if (Module.hasLogType(32768)) {
                     output.sort((a, b) => {
                         if (a[2] === b[2]) {
                             return a[1] < b[1] ? -1 : 1;
@@ -842,7 +862,7 @@ class Request extends module_1 {
                     });
                     const width = count.toString().length;
                     for (const [title, origin, downloads, messages] of output) {
-                        const options = { ...title === 'HTTP1' ? module_1.LOG_STYLE_NOTICE : module_1.LOG_STYLE_INFO };
+                        const options = { ...title === 'HTTP1' ? Module.LOG_STYLE_NOTICE : Module.LOG_STYLE_INFO };
                         if (messages.length === 1) {
                             const message = messages[0];
                             message[1] = title;
@@ -892,7 +912,7 @@ class Request extends module_1 {
                 this.ipVersion = ipVersion;
             }
             if (readTimeout !== undefined) {
-                this.readTimeout = (0, util_1.fromSeconds)(readTimeout);
+                this.readTimeout = fromSeconds(readTimeout);
             }
         }
         return this;
@@ -916,7 +936,7 @@ class Request extends module_1 {
                         this._config.retryWait = Math.min(retryWait, 600 * 1000);
                     }
                     if (retryAfter >= 0) {
-                        this._config.retryAfter = Math.min(retryAfter, module_1.MAX_TIMEOUT);
+                        this._config.retryAfter = Math.min(retryAfter, Module.MAX_TIMEOUT);
                     }
                     if (retryLimit >= 0) {
                         this._config.retryLimit = retryLimit;
@@ -1056,7 +1076,7 @@ class Request extends module_1 {
                 let valid = true;
                 for (const value of exclude) {
                     if (value.startsWith('!')) {
-                        if (REGEXP_GLOBWITHIN.test(value.substring(1))) {
+                        if (REGEXP_GLOBWITHIN.test(value.slice(1))) {
                             valid = true;
                             break;
                         }
@@ -1069,7 +1089,7 @@ class Request extends module_1 {
                     return;
                 }
             }
-            if ((0, types_1.isArray)(include) && !include.some(value => REGEXP_GLOBWITHIN.test(value) ? pm.isMatch(uri, value) : uri.startsWith(value))) {
+            if (isArray(include) && !include.some(value => REGEXP_GLOBWITHIN.test(value) ? pm.isMatch(uri, value) : uri.startsWith(value))) {
                 return;
             }
             return proxy;
@@ -1080,9 +1100,9 @@ class Request extends module_1 {
             callback = globUrl;
             globUrl = '*';
         }
-        if ((0, types_1.isString)(globUrl) && typeof callback === 'function') {
+        if (isString(globUrl) && typeof callback === 'function') {
             const on = this.#statusOn ||= new Map();
-            for (const item of !Array.isArray(code) ? [code] : code) {
+            for (const item of Array.isArray(code) ? code : [code]) {
                 let status = on.get(item);
                 if (!status) {
                     on.set(item, status = []);
@@ -1096,9 +1116,9 @@ class Request extends module_1 {
             callback = globUrl;
             globUrl = '*';
         }
-        if ((0, types_1.isString)(globUrl) && typeof callback === 'function') {
+        if (isString(globUrl) && typeof callback === 'function') {
             const on = this.#headersOn ||= new Map();
-            for (const item of !Array.isArray(name) ? [name] : name) {
+            for (const item of Array.isArray(name) ? name : [name]) {
                 let headers = on.get(item);
                 if (!headers) {
                     on.set(item, headers = []);
@@ -1112,20 +1132,20 @@ class Request extends module_1 {
     }
     async aria2c(uri, options = {}) {
         if (!ARIA2.BIN) {
-            return Promise.reject((0, types_1.errorMessage)("aria2", "Binary not found"));
+            return Promise.reject(errorMessage("aria2", "Binary not found"));
         }
         let pathname, headers, binOpts, signal, silent;
         if (typeof options === 'string') {
             pathname = options;
         }
         else if (options instanceof URL) {
-            pathname = (0, node_url_1.fileURLToPath)(options);
+            pathname = fileURLToPath(options);
         }
         else {
             ({ signal, silent } = options);
             ({ pathname, headers, binOpts } = this.parseBinOpts(options, ['--daemon'], ['--input-file']));
         }
-        if ((0, types_1.isString)(uri) && module_1.isURL(uri)) {
+        if (isString(uri) && Module.isURL(uri)) {
             uri = new URL(uri);
         }
         pathname = checkBinTarget(this, "aria2", uri, pathname, 'aria2', binOpts);
@@ -1179,9 +1199,7 @@ class Request extends module_1 {
             if (ARIA2.LOWEST_SPEED_LIMIT !== null) {
                 opts.push('--lowest-speed-limit=' + ARIA2.LOWEST_SPEED_LIMIT);
             }
-            if (ARIA2.CONF_PATH) {
-                opts.push(`--conf-path="${escapeShellQuote(ARIA2.CONF_PATH)}"`);
-            }
+            quoteOpt(opts, 'conf-path', ARIA2.CONF_PATH);
             if (!ARIA2.ALWAYS_RESUME) {
                 opts.push('--always-resume=false', '--keep-unfinished-download-result=false');
             }
@@ -1194,9 +1212,7 @@ class Request extends module_1 {
             if (retryWait > 0) {
                 opts.push('--retry-wait=' + Math.min(Math.ceil(retryWait / 1000), 600));
             }
-            if (ARIA2.NO_PROXY) {
-                opts.push(`--no-proxy="${ARIA2.NO_PROXY}"`);
-            }
+            quoteOpt(opts, 'no-proxy', ARIA2.NO_PROXY);
             let proxy;
             if (protocol) {
                 if (this.agentTimeout === 0) {
@@ -1213,13 +1229,11 @@ class Request extends module_1 {
                     const secure = this.#certs?.[1][origin] || this.host && TLS.FILE[origin];
                     if (secure) {
                         if (secure.ca && ignoreOpt(binOpts, '--ca-certificate')) {
-                            args.push(`--ca-certificate="${escapeShellQuote(secure.ca)}"`);
+                            quoteOpt(args, 'ca-certificate', secure.ca);
                         }
                         if (secure.cert && ignoreOpt(binOpts, '--certificate', '--private-key')) {
-                            args.push(`--certificate="${escapeShellQuote(secure.cert)}"`);
-                            if (secure.key) {
-                                args.push(`--private-key="${escapeShellQuote(secure.key)}"`);
-                            }
+                            quoteOpt(args, 'certificate', secure.cert);
+                            quoteOpt(args, 'private-key', secure.key);
                         }
                     }
                 }
@@ -1233,10 +1247,10 @@ class Request extends module_1 {
                         const prefix = protocol === 'https' ? 'http' : protocol;
                         if (ignoreOpt(binOpts, `--${prefix}-user`, `--${prefix}-passwd`)) {
                             if (username) {
-                                args.push(`--${prefix}-user="${escapeShellQuote(decodeURIComponent(username))}"`);
+                                quoteOpt(args, `${prefix}-user`, decodeURIComponent(username));
                             }
                             if (password) {
-                                args.push(`--${prefix}-passwd="${escapeShellQuote(decodeURIComponent(password))}"`);
+                                quoteOpt(args, `${prefix}-passwd`, decodeURIComponent(password));
                             }
                         }
                         if (ignoreOpt(binOpts, `--${protocol}-proxy`, `--${protocol}-proxy-user`, `--${protocol}-proxy-passwd`)) {
@@ -1265,15 +1279,15 @@ class Request extends module_1 {
                 closeTorrent(pid);
                 reject(err);
             };
-            const { pid, stdout, stderr } = child_process.spawn((0, types_1.sanitizeCmd)(ARIA2.BIN, args), { cwd: pathname, shell: true, signal: signal || this.signal, uid: ARIA2.EXEC_UID, gid: ARIA2.EXEC_GID })
+            const { pid, stdout, stderr } = child_process.spawn(sanitizeCmd(ARIA2.BIN, args), { cwd: pathname, shell: true, signal: signal || this.signal, uid: ARIA2.EXEC_UID, gid: ARIA2.EXEC_GID })
                 .on('exit', code => {
                 closeTorrent(pid);
                 if (this.aborted) {
-                    errorResponse(pid, (0, types_1.createAbortError)());
+                    errorResponse(pid, createAbortError());
                     return;
                 }
                 if (code) {
-                    reject((0, types_1.errorValue)(message || "Unknown", 'Exit status: ' + code));
+                    reject(errorValue(message || "Unknown", 'Exit status: ' + code));
                     return;
                 }
                 const result = [];
@@ -1318,7 +1332,7 @@ class Request extends module_1 {
             });
             stdout.setEncoding('utf8').on('data', (value) => out += value);
             stderr.setEncoding('utf8').on('data', (value) => message += value);
-            if (pid !== undefined && module_1.isFile(uri, 'torrent')) {
+            if (pid !== undefined && Module.isFile(uri, 'torrent')) {
                 if (!ARIA2.PID_TIMER) {
                     ARIA2.PID_TIMER = setInterval(() => {
                         if (ARIA2.PID_QUEUE.length === 0) {
@@ -1346,15 +1360,12 @@ class Request extends module_1 {
                                 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)();
+                                let progressBar = true;
+                                if (!item[2]) {
+                                    const current = getLogCurrent();
                                     progressBar = current?.type === 128 && current.title === "aria2";
                                 }
-                                this.formatMessage(128, "aria2", ['Downloading...', (0, types_1.formatTime)(startTime, true)], (module_1.PLATFORM_WIN32 ? 'taskkill /f /pid' : 'kill') + ` ${item[0]} -> ` + item[1], { ...module_1.LOG_STYLE_INFO, progressBar, broadcastId: item[2] });
+                                this.formatMessage(128, "aria2", ['Downloading...', formatTime(startTime, true)], (Module.PLATFORM_WIN32 ? 'taskkill /f /pid' : 'kill') + ` ${item[0]} -> ` + item[1], { ...Module.LOG_STYLE_INFO, progressBar, broadcastId: item[2] });
                             }
                             ARIA2.PID_QUEUE.push(item);
                         }
@@ -1366,7 +1377,7 @@ class Request extends module_1 {
     }
     async rclone(uri, options = {}) {
         if (!RCLONE.BIN) {
-            return Promise.reject((0, types_1.errorMessage)("rclone", "Binary not found"));
+            return Promise.reject(errorMessage("rclone", "Binary not found"));
         }
         uri = uri.toString();
         let pathname, headers, binOpts, silent;
@@ -1375,7 +1386,7 @@ class Request extends module_1 {
             options = {};
         }
         else if (options instanceof URL) {
-            pathname = (0, node_url_1.fileURLToPath)(options);
+            pathname = fileURLToPath(options);
             options = {};
         }
         else {
@@ -1391,12 +1402,13 @@ class Request extends module_1 {
                 source = uri.replace(REGEXP_RCLONE, '');
                 break;
             default:
-                return Promise.reject((0, types_1.errorMessage)("rclone", "Invalid command", command || uri));
+                return Promise.reject(errorMessage("rclone", "Invalid command", command || uri));
         }
         pathname = checkBinTarget(this, "rclone", uri, pathname, command, binOpts);
         silent ??= this.#singleton;
         return new Promise((resolve, reject) => {
             const init = [
+                '--files-only=true',
                 '--links=false',
                 '--delete-excluded=false',
                 '--interactive=false',
@@ -1428,6 +1440,13 @@ class Request extends module_1 {
             if (RCLONE.CSV) {
                 opts.push('--csv');
             }
+            if (RCLONE.FORMAT) {
+                opts.push('--format=' + RCLONE.FORMAT);
+            }
+            if (RCLONE.SEPARATOR) {
+                opts.push('--separator=' + RCLONE.SEPARATOR);
+            }
+            quoteOpt(opts, 'timeformat', RCLONE.TIMEFORMAT);
             if (RCLONE.HASH) {
                 opts.push('--hash=' + RCLONE.HASH);
             }
@@ -1479,6 +1498,7 @@ class Request extends module_1 {
             if (RCLONE.MULTI_THREAD_WRITE_BUFFER_SIZE) {
                 opts.push('--multi-thread-buffer-size=' + RCLONE.MULTI_THREAD_WRITE_BUFFER_SIZE);
             }
+            quoteOpt(opts, 'order-by', RCLONE.ORDER_BY);
             if (RCLONE.NO_CHECK_DEST) {
                 opts.push('--no-check-dest');
             }
@@ -1521,23 +1541,15 @@ class Request extends module_1 {
             else if (this._config.timeout > 0) {
                 opts.push(`--timeout=${this._config.timeout}ms`);
             }
-            if (RCLONE.COMBINED) {
-                opts.push(`--combined="${escapeShellQuote(RCLONE.COMBINED)}"`);
-            }
-            if (RCLONE.DIFFER) {
-                opts.push(`--differ="${escapeShellQuote(RCLONE.DIFFER)}"`);
-            }
-            if (RCLONE.ERROR) {
-                opts.push(`--error="${escapeShellQuote(RCLONE.ERROR)}"`);
-            }
-            if (RCLONE.CONFIG) {
-                opts.push(`--config="${escapeShellQuote(RCLONE.CONFIG)}"`);
-            }
+            quoteOpt(opts, 'combined', RCLONE.COMBINED);
+            quoteOpt(opts, 'differ', RCLONE.DIFFER);
+            quoteOpt(opts, 'error', RCLONE.ERROR);
+            quoteOpt(opts, 'config', RCLONE.CONFIG);
             setBinHeaders(args, headers);
-            const cwd = module_1.isDir(pathname) ? pathname : path.dirname(pathname);
+            const cwd = Module.isDir(pathname) ? pathname : path.dirname(pathname);
             const cmd = [source, pathname];
             args = this.mergeBinOpts(args, opts, binOpts, { name: "rclone", bin: RCLONE.BIN, cmd }).concat(init, opts);
-            args.push(...cmd.map(value => (0, types_1.sanitizeCmd)(value)));
+            args.push(...cmd.map(value => sanitizeCmd(value)));
             args.unshift(command);
             const startTime = Date.now();
             const out = [];
@@ -1548,19 +1560,19 @@ class Request extends module_1 {
             const parseOutput = (value) => {
                 try {
                     const data = JSON.parse(value);
-                    if ((0, types_1.isPlainObject)(data)) {
+                    if (isPlainObject(data)) {
                         switch (data.level) {
                             case 'info':
-                                if (data.size > 0 && (0, types_1.isString)(data.object)) {
+                                if (data.size > 0 && isString(data.object)) {
                                     out.push(data);
                                 }
-                                else if ((0, types_1.isPlainObject)(data.stats)) {
+                                else if (isPlainObject(data.stats)) {
                                     if (data.stats.fatalError) {
                                         commitLog(2, data.msg);
                                     }
                                     else {
                                         if (command === 'copyurl' && data.stats.totalTransfers > 0) {
-                                            data.object = module_1.isPath(pathname, true) ? pathname : '';
+                                            data.object = Module.isPath(pathname, true) ? pathname : '';
                                             out.push(data);
                                         }
                                         commitLog(4, data.msg);
@@ -1577,14 +1589,14 @@ class Request extends module_1 {
                     commitLog(2, err);
                 }
             };
-            const { stdout, stderr } = child_process.spawn((0, types_1.sanitizeCmd)(RCLONE.BIN, args), { cwd, shell: true, signal: this.signal, uid: RCLONE.EXEC_UID, gid: RCLONE.EXEC_GID })
+            const { stdout, stderr } = child_process.spawn(sanitizeCmd(RCLONE.BIN, args), { cwd, shell: true, signal: this.signal, uid: RCLONE.EXEC_UID, gid: RCLONE.EXEC_GID })
                 .on('exit', code => {
                 if (options.signal || this.aborted) {
-                    reject((0, types_1.createAbortError)());
+                    reject(createAbortError());
                     return;
                 }
                 if (code) {
-                    reject((0, types_1.errorValue)("Unknown", 'Exit status: ' + code));
+                    reject(errorValue("Unknown", 'Exit status: ' + code));
                     return;
                 }
                 if (out.length > 0 && !silent && LOG_HTTP && LOG_TIMEPROCESS) {
@@ -1642,16 +1654,17 @@ class Request extends module_1 {
         }
         let host;
         if (this.host) {
-            host = HTTP.HOST[url.origin] ||= new host_1(url, HTTP.VERSION);
+            host = HTTP.HOST[url.origin] ||= new HttpHost(url, HTTP.VERSION);
         }
         else {
-            host = this.#hostInfo[url.origin] ||= new host_1(url, this.httpVersion || 1);
+            host = this.#hostInfo[url.origin] ||= new HttpHost(url, this.httpVersion || 1);
         }
         return { ...options, host, url };
     }
     open(uri, options) {
-        let { host, url, httpVersion, method = 'GET', search, encoding, format, socketPath, expectContinue = false, timeout = this._config.connectTimeout, outStream } = options, headers = (0, util_1.parseOutgoingHeaders)(options.headers), getting = false, posting = false;
-        switch (method = method.toUpperCase()) {
+        let { host, url, httpVersion, search, encoding, format, socketPath, expectContinue = false, timeout = this._config.connectTimeout, outStream } = options, headers = copyHeaders(options.headers), getting = false, posting = false;
+        const method = (options.method?.toUpperCase() || 'GET');
+        switch (method) {
             case 'GET':
             case 'DELETE':
                 getting = true;
@@ -1663,7 +1676,7 @@ class Request extends module_1 {
         }
         if (format) {
             let parser;
-            if ((0, types_1.isObject)(format)) {
+            if (isObject(format)) {
                 ({ out: format = 'json', parser } = format);
             }
             if (format.includes('/')) {
@@ -1689,7 +1702,7 @@ class Request extends module_1 {
                     break;
             }
             headers.accept += ', text/plain';
-            options.encoding = (0, types_1.getEncoding)(encoding);
+            options.encoding = getEncoding(encoding);
             if (!options.outBlob) {
                 options.outFormat = { out: format, parser };
             }
@@ -1764,6 +1777,19 @@ class Request extends module_1 {
                 ({ ca, cert, key, ciphers, version: minVersion } = certs);
             }
         }
+        const basicAuth = HttpHost.getBasicAuth(url);
+        if (baseHeaders || basicAuth) {
+            headers = { ...baseHeaders, ...basicAuth, ...headers };
+        }
+        if (headers) {
+            const cacheControl = headers['cache-control']?.toLowerCase();
+            if (headers.authorization && !cacheControl?.includes('max-age') || cacheControl?.includes('no-cache')) {
+                options.noCache ??= true;
+            }
+            if (cacheControl?.includes('no-store')) {
+                options.noStore ??= true;
+            }
+        }
         if (!proxy && httpVersion !== 1 && ((httpVersion || host.version) === 2 && version !== 1 || secure && version === 2 && host.failed(2, true) === 0)) {
             let session = this.#session[0][origin], conn, maxConcurrentStreams = 0;
             if (session) {
@@ -1780,7 +1806,10 @@ class Request extends module_1 {
             else {
                 conn = session[0].at(-1);
             }
-            request = conn.request({ ...baseHeaders, ...host_1.getBasicAuth(url), ...headers, ':path': pathname, ':method': method });
+            headers ||= {};
+            headers[':method'] = method;
+            headers[':path'] = pathname;
+            request = conn.request(headers);
             if (getting) {
                 const listenerMap = {};
                 const onEvent = request.on.bind(request);
@@ -1797,7 +1826,7 @@ class Request extends module_1 {
                         const contentEncoding = response['content-encoding'];
                         if (checkEncoding(request, statusCode, contentEncoding) && (emitter = this.pipeline(request, contentEncoding, outStream))) {
                             if (typeof emitter === 'number') {
-                                this.abortHeaders(request, options, { href: url.href, statusCode: emitter, message: (0, util_1.fromStatusCode)(emitter) });
+                                this.abortHeaders(request, options, { href: url.href, statusCode: emitter, message: fromStatusCode(emitter) });
                             }
                             else {
                                 for (const event in listenerMap) {
@@ -1820,7 +1849,7 @@ class Request extends module_1 {
                                 });
                             }
                             if (encoding) {
-                                request.setEncoding((0, types_1.getEncoding)(encoding));
+                                request.setEncoding(getEncoding(encoding));
                             }
                         }
                         if (LOG_HTTP) {
@@ -1906,10 +1935,6 @@ class Request extends module_1 {
                     }
                 }
             }
-            const basicAuth = host_1.getBasicAuth(url);
-            if (baseHeaders || basicAuth) {
-                headers = { ...baseHeaders, ...basicAuth, ...headers };
-            }
             request = (secure ? https : http).request(socketPath ? { socketPath, path: pathname } : {
                 protocol: host.protocol,
                 hostname,
@@ -1932,7 +1957,7 @@ class Request extends module_1 {
                     let source;
                     if (checkEncoding(request, statusCode, contentEncoding) && (source = this.pipeline(response, contentEncoding, outStream))) {
                         if (typeof source === 'number') {
-                            this.abortHeaders(request, options, { href: url.href, statusCode: source, message: (0, util_1.fromStatusCode)(source) });
+                            this.abortHeaders(request, options, { href: url.href, statusCode: source, message: fromStatusCode(source) });
                         }
                         else {
                             source.once('finish', () => {
@@ -1942,7 +1967,7 @@ class Request extends module_1 {
                     }
                     else {
                         if (encoding) {
-                            response.setEncoding((0, types_1.getEncoding)(encoding));
+                            response.setEncoding(getEncoding(encoding));
                         }
                         if (outStream) {
                             stream.pipeline(response, outStream, err => {
@@ -2061,7 +2086,7 @@ class Request extends module_1 {
         return this.open(out.url, out);
     }
     async put(uri, data, contentType, options) {
-        if ((0, types_1.isPlainObject)(contentType)) {
+        if (isPlainObject(contentType)) {
             options = contentType;
         }
         else {
@@ -2080,7 +2105,7 @@ class Request extends module_1 {
             contentType = undefined;
         }
         else {
-            if ((0, types_1.isPlainObject)(contentType)) {
+            if (isPlainObject(contentType)) {
                 options = contentType;
                 putting = options.method === 'PUT';
                 contentType = undefined;
@@ -2091,7 +2116,7 @@ class Request extends module_1 {
             }
         }
         let dataEncoding;
-        if ((0, types_1.isPlainObject)(options)) {
+        if (isPlainObject(options)) {
             if (!putting && options.formData) {
                 (parts ||= []).push(...Array.isArray(options.formData) ? options.formData : [options.formData]);
             }
@@ -2103,12 +2128,12 @@ class Request extends module_1 {
         else {
             options = {};
         }
-        const headers = (0, util_1.parseOutgoingHeaders)(options.headers, 'content-type', 'content-length') || {};
+        const headers = copyHeaders(options.headers, 'content-type', 'content-length') || {};
         if (!putting && (parts || contentType === "multipart/form-data" || contentType === 'form-data')) {
             let valid = false;
-            if ((0, types_1.isArray)(parts)) {
+            if (isArray(parts)) {
                 const write = combined.create();
-                const boundary = crypto.randomUUID().replaceAll('-', '');
+                const boundary = crypto.randomUUID().replace(/-/g, '');
                 contentType = "multipart/form-data" + `; boundary="${boundary}"`;
                 let contentLength = 0;
                 const createPart = (name, filename, type) => {
@@ -2120,33 +2145,33 @@ class Request extends module_1 {
                 };
                 const addValue = (name, value) => {
                     if (value !== undefined) {
-                        const disposition = createPart(name) + module_1.asString(value) + "\r\n";
+                        const disposition = createPart(name) + Module.asString(value) + "\r\n";
                         write.append(disposition);
                         contentLength += Buffer.byteLength(disposition);
                     }
                 };
-                if ((0, types_1.isPlainObject)(data)) {
+                if (isPlainObject(data)) {
                     for (const name in data) {
                         addValue(name, data[name]);
                     }
                 }
                 for (const part of parts) {
                     let name, target, value, type, filename;
-                    if ((0, types_1.isPlainObject)(part)) {
+                    if (isPlainObject(part)) {
                         ({ name, data: target, value, contentType: type, filename } = part);
                     }
-                    else if ((0, types_1.supported)(18, 13) && part instanceof File) {
+                    else if (supported(18, 13) && part instanceof File) {
                         name = part.name;
                         type = part.type;
                         target = Buffer.from(await part.arrayBuffer());
                     }
-                    if (!(0, types_1.isString)(name)) {
-                        throw (0, types_1.errorValue)('Name of file part was invalid', uri.toString());
+                    if (!isString(name)) {
+                        throw errorValue('Name of file part was invalid', uri.toString());
                     }
                     if (target) {
                         if (typeof target === 'string') {
                             filename ||= path.basename(target);
-                            type ||= module_1.lookupMime(filename);
+                            type ||= Module.lookupMime(filename);
                             target = fs.readFileSync(target);
                         }
                         else if (stream.Readable.isReadable(target)) {
@@ -2157,17 +2182,17 @@ class Request extends module_1 {
                             target = Buffer.concat(chunks);
                         }
                         if (!Buffer.isBuffer(target)) {
-                            throw (0, types_1.errorMessage)('File', "Unknown", "multipart/form-data");
+                            throw errorMessage('File', "Unknown", "multipart/form-data");
                         }
                         if (!type || !filename) {
-                            const result = await module_1.resolveMime(target);
+                            const result = await Module.resolveMime(target);
                             let ext;
                             if (result) {
                                 type ||= result.mime;
                                 ext = result.ext;
                             }
                             else if (type) {
-                                ext = module_1.lookupMime(type, true);
+                                ext = Module.lookupMime(type, true);
                             }
                             if (ext && !filename) {
                                 filename = crypto.randomUUID() + '.' + ext;
@@ -2191,15 +2216,15 @@ class Request extends module_1 {
                 }
             }
             if (!valid) {
-                return Promise.reject((0, types_1.errorValue)("No files were attached", "multipart/form-data"));
+                return Promise.reject(errorValue("No files were attached", "multipart/form-data"));
             }
         }
         else {
             if (contentType && !contentType.includes('/')) {
                 contentType = 'application/' + contentType;
             }
-            if (!(0, types_1.isPlainObject)(data)) {
-                data = module_1.asString(data);
+            if (!isPlainObject(data)) {
+                data = Module.asString(data);
             }
             else if (contentType === "application/x-www-form-urlencoded") {
                 data = qs.stringify(data);
@@ -2208,7 +2233,7 @@ class Request extends module_1 {
                 data = JSON.stringify(data);
                 contentType ||= "application/json";
             }
-            headers['content-length'] = Buffer.byteLength(data, (0, types_1.getEncoding)(dataEncoding)).toString();
+            headers['content-length'] = Buffer.byteLength(data, getEncoding(dataEncoding)).toString();
         }
         if (!putting) {
             options.method = 'POST';
@@ -2222,7 +2247,7 @@ class Request extends module_1 {
     async get(uri, options) {
         const opts = (typeof options === 'string' ? { format: options, encoding: 'utf8' } : options || {});
         if (this.readExpect === 'string') {
-            opts.encoding = (0, types_1.getEncoding)(opts.encoding);
+            opts.encoding = getEncoding(opts.encoding);
         }
         const singleton = this.#singleton;
         const verbose = !opts.silent && !singleton || opts.silent === false;
@@ -2373,7 +2398,7 @@ class Request extends module_1 {
         return true;
     }
     abortHeaders(request, options, { href, statusCode = '', message = "Aborted by client" } = {}) {
-        const reason = (0, types_1.errorMessage)(statusCode, message, href);
+        const reason = errorMessage(statusCode, message, href);
         const outAbort = options.outAbort;
         if (outAbort) {
             outAbort.abort(reason);
@@ -2384,19 +2409,19 @@ class Request extends module_1 {
     parseBinOpts(options, ignore, skip, doubleQuote = options.shellExpansion) {
         let pathname = options.pathname, binOpts;
         if (pathname instanceof URL) {
-            pathname = (0, node_url_1.fileURLToPath)(pathname);
+            pathname = fileURLToPath(pathname);
         }
-        else if (!(0, types_1.isString)(pathname)) {
+        else if (!isString(pathname)) {
             if (!this.host) {
                 return {};
             }
             pathname = process.cwd();
         }
-        if ((0, types_1.isArray)(options.binOpts)) {
+        if (isArray(options.binOpts)) {
             let next = false;
-            binOpts = options.binOpts.filter((opt) => !((0, types_1.isString)(opt) && /^-[a-z].*$/i.test(opt))).map((opt) => {
+            binOpts = options.binOpts.filter((opt) => !(isString(opt) && /^-[a-z].*$/i.test(opt))).map((opt) => {
                 if (next) {
-                    if (!module_1.asString(opt).startsWith('--')) {
+                    if (!Module.asString(opt).startsWith('--')) {
                         return [];
                     }
                     next = false;
@@ -2421,12 +2446,12 @@ class Request extends module_1 {
                                     case '--help':
                                         return [];
                                     default:
-                                        return match[3] ? [match[1] + '=' + (0, types_1.sanitizeArgs)(match[3], doubleQuote)] : [match[1]];
+                                        return match[3] ? [match[1] + '=' + sanitizeArgs(match[3], doubleQuote)] : [match[1]];
                                 }
                             }
                         }
                         else if (value) {
-                            return [(0, types_1.sanitizeArgs)(value, doubleQuote)];
+                            return [sanitizeArgs(value, doubleQuote)];
                         }
                         break;
                     }
@@ -2434,15 +2459,15 @@ class Request extends module_1 {
                     case 'boolean':
                         return [opt.toString()];
                     default:
-                        if ((0, types_1.isArray)(opt)) {
-                            return opt.filter(item => (0, types_1.isString)(item)).map(item => (0, types_1.sanitizeArgs)(item, doubleQuote));
+                        if (isArray(opt)) {
+                            return opt.filter(item => isString(item)).map(item => sanitizeArgs(item, doubleQuote));
                         }
                         break;
                 }
                 return [];
             }).flat();
         }
-        return { pathname, headers: (0, util_1.parseOutgoingHeaders)(options.headers), binOpts };
+        return { pathname, headers: copyHeaders(options.headers), binOpts };
     }
     mergeBinOpts(args, opts, binOpts, options) {
         if (binOpts) {
@@ -2461,8 +2486,8 @@ class Request extends module_1 {
         }
         if (options && args.length > 0) {
             const { name, bin, cmd = [] } = options;
-            if (module_1.hasLogType(32768)) {
-                this.formatMessage(32768, name.toUpperCase(), [bin].concat(cmd).join(' '), args.join(' '), { ...module_1.LOG_STYLE_WARN });
+            if (Module.hasLogType(32768)) {
+                this.formatMessage(32768, name.toUpperCase(), [bin].concat(cmd).join(' '), args.join(' '), { ...Module.LOG_STYLE_WARN });
             }
             else {
                 this.addLog(4, path.basename(bin) + ' ' + args.join(' '), name);
@@ -2471,14 +2496,14 @@ class Request extends module_1 {
         return args;
     }
     parseHeaders(outgoing) {
-        if ((0, types_1.isPlainObject)(outgoing)) {
+        if (isPlainObject(outgoing)) {
             Object.assign(this.#headers ||= {}, outgoing);
         }
     }
     findHeadersByUri(uri, outgoing = this.#headers) {
         if (outgoing) {
             const data = [];
-            uri = (0, util_1.trimPath)(uri);
+            uri = trimPath(uri);
             for (const pathname in outgoing) {
                 if (pathname === uri || uri.startsWith(pathname + '/')) {
                     data.push([pathname, outgoing[pathname]]);
@@ -2489,7 +2514,7 @@ class Request extends module_1 {
                 const headers = data[0][1];
                 let result = HTTP.CACHE.get(headers);
                 if (!result) {
-                    result = (0, util_1.normalizeHeaders)(headers);
+                    result = normalizeHeaders(headers);
                     HTTP.CACHE.set(headers, result);
                 }
                 return result;
@@ -2497,7 +2522,7 @@ class Request extends module_1 {
         }
     }
     set adapter(value) {
-        if (adapter_1.constructorOf(value)) {
+        if (HttpAdapter.constructorOf(value)) {
             this.#adapter = value;
         }
     }
@@ -2541,4 +2566,5 @@ class Request extends module_1 {
         return this.module.settings ||= {};
     }
 }
+
 module.exports = Request;