@e-mc/module 0.5.2 → 0.6.0

package/index.js

@@ -558,7 +558,7 @@ class Module extends EventEmitter {
         this[_f] = new AbortController();
         this[_g] = null;
     }
-    static get VERSION() { return "0.5.2" /* INTERNAL.VERSION */; }
+    static get VERSION() { return "0.6.0" /* INTERNAL.VERSION */; }
     static get LOG_TYPE() { return types_1.LOG_TYPE; }
     static get STATUS_TYPE() { return types_1.STATUS_TYPE; }
     static get MAX_TIMEOUT() { return 2147483647; }
@@ -1068,7 +1068,10 @@ class Module extends EventEmitter {
         return cacheKey ? (0, types_1.generateUUID)() : '';
     }
     static asHash(data, algorithm, minLength = 0) {
-        let options;
+        if (!algorithm && !minLength) {
+            return crypto.createHash('sha256').update(data).digest('hex');
+        }
+        let options, digest;
         if (typeof minLength !== 'number') {
             options = minLength;
             minLength = 0;
@@ -1081,7 +1084,6 @@ class Module extends EventEmitter {
             options = algorithm;
             algorithm = '';
         }
-        let digest;
         if (options) {
             options = { ...options };
             if ('minLength' in options) {
@@ -1229,7 +1231,7 @@ class Module extends EventEmitter {
             return '';
         }
         if (/^\\\\\?\\[A-Za-z]:\\/.test(value)) {
-            return process.platform === 'win32' && !/\\\\|\\\.+\\|\\[^\n]+?\.+\\/.test(value = value.substring(4)) ? value : '';
+            return PLATFORM_WIN32 && !/\\\\|\\\.+\\|\\[^\n]+?\.+\\/.test(value = value.substring(4)) ? value : '';
         }
         return this.fromLocalPath(value) || value;
     }
@@ -1620,34 +1622,32 @@ class Module extends EventEmitter {
         let result = '';
         if (cpu || all) {
             let usage = this.getCpuUsage(start, !cpu_bar);
-            if (usage) {
-                if (typeof usage === 'number') {
-                    if (!cpu_single_core) {
-                        usage /= CPU_CORETOTAL;
-                    }
-                    if (usage + 0.005 /* CPU_MEM.BAR_100_OFFSET */ >= 1) {
-                        usage = 1;
-                    }
-                    let bar = 20 /* CPU_MEM.BAR_LENGTH */, red = 0.9 /* CPU_MEM.BAR_RED */, yellow = 0.75 /* CPU_MEM.BAR_YELLOW */;
-                    if (typeof cpu_bar === 'number') {
-                        bar = cpu_bar;
-                    }
-                    else if (Array.isArray(cpu_bar) && cpu_bar[0] >= 10 /* CPU_MEM.BAR_MIN_LENGTH */) {
-                        let r, y;
-                        [bar, r = 0.9 /* CPU_MEM.BAR_RED */, y = 0.75 /* CPU_MEM.BAR_YELLOW */] = cpu_bar;
-                        if (r > 0 && r < 1 && y > 0 && y < 1 && y < r) {
-                            red = r;
-                            yellow = y;
-                        }
-                    }
-                    const unit = Math.max(bar, 10 /* CPU_MEM.BAR_MIN_LENGTH */);
-                    const length = Math.floor(usage * unit);
-                    const hint = usage === 1 ? "MAX" /* CPU_MEM.BAR_100 */ : formatPercent(usage, 2);
-                    result += chalk[usage >= red ? 'bgRed' : usage >= yellow ? 'bgYellow' : 'bgBlue'].white(':'.repeat(length)) + chalk.bgGrey.white(':'.repeat(unit - length)) + (hint ? chalk.bgWhite.grey(` ${hint} `) : '');
+            if (typeof usage === 'number') {
+                if (!cpu_single_core) {
+                    usage /= CPU_CORETOTAL;
                 }
-                else {
-                    result += usage + ' CPU' + (!cpu_single_core ? '/' + CPU_CORETOTAL : '');
+                if (usage + 0.005 /* CPU_MEM.BAR_100_OFFSET */ >= 1) {
+                    usage = 1;
+                }
+                let bar = 20 /* CPU_MEM.BAR_LENGTH */, red = 0.9 /* CPU_MEM.BAR_RED */, yellow = 0.75 /* CPU_MEM.BAR_YELLOW */;
+                if (typeof cpu_bar === 'number') {
+                    bar = cpu_bar;
                 }
+                else if (Array.isArray(cpu_bar) && cpu_bar[0] >= 10 /* CPU_MEM.BAR_MIN_LENGTH */) {
+                    let r, y;
+                    [bar, r = 0.9 /* CPU_MEM.BAR_RED */, y = 0.75 /* CPU_MEM.BAR_YELLOW */] = cpu_bar;
+                    if (r > 0 && r < 1 && y > 0 && y < 1 && y < r) {
+                        red = r;
+                        yellow = y;
+                    }
+                }
+                const unit = Math.max(bar, 10 /* CPU_MEM.BAR_MIN_LENGTH */);
+                const length = Math.floor(usage * unit);
+                const hint = usage === 1 ? "MAX" /* CPU_MEM.BAR_100 */ : usage < 0 ? "N/A" /* CPU_MEM.BAR_UNDER */ : formatPercent(usage, 2);
+                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) {
+                result += usage + ' CPU' + (!cpu_single_core ? '/' + CPU_CORETOTAL : '');
             }
         }
         if (mem || all) {
@@ -3177,17 +3177,18 @@ class Module extends EventEmitter {
     }
     detach() {
         const host = this.host;
-        if (host) {
-            this.abortable = false;
-            host.modules.delete(this);
-            host.subProcesses.delete(this);
-            const listener = this[kAbortEvent];
-            if (listener) {
-                host.signal.removeEventListener('abort', listener);
-                this[kAbortEvent] = null;
-            }
-            this._host = null;
+        if (!host) {
+            return;
+        }
+        this.abortable = false;
+        host.modules.delete(this);
+        host.subProcesses.delete(this);
+        const listener = this[kAbortEvent];
+        if (listener) {
+            host.signal.removeEventListener('abort', listener);
+            this[kAbortEvent] = null;
         }
+        this._host = null;
     }
     abort() {
         if (!this.aborted) {
@@ -3209,22 +3210,23 @@ class Module extends EventEmitter {
     }
     set host(value) {
         this.detach();
-        if (this._host = value) {
-            this.sessionId = value.sessionId;
-            this.broadcastId = value.broadcastId;
-            this._logEnabled = value.willLog(this.moduleName);
-            const aborting = this._hostEvents.includes('abort');
-            if (value.aborted) {
-                if (aborting) {
-                    this.abort();
-                }
+        if (!(this._host = value)) {
+            return;
+        }
+        this.sessionId = value.sessionId;
+        this.broadcastId = value.broadcastId;
+        this._logEnabled = value.willLog(this.moduleName);
+        const aborting = this._hostEvents.includes('abort');
+        if (value.aborted) {
+            if (aborting) {
+                this.abort();
             }
-            else if (!value.subProcesses.has(this)) {
-                this.abortable = value.willAbort(this);
-                value.modules.add(this);
-                if (aborting) {
-                    value.signal.addEventListener('abort', this[kAbortEvent] = () => this.abort(), { once: true });
-                }
+        }
+        else if (!value.subProcesses.has(this)) {
+            this.abortable = value.willAbort(this);
+            value.modules.add(this);
+            if (aborting) {
+                value.signal.addEventListener('abort', this[kAbortEvent] = () => this.abort(), { once: true });
             }
         }
     }
@@ -3278,11 +3280,11 @@ class Module extends EventEmitter {
     }
     get logLevel() {
         const value = this._logLevel;
-        if (value === -1) {
-            const host = this.host;
-            return host ? host.logLevel : 0;
+        if (value !== -1) {
+            return value;
         }
-        return value;
+        const host = this.host;
+        return host ? host.logLevel : 0;
     }
     get statusType() {
         return types_1.STATUS_TYPE;

package/package.json

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