@e-mc/request 0.12.8 → 0.13.0

package/README.md

@@ -1,6 +1,6 @@
 # @e-mc/request
 
-* NodeJS 18
+* NodeJS 18.20.5 LTS
 * ES2022
 
 ## General Usage
@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.12.7/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.13.0/lib/index.d.ts)
 
 ```typescript
 import type { IModule, ModuleConstructor } from "./index";
@@ -40,9 +40,9 @@ interface IRequest extends IModule {
     headersOn(name: string | string[], callback: HeadersOnCallback): void;
     headersOn(name: string | string[], globUrl: string, callback: HeadersOnCallback): void;
     headersOf(uri: string): OutgoingHttpHeaders | undefined;
-    aria2c(uri: string | URL, pathname: string): Promise<string[]>;
+    aria2c(uri: string | URL, pathname: string | URL): Promise<string[]>;
     aria2c(uri: string | URL, options?: Aria2Options): Promise<string[]>;
-    rclone(uri: string | URL, pathname: string): Promise<string[]>;
+    rclone(uri: string | URL, pathname: string | URL): Promise<string[]>;
     rclone(uri: string | URL, options?: RcloneOptions): Promise<string[]>;
     json(uri: string | URL, options?: OpenOptions): Promise<object | null>;
     pipe(uri: string | URL, to: Writable, options?: OpenOptions): Promise<null>;
@@ -55,6 +55,7 @@ interface IRequest extends IModule {
     post(uri: string | URL, form: Record<string, unknown>, parts: FormDataPart[]): Promise<Buffer | string | null>;
     post(uri: string | URL, data: unknown, options: PostOptions): Promise<Buffer | string | null>;
     post(uri: string | URL, data: unknown, contentType?: string, options?: PostOptions): Promise<Buffer | string | null>;
+    get(uri: string | URL, format: "json" | "yaml" | "json5" | "xml" | "toml"): Promise<object | null>;
     get(uri: string | URL, options?: OpenOptions): Promise<Buffer | object | string | null>;
     detach(singleton?: boolean): void;
     reset(adapter?: IHttpAdapter): void;
@@ -74,10 +75,6 @@ interface RequestConstructor extends ModuleConstructor {
     readTLSKey(value: string, cache?: boolean): string;
     readTLSCert(value: string, cache?: boolean): string;
     isCert(value: string): boolean;
-    /** @deprecated @e-mc/request/util */
-    fromURL(url: URL, value: string): string;
-    /** @deprecated @e-mc/request/util */
-    fromStatusCode(value: number | string): string;
     defineHttpAgent(options: HttpAgentSettings): void;
     defineDnsLookup(options: DnsLookupSettings, clear?: boolean): void;
     defineHttpAdapter(module: unknown): void;
@@ -255,9 +252,9 @@ instance.get("http://hostname/path/config.yml", options).then(data => {
 
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.12.7/lib/http.d.ts
-- https://www.unpkg.com/@e-mc/types@0.12.7/lib/request.d.ts
-- https://www.unpkg.com/@e-mc/types@0.12.7/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.0/lib/http.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.0/lib/request.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.0/lib/settings.d.ts
 
 * https://www.npmjs.com/package/@types/node
 

package/http/adapter/index.js

@@ -5,22 +5,28 @@ const yaml = require("js-yaml");
 const types_1 = require("@e-mc/types");
 const module_1 = require("@e-mc/module");
 const util_1 = require("@e-mc/request/util");
+const kHttpAdapter = Symbol.for('request:http:adapter:constructor');
 let LOG_TIMEFORMAT = 'readable';
+const isConstructor = (value) => typeof value === 'function' && !!value.prototype?.constructor.name;
 class HttpAdapter {
     instance;
     state;
     uri;
+    static [kHttpAdapter] = true;
+    static constructorOf(value) {
+        return isConstructor(value) && value[kHttpAdapter] === true;
+    }
     static isUnsupported(value) {
         return value === 421 || value === 505;
     }
     static isDowngrade(err) {
-        return module_1.isErrorCode(err, 'ERR_HTTP2_ERROR') || err instanceof Error && this.isUnsupported(Math.abs(err.errno));
+        return (0, types_1.isErrorCode)(err, 'ERR_HTTP2_ERROR') || err instanceof Error && this.isUnsupported(Math.abs(err.errno));
     }
     static wasAborted(err) {
         return err instanceof Error && err.message.startsWith("Aborted");
     }
     static isConnectionError(err) {
-        return module_1.isErrorCode(err, 'ETIMEDOUT', 'ECONNRESET');
+        return (0, types_1.isErrorCode)(err, 'ETIMEDOUT', 'ECONNRESET');
     }
     static defineHostConfig({ settings }) {
         const time_format = settings?.time_format;

package/index.js

@@ -14,6 +14,7 @@ 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");
@@ -21,8 +22,8 @@ const host_1 = require("@e-mc/request/http/host");
 const adapter_1 = 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, 0, true);
-const REGEXP_PEMCERT = /^-{3,}[ \t]*BEGIN[ \t].+\n-{3,}[ \t]*END[ \t][^-]+-{3,}$/s;
+const SUPPORTED_ZSTD = (0, types_1.supported)(23, 8) || (0, types_1.supported)(22, 15, true);
+const SUPPORTED_PROXY = (0, types_1.supported)(24, 5);
 const REGEXP_GLOBWITHIN = /\\\?|(?:(?<!\\)(?:\*|\[!?[^!\]]+\]|\{(?:[^,]+,)+[^}]+\}|[!?+*@]\((?:[^|]+\|)*[^)]+\)|\?.*\?|\?$))/;
 const REGEXP_RCLONE = /^rclone:\?/i;
 const HTTP = {
@@ -70,7 +71,12 @@ const RCLONE = {
     EXEC_GID: undefined,
     CHECK_FIRST: false,
     CHECKSUM: false,
+    COMBINED: '',
+    CSV: false,
     CUTOFF_MODE: '',
+    DIFFER: '',
+    ERROR: '',
+    HASH: '',
     IGNORE_CASE_SYNC: false,
     IGNORE_CHECKSUM: false,
     IGNORE_EXISTING: false,
@@ -90,8 +96,10 @@ const RCLONE = {
     NO_CHECK_DEST: false,
     NO_TRAVERSE: false,
     NO_UPDATE_DIR_MODTIME: false,
+    NO_UPDATE_MODTIME: false,
     REFRESH_TIMES: false,
     SIZE_ONLY: false,
+    STREAMING_UPLOAD_CUTOFF: '',
     UPDATE: false,
     FAST_LIST: false,
     BIND: '',
@@ -107,14 +115,6 @@ let READ_TIMEOUT = 0;
 let AGENT_TIMEOUT = 0;
 let LOG_HTTP = false;
 let LOG_TIMEPROCESS = true;
-let LIB_ZSTD = null;
-try {
-    require('zstd-codec/lib/zstd-stream').run(codec => {
-        LIB_ZSTD = codec;
-    });
-}
-catch {
-}
 function getBaseHeaders(uri, headers) {
     let result;
     uri = (0, util_1.trimPath)(uri);
@@ -338,6 +338,16 @@ function checkEncoding(request, response, statusCode, outStream, contentEncoding
         return pipeTo;
     }
 }
+function sendBody(request, options) {
+    const postData = options.postData;
+    if ((0, types_1.isString)(postData) || Buffer.isBuffer(postData)) {
+        request.write(postData);
+    }
+    else if (postData instanceof stream.Stream) {
+        postData.pipe(request);
+    }
+    request.end();
+}
 function decompressEncoding(value, chunkSize) {
     switch (value) {
         case 'gzip':
@@ -349,9 +359,6 @@ function decompressEncoding(value, chunkSize) {
         case 'deflate-raw':
             return zlib.createInflateRaw({ chunkSize });
         case 'zstd':
-            if (LIB_ZSTD) {
-                return new LIB_ZSTD.ZstdDecompressTransform({ writableHighWaterMark: chunkSize });
-            }
             if (SUPPORTED_ZSTD) {
                 return zlib.createZstdDecompress({ chunkSize });
             }
@@ -391,68 +398,8 @@ function setBinExec(settings, target) {
         target.EXEC_GID = (gid = (0, util_1.asInt)(gid)) >= 0 ? gid : undefined;
     }
 }
-function parseBinOpts(instance, options, ignore, skip, doubleQuote) {
-    let pathname = options.pathname, binOpts;
-    if (!(0, types_1.isString)(pathname)) {
-        if (!instance.host) {
-            return [];
-        }
-        pathname = process.cwd();
-    }
-    if ((0, types_1.isArray)(options.binOpts)) {
-        let next = false;
-        binOpts = options.binOpts.filter(opt => !((0, types_1.isString)(opt) && /^-[a-z].*$/i.test(opt.trim()))).map((opt) => {
-            if (next) {
-                if (!module_1.asString(opt).startsWith('--')) {
-                    return [];
-                }
-                next = false;
-            }
-            switch (typeof opt) {
-                case 'string': {
-                    const value = opt.trim();
-                    if (value.startsWith('--')) {
-                        const match = /^(--[a-z]+[a-z0-9-]*)(=)?\s*(.*)$/s.exec(value);
-                        if (match) {
-                            if (ignore.includes(match[1])) {
-                                return [];
-                            }
-                            if (skip.includes(match[1])) {
-                                if (!match[2]) {
-                                    next = true;
-                                }
-                                return [];
-                            }
-                            switch (match[1]) {
-                                case '--version':
-                                case '--help':
-                                    return [];
-                                default:
-                                    return match[3] ? [match[1] + '=' + (0, types_1.sanitizeArgs)(match[3], doubleQuote)] : [match[1]];
-                            }
-                        }
-                    }
-                    else if (value) {
-                        return [(0, types_1.sanitizeArgs)(value, doubleQuote)];
-                    }
-                    break;
-                }
-                case 'number':
-                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));
-                    }
-                    break;
-            }
-            return [];
-        }).flat();
-    }
-    return [pathname, (0, util_1.parseOutgoingHeaders)(options.headers), binOpts];
-}
 function checkBinTarget(instance, name, uri, pathname, command, binOpts) {
-    if (!(0, types_1.isString)(pathname)) {
+    if (!pathname) {
         throw (0, types_1.errorMessage)(name, "Invalid parameters", 'pathname');
     }
     pathname = path.resolve(pathname);
@@ -549,7 +496,6 @@ function addAria2Proxy(args, protocol, host) {
         args.push(`--${protocol}-proxy-passwd="${escapeShellQuote(decodeURIComponent(password))}"`);
     }
 }
-const isConstructor = (value) => typeof value === 'function';
 const isDirEnd = (value) => value.endsWith('/') || value.endsWith(path.sep);
 const trimCharEnd = (value) => value.substring(0, value.length - 1);
 const configureDns = (family, options) => family === 0 ? options : { family, hints: family === 6 ? dns.V4MAPPED : 0 };
@@ -578,7 +524,8 @@ class Request extends module_1 {
         }
         const { request, download } = settings;
         if (download?.aria2) {
-            let { update_status, max_concurrent_downloads, max_connection_per_server, check_integrity, bt_stop_timeout, bt_tracker_connect_timeout, bt_tracker_timeout, min_split_size, disk_cache, lowest_speed_limit, always_resume, file_allocation, proxy, no_proxy, conf_path } = download.aria2;
+            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)) {
                 const { interval, broadcast_only } = update_status;
@@ -593,21 +540,9 @@ class Request extends module_1 {
             if (typeof check_integrity === 'boolean') {
                 ARIA2.CHECK_INTEGRITY = check_integrity;
             }
-            if ((max_concurrent_downloads = (0, util_1.asInt)(max_concurrent_downloads)) > 0) {
-                ARIA2.MAX_CONCURRENT_DOWNLOADS = max_concurrent_downloads;
-            }
-            if ((max_connection_per_server = (0, util_1.asInt)(max_connection_per_server)) > 0) {
-                ARIA2.MAX_CONNECTION_PER_SERVER = max_connection_per_server;
-            }
             if ((bt_stop_timeout = (0, util_1.asInt)(bt_stop_timeout)) >= 0) {
                 ARIA2.BT_STOP_TIMEOUT = bt_stop_timeout;
             }
-            if ((bt_tracker_connect_timeout = (0, util_1.asInt)(bt_tracker_connect_timeout)) > 0) {
-                ARIA2.BT_TRACKER_CONNECT_TIMEOUT = bt_tracker_connect_timeout;
-            }
-            if ((bt_tracker_timeout = (0, util_1.asInt)(bt_tracker_timeout)) > 0) {
-                ARIA2.BT_TRACKER_TIMEOUT = bt_tracker_timeout;
-            }
             if (min_split_size = parseSize(min_split_size, false)) {
                 ARIA2.MIN_SPLIT_SIZE = min_split_size;
             }
@@ -644,22 +579,23 @@ class Request extends module_1 {
             else if (proxy === false) {
                 ARIA2.PROXY = {};
             }
-            if (no_proxy === '' || (0, types_1.isString)(no_proxy)) {
+            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))) {
                 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) {
+                    ARIA2[name.toUpperCase()] = value;
+                }
+            }
         }
         if (download?.rclone) {
-            let { check_first, checksum, cutoff_mode, ignore_case_sync, ignore_checksum, ignore_existing, ignore_size, ignore_times, immutable, inplace, max_backlog, max_duration, max_transfer, metadata, modify_window, multi_thread_chunk_size, multi_thread_cutoff, multi_thread_streams, multi_thread_write_buffer_size, no_check_dest, no_traverse, no_update_dir_modtime, refresh_times, size_only, update, fast_list, bind, contimeout, disable_http2, timeout, config } = 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;
             setBinExec(download.rclone, RCLONE);
-            if (typeof check_first === 'boolean') {
-                RCLONE.CHECK_FIRST = check_first;
-            }
-            if (typeof checksum === 'boolean') {
-                RCLONE.CHECKSUM = checksum;
-            }
             if ((0, types_1.isString)(cutoff_mode)) {
                 const value = cutoff_mode.toUpperCase();
                 switch (value) {
@@ -670,26 +606,18 @@ class Request extends module_1 {
                         break;
                 }
             }
-            if (typeof ignore_case_sync === 'boolean') {
-                RCLONE.IGNORE_CASE_SYNC = ignore_case_sync;
-            }
-            if (typeof ignore_checksum === 'boolean') {
-                RCLONE.IGNORE_CHECKSUM = ignore_checksum;
-            }
-            if (typeof ignore_existing === 'boolean') {
-                RCLONE.IGNORE_EXISTING = ignore_existing;
-            }
-            if (typeof ignore_size === 'boolean') {
-                RCLONE.IGNORE_SIZE = ignore_size;
-            }
-            if (typeof ignore_times === 'boolean') {
-                RCLONE.IGNORE_TIMES = ignore_times;
-            }
-            if (typeof immutable === 'boolean') {
-                RCLONE.IMMUTABLE = immutable;
-            }
-            if (typeof inplace === 'boolean') {
-                RCLONE.INPLACE = inplace;
+            if ((0, types_1.isString)(hash)) {
+                switch (hash.toLowerCase()) {
+                    case 'md5':
+                        RCLONE.HASH = 'md5';
+                        break;
+                    case 'sha-1':
+                        RCLONE.HASH = 'SHA-1';
+                        break;
+                    case 'dropboxhash':
+                        RCLONE.HASH = 'DropboxHash';
+                        break;
+                }
             }
             if ((max_backlog = (0, util_1.asInt)(max_backlog)) > 0) {
                 RCLONE.MAX_BACKLOG = max_backlog;
@@ -700,9 +628,6 @@ class Request extends module_1 {
             if (max_transfer = rcloneSize(max_transfer)) {
                 RCLONE.MAX_TRANSFER = max_transfer;
             }
-            if (typeof metadata === 'boolean') {
-                RCLONE.METADATA = metadata;
-            }
             if (modify_window = rcloneDuration(modify_window)) {
                 RCLONE.MODIFY_WINDOW = modify_window;
             }
@@ -718,26 +643,8 @@ class Request extends module_1 {
             if (multi_thread_write_buffer_size = rcloneSize(multi_thread_write_buffer_size)) {
                 RCLONE.MULTI_THREAD_WRITE_BUFFER_SIZE = multi_thread_write_buffer_size;
             }
-            if (typeof no_check_dest === 'boolean') {
-                RCLONE.NO_CHECK_DEST = no_check_dest;
-            }
-            if (typeof no_traverse === 'boolean') {
-                RCLONE.NO_TRAVERSE = no_traverse;
-            }
-            if (typeof no_update_dir_modtime === 'boolean') {
-                RCLONE.NO_UPDATE_DIR_MODTIME = no_update_dir_modtime;
-            }
-            if (typeof refresh_times === 'boolean') {
-                RCLONE.REFRESH_TIMES = refresh_times;
-            }
-            if (typeof size_only === 'boolean') {
-                RCLONE.SIZE_ONLY = size_only;
-            }
-            if (typeof update === 'boolean') {
-                RCLONE.UPDATE = update;
-            }
-            if (typeof fast_list === 'boolean') {
-                RCLONE.FAST_LIST = fast_list;
+            if (streaming_upload_cutoff = rcloneSize(streaming_upload_cutoff)) {
+                RCLONE.STREAMING_UPLOAD_CUTOFF = streaming_upload_cutoff;
             }
             if (contimeout = rcloneDuration(contimeout)) {
                 RCLONE.CONTIMEOUT = contimeout;
@@ -745,14 +652,20 @@ class Request extends module_1 {
             if (typeof bind === 'string') {
                 RCLONE.BIND = bind;
             }
-            if (typeof disable_http2 === 'boolean') {
-                RCLONE.DISABLE_HTTP2 = disable_http2;
-            }
             if (timeout = rcloneDuration(timeout)) {
                 RCLONE.TIMEOUT = timeout;
             }
-            if (config === '' || (0, types_1.isString)(config) && this.isPath(config = path.resolve(config), true)) {
-                RCLONE.CONFIG = config;
+            for (const name of ['check_first', 'checksum', 'csv', 'ignore_case_sync', 'ignore_checksum', 'ignore_existing', 'ignore_size', 'ignore_times', 'immutable', 'inplace', 'metadata', 'no_check_dest', 'no_traverse', 'no_update_dir_modtime', 'no_update_modtime', 'refresh_times', 'size_only', 'update', 'fast_list', 'disable_http2']) {
+                const value = rclone[name];
+                if (typeof value === 'boolean') {
+                    RCLONE[name.toUpperCase()] = value;
+                }
+            }
+            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)) {
+                    RCLONE[name.toUpperCase()] = value;
+                }
             }
         }
         if (request) {
@@ -814,13 +727,7 @@ class Request extends module_1 {
         return this.readCACert(value, cache);
     }
     static isCert(value) {
-        return typeof value === 'string' && (value = value.trim()).length > 0 && REGEXP_PEMCERT.test(value);
-    }
-    static fromURL(url, value) {
-        return (0, util_1.fromURL)(url, value);
-    }
-    static fromStatusCode(value) {
-        return (0, util_1.fromStatusCode)(value);
+        return typeof value === 'string' && (value = value.trim()).length > 0 && /^-{3,}[ \t]*BEGIN[ \t].+\n-{3,}[ \t]*END[ \t][^-]+-{3,}$/s.test(value);
     }
     static defineHttpAgent(options) {
         const { keepAlive, timeout = 0 } = options;
@@ -847,15 +754,25 @@ class Request extends module_1 {
         if (reset) {
             clearDnsLookup();
         }
-        switch (family = (0, util_1.asInt)(family)) {
-            case 0:
-            case 4:
-            case 6:
-                DNS.FAMILY = family;
+        switch (family) {
+            case 'IPv4':
+                DNS.FAMILY = 4;
+                break;
+            case 'IPv6':
+                DNS.FAMILY = 6;
+                break;
+            default:
+                switch (family = (0, util_1.asInt)(family)) {
+                    case 0:
+                    case 4:
+                    case 6:
+                        DNS.FAMILY = family;
+                        break;
+                }
                 break;
         }
         if (expires !== undefined) {
-            if (typeof expires === 'string') {
+            if ((0, types_1.isString)(expires)) {
                 expires = (0, types_1.parseExpires)(expires);
             }
             if (expires >= 0) {
@@ -863,14 +780,14 @@ class Request extends module_1 {
             }
         }
         for (const hostname in resolve) {
-            let { address, family: ipv } = resolve[hostname];
-            if (address && (ipv = ipv && ((ipv = +ipv) === 4 || ipv === 6) ? ipv : net.isIPv6(address) ? 6 : net.isIPv4(address) ? 4 : 0)) {
-                DNS.CACHE[hostname] = [{ address, family: ipv }];
+            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)) {
+                DNS.CACHE[hostname] = [{ address, family }];
             }
         }
     }
     static defineHttpAdapter(module) {
-        if (isConstructor(module) && module.prototype instanceof adapter_1) {
+        if (adapter_1.constructorOf(module)) {
             HTTP_ADAPTER = module;
         }
     }
@@ -1104,8 +1021,12 @@ class Request extends module_1 {
                     }
                     break;
                 case 'readExpect':
-                    if ((0, types_1.isString)(value)) {
-                        this[name] = value;
+                    switch (value) {
+                        case 'string':
+                        case 'always':
+                        case 'none':
+                            this[name] = value;
+                            break;
                     }
                     break;
             }
@@ -1280,12 +1201,15 @@ class Request extends module_1 {
             return Promise.reject((0, types_1.errorMessage)("aria2", "Binary not found"));
         }
         let pathname, headers, binOpts, signal, silent;
-        if ((0, types_1.isString)(options)) {
+        if (typeof options === 'string') {
             pathname = options;
         }
+        else if (options instanceof URL) {
+            pathname = (0, node_url_1.fileURLToPath)(options);
+        }
         else {
             ({ signal, silent } = options);
-            [pathname, headers, binOpts] = parseBinOpts(this, options, ['--daemon'], ['--input-file'], options.shellExpansion);
+            ({ pathname, headers, binOpts } = this.parseBinOpts(options, ['--daemon'], ['--input-file']));
         }
         try {
             if (typeof uri === 'string' && module_1.isURL(uri)) {
@@ -1537,13 +1461,17 @@ class Request extends module_1 {
         }
         uri = uri.toString();
         let pathname, headers, binOpts, silent;
-        if ((0, types_1.isString)(options)) {
+        if (typeof options === 'string') {
             pathname = options;
             options = {};
         }
+        else if (options instanceof URL) {
+            pathname = (0, node_url_1.fileURLToPath)(options);
+            options = {};
+        }
         else {
             silent = options.silent;
-            [pathname, headers, binOpts] = parseBinOpts(this, options, ['--interactive', '--dry-run'], ['--partial-suffix', '--verbose'], options.shellExpansion);
+            ({ pathname, headers, binOpts } = this.parseBinOpts(options, ['--interactive', '--dry-run'], ['–name-transform', '--partial-suffix', '--verbose']));
         }
         const command = options.command || 'copy';
         let source;
@@ -1593,6 +1521,12 @@ class Request extends module_1 {
             if (RCLONE.CUTOFF_MODE) {
                 opts.push('--cutoff-mode=' + RCLONE.CUTOFF_MODE);
             }
+            if (RCLONE.CSV) {
+                opts.push('--csv');
+            }
+            if (RCLONE.HASH) {
+                opts.push('--hash=' + RCLONE.HASH);
+            }
             if (RCLONE.IGNORE_CASE_SYNC) {
                 opts.push('--ignore-case-sync');
             }
@@ -1650,12 +1584,18 @@ class Request extends module_1 {
             if (RCLONE.NO_UPDATE_DIR_MODTIME) {
                 opts.push('--no-update-dir-modtime');
             }
+            if (RCLONE.NO_UPDATE_MODTIME) {
+                opts.push('--no-update-modtime');
+            }
             if (RCLONE.REFRESH_TIMES) {
                 opts.push('--refresh-times');
             }
             if (RCLONE.SIZE_ONLY) {
                 opts.push('--size-only');
             }
+            if (RCLONE.STREAMING_UPLOAD_CUTOFF) {
+                opts.push('--streaming-upload-cutoff');
+            }
             if (RCLONE.FAST_LIST) {
                 opts.push('--fast-list');
             }
@@ -1677,6 +1617,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)}"`);
             }
@@ -1868,7 +1817,7 @@ class Request extends module_1 {
         const baseHeaders = this.headersOf(uri);
         let request, ca, cert, key, ciphers, minVersion;
         if (getting && this.acceptEncoding && !host.localhost && !baseHeaders?.['accept-encoding']) {
-            (headers ||= {})['accept-encoding'] ||= 'gzip, deflate, br' + (LIB_ZSTD || SUPPORTED_ZSTD ? ', zstd' : '');
+            (headers ||= {})['accept-encoding'] ||= 'gzip, deflate, br' + (SUPPORTED_ZSTD ? ', zstd' : '');
         }
         if (posting && options.postData) {
             if (expectContinue) {
@@ -1904,7 +1853,7 @@ class Request extends module_1 {
                 request.on('response', response => {
                     const statusCode = response[':status'];
                     if (expectContinue) {
-                        this.abortHeaders(url.href, request, options, statusCode, "Did not receive continue acknowledgment");
+                        this.abortHeaders(request, options, { href: url.href, statusCode, message: "Did not receive continue acknowledgment" });
                         return;
                     }
                     connected = true;
@@ -1983,27 +1932,34 @@ class Request extends module_1 {
             if (!socketPath) {
                 let { keepAlive, agentTimeout } = options;
                 if (proxy) {
+                    keepAlive ??= proxy.keepAlive;
+                    agentTimeout ??= proxy.agentTimeout;
+                    const proxyHeaders = this.#headers && getBaseHeaders(proxy.host.href, this.#headers) || getBaseHeaders(proxy.host.href, HTTP.HEADERS);
                     const pkg = secure ? 'https-proxy-agent' : 'http-proxy-agent';
                     try {
-                        keepAlive ??= proxy.keepAlive;
-                        agentTimeout ??= proxy.agentTimeout;
-                        const proxyHeaders = this.#headers && getBaseHeaders(proxy.host.href, this.#headers) || getBaseHeaders(proxy.host.href, HTTP.HEADERS);
                         agent = require(pkg)(proxy.host, (typeof keepAlive === 'boolean' || agentTimeout > 0) && agentTimeout !== 0 ? { keepAlive: keepAlive ?? true, timeout: agentTimeout, headers: proxyHeaders } : { headers: proxyHeaders });
                     }
                     catch (err) {
-                        this.checkPackage(err, pkg, "Unknown");
+                        if (!SUPPORTED_PROXY || proxyHeaders) {
+                            this.checkPackage(err, pkg, proxyHeaders ? "Unable to process headers" : '');
+                        }
                     }
                 }
-                else if (keepAlive === false) {
-                    agent = new (secure ? https.Agent : http.Agent)({ keepAlive: false });
-                }
-                else if (keepAlive === true || agentTimeout > 0) {
-                    agent = new (secure ? https.Agent : http.Agent)({ keepAlive: true, timeout: agentTimeout });
-                }
-                else if (agentTimeout !== 0) {
-                    agentTimeout ??= this.agentTimeout;
-                    if (this.keepAlive !== null || agentTimeout > 0) {
-                        agent = new (secure ? https.Agent : http.Agent)({ keepAlive: this.keepAlive ?? true, timeout: agentTimeout });
+                if (!agent) {
+                    let proxyEnv;
+                    if (proxy && SUPPORTED_PROXY) {
+                        const http_proxy = proxy.host.toString();
+                        proxyEnv = { http_proxy, https_proxy: http_proxy };
+                    }
+                    if (keepAlive === false) {
+                        agent = new (secure ? https.Agent : http.Agent)({ keepAlive: false, proxyEnv });
+                    }
+                    else if (keepAlive === true || agentTimeout > 0) {
+                        agent = new (secure ? https.Agent : http.Agent)({ keepAlive: true, timeout: agentTimeout, proxyEnv });
+                    }
+                    else if (agentTimeout !== 0 || proxyEnv) {
+                        agentTimeout ??= this.agentTimeout;
+                        agent = new (secure ? https.Agent : http.Agent)({ keepAlive: this.keepAlive ?? true, timeout: agentTimeout || undefined, proxyEnv });
                     }
                 }
             }
@@ -2099,7 +2055,7 @@ class Request extends module_1 {
                         request.emit('end');
                     });
                     if (expectContinue) {
-                        this.abortHeaders(url.href, request, options, statusCode, "Did not receive continue acknowledgment");
+                        this.abortHeaders(request, options, { href: url.href, statusCode, message: "Did not receive continue acknowledgment" });
                         return;
                     }
                 }
@@ -2126,17 +2082,6 @@ class Request extends module_1 {
                 ac.abort(new Error("Aborted by process"));
             }, { once: true });
         }
-        const sendBody = () => {
-            if (posting) {
-                const postData = options.postData;
-                if ((0, types_1.isString)(postData) || Buffer.isBuffer(postData)) {
-                    request.write(postData);
-                }
-                else if (postData instanceof stream.Stream) {
-                    postData.pipe(request);
-                }
-            }
-        };
         if (expectContinue) {
             const pending = setTimeout(() => {
                 request.end();
@@ -2144,12 +2089,18 @@ class Request extends module_1 {
             request.on('continue', () => {
                 clearTimeout(pending);
                 expectContinue = false;
-                sendBody();
-                request.end();
+                if (posting) {
+                    sendBody(request, options);
+                }
+                else {
+                    request.end();
+                }
             });
         }
+        else if (posting) {
+            sendBody(request, options);
+        }
         else {
-            sendBody();
             request.end();
         }
         return request;
@@ -2246,7 +2197,7 @@ class Request extends module_1 {
                             type ||= module_1.lookupMime(filename);
                             target = fs.readFileSync(target);
                         }
-                        else if (target instanceof stream.Readable) {
+                        else if (stream.Readable.isReadable(target)) {
                             const chunks = [];
                             for await (const chunk of target) {
                                 chunks.push(chunk);
@@ -2371,7 +2322,7 @@ class Request extends module_1 {
             for (const callback of called) {
                 try {
                     if (callback(code, headers, url) === true) {
-                        this.abortHeaders(href, request, options, code);
+                        this.abortHeaders(request, options, { href, statusCode: code });
                         return false;
                     }
                 }
@@ -2403,7 +2354,7 @@ class Request extends module_1 {
             for (const [callback, data] of called) {
                 try {
                     if (callback(data, url) === true) {
-                        this.abortHeaders(href, request, options);
+                        this.abortHeaders(request, options, { href });
                         return false;
                     }
                 }
@@ -2414,7 +2365,7 @@ class Request extends module_1 {
         }
         return true;
     }
-    abortHeaders(href, request, options, statusCode = '', message = "Aborted by client") {
+    abortHeaders(request, options, { href, statusCode = '', message = "Aborted by client" } = {}) {
         const reason = (0, types_1.errorMessage)(statusCode, message, href);
         const outAbort = options.outAbort;
         if (outAbort) {
@@ -2423,8 +2374,71 @@ class Request extends module_1 {
         }
         request.destroy(reason);
     }
+    parseBinOpts(options, ignore, skip, doubleQuote = options.shellExpansion) {
+        let pathname = options.pathname, binOpts;
+        if (pathname instanceof URL) {
+            pathname = (0, node_url_1.fileURLToPath)(pathname);
+        }
+        else if (!(0, types_1.isString)(pathname)) {
+            if (!this.host) {
+                return {};
+            }
+            pathname = process.cwd();
+        }
+        if ((0, types_1.isArray)(options.binOpts)) {
+            let next = false;
+            binOpts = options.binOpts.filter((opt) => !((0, types_1.isString)(opt) && /^-[a-z].*$/i.test(opt.trim()))).map((opt) => {
+                if (next) {
+                    if (!module_1.asString(opt).startsWith('--')) {
+                        return [];
+                    }
+                    next = false;
+                }
+                switch (typeof opt) {
+                    case 'string': {
+                        const value = opt.trim();
+                        if (value.startsWith('--')) {
+                            const match = /^(--[a-z]+[a-z0-9-]*)(=)?\s*(.*)$/s.exec(value);
+                            if (match) {
+                                if (ignore.includes(match[1])) {
+                                    return [];
+                                }
+                                if (skip.includes(match[1])) {
+                                    if (!match[2]) {
+                                        next = true;
+                                    }
+                                    return [];
+                                }
+                                switch (match[1]) {
+                                    case '--version':
+                                    case '--help':
+                                        return [];
+                                    default:
+                                        return match[3] ? [match[1] + '=' + (0, types_1.sanitizeArgs)(match[3], doubleQuote)] : [match[1]];
+                                }
+                            }
+                        }
+                        else if (value) {
+                            return [(0, types_1.sanitizeArgs)(value, doubleQuote)];
+                        }
+                        break;
+                    }
+                    case 'number':
+                    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));
+                        }
+                        break;
+                }
+                return [];
+            }).flat();
+        }
+        return { pathname, headers: (0, util_1.parseOutgoingHeaders)(options.headers), binOpts };
+    }
     set adapter(value) {
-        if (isConstructor(value) && value.prototype instanceof adapter_1) {
+        if (adapter_1.constructorOf(value)) {
             this.#adapter = value;
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/request",
-  "version": "0.12.8",
+  "version": "0.13.0",
   "description": "Request constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -19,8 +19,8 @@
   "license": "BSD-3-Clause",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/module": "0.12.8",
-    "@e-mc/types": "0.12.8",
+    "@e-mc/module": "0.13.0",
+    "@e-mc/types": "0.13.0",
     "combined-stream": "^1.0.8",
     "js-yaml": "^4.1.0",
     "picomatch": "^4.0.3",

package/util.js

@@ -142,7 +142,7 @@ function isRetryable(value, timeout) {
 }
 function parseHttpProxy(value, ignoreEnv) {
     if (!ignoreEnv) {
-        value ||= process.env.HTTP_PROXY || process.env.HTTPS_PROXY;
+        value ||= process.env.HTTP_PROXY || process.env.HTTPS_PROXY || process.env.ALL_PROXY;
     }
     if (value) {
         try {
@@ -426,7 +426,7 @@ function cleanupStream(stream, uri) {
         }
     }
     catch (err) {
-        if (!module_1.isErrorCode(err, 'ENOENT')) {
+        if (!(0, types_1.isErrorCode)(err, 'ENOENT')) {
             module_1.writeFail(["Unable to delete file", path.basename(uri)], err, 32);
         }
     }