@e-mc/module 0.9.4 → 0.9.6

package/README.md

@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.9.4/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.9.6/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.4/lib/core.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.4/lib/logger.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.4/lib/module.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.4/lib/node.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.4/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.6/lib/core.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.6/lib/logger.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.6/lib/module.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.6/lib/node.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.6/lib/settings.d.ts
 
 * https://www.npmjs.com/package/@types/node
 

package/index.js

@@ -129,6 +129,25 @@ const MEMORY_CACHE_DISK = {
     exclude: null
 };
 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");
@@ -420,7 +439,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) {
@@ -532,7 +551,7 @@ function addCacheItem(map, key, data, cache) {
 }
 function checkFunction(value) {
     if (typeof value === 'function') {
-        Object.defineProperty(value, "__cjs__", { value: true });
+        Object.defineProperty(value, "__cjs__", { value: true, writable: false, enumerable: false });
         return value;
     }
     return null;
@@ -549,9 +568,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 {
@@ -645,9 +664,16 @@ function applyLogId(options) {
     }
     return options;
 }
-function withinDir(value, base) {
+function withinDir(value, base, override = false) {
     value = path.normalize(value);
-    return (PLATFORM_WIN32 ? value.toLowerCase() : value).startsWith(ensureDir(PLATFORM_WIN32 ? base.toLowerCase() : base));
+    if (PLATFORM_WIN32) {
+        value = value.toLowerCase();
+        base = ensureDir(base.toLowerCase());
+    }
+    else {
+        base = ensureDir(base);
+    }
+    return value.startsWith(base) && (value !== base || override);
 }
 function formatPercent(value, precision) {
     if (value <= 0) {
@@ -696,7 +722,7 @@ class Module extends EventEmitter {
         this[_f] = new AbortController();
         this[_g] = null;
     }
-    static get VERSION() { return "0.9.4"; }
+    static get VERSION() { return "0.9.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; }
@@ -990,10 +1016,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;
@@ -1038,19 +1068,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) {
@@ -1160,13 +1190,16 @@ class Module extends EventEmitter {
         return null;
     }
     static asString(value, cacheKey) {
-        if ((0, types_1.isEmpty)(value)) {
+        if (value === undefined) {
             return '';
         }
         switch (typeof value) {
             case 'string':
                 return value;
             case 'object':
+                if (value === null) {
+                    return '';
+                }
                 if (value.constructor === Object || Object.getPrototypeOf(value) === null) {
                     if (Object.keys(value).length === 0) {
                         return '';
@@ -1334,6 +1367,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) {
@@ -1354,6 +1389,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;
@@ -2124,6 +2161,9 @@ class Module extends EventEmitter {
                                 value = "'" + value.replace(/'/g, "'\\''") + "'";
                             }
                         }
+                        else if (RESERVED_SHELL.includes(value)) {
+                            value = "'" + value + "'";
+                        }
                     }
                 }
                 else if (opt) {
@@ -2510,7 +2550,7 @@ class Module extends EventEmitter {
             }
         } 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 });
+            this.formatMessage(1, 'TEMP', ["Directory was modified", dir], TEMP_DIR + (VALUES["temp.write"] ? ' - writable' : ''), { ...this.LOG_STYLE_NOTICE, newline: true });
         }
         settings.temp_dir = dir;
         if ((0, types_1.isPlainObject)(temp)) {
@@ -2599,7 +2639,7 @@ class Module extends EventEmitter {
         if (permission && (Module.isFile(uri, 'unc') ? permission.hasUNCRead(path.normalize(uri)) || ownPermissionOnly && !permission.getUNCRead() : path.isAbsolute(uri = path.resolve(uri)) && (permission.hasDiskRead(uri) || ownPermissionOnly && !permission.getDiskRead()))) {
             return true;
         }
-        return VALUES["permission.home_read"] && withinDir(uri, OS_HOMEDIR);
+        return VALUES["permission.home_read"] && withinDir(uri, OS_HOMEDIR, true);
     }
     canWrite(uri, options) {
         let permission = this.permission, ownPermissionOnly = false;
@@ -2623,7 +2663,7 @@ class Module extends EventEmitter {
         if (permission && (Module.isFile(uri, 'unc') ? permission.hasUNCWrite(path.normalize(uri)) || ownPermissionOnly && !permission.getUNCWrite() : path.isAbsolute(uri = path.resolve(uri)) && (permission.hasDiskWrite(uri) || ownPermissionOnly && !permission.getDiskWrite()))) {
             return true;
         }
-        return VALUES["temp.write"] && withinDir(uri, TEMP_DIR) || VALUES["permission.home_write"] && withinDir(uri, OS_HOMEDIR);
+        return VALUES["temp.write"] && withinDir(uri, TEMP_DIR, true) || VALUES["permission.home_write"] && withinDir(uri, OS_HOMEDIR, true);
     }
     readFile(src, options = {}, callback) {
         let promises, outSrc;
@@ -2978,7 +3018,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);
@@ -3027,7 +3067,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) {
@@ -3145,7 +3185,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);
@@ -3182,7 +3222,7 @@ class Module extends EventEmitter {
             this._logQueued.push(args);
         }
         else {
-            relayMessage.call(this, args);
+            relayMessage(this, args);
         }
     }
     formatFail(type, title, value, message, options = {}) {
@@ -3322,7 +3362,7 @@ class Module extends EventEmitter {
             this._logQueued.push(args);
         }
         else {
-            relayMessage.call(this, args);
+            relayMessage(this, args);
         }
     }
     checkPackage(err, name, value, options) {
@@ -3478,7 +3518,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.4",
+  "version": "0.9.6",
   "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.4",
+    "@e-mc/types": "0.9.6",
     "chalk": "4.1.2",
     "file-type": "16.5.4",
     "js-yaml": "^4.1.0",