@e-mc/request 0.7.18 → 0.7.20

package/http/adapter/index.js

@@ -5,8 +5,6 @@ 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 kOutStream = Symbol('outStream');
-const kOptions = Symbol('options');
 let LOG_TIMEFORMAT = 'readable';
 class HttpAdapter {
     instance;
@@ -53,13 +51,13 @@ class HttpAdapter {
     resolve;
     reject;
     startTime;
-    [kOutStream] = null;
-    [kOptions];
+    #outStream = null;
+    #options;
     constructor(instance, state, uri, options) {
         this.instance = instance;
         this.state = state;
         this.uri = uri;
-        this[kOptions] = options;
+        this.#options = options;
         this.startTime = state.log ? process.hrtime.bigint() : BigInt(0);
         this.setOpts();
     }
@@ -99,14 +97,14 @@ class HttpAdapter {
                     this.retryResponse(statusCode, headers['retry-after']);
                 }
                 else if (HttpAdapter.isUnsupported(statusCode)) {
-                    this.retryDownload(true, this.formatNgFlags(http2.constants.NGHTTP2_PROTOCOL_ERROR, statusCode));
+                    this.retryDownload(true, this.#formatNgFlags(http2.constants.NGHTTP2_PROTOCOL_ERROR, statusCode));
                 }
                 else {
                     switch (flags) {
                         case http2.constants.NGHTTP2_PROTOCOL_ERROR:
                         case http2.constants.NGHTTP2_INADEQUATE_SECURITY:
                         case http2.constants.NGHTTP2_HTTP_1_1_REQUIRED:
-                            this.retryDownload(true, this.formatNgFlags(flags, statusCode, headers.location));
+                            this.retryDownload(true, this.#formatNgFlags(flags, statusCode, headers.location));
                             break;
                         default:
                             this.retryDownload(false, this.formatStatus(statusCode));
@@ -194,7 +192,7 @@ class HttpAdapter {
         if (uri) {
             this.uri = uri;
         }
-        this.opts = this.instance.opts(this.uri, this[kOptions]);
+        this.opts = this.instance.opts(this.uri, this.#options);
     }
     setWriteStream() {
         const pipeTo = this.pipeTo;
@@ -462,7 +460,7 @@ class HttpAdapter {
                 return;
             }
         }
-        this.sendWarning(this.formatRetry((0, util_1.fromStatusCode)(statusCode)));
+        this.sendWarning(this.#formatRetry((0, util_1.fromStatusCode)(statusCode)));
         if ((0, util_1.isRetryable)(statusCode, true)) {
             setImmediate(this.init.bind(this));
         }
@@ -476,7 +474,7 @@ class HttpAdapter {
         return (0, util_1.isRetryable)(value) && ++this.retries <= this.retryLimit;
     }
     retryTimeout() {
-        this.sendWarning(this.formatRetry("HTTP connection timeout"));
+        this.sendWarning(this.#formatRetry("HTTP connection timeout"));
         this.init();
     }
     terminate(err) {
@@ -509,10 +507,10 @@ class HttpAdapter {
             this.outStream = null;
         }
     }
-    formatNgFlags(value, statusCode, location) {
+    #formatNgFlags(value, statusCode, location) {
         return location ? `Using HTTP 1.1 for URL redirect (${location})` : this.formatStatus(statusCode, value ? 'NGHTTP2 Error ' + value : '');
     }
-    formatRetry(message) {
+    #formatRetry(message) {
         return `${message} (${this.retries} / ${this.retryLimit})`;
     }
     set abortController(value) {
@@ -522,13 +520,13 @@ class HttpAdapter {
         return this.opts.outAbort || null;
     }
     set outStream(value) {
-        this[kOutStream] = value;
+        this.#outStream = value;
         if (value) {
             this.opts.outStream = value;
         }
     }
     get outStream() {
-        return this[kOutStream];
+        return this.#outStream;
     }
     get destroyed() {
         return this.client.destroyed || this.httpVersion === 2 && this.client.aborted;

package/index.js

@@ -385,7 +385,7 @@ class Request extends module_1.default {
                 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)) {
@@ -399,7 +399,7 @@ class Request extends module_1.default {
                             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;
                 }
             }
@@ -1027,7 +1027,7 @@ class Request extends module_1.default {
                             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':
@@ -1083,8 +1083,8 @@ class Request extends module_1.default {
                 ({ protocol, origin, username, password, href: uri } = uri);
             }
             const escapeQuote = (value) => {
-                value = value.replace(/"/g, '\\"');
-                return PLATFORM_WIN32 ? value : value.replace(/[ $`]/g, capture => (capture !== ' ' ? '\\' : '') + '\\' + capture);
+                value = value.replace(/(?<!\\)"/g, '\\"');
+                return PLATFORM_WIN32 ? value : value.replace(/(?<!\\)\$/g, '\\$');
             };
             const init = [
                 `--dir="${escapeQuote(pathname)}"`,
@@ -1229,10 +1229,13 @@ class Request extends module_1.default {
             }
             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;
+                            }
                         }
                     }
                 }
@@ -1249,18 +1252,14 @@ class Request extends module_1.default {
             opts.push(`"${escapeQuote(uri)}"`);
             args = args.concat(init, opts);
             const startTime = Date.now();
-            let out = '', message = '', aborted;
+            let out = '', message = '';
             const errorResponse = (pid, err) => {
-                aborted = true;
                 closeTorrent(pid);
                 reject(err);
             };
             const { pid, stdout, stderr } = child_process.spawn(module_1.default.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;
@@ -1291,10 +1290,15 @@ class Request extends module_1.default {
                                 break;
                         }
                     }
-                    if (result.length && !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 ? types_1.STATUS_TYPE.INFO : types_1.STATUS_TYPE.ERROR, out, currentTime, currentTime - startTime, "aria2", uri);
                     resolve(result);
                 }
                 else {
@@ -1688,7 +1692,7 @@ class Request extends module_1.default {
         else {
             options = {};
         }
-        const headers = (0, util_1.parseOutgoingHeaders)(options.headers || (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') {
@@ -1802,6 +1806,7 @@ class Request extends module_1.default {
         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.7.18",
+  "version": "0.7.20",
   "description": "Request constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -20,8 +20,8 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/module": "0.7.18",
-    "@e-mc/types": "0.7.18",
+    "@e-mc/module": "0.7.20",
+    "@e-mc/types": "0.7.20",
     "combined-stream": "^1.0.8",
     "js-yaml": "^4.1.0",
     "which": "^2.0.2"