@e-mc/module 0.9.3 → 0.9.5

package/README.md

@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.9.3/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.9.5/lib/index.d.ts)
 
 ```typescript
 import type { LogStatus } from "./squared";
@@ -391,11 +391,11 @@ type ForegroundColor = typeof IForegroundColor | `#${string}`;
 
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.9.3/lib/core.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.3/lib/logger.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.3/lib/module.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.3/lib/node.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.3/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.5/lib/core.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.5/lib/logger.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.5/lib/module.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.5/lib/node.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.5/lib/settings.d.ts
 
 * https://www.npmjs.com/package/@types/node
 

package/index.js

@@ -218,7 +218,7 @@ function applyStyle(options, style) {
     return options;
 }
 function checkColorOptions(type, settings, options) {
-    if (typeof settings !== 'object') {
+    if (!(0, types_1.isObject)(settings)) {
         return false;
     }
     let result = false;
@@ -420,7 +420,7 @@ function recurseCause(err, out, visited) {
         visited = new WeakSet();
     }
     visited.add(err);
-    if (err.hasOwnProperty('cause')) {
+    if (Object.prototype.hasOwnProperty.call(err, 'cause')) {
         const cause = err.cause;
         if (cause instanceof Error) {
             if (message) {
@@ -549,9 +549,9 @@ function encryptMessage(data, cipher, algorithm) {
     }
     return data;
 }
-function relayMessage(args) {
-    const host = this.host;
-    if (host?.logState === 0) {
+function relayMessage(instance, args) {
+    const host = instance.host || instance;
+    if (host.logState === 0) {
         host.delayMessage(args);
     }
     else {
@@ -653,10 +653,11 @@ 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) + '%';
 }
 const hideAbort = (err) => err.name === 'AbortError' && SETTINGS.abort === false;
 const asFile = (value) => typeof value === 'string' ? value.trim() : value instanceof URL && value.protocol === 'file:' ? url.fileURLToPath(value) : '';
@@ -695,7 +696,7 @@ class Module extends EventEmitter {
         this[_f] = new AbortController();
         this[_g] = null;
     }
-    static get VERSION() { return "0.9.3"; }
+    static get VERSION() { return "0.9.5"; }
     static get LOG_TYPE() { return types_1.LOG_TYPE; }
     static get STATUS_TYPE() { return types_1.STATUS_TYPE; }
     static get MAX_TIMEOUT() { return 2147483647; }
@@ -989,10 +990,14 @@ class Module extends EventEmitter {
                 ({ color: hintColor, bgColor: hintBgColor } = formatHint);
                 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;
@@ -1037,19 +1042,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, (options.titleBold || formatTitle.bold) ?? false) + chalk.blackBright(':') + ' ' : '') + formatColumn(v, valueColor, valueBgColor, valueBold) + (i ? i : ' ') + m;
+                output = (titleIndent !== -1 ? title : title ? formatColumn(title, titleColor || 'green', titleBgColor, (options.titleBold || formatTitle.bold) ?? false) + chalk.blackBright(':') + ' ' : '') + formatColumn(v, valueColor, valueBgColor, valueBold) + hint + (i || ' ') + m;
             }
             catch {
             }
         }
         if (!output) {
             const m = truncateStart(stripansi(this.asString(message)), options.messageWidth ?? format.message.width);
-            output = (titleIndent !== -1 ? title : title ? title + ': ' : '') + stripansi(value) + (id ? id : ' ') + (m && SETTINGS.message !== false ? (error ? '{' : '(') + getMessage(m, unit) + (error ? '}' : ')') : '');
+            output = (titleIndent !== -1 ? title : title ? title + ': ' : '') + stripansi(value) + stripansi(hint) + (id || ' ') + (m && SETTINGS.message !== false ? (error ? '{' : '(') + getMessage(m, unit) + (error ? '}' : ')') : '');
         }
         if (broadcastId) {
             if (BROADCAST_OUT) {
@@ -1333,6 +1338,8 @@ class Module extends EventEmitter {
                     return /^s?ftp:\/\/[^/]/i.test(value);
                 case 'torrent':
                     return REGEXP_TORRENT.test(value);
+                case 'file':
+                    return isFileURL(value);
             }
         }
         else if (value instanceof URL) {
@@ -1353,6 +1360,8 @@ class Module extends EventEmitter {
                     return value.protocol === 'ftp:' || value.protocol === 'sftp:';
                 case 'torrent':
                     return REGEXP_TORRENT.test(value.toString());
+                case 'file':
+                    return value.protocol === 'file:';
             }
         }
         return false;
@@ -2470,52 +2479,50 @@ class Module extends EventEmitter {
                 });
             }
         }
-        {
-            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);
-                }
-                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;
     }
@@ -2979,7 +2986,7 @@ class Module extends EventEmitter {
                         if (callback) {
                             result.catch((err) => callback(errorCheck(err, outSrc)));
                         }
-                        return promises ? result : undefined;
+                        return promises ? result : void 0;
                     }
                     if (tryCreateDir(outSrc)) {
                         this.emit('dir:create', outSrc, options);
@@ -3028,7 +3035,7 @@ class Module extends EventEmitter {
                         if (callback) {
                             result.catch((err) => callback(errorCheck(err, outSrc)));
                         }
-                        return promises ? result : undefined;
+                        return promises ? result : void 0;
                     }
                     const failed = tryRemoveDir(outSrc, emptyDir, !!recursive);
                     if (failed.length === 0) {
@@ -3146,7 +3153,7 @@ class Module extends EventEmitter {
         }
         else {
             setCpuAndMem.call(this, options);
-            relayMessage.call(this, args);
+            relayMessage(this, args);
         }
         if (!options.bypassLog) {
             this.addLog(types_1.STATUS_TYPE.INFO, title + ' -> ' + value, Date.now(), duration);
@@ -3183,7 +3190,7 @@ class Module extends EventEmitter {
             this._logQueued.push(args);
         }
         else {
-            relayMessage.call(this, args);
+            relayMessage(this, args);
         }
     }
     formatFail(type, title, value, message, options = {}) {
@@ -3323,7 +3330,7 @@ class Module extends EventEmitter {
             this._logQueued.push(args);
         }
         else {
-            relayMessage.call(this, args);
+            relayMessage(this, args);
         }
     }
     checkPackage(err, name, value, options) {
@@ -3479,7 +3486,7 @@ class Module extends EventEmitter {
                     }
                     args = [args[0], '', this.supports('stripAnsi') ? stripansi(args[1]) : args[1], null, applyLogId.call(this, { sessionId: '' })];
                 }
-                Module.formatMessage(...args);
+                relayMessage(this, args);
             });
             logQueued.length = 0;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/module",
-  "version": "0.9.3",
+  "version": "0.9.5",
   "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.9.3",
+    "@e-mc/types": "0.9.5",
     "chalk": "4.1.2",
     "file-type": "16.5.4",
     "js-yaml": "^4.1.0",