@e-mc/request 0.12.7 → 0.12.9

package/README.md

@@ -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.12.9/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>;
@@ -255,9 +255,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.12.9/lib/http.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.9/lib/request.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.9/lib/settings.d.ts
 
 * https://www.npmjs.com/package/@types/node
 

package/http/adapter/index.js

@@ -14,19 +14,13 @@ class HttpAdapter {
         return value === 421 || value === 505;
     }
     static isDowngrade(err) {
-        return err instanceof Error && (err.code === 'ERR_HTTP2_ERROR' || this.isUnsupported(Math.abs(err.errno)));
+        return module_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) {
-        switch (err instanceof Error && err.code) {
-            case 'ETIMEDOUT':
-            case 'ECONNRESET':
-                return true;
-            default:
-                return false;
-        }
+        return module_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");
@@ -391,68 +392,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);
@@ -482,24 +423,25 @@ function checkBinTarget(instance, name, uri, pathname, command, binOpts) {
     return pathname;
 }
 function checkBinOpts(init, binOpts) {
-    if ((0, types_1.isArray)(binOpts)) {
-        for (let i = 0; i < binOpts.length; ++i) {
-            const leading = binOpts[i] + '=';
-            for (const arg of init) {
-                if (arg.startsWith(leading)) {
-                    const items = [];
-                    for (let k = i + 1; k < binOpts.length; ++k) {
-                        const next = binOpts[k];
-                        if (next.startsWith('--')) {
-                            break;
-                        }
-                        items.push(next);
+    if (!binOpts) {
+        return;
+    }
+    for (let i = 0; i < binOpts.length; ++i) {
+        const leading = binOpts[i] + '=';
+        for (const arg of init) {
+            if (arg.startsWith(leading)) {
+                const items = [];
+                for (let k = i + 1; k < binOpts.length; ++k) {
+                    const next = binOpts[k];
+                    if (next.startsWith('--')) {
+                        break;
                     }
-                    const l = items.length + 1;
-                    binOpts.splice(i, l);
-                    i += l;
-                    break;
+                    items.push(next);
                 }
+                const l = items.length + 1;
+                binOpts.splice(i, l);
+                i += l;
+                break;
             }
         }
     }
@@ -514,7 +456,7 @@ function setBinHeaders(args, headers) {
     }
 }
 function finalizeBinArgs(instance, name, bin, args, opts, binOpts, cmd = []) {
-    if ((0, types_1.isArray)(binOpts)) {
+    if (binOpts) {
         for (const leading of binOpts) {
             if (leading.startsWith('-')) {
                 const pattern = new RegExp(`^${leading}(?:=|$)`);
@@ -554,7 +496,7 @@ const trimCharEnd = (value) => value.substring(0, value.length - 1);
 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 escapeQuote = (value) => value.replace(/[\\"]/g, capture => '\\' + capture);
-const rcloneSize = (value) => (0, types_1.isString)(value) ? /^\d+(?:B|K|M|G|T|P)$/.exec(value)?.[0] : undefined;
+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 {
     static [kRequest] = true;
@@ -643,7 +585,7 @@ 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))) {
@@ -854,7 +796,7 @@ class Request extends module_1 {
                 break;
         }
         if (expires !== undefined) {
-            if (typeof expires === 'string') {
+            if ((0, types_1.isString)(expires)) {
                 expires = (0, types_1.parseExpires)(expires);
             }
             if (expires >= 0) {
@@ -1103,8 +1045,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;
             }
@@ -1279,12 +1225,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'], options.shellExpansion));
         }
         try {
             if (typeof uri === 'string' && module_1.isURL(uri)) {
@@ -1536,13 +1485,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'], options.shellExpansion));
         }
         const command = options.command || 'copy';
         let source;
@@ -2422,6 +2375,69 @@ class Request extends module_1 {
         }
         request.destroy(reason);
     }
+    parseBinOpts(options, ignore, skip, doubleQuote = false) {
+        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) {
             this.#adapter = value;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/request",
-  "version": "0.12.7",
+  "version": "0.12.9",
   "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.7",
-    "@e-mc/types": "0.12.7",
+    "@e-mc/module": "0.12.9",
+    "@e-mc/types": "0.12.9",
     "combined-stream": "^1.0.8",
     "js-yaml": "^4.1.0",
     "picomatch": "^4.0.3",