@e-mc/module 0.6.4 → 0.6.6

package/LICENSE

@@ -1,7 +1,7 @@
-Copyright 2024 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:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
+Copyright 2024 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:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/README.md

@@ -1,7 +1,7 @@
-# @e-mc/module
-
-PEP 402 - Forever Any Mayo
-
-## LICENSE
-
+# @e-mc/module
+
+PEP 402 - Forever Any Mayo
+
+## LICENSE
+
 MIT

package/index.d.ts

@@ -1,5 +1,5 @@
-import type { ModuleConstructor } from '../types/lib';
-
-declare const Module: ModuleConstructor;
-
+import type { ModuleConstructor } from '../types/lib';
+
+declare const Module: ModuleConstructor;
+
 export = Module;

package/index.js

@@ -117,6 +117,25 @@ const VALUES = {
     ["logger.level"]: -1
 };
 const REGEXP_TORRENT = /^(?:magnet:\?xt=|(?:https?|s?ftp):\/\/[^/][^\n]*?\.(?:torrent|metalink|meta4)(?:\?[^\n]*)?$)/i;
+const RESERVED_SHELL = [
+    'if',
+    'then',
+    'elif',
+    'else',
+    'fi',
+    'time',
+    'for',
+    'in',
+    'until',
+    'while',
+    'do',
+    'done',
+    'case',
+    'esac',
+    'coproc',
+    'select',
+    'function'
+];
 let LOG_NEWLINE = true;
 let LOG_EMPTYLINE = false;
 let TEMP_DIR = path.join(PROCESS_CWD, "tmp");
@@ -152,7 +171,7 @@ function applyStyle(options, style) {
 }
 function checkColorOptions(type, settings, options) {
     var _h, _j, _k, _l;
-    if (typeof settings !== 'object') {
+    if (!(0, types_1.isObject)(settings)) {
         return false;
     }
     let result = false;
@@ -499,14 +518,15 @@ function withinDir(value, base) {
     value = path.normalize(value);
     return (PLATFORM_WIN32 ? value.toLowerCase() : value).startsWith(ensureDir(PLATFORM_WIN32 ? base.toLowerCase() : base));
 }
-function formatPercent(value, precision = 3) {
+function formatPercent(value, precision) {
     if (value <= 0) {
         return '0%';
     }
-    if (value === Math.floor(value)) {
+    if (value === (value | 0)) {
         return value + '00%';
     }
-    return (value * 100).toPrecision(precision) + '%';
+    value *= 100;
+    return value.toPrecision(value < 1 ? 2 : precision) + '%';
 }
 function tryIncrementDir(value, increment) {
     const baseDir = trimDir(value);
@@ -559,7 +579,7 @@ class Module extends EventEmitter {
         this[_f] = new AbortController();
         this[_g] = null;
     }
-    static get VERSION() { return "0.6.4"; }
+    static get VERSION() { return "0.6.6"; }
     static get LOG_TYPE() { return types_1.LOG_TYPE; }
     static get STATUS_TYPE() { return types_1.STATUS_TYPE; }
     static get MAX_TIMEOUT() { return 2147483647; }
@@ -847,10 +867,14 @@ class Module extends EventEmitter {
                 ({ color: hintColor, bgColor: hintBgColor } = formatHint);
                 hintBold !== null && hintBold !== void 0 ? hintBold : (hintBold = formatHint.bold);
             }
-            value = getValue() + (coloring ? chalk.blackBright('[') + formatColumn(truncateEnd(hint, hintWidth), hintColor, hintBgColor, hintBold) + chalk.blackBright(']') : `[${truncateEnd(hint, hintWidth)}]`);
-        }
-        else if (title) {
             value = getValue();
+            hint = coloring ? chalk.blackBright('[') + formatColumn(truncateEnd(hint, hintWidth), hintColor, hintBgColor, hintBold) + chalk.blackBright(']') : `[${truncateEnd(hint, hintWidth)}]`;
+        }
+        else {
+            if (title) {
+                value = getValue();
+            }
+            hint = '';
         }
         const unit = options.messageUnit ? type & 256 ? options.messageUnit.padStart(options.messageUnitMinWidth || 0) : options.messageUnit : '';
         const getMessage = (m, u) => type & 256 && messageUnitIndent === undefined ? (u + m).trimEnd() : u ? (m + (messageUnitIndent === undefined ? ' ' : '') + u).trimStart() : m;
@@ -895,19 +919,19 @@ class Module extends EventEmitter {
                     }
                 }
                 else {
-                    if (!i) {
+                    if (!i && !hint) {
                         v = v.trim();
                     }
                     m = '';
                 }
-                output = (titleIndent !== -1 ? title : title ? formatColumn(title, titleColor || 'green', titleBgColor, (_k = (options.titleBold || formatTitle.bold)) !== null && _k !== void 0 ? _k : false) + chalk.blackBright(':') + ' ' : '') + formatColumn(v, valueColor, valueBgColor, valueBold) + (i ? i : ' ') + m;
+                output = (titleIndent !== -1 ? title : title ? formatColumn(title, titleColor || 'green', titleBgColor, (_k = (options.titleBold || formatTitle.bold)) !== null && _k !== void 0 ? _k : false) + chalk.blackBright(':') + ' ' : '') + formatColumn(v, valueColor, valueBgColor, valueBold) + hint + (i ? i : ' ') + m;
             }
             catch {
             }
         }
         if (!output) {
-            const m = truncateStart(this.asString(message), (_l = options.messageWidth) !== null && _l !== void 0 ? _l : format.message.width);
-            output = (titleIndent !== -1 ? title : title ? title + ': ' : '') + value + (id ? id : ' ') + (m && SETTINGS.message !== false ? (error ? '{' : '(') + getMessage(m, unit) + (error ? '}' : ')') : '');
+            const m = truncateStart(stripansi(this.asString(message)), (_l = options.messageWidth) !== null && _l !== void 0 ? _l : format.message.width);
+            output = (titleIndent !== -1 ? title : title ? title + ': ' : '') + stripansi(value) + stripansi(hint) + (id ? id : ' ') + (m && SETTINGS.message !== false ? (error ? '{' : '(') + getMessage(m, unit) + (error ? '}' : ')') : '');
         }
         if (broadcastId) {
             if (BROADCAST_OUT) {
@@ -1581,7 +1605,7 @@ class Module extends EventEmitter {
                     const usage = user + system;
                     result = usage > 0 ? Math.min(usage / value, 1) * (typeof SETTINGS.process === 'object' && SETTINGS.process.cpu_single_core ? 1 : CPU_CORETOTAL) : 0;
                 }
-                return format ? formatPercent(result) : result;
+                return format ? formatPercent(result, 3) : result;
             }
         }
         return format ? '' : 0;
@@ -1611,7 +1635,7 @@ class Module extends EventEmitter {
                     return (0, types_1.formatSize)(result, { unit });
             }
         }
-        return format ? formatPercent(result / MEM_TOTAL) : result;
+        return format ? formatPercent(result / MEM_TOTAL, 3) : result;
     }
     static formatCpuMem(start, all) {
         let cpu, cpu_bar, cpu_single_core, mem, mem_format;
@@ -1642,7 +1666,7 @@ class Module extends EventEmitter {
                 }
                 const unit = Math.max(bar, 10);
                 const length = Math.floor(usage * unit);
-                const hint = usage === 1 ? "MAX" : usage < 0 ? "N/A" : formatPercent(usage, 2);
+                const hint = usage === 1 ? "MAX" : usage < 0 ? "N/A" : formatPercent(usage, 2).padStart(3);
                 result += chalk[usage >= red ? 'bgRed' : usage >= yellow ? 'bgYellow' : 'bgBlue'].white(':'.repeat(length)) + chalk.bgGrey.white(':'.repeat(unit - length)) + (hint ? chalk.bgWhite.grey(` ${hint} `) : '');
             }
             else if (usage) {
@@ -1652,7 +1676,7 @@ class Module extends EventEmitter {
         if (mem || all) {
             const usage = this.getMemUsage(mem_format || true);
             if (usage) {
-                result += (result ? ' ' : '') + usage + ' MEM';
+                result += (result ? ' ' : '') + usage.padStart(7) + ' MEM';
             }
         }
         return result;
@@ -1890,6 +1914,9 @@ class Module extends EventEmitter {
                                 value = "'" + value.replace(/'/g, "'\\''") + "'";
                             }
                         }
+                        else if (RESERVED_SHELL.includes(value)) {
+                            value = "'" + value + "'";
+                        }
                     }
                 }
                 else if (opt) {
@@ -2188,53 +2215,50 @@ class Module extends EventEmitter {
                 });
             }
         }
-        {
-            let dir = settings.temp_dir, write;
-            if ((0, types_1.isPlainObject)(temp)) {
-                dir || (dir = temp.dir);
-                write = temp.write;
-            }
-            let modified;
-            if ((0, types_1.isString)(dir) && path.isAbsolute(dir = path.normalize(dir).replace(/[\\/]$/, ''))) {
-                if (withinDir(dir, PROCESS_CWD)) {
-                    dir = dir.substring(ensureDir(PROCESS_CWD).length);
-                }
-                else {
-                    this.formatMessage(1, 'WARN', 'Temp directory can only be relative', dir, { ...this.LOG_STYLE_WARN, newline: true });
-                    dir = undefined;
-                }
-            }
-            if (!(0, types_1.isString)(dir)) {
-                dir = VALUES["temp.dir"];
+        let dir = settings.temp_dir, write, modified;
+        if ((0, types_1.isPlainObject)(temp)) {
+            dir || (dir = temp.dir);
+            write = temp.write;
+        }
+        if ((0, types_1.isString)(dir) && path.isAbsolute(dir = path.normalize(dir).replace(/[\\/]$/, ''))) {
+            if (withinDir(dir, PROCESS_CWD)) {
+                dir = dir.substring(ensureDir(PROCESS_CWD).length);
             }
-            if (typeof write === 'boolean') {
-                modified = VALUES["temp.write"] !== write;
-                VALUES["temp.write"] = write;
+            else {
+                this.formatMessage(1, 'WARN', 'Temp directory can only be relative', dir, { ...this.LOG_STYLE_WARN, newline: true });
+                dir = undefined;
             }
-            do {
-                const [output, index] = tryIncrementDir(path.join(PROCESS_CWD, dir), 5);
-                if ((0, types_1.isString)(output)) {
-                    if (index > 0) {
-                        dir = trimDir(dir) + '_' + index;
-                    }
-                    if (dir !== VALUES["temp.dir"]) {
-                        VALUES["temp.dir"] = dir;
-                        modified = true;
-                    }
-                    (0, types_1.setTempDir)(TEMP_DIR = output);
-                    break;
+        }
+        if (!(0, types_1.isString)(dir)) {
+            dir = VALUES["temp.dir"];
+        }
+        if (typeof write === 'boolean') {
+            modified = VALUES["temp.write"] !== write;
+            VALUES["temp.write"] = write;
+        }
+        do {
+            const [output, index] = tryIncrementDir(path.join(PROCESS_CWD, dir), 5);
+            if ((0, types_1.isString)(output)) {
+                if (index > 0) {
+                    dir = trimDir(dir) + '_' + index;
                 }
-                if (output instanceof Error) {
-                    this.writeFail(["Unable to create temp directory", dir], output, 32);
+                if (dir !== VALUES["temp.dir"]) {
+                    VALUES["temp.dir"] = dir;
+                    modified = true;
                 }
-            } while ((dir !== "tmp") && (dir = "tmp"));
-            if (modified) {
-                this.formatMessage(1, 'TEMP', ["Directory was modified", dir], TEMP_DIR + (VALUES["temp.write"] ? ' - writeable' : ''), { ...this.LOG_STYLE_NOTICE, newline: true });
+                (0, types_1.setTempDir)(TEMP_DIR = output);
+                break;
             }
-            settings.temp_dir = dir;
-            if ((0, types_1.isPlainObject)(temp)) {
-                temp.dir = dir;
+            if (output instanceof Error) {
+                this.writeFail(["Unable to create temp directory", dir], output, 32);
             }
+        } while ((dir !== "tmp") && (dir = "tmp"));
+        if (modified) {
+            this.formatMessage(1, 'TEMP', ["Directory was modified", dir], TEMP_DIR + (VALUES["temp.write"] ? ' - writeable' : ''), { ...this.LOG_STYLE_NOTICE, newline: true });
+        }
+        settings.temp_dir = dir;
+        if ((0, types_1.isPlainObject)(temp)) {
+            temp.dir = dir;
         }
         return true;
     }

package/lib-v4.d.ts

@@ -1,5 +1,5 @@
-import type { IModuleLibV4 } from '../types/lib/compat-v4';
-
-declare const LibV4: IModuleLibV4;
-
+import type { IModuleLibV4 } from '../types/lib/compat-v4';
+
+declare const LibV4: IModuleLibV4;
+
 export = LibV4;

package/package.json

@@ -1,31 +1,31 @@
-{
-  "name": "@e-mc/module",
-  "version": "0.6.4",
-  "description": "Module base class for E-mc.",
-  "main": "index.js",
-  "types": "index.d.ts",
-  "publishConfig": {
-    "access": "public"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/anpham6/e-mc.git",
-    "directory": "src/module"
-  },
-  "keywords": [
-    "squared",
-    "squared-functions"
-  ],
-  "author": "An Pham <anpham6@gmail.com>",
-  "license": "MIT",
-  "homepage": "https://github.com/anpham6/e-mc#readme",
-  "dependencies": {
-    "@e-mc/types": "0.6.4",
-    "abort-controller": "^3.0.0",
-    "chalk": "4.1.2",
-    "event-target-shim": "^5.0.1",
-    "file-type": "16.5.4",
-    "mime-types": "^2.1.35",
-    "strip-ansi": "6.0.1"
-  }
-}
+{
+  "name": "@e-mc/module",
+  "version": "0.6.6",
+  "description": "Module base class for E-mc.",
+  "main": "index.js",
+  "types": "index.d.ts",
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/anpham6/e-mc.git",
+    "directory": "src/module"
+  },
+  "keywords": [
+    "squared",
+    "squared-functions"
+  ],
+  "author": "An Pham <anpham6@gmail.com>",
+  "license": "MIT",
+  "homepage": "https://github.com/anpham6/e-mc#readme",
+  "dependencies": {
+    "@e-mc/types": "0.6.6",
+    "abort-controller": "^3.0.0",
+    "chalk": "4.1.2",
+    "event-target-shim": "^5.0.1",
+    "file-type": "16.5.4",
+    "mime-types": "^2.1.35",
+    "strip-ansi": "6.0.1"
+  }
+}