@e-mc/module 0.6.14 → 0.6.15

package/index.js

@@ -117,6 +117,8 @@ const VALUES = {
     ["logger.level"]: -1
 };
 const REGEXP_TORRENT = /^(?:magnet:\?xt=|(?:https?|s?ftp):\/\/[^/][^\n]*?\.(?:torrent|metalink|meta4)(?:\?[^\n]*)?$)/i;
+const REGEXP_CLIESCAPE = /[^\w+-.,/:@]/g;
+const REGEXP_CLIOPTION = /^(-[^\s=]+|--[^-\s=][^\s=]*)(=)?\s*(.*)$/s;
 const RESERVED_SHELL = [
     'if',
     'then',
@@ -586,7 +588,7 @@ class Module extends EventEmitter {
         this[_f] = new AbortController();
         this[_g] = null;
     }
-    static get VERSION() { return "0.6.14"; }
+    static get VERSION() { return "0.6.15"; }
     static get LOG_TYPE() { return types_1.LOG_TYPE; }
     static get STATUS_TYPE() { return types_1.STATUS_TYPE; }
     static get MAX_TIMEOUT() { return 2147483647; }
@@ -1869,12 +1871,10 @@ class Module extends EventEmitter {
     }
     static sanitizeArgs(values, doubleQuote) {
         const result = typeof values === 'string' ? [values] : values;
-        const pattern = /[^\w+-.,/:@]/g;
-        const sanitize = (value) => value.replace(pattern, capture => capture === '\n' ? "'\n'" : (capture === '$' || capture === '`' ? '\\' : '') + '\\' + capture);
         for (let i = 0; i < result.length; ++i) {
             let value = result[i].trim(), leading = '';
             if (value !== '--') {
-                const opt = /^(-[^\s=]+|--[^-\s=][^\s=]*)(=)?\s*(.*)$/.exec(value);
+                const opt = REGEXP_CLIOPTION.exec(value);
                 if (opt) {
                     if (!opt[2] && !opt[3]) {
                         result[i] = opt[1];
@@ -1884,7 +1884,7 @@ class Module extends EventEmitter {
                     value = opt[3];
                 }
                 if (value) {
-                    const quoted = /^(["'])(.*)\1$/.exec(value);
+                    const quoted = /^(["'])(.*)\1$/s.exec(value);
                     if (PLATFORM_WIN32) {
                         if (quoted) {
                             if (quoted[1] === '"') {
@@ -1897,33 +1897,19 @@ class Module extends EventEmitter {
                             value = wrapQuote(value);
                         }
                     }
-                    else {
-                        let type = doubleQuote;
-                        if (quoted) {
-                            if (quoted[1] === "'") {
-                                result[i] = leading + value;
-                                continue;
-                            }
-                            value = quoted[2];
-                            type = true;
-                        }
-                        if (pattern.test(value)) {
-                            if (type) {
-                                value = '"' + sanitize(value) + '"';
-                            }
-                            else {
-                                value = "'" + value.replace(/'/g, "'\\''") + "'";
-                            }
+                    else if (!quoted) {
+                        if (REGEXP_CLIESCAPE.test(value)) {
+                            value = doubleQuote ? `"${value.replace(/(?<!\\)"/g, '\\"')}"` : `'${value.replace(/'/g, "'\\''")}'`;
                         }
                         else if (RESERVED_SHELL.includes(value)) {
-                            value = "'" + value + "'";
+                            value = `'${value}'`;
                         }
                     }
                 }
                 else if (opt) {
                     leading = leading.trim();
                     if (!PLATFORM_WIN32 && leading.length > 2 && leading[1] !== '-') {
-                        leading = sanitize(leading);
+                        leading.replace(REGEXP_CLIESCAPE, capture => '\\' + capture);
                     }
                 }
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/module",
-  "version": "0.6.14",
+  "version": "0.6.15",
   "description": "Module base class for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -20,7 +20,7 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/types": "0.6.14",
+    "@e-mc/types": "0.6.15",
     "abort-controller": "^3.0.0",
     "chalk": "4.1.2",
     "event-target-shim": "^5.0.1",