@e-mc/request 0.12.1 → 0.12.3

package/README.md

@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.12.1/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.12.2/lib/index.d.ts)
 
 ```typescript
 import type { IModule, ModuleConstructor } from "./index";
@@ -42,8 +42,8 @@ interface IRequest extends IModule {
     headersOf(uri: string): OutgoingHttpHeaders | undefined;
     aria2c(uri: string | URL, pathname: string): Promise<string[]>;
     aria2c(uri: string | URL, options?: Aria2Options): Promise<string[]>;
-    rclone(uri: string, pathname: string): Promise<string[]>;
-    rclone(uri: string, options?: RcloneOptions): Promise<string[]>;
+    rclone(uri: string | URL, pathname: string): 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>;
     opts(url: string | URL, options?: OpenOptions): HostConfig;
@@ -81,7 +81,9 @@ interface RequestConstructor extends ModuleConstructor {
     defineHttpAgent(options: HttpAgentSettings): void;
     defineDnsLookup(options: DnsLookupSettings, clear?: boolean): void;
     defineHttpAdapter(module: unknown): void;
+    isRclone(value: string | URL): boolean;
     getAria2Path(): string;
+    getRclonePath(): string;
     readonly prototype: IRequest;
     new(module?: RequestModule): IRequest;
 }
@@ -253,9 +255,9 @@ instance.get("http://hostname/path/config.yml", options).then(data => {
 
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.12.1/lib/http.d.ts
-- https://www.unpkg.com/@e-mc/types@0.12.1/lib/request.d.ts
-- https://www.unpkg.com/@e-mc/types@0.12.1/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.2/lib/http.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.2/lib/request.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.2/lib/settings.d.ts
 
 * https://www.npmjs.com/package/@types/node
 

package/index.js

@@ -24,6 +24,7 @@ const SUPPORTED_NODE20 = (0, types_1.supported)(20);
 const SUPPORTED_ZSTD = (0, types_1.supported)(23, 8) && typeof zlib.createZstdDecompress === 'function';
 const REGEXP_PEMCERT = /^-{3,}[ \t]*BEGIN[ \t].+\n-{3,}[ \t]*END[ \t][^-]+-{3,}$/s;
 const REGEXP_GLOBWITHIN = /\\\?|(?:(?<!\\)(?:\*|\[!?[^!\]]+\]|\{(?:[^,]+,)+[^}]+\}|[!?+*@]\((?:[^|]+\|)*[^)]+\)|\?.*\?|\?$))/;
+const REGEXP_RCLONE = /^rclone:\?/i;
 const HTTP = {
     HOST: {},
     HEADERS: {},
@@ -390,7 +391,7 @@ function setBinExec(settings, target) {
         target.EXEC_GID = (gid = (0, util_1.asInt)(gid)) >= 0 ? gid : undefined;
     }
 }
-function parseBinOpts(instance, options, ignore, skip) {
+function parseBinOpts(instance, options, ignore, skip, doubleQuote) {
     let pathname = options.pathname, binOpts;
     if (!(0, types_1.isString)(pathname)) {
         if (!instance.host) {
@@ -427,12 +428,12 @@ function parseBinOpts(instance, options, ignore, skip) {
                                 case '--help':
                                     return [];
                                 default:
-                                    return match[3] ? [match[1], (0, types_1.sanitizeArgs)(match[3])] : [match[1]];
+                                    return match[3] ? [match[1] + '=' + (0, types_1.sanitizeArgs)(match[3], doubleQuote)] : [match[1]];
                             }
                         }
                     }
                     else if (value) {
-                        return [(0, types_1.sanitizeArgs)(value)];
+                        return [(0, types_1.sanitizeArgs)(value, doubleQuote)];
                     }
                     break;
                 }
@@ -441,7 +442,7 @@ function parseBinOpts(instance, options, ignore, skip) {
                     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));
+                        return opt.filter(item => (0, types_1.isString)(item)).map(item => (0, types_1.sanitizeArgs)(item, doubleQuote));
                     }
                     break;
             }
@@ -872,6 +873,9 @@ class Request extends module_1 {
             HTTP_ADAPTER = module;
         }
     }
+    static isRclone(value) {
+        return REGEXP_RCLONE.test(value.toString());
+    }
     static getAria2Path() {
         return ARIA2.BIN;
     }
@@ -1280,7 +1284,7 @@ class Request extends module_1 {
         }
         else {
             ({ signal, silent } = options);
-            [pathname, headers, binOpts] = parseBinOpts(this, options, ['--daemon'], ['--input-file']);
+            [pathname, headers, binOpts] = parseBinOpts(this, options, ['--daemon'], ['--input-file'], options.shellExpansion);
         }
         try {
             if (typeof uri === 'string' && module_1.isURL(uri)) {
@@ -1427,7 +1431,7 @@ 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((0, types_1.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) {
@@ -1530,6 +1534,7 @@ class Request extends module_1 {
         if (!RCLONE.BIN) {
             return Promise.reject((0, types_1.errorMessage)("rclone", "Binary not found"));
         }
+        uri = uri.toString();
         let pathname, headers, binOpts, silent;
         if ((0, types_1.isString)(options)) {
             pathname = options;
@@ -1537,21 +1542,15 @@ class Request extends module_1 {
         }
         else {
             silent = options.silent;
-            [pathname, headers, binOpts] = parseBinOpts(this, options, ['--interactive', '--dry-run'], ['--partial-suffix', '--verbose']);
+            [pathname, headers, binOpts] = parseBinOpts(this, options, ['--interactive', '--dry-run'], ['--partial-suffix', '--verbose'], options.shellExpansion);
         }
         const command = options.command || 'copy';
         let source;
         switch (command) {
             case 'copy':
             case 'copyto':
-                if (module_1.isURL(source = uri.replace(/^rclone:\?/i, ''))) {
-                    return Promise.reject((0, types_1.errorMessage)("rclone", "Unsupported protocol", uri));
-                }
-                break;
             case 'copyurl':
-                if (!module_1.isURL(source = uri)) {
-                    return Promise.reject((0, types_1.errorMessage)("rclone", "Unsupported protocol", uri));
-                }
+                source = uri.replace(REGEXP_RCLONE, '');
                 break;
             default:
                 return Promise.reject((0, types_1.errorMessage)("rclone", "Invalid command", command || uri));
@@ -1724,7 +1723,7 @@ class Request extends module_1 {
                     commitLog(types_1.STATUS_TYPE.ERROR, 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((0, types_1.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)());

package/package.json

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