@e-mc/module 0.6.15 → 0.6.17

package/index.js

@@ -555,7 +555,8 @@ function tryIncrementDir(value, increment) {
     } while (increment-- > 0);
     return [outErr, -1];
 }
-const asFile = (value) => value instanceof URL ? value.protocol === 'file:' ? url.fileURLToPath(value) : '' : value;
+const isErrorNo = (value) => value instanceof Error && (0, types_1.isString)(value.code);
+const asFile = (value) => typeof value === 'string' ? PLATFORM_WIN32 ? value.trim() : value : value instanceof URL && value.protocol === 'file:' ? url.fileURLToPath(value) : '';
 const wrapQuote = (value) => '"' + value.replace(/"/g, '\\"') + '"';
 const isFunction = (value) => typeof value === 'function';
 const isFileURL = (value) => /^file:\/\//i.test(value);
@@ -588,7 +589,7 @@ class Module extends EventEmitter {
         this[_f] = new AbortController();
         this[_g] = null;
     }
-    static get VERSION() { return "0.6.15"; }
+    static get VERSION() { return "0.6.17"; }
     static get LOG_TYPE() { return types_1.LOG_TYPE; }
     static get STATUS_TYPE() { return types_1.STATUS_TYPE; }
     static get MAX_TIMEOUT() { return 2147483647; }
@@ -668,7 +669,7 @@ class Module extends EventEmitter {
     }
     static formatMessage(type, title, value, message, options = {}) {
         var _h, _j, _k, _l;
-        if (options.type) {
+        if (typeof options.type === 'number') {
             type |= options.type;
         }
         const BROADCAST_OUT = VALUES["broadcast.out"];
@@ -1141,7 +1142,7 @@ class Module extends EventEmitter {
             filename = undefined;
         }
         if (typeof value === 'string') {
-            let pathname = value.trim(), convert = true;
+            let pathname = PLATFORM_WIN32 ? value.trim() : value, convert = true;
             if (normalize) {
                 pathname = path.normalize(pathname);
                 convert = PLATFORM_WIN32;
@@ -1241,14 +1242,10 @@ class Module extends EventEmitter {
         }
     }
     static isErrorCode(err, ...code) {
-        if (err instanceof Error) {
-            const value = err.code;
-            return typeof value === 'string' && code.includes(value);
-        }
-        return false;
+        return isErrorNo(err) && code.includes(err.code);
     }
     static resolveFile(value) {
-        if (isFileURL(value = value instanceof URL ? value.toString() : value.trim())) {
+        if (isFileURL(value = value instanceof URL ? value.toString() : value)) {
             try {
                 return url.fileURLToPath(value);
             }
@@ -1263,7 +1260,7 @@ class Module extends EventEmitter {
     }
     static resolvePath(value, base) {
         try {
-            if (this.isURL(value = value.trim())) {
+            if (this.isURL(value)) {
                 return isFileURL(value) ? url.fileURLToPath(value) : new URL(value).href;
             }
             if (base instanceof URL || this.isURL(base)) {
@@ -1295,7 +1292,7 @@ class Module extends EventEmitter {
             if (typeof flags === 'boolean') {
                 flags = flags ? 2 : 0;
             }
-            let result = value.trim();
+            let result = PLATFORM_WIN32 ? value.trim() : value;
             result = flags & 1 ? path.resolve(result) : path.normalize(result);
             if ((flags & 3) && result.length) {
                 result = ensureDir(result);
@@ -2905,9 +2902,6 @@ class Module extends EventEmitter {
         else if (result === false) {
             return;
         }
-        if (options.passThrough) {
-            message = null;
-        }
         const args = [(type | 512), title, value, message, applyStyle(options, Module.LOG_STYLE_FAIL)];
         applyLogId.call(this, options);
         if (options.queue !== false && !options.passThrough && !this._logFlushed) {
@@ -3037,11 +3031,11 @@ class Module extends EventEmitter {
             options = value;
             value = undefined;
         }
-        if (err instanceof Error && err.code === types_1.ERR_CODE.MODULE_NOT_FOUND && (0, types_1.isString)(name)) {
+        if (name && isErrorNo(err) && err.code.endsWith(types_1.ERR_CODE.MODULE_NOT_FOUND)) {
             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: 'npm', args: ['i', name] } });
+            this.writeFail("Package not found", err, { ...options, type: types_1.LOG_TYPE.SYSTEM, code: err.code, exec: { command: 'npm', args: ['i', name] } });
             return true;
         }
         if (value) {
@@ -3050,47 +3044,41 @@ class Module extends EventEmitter {
         return false;
     }
     checkFail(message, options) {
-        const code = options.code;
-        if (code && message instanceof Error) {
-            const valid = message.code === code;
-            switch (code) {
-                case types_1.ERR_CODE.MODULE_NOT_FOUND: {
-                    const exec = options.exec;
-                    if (exec) {
-                        if (valid && !this.aborted) {
-                            const command = exec.command + (exec.args ? ' ' + exec.args.join(' ') : '');
-                            const target = this.host || this;
-                            let session = CACHE_EXEC.get(target);
-                            if (!session) {
-                                CACHE_EXEC.set(target, session = []);
-                            }
-                            if (session.includes(command)) {
-                                return false;
-                            }
-                            session.push(command);
-                            let type = options.type || 0;
-                            type |= 4096;
-                            type &= ~1;
-                            if (options.passThrough) {
-                                options.passThrough = false;
-                                message = null;
-                            }
-                            return { type, value: ["Install required?", command], message };
-                        }
-                        delete options.exec;
-                    }
-                    break;
+        let { code, exec } = options;
+        if (!code && isErrorNo(message)) {
+            code = message.code;
+        }
+        if (exec && (code === null || code === void 0 ? void 0 : code.endsWith(types_1.ERR_CODE.MODULE_NOT_FOUND))) {
+            if (!this.aborted) {
+                const command = exec.command + (exec.args ? ' ' + exec.args.join(' ') : '');
+                const target = this.host || this;
+                let session = CACHE_EXEC.get(target);
+                if (!session) {
+                    CACHE_EXEC.set(target, session = []);
+                }
+                if (session.includes(command)) {
+                    return false;
+                }
+                session.push(command);
+                let type = options.type || 0;
+                type |= 4096;
+                type &= ~1;
+                if (options.passThrough) {
+                    options.passThrough = false;
+                    message = null;
                 }
+                return { type, value: ["Install required?", command], message };
             }
+            delete options.exec;
         }
     }
     writeLog(type, value, timeStamp, duration) {
-        let queue;
+        let queue = false;
         if ((0, types_1.isObject)(type)) {
             if (typeof value === 'boolean') {
                 queue = value;
             }
-            ({ type = types_1.STATUS_TYPE.UNKNOWN, value, timeStamp, duration } = type);
+            value = type.value;
         }
         const output = Module.asString(value);
         if (output) {
@@ -3118,7 +3106,7 @@ class Module extends EventEmitter {
             from = timeStamp;
             timeStamp = 0;
         }
-        else if ((0, types_1.isObject)(timeStamp)) {
+        else if ((0, types_1.isPlainObject)(timeStamp)) {
             ({ timeStamp, duration, from, source } = timeStamp);
         }
         const name = types_1.STATUS_TYPE[type] || types_1.STATUS_TYPE[type = 0];

package/package.json

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