jsir 2.3.0 → 2.3.1

package/cmd/oaa.js

@@ -367,7 +367,7 @@ function getTipStr(showKey = false) {
         }
     }
     let tips = items.join(',')
-    if (!showKey && !_isTipsDoneShowKey && tips.length > 81) {
+    if (!showKey && !_isTipsDoneShowKey && tips.length > 64) {
         return '...'
     }
     return tips;
@@ -578,30 +578,18 @@ async function wrapperInput(str) {
 }
 
 function wrapperAlias(str) {
-    let aliasMap = null;
+    let aliasMap = {};
     try {
         aliasMap = getConfig("alias");
     } catch (e) {
-        console.$error(e);
+        console.$error("getAlias failed ", e);
     }
-    if (!aliasMap) {
+    if (Object.keys(aliasMap).length <= 0) {
         return str;
     }
-    let args = enrichArgs(str);
-    for (let i = 0; i < args.length; i++) {
-        let arg = args[i];
-        if (arg.endsWith("   ")) {
-            arg = `\`${arg}\``
-        } else if (arg.endsWith("  ")) {
-            arg = `"${arg}"`
-        } else if (arg.endsWith(" ")) {
-            arg = `'${arg}'`
-        } else {
-            arg = getAlias(aliasMap, arg)
-        }
-        args[i] = arg;
-    }
-    return args.join(' ')
+    let fstr = str.split(/\s+/)[0];
+    fstr = getAlias(aliasMap, fstr);
+    return [fstr, str.substring(fstr.length)].map(trim).filter(i => i).join(' ')
 }
 
 async function _wrapperInput(str) {
@@ -1462,7 +1450,7 @@ async function preLoad(text, fnNameMatch, fn, packages = [], space) {
             };
             await fn(packageName, space)
         } catch (e) {
-            console.$error(e)
+            console.$error('preLoad failed', e)
         }
     }
     return packages;
@@ -1501,14 +1489,17 @@ async function _dealKeyword(keyword, args) {
         if (item.short === shortKey) {
             unMatched = false;
             if (item === keywordDef.run) {
+                console.$log('execute', key)
                 await item.exeFn(args);
             } else {
+                console.$log('execute', key)
                 await item.exeFn(args.map(trim));
             }
             break;
         }
     }
     if (unMatched) {
+        console.$log('execute run', keyword)
         await keywordDef.run.exeFn([keyword, ...args])
     }
 }

package/deps/util.js

@@ -71,7 +71,8 @@ const $log = createLimitLogger(`${setting.name}.log`, {
 });
 const $error = createLimitLogger(`${setting.name}.error`, {
     logInfo: false,
-    error: true
+    error: true,
+    syncLogs: [$log]
 });
 let _globalDraft= createLimitLogger(`draft.log`, {
     logInfo: false,
@@ -209,7 +210,8 @@ function createConsole(uniqueName) {
         });
         result.$error = createLimitLogger(fileName + '.error', {
             logInfo: false,
-            error: true
+            error: true,
+            syncLogs: [result.$log]
         });
     }
     let quite = false
@@ -230,7 +232,6 @@ function createConsole(uniqueName) {
                 }
                 let _args = _consoleFns[key].args(args);
                 if ("error" === key) {
-                    result.$log(..._args)
                     result.$error(..._args)
                 } else {
                     result.$log(..._args)
@@ -502,7 +503,7 @@ function getEditor() {
     try {
         defaultEditor = getConfig("defaultEditor", "vi");
     } catch (e) {
-        console.$error('getConfig failed', e);
+        console.$error('getEditor failed', e);
     }
     return defaultEditor
 }
@@ -640,7 +641,8 @@ function createLimitLogger(fileName, {
     maxChars = 49 * 1024 * 1024,
     logInfo = true,
     time = true,
-    error = false
+    error = false,
+    syncLogs = []
 } = {}) {
     fileName = trim(fileName)
     if (!fileName) {
@@ -657,10 +659,16 @@ function createLimitLogger(fileName, {
     }
     let minNum = (Date.now()/(1000 * 60 * 10)).toFixed(0)
     return (...args) => {
-        let text = args.join(" ")
-        if (!text) {
+        if (args.length <= 0) {
             return
         }
+        // 处理参数
+        args = args.map(i => isError(i) ? errorStack(i):i);
+
+        // 处理同步函数
+        syncLogs.forEach(i => i(...args));
+
+        let text = args.join(" ")
         if (error) {
             global.$newError = true;
         }
@@ -862,7 +870,7 @@ function aesCipher(str, key){
         const cipher = crypto.createCipheriv('aes-128-ecb', pad(key, 16, '0'), null);
         return cipher.update(str, 'utf8', 'hex') + cipher.final('hex');
     } catch(err) {
-        $log(errorStack(err))
+        $error(err)
         throw 'aesCipher failed: ' + String(err)
     }
 }
@@ -879,7 +887,7 @@ function aesDecipher(str, key){
         const decipher = crypto.createDecipheriv('aes-128-ecb', pad(key, 16, '0'), null);
         return decipher.update(str, 'hex', 'utf8') + decipher.final('utf8');
     } catch(err) {
-        $log(errorStack(err))
+        $error(err)
         throw 'aesDecipher failed: ' + String(err)
     }
 }
@@ -1139,8 +1147,7 @@ function tipsOnRmCallback(key) {
             try {
                 callback()
             } catch (e) {
-                $log(errorStack(e))
-                console.error(`[${key}] OnRmCallback: ${String(e)}`)
+                $error(`[${key}] OnRmCallback`, e)
             }
         }
     }
@@ -1211,7 +1218,7 @@ function cleanFile(path, maxChars = 9 * 1024 * 1024) {
         try {
             stats = await fp.stat(path);
         } catch (e) {
-            console.$error('cleanFile stat failed', errorMsg(e));
+            console.$error('cleanFile stat failed', e);
             return;
         }
         const fileSize = stats.size;
@@ -1292,8 +1299,7 @@ function timeLoop(fn, timestamp, lastIds = []){
     try {
         val = fn()
     } catch (e) {
-        console.error(String(e))
-        $log(new Error(errorStack(e)).stack)
+        $error(e)
     }
     if (vl(val) && getType(val) === 'Promise') {
         return val.then(result => {
@@ -1302,8 +1308,7 @@ function timeLoop(fn, timestamp, lastIds = []){
             }
             return lastIds
         }).catch(e => {
-            console.error(String(e))
-            $log(new Error(errorStack(e)).stack)
+            $error(e)
 
             if (lastIds[0] !== false) {
                 lastIds[0] = setTimeout(() => timeLoop(fn, timestamp, lastIds), timestamp)
@@ -1348,7 +1353,7 @@ function mkdir(dir) {
     try {
         fs.mkdirSync(dir)
     } catch (e) {
-        console.$error(errorStack(e))
+        console.$error(e)
     }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsir",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "description": "JavaScript Script Management Tool",
   "main": "index.js",
   "scripts": {