@e-mc/request 0.7.18 → 0.7.19

package/http/adapter/index.js

@@ -1,4 +1,5 @@
 "use strict";
+var _a;
 const fs = require("node:fs");
 const http2 = require("node:http2");
 const yaml = require("js-yaml");
@@ -9,9 +10,6 @@ const kOutStream = Symbol('outStream');
 const kOptions = Symbol('options');
 let LOG_TIMEFORMAT = 'readable';
 class HttpAdapter {
-    instance;
-    state;
-    uri;
     static isUnsupported(value) {
         return value === 421 || value === 505;
     }
@@ -40,25 +38,19 @@ class HttpAdapter {
                 break;
         }
     }
-    contentLength = 0;
-    retries = 0;
-    redirects = 0;
-    closed = false;
-    aborted = false;
-    timeout = null;
-    dataTime = null;
-    delayTime = undefined;
-    opts;
-    client;
-    resolve;
-    reject;
-    startTime;
-    [kOutStream] = null;
-    [kOptions];
     constructor(instance, state, uri, options) {
         this.instance = instance;
         this.state = state;
         this.uri = uri;
+        this.contentLength = 0;
+        this.retries = 0;
+        this.redirects = 0;
+        this.closed = false;
+        this.aborted = false;
+        this.timeout = null;
+        this.dataTime = null;
+        this.delayTime = undefined;
+        this[_a] = null;
         this[kOptions] = options;
         this.startTime = state.log ? process.hrtime.bigint() : BigInt(0);
         this.setOpts();
@@ -558,4 +550,5 @@ class HttpAdapter {
         return this.state.config.redirectLimit;
     }
 }
+_a = kOutStream;
 module.exports = HttpAdapter;

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 {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/request",
-  "version": "0.7.18",
+  "version": "0.7.19",
   "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.19",
+    "@e-mc/types": "0.7.19",
     "combined-stream": "^1.0.8",
     "js-yaml": "^4.1.0",
     "which": "^2.0.2"