@e-mc/request 0.11.2 → 0.11.4

package/README.md

@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.11.2/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.11.4/lib/index.d.ts)
 
 ```typescript
 import type { IModule, ModuleConstructor } from "./index";
@@ -209,9 +209,9 @@ instance.get("http://hostname/path/config.yml", options).then(data => {
 
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.11.2/lib/http.d.ts
-- https://www.unpkg.com/@e-mc/types@0.11.2/lib/request.d.ts
-- https://www.unpkg.com/@e-mc/types@0.11.2/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.4/lib/http.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.4/lib/request.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.4/lib/settings.d.ts
 
 * https://www.npmjs.com/package/@types/node
 

package/index.js

@@ -37,6 +37,7 @@ const kStatusOn = Symbol('statusOn');
 const kHeadersOn = Symbol('headersOn');
 const kAdapter = Symbol('adapter');
 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 HTTP = {
@@ -328,6 +329,9 @@ function decompressEncoding(value, chunkSize) {
             if (LIB_ZSTD) {
                 return new LIB_ZSTD.ZstdDecompressTransform({ writableHighWaterMark: chunkSize });
             }
+            if (SUPPORTED_ZSTD) {
+                return zlib.createZstdDecompress({ chunkSize });
+            }
             break;
     }
 }
@@ -345,8 +349,8 @@ function resetAria2() {
     ARIA2.PID_TIMER = null;
 }
 function escapeShellQuote(value) {
-    value = value.replaceAll('"', '\\"');
-    return module_1.PLATFORM_WIN32 ? value : value.replace(/[ $`;]/g, capture => (capture !== ' ' ? '\\' : '') + '\\' + capture);
+    value = value.replace(/(?<!\\)"/g, '\\"');
+    return module_1.PLATFORM_WIN32 ? value : value.replace(/(?<!\\)\$/g, '\\$');
 }
 function failedDns(err, pending) {
     for (const cb of pending) {
@@ -448,7 +452,7 @@ class Request extends module_1 {
             if ((lowest_speed_limit = parseSize(lowest_speed_limit, true)) !== undefined) {
                 ARIA2.LOWEST_SPEED_LIMIT = lowest_speed_limit;
             }
-            if (always_resume) {
+            if (typeof always_resume === 'boolean') {
                 ARIA2.ALWAYS_RESUME = always_resume;
             }
             if ((0, types_1.isString)(file_allocation)) {
@@ -462,7 +466,7 @@ class Request extends module_1 {
                         break;
                 }
             }
-            if (conf_path && this.isPath(conf_path = path.resolve(conf_path))) {
+            if (conf_path === '' || (0, types_1.isString)(conf_path) && this.isPath(conf_path = path.resolve(conf_path))) {
                 ARIA2.CONF_PATH = conf_path;
             }
         }
@@ -986,7 +990,7 @@ class Request extends module_1 {
                             case 'string': {
                                 const value = opt.trim();
                                 if (value.startsWith('--')) {
-                                    const match = /^(--[a-z]+[a-z0-9-]*)(=)?\s*(.*)$/.exec(value);
+                                    const match = /^(--[a-z]+[a-z0-9-]*)(=)?\s*(.*)$/s.exec(value);
                                     if (match) {
                                         switch (match[1]) {
                                             case '--daemon':
@@ -1188,10 +1192,13 @@ class Request extends module_1 {
             }
             if (binOpts) {
                 for (const leading of binOpts) {
-                    for (let i = 0; i < opts.length; ++i) {
-                        if (opts[i].startsWith(leading)) {
-                            opts.splice(i--, i);
-                            break;
+                    if (leading.startsWith('-')) {
+                        const pattern = new RegExp(`^${leading}(?:=|$)`);
+                        for (let i = 0; i < opts.length; ++i) {
+                            if (pattern.test(opts[i])) {
+                                opts.splice(i--, i);
+                                break;
+                            }
                         }
                     }
                 }
@@ -1208,18 +1215,14 @@ class Request extends module_1 {
             opts.push(`"${escapeShellQuote(uri)}"`);
             args = args.concat(init, opts);
             const startTime = Date.now();
-            let out = '', message = '', aborted = false;
+            let out = '', message = '';
             const errorResponse = (pid, err) => {
-                aborted = true;
                 closeTorrent(pid);
                 reject(err);
             };
             const { pid, stdout, stderr } = child_process.spawn(module_1.sanitizeCmd(ARIA2.BIN), args, { cwd: pathname, shell: true, signal: this.signal, uid: ARIA2.EXEC_UID, gid: ARIA2.EXEC_GID })
                 .on('exit', code => {
                 closeTorrent(pid);
-                if (aborted) {
-                    return;
-                }
                 if (this.aborted) {
                     errorResponse(pid, (0, types_1.createAbortError)());
                     return;
@@ -1255,10 +1258,15 @@ class Request extends module_1 {
                         }
                     }
                 }
-                if (result.length > 0 && !silent && LOG_HTTP && LOG_TIMEPROCESS) {
-                    this.writeTimeProcess("aria2", uri, startTime, { type: 1024, queue: true, messageUnit, messageUnitMinWidth: 9, bypassLog: true });
+                if (result.length > 0) {
+                    if (!silent && LOG_HTTP && LOG_TIMEPROCESS) {
+                        this.writeTimeProcess("aria2", uri, startTime, { type: 1024, queue: true, messageUnit, messageUnitMinWidth: 9, bypassLog: true });
+                    }
+                    this.addLog(types_1.STATUS_TYPE.INFO, out, currentTime, currentTime - startTime, "aria2", uri);
+                }
+                else {
+                    this.addLog(types_1.STATUS_TYPE.ERROR, "No files were successfully downloaded", currentTime, currentTime - startTime, "aria2", uri);
                 }
-                this.addLog(result.length > 0 ? types_1.STATUS_TYPE.INFO : types_1.STATUS_TYPE.ERROR, out, currentTime, currentTime - startTime, "aria2", uri);
                 resolve(result);
             })
                 .on('error', err => {
@@ -1429,7 +1437,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 ? ', zstd' : '');
+            (headers ||= {})['accept-encoding'] ||= 'gzip, deflate, br' + (LIB_ZSTD || SUPPORTED_ZSTD ? ', zstd' : '');
         }
         if (posting && options.postData) {
             if (expectContinue) {
@@ -1763,7 +1771,7 @@ class Request extends module_1 {
         else {
             options = {};
         }
-        const headers = (0, util_1.parseOutgoingHeaders)(options.headers ||= {});
+        const headers = (0, util_1.parseOutgoingHeaders)(options.headers) || {};
         for (const attr in headers) {
             const name = attr.toLowerCase();
             if (name === 'content-type' || name === 'content-length') {
@@ -1873,6 +1881,7 @@ class Request extends module_1 {
         options.httpVersion = 1;
         options.postData = data;
         headers['content-type'] = contentType || "text/plain";
+        options.headers = headers;
         return this.get(uri, options);
     }
     async get(uri, options) {

package/package.json

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