@e-mc/module 0.6.13 → 0.6.15

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2024 An Pham
+Copyright 2023 An Pham
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

package/index.js

@@ -102,7 +102,6 @@ const VALUES = {
     ["node.process.cpu_usage"]: true,
     ["node.process.memory_usage"]: true,
     ["node.process.inline"]: true,
-    ["node.settings.package_manager"]: '',
     ["temp.dir"]: "tmp",
     ["temp.write"]: false,
     ["process.password"]: '',
@@ -118,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',
@@ -587,7 +588,7 @@ class Module extends EventEmitter {
         this[_f] = new AbortController();
         this[_g] = null;
     }
-    static get VERSION() { return "0.6.13"; }
+    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; }
@@ -627,7 +628,6 @@ class Module extends EventEmitter {
             case "error.fatal":
                 return VALUES[key];
             case "node.require.ext":
-            case "node.settings.package_manager":
             case "process.password":
             case "process.cipher.algorithm":
                 return VALUES[key] !== '';
@@ -1871,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];
@@ -1886,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] === '"') {
@@ -1899,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);
                     }
                 }
             }
@@ -1979,8 +1963,8 @@ class Module extends EventEmitter {
         }
     }
     static loadSettings(settings, password) {
-        var _h, _j;
-        var _k;
+        var _h;
+        var _j;
         const current = VALUES["process.password"];
         if (current) {
             const proc = settings.process || {};
@@ -2035,17 +2019,6 @@ class Module extends EventEmitter {
                     VALUES["node.require.inline"] = inline;
                 }
             }
-            const manager = (_j = node.settings) === null || _j === void 0 ? void 0 : _j.package_manager;
-            switch (manager) {
-                case 'npm':
-                case 'yarn':
-                case 'pnpm':
-                    VALUES["node.settings.package_manager"] = manager;
-                    break;
-                default:
-                    VALUES["node.settings.package_manager"] = '';
-                    break;
-            }
         }
         if ((0, types_1.isPlainObject)(settings.process)) {
             const { env, cipher, password: pwd } = settings.process;
@@ -2053,7 +2026,7 @@ class Module extends EventEmitter {
                 VALUES["process.env.apply"] = env.apply;
             }
             if ((0, types_1.isString)(pwd)) {
-                VALUES[_k = "process.password"] || (VALUES[_k] = encryptMessage(pwd, cipher));
+                VALUES[_j = "process.password"] || (VALUES[_j] = encryptMessage(pwd, cipher));
             }
         }
         if (memory && (0, types_1.isPlainObject)(memory.settings)) {
@@ -3068,7 +3041,7 @@ class Module extends EventEmitter {
             if (typeof options === 'number') {
                 options = undefined;
             }
-            this.writeFail("Unknown", err, { ...options, type: types_1.LOG_TYPE.SYSTEM, code: types_1.ERR_CODE.MODULE_NOT_FOUND, exec: { command: VALUES["node.settings.package_manager"] || 'npm', args: ['install', name] } });
+            this.writeFail("Unknown", err, { ...options, type: types_1.LOG_TYPE.SYSTEM, code: types_1.ERR_CODE.MODULE_NOT_FOUND, exec: { command: 'npm', args: ['i', name] } });
             return true;
         }
         if (value) {
@@ -3361,8 +3334,8 @@ Module.LOG_STYLE_WARN = Object.freeze({ titleBgColor: 'bgBlack', titleColor: 'ye
 Module.LOG_STYLE_NOTICE = Object.freeze({ titleBgColor: 'bgGrey', titleColor: 'white' });
 Module.LOG_STYLE_REVERSE = Object.freeze({ titleBgColor: 'bgWhite', titleColor: 'black', messageBgColor: 'bgGrey' });
 if (!Module.supported(15, 4)) {
-    ({ AbortController: global.AbortController } = require('abort-controller'));
-    ({ EventTarget: global.EventTarget } = require('event-target-shim'));
+    ({ AbortController: globalThis.AbortController } = require('abort-controller'));
+    ({ EventTarget: globalThis.EventTarget } = require('event-target-shim'));
 }
 EventEmitter.defaultMaxListeners = Infinity;
 Object.freeze(types_1.LOG_TYPE);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/module",
-  "version": "0.6.13",
+  "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.13",
+    "@e-mc/types": "0.6.15",
     "abort-controller": "^3.0.0",
     "chalk": "4.1.2",
     "event-target-shim": "^5.0.1",