jsir 2.2.2 → 2.2.4

package/cmd/oaa.js

@@ -3,15 +3,15 @@ const $lib = require('../deps/util');
 const {
     getLibDataDir, trim, regEach, getConfig, mkdir, reget,
     getCbText, e, sleep, objDataFile, vl, md5, BigNumber,
-    arrayDataFile, infoStr, warnStr, errorStack,
+    arrayDataFile, infoStr, warnStr,
     getInfo, ei, pad, msgStr, getType,
-    isArgsMatch, draftQuery, setConfig,
+    isMatch, draftQuery, setConfig,
     getTextComments, importG, requireG,
     clearConsole, trimText, getFnArgsStr,
     createConsole, setTips, delTips,
     getEditor, errorStr, getConfigDir,
     getFullPath, parseUniqueName, toUniqueName, isJsirFileName, toJsirFileName,
-    fileJson, fileLock
+    fileJson, fileLock, getOr
 } = $lib;
 const _args = process.argv.slice(2).map(trim);
 const evalCode = require('../deps/evalCode')
@@ -42,8 +42,8 @@ let _haveWrapperInput = true
 let _noAppendNextLine = true
 let _onLazyTempCode = null
 
-const _onLazyGetMap = {}
-const _data = {}
+const _onLazyGetMap = Object.create(null)
+const _data = Object.create(null)
 const _lazyTime = 5 * 60 * 1000
 const _dealOnLazyGet = (key, onLazyTempCode) => {
     if (_noAppendNextLine || !_onLazyGetMap[key]) {
@@ -120,8 +120,8 @@ const $data = {
         delete _data[key]
         return val
     },
-    keys: () => Object.keys(_data),
-    have: (key) => vl(_data[key])
+    key: () => Object.keys(_data),
+    has: (key) => vl(_data[key])
 }
 const $file = {
     json: fileJson,
@@ -534,7 +534,7 @@ function listCmd(tmpMap) {
         let suffix = getJsirFileSuffix(pair[1])
         let item = {
             key: ' ' + i,
-            name: pair[0] + '/' + name.replace(/^[eif]\s+/, ''),
+            name: pair[0] + '/' + name,
             type: [_types[name.split(/\s+/)[0]] || 'note', suffix].map(trim).join(".")
         }
         items.push(item)
@@ -645,8 +645,8 @@ async function dealStar(text) {
     }
     let items = text.split(/\s+/);
     let rows = []
-    if (_cmdMap[items[0]]) {
-        rows.push(...await dealStarCmd([], _cmdMap[items[0]], '.'))
+    if (_cmdMap.hasOwnProperty(items[0])) {
+        rows.push(...await dealStarCmd([], _cmdMap[items[0]], items.slice(1).join(' ')))
     } else if (items[0].indexOf("/") !== -1) {
         await dealStartGlobalMode(rows, items, text);
     } else {
@@ -657,7 +657,7 @@ async function dealStar(text) {
             await dealStartGlobalMode(rows, items, text);
         }
     }
-    rows = rows.filter(i => !i.name.startsWith('_'));
+    rows = rows.filter(i => !i.name || (!i.name.startsWith('_') && i.name.indexOf('._') === -1));
     if (rows.length === 0) {
         console.warn("no items")
     } else {
@@ -679,9 +679,60 @@ function dealStarGlobal(items, text) {
     return rows;
 }
 
+function wrapperClassLine(className, classLines) {
+    let str = trimText(classLines.join('\n'))
+    let results = []
+    for (let line of str.split('\n')) {
+        let asyncMethod = false;
+        if (line.startsWith("async ")) {
+            // 检查是否为异步方法
+            asyncMethod = true;
+            line = line.replace("async ", "").trim(); // 去除 'async ' 前缀
+        }
+        const methodMatch = line.match(/^\w+\s*\(/);
+        if (methodMatch) {
+            let prefix = `function ${className}.`;
+            if (asyncMethod) {
+                prefix = "async " + prefix;
+            }
+            results.push(prefix + line.trim());
+            continue;
+        }
+        results.push(line)
+    }
+    return results;
+}
+
+function wrapperClass(lines) {
+    let results = [];
+    let className = null;
+    let inClass = false;
+
+    let classLines = []
+    for (let line of lines) {
+        if (line.startsWith("class ")) {
+            inClass = true;
+            className = reget(line, /^class\s+(\w+)/);
+            continue
+        } else if (inClass && line.startsWith("}")) {
+            inClass = false
+            results.push(...wrapperClassLine(className, classLines));
+            classLines = []
+            continue;
+        }
+
+        if (inClass) {
+            classLines.push(line)
+        } else {
+            results.push(line);
+        }
+    }
+    return results;
+}
+
 function dealStarCmd(rows, cmd, filterStr) {
     let content = String(fs.readFileSync(getFullPath(cmd)));
-    let lines = content.split('\n');
+    let lines = wrapperClass(content.split('\n'));
     let capturingFunction = false;
     let inMultiLineComment = false;
     let potentialComments = [];
@@ -719,10 +770,10 @@ function dealStarCmd(rows, cmd, filterStr) {
         }
 
         // Check for function start
-        if ((line.startsWith('function') || line.startsWith('async function'))) {
-            let _fnName = reget(line, /function\s+(\w+)\s*\(/);
+        if ((line.startsWith('function ') || line.startsWith('async function '))) {
+            let _fnName = reget(line, /function\s+([\w.]+)\s*\(/);
             let matchKey = _fnName + "(" + getFnArgsStr(lines.slice(index, index + 9).join("\n")) + ")"
-            if (isArgsMatch(matchKey, [filterStr])) {
+            if (isMatch(matchKey, filterStr)) {
                 fnName = _fnName;
                 fnType = line.startsWith('async') ? 'AsyncFunction' : 'Function';
                 capturingFunction = true;
@@ -741,7 +792,9 @@ function dealStarCmd(rows, cmd, filterStr) {
             let functionContent = functionLines.join('\n');
             let commentContent = trimText(comments.join('\n'));
             let row = getInfo(functionContent, fnName, fnType);
-            row.value = infoStr(cmd) + ' ' + getCmdMd5Key(parseUniqueName(cmd)[1]) + '\n' + [commentContent, row.value].filter(i => trim(i)).join("\n");
+            let pair = parseUniqueName(cmd);
+            row.value = infoStr(pair[0] + '/' + trimJsirFileName(pair[1])) + ' ' +
+                getCmdMd5Key(parseUniqueName(cmd)[1]) + '\n' + [commentContent, row.value].filter(i => trim(i)).join("\n");
             rows.push(row);
 
             resetState();
@@ -767,7 +820,7 @@ async function dealStarCase(result, matchStrs, cmd) {
             if (type === 'Function' || type === 'AsyncFunction') {
                 matchKey = key + "(" + getFnArgsStr(String(obj)) + ")";
             }
-            if (matchStrs.length === 0 || isArgsMatch(matchKey, [matchStrs.join(' ')])){
+            if (matchStrs.length === 0 || isMatch(matchKey, matchStrs.join(' '))){
                 rows.push(getInfo(result[key], key))
             }
         }
@@ -914,7 +967,7 @@ const keywordDef = {
         args: {
             queryParams: 'string matching, [,] represents all, keywords can be omitted'
         },
-        short: 'l'
+        short: 'L'
     },
     clear: {
         comment: 'Clear task',
@@ -1024,11 +1077,6 @@ const keywordDef = {
         exeFn: async (args) => {
             let uniqueName = _cmdMap[args[0]];
             if (uniqueName) {
-                let isExe = uniqueName &&uniqueName.split("/")[1].startsWith('e ');
-                if (!isExe) {
-                    console.warn("not exe file")
-                    return;
-                }
                 let configDir = `${getLibDataDir()}/config`;
                 mkdir(configDir)
                 ei(getEditor(), [`${configDir}/${md5(uniqueName)}.json`])
@@ -1172,8 +1220,10 @@ const keywordDef = {
         comment: 'Workspace Management',
         exeFn: async (args) => {
             let newWorkspace = args.join(' ')
+            let isSwitch = false
             if (newWorkspace) {
                 if ($workspaceMap[newWorkspace]) {
+                    isSwitch = true;
                     initWorkspace(newWorkspace)
                 } else if (newWorkspace.startsWith('-')) {
                     let name = newWorkspace.replace(/^-\s*/, '');
@@ -1194,7 +1244,9 @@ const keywordDef = {
                     path
                 }
             })
-            console.table(items)
+            if (!isSwitch) {
+                console.table(items)
+            }
         },
         args: {
             workspacePath: 'New workspace path'
@@ -1277,43 +1329,61 @@ const keywordDef = {
         },
         short: 'p'
     },
-    npm: {
-        comment: 'Node npm',
+    exe: {
+        comment: 'System execute',
         exeFn: (args) => {
-            let packageFile = $workspaceMap[global.$defaultSpace] + '/package.json';
-            if(!fs.existsSync(packageFile)) {
-                let jsonObj = {
-                    "dependencies": {}
-                }
-                fs.writeFileSync(packageFile, JSON.stringify(jsonObj, null, 2));
+            let cmd = ''
+            let _args = []
+            if (args.length > 0) {
+                cmd = args[0]
+            }
+            if (args.length > 1) {
+                _args = args.slice(1)
             }
-            ei(`cd "${$workspaceMap[global.$defaultSpace]}";npm ${args.join(' ')}`, [], true)
+            ei(`cd "${$workspaceMap[global.$defaultSpace]}";${cmd}`, _args, true)
         },
-        short: 'N'
+        short: 'E'
     },
     log: {
-        comment: 'View log',
+        comment: 'View log (type[[lt][le]], index)',
         exeFn: (args) => {
             let path = `${getLibDataDir()}/log/jsir`
-            let type = 'log';
-            if (args.length > 1) {
-                path = `${getLibDataDir()}/log/${md5(_cmdMap[trim(args[0])])}`
-                type = trim(args[1])
-            } else if (args.length > 0) {
-                if (_cmdMap[args[0]]) {
-                    path = `${getLibDataDir()}/log/${md5(_cmdMap[trim(args[0])])}`
+            let type = '';
+            for (let arg of args) {
+                if (_cmdMap[arg]) {
+                    path = `${getLibDataDir()}/log/${md5(_cmdMap[trim(arg)])}`
                 } else {
-                    type = args[0]
+                    type = arg;
                 }
             }
-            path = path + '.' + type;
+            let suffix = 'log'
+            let cmdStr = 'less -R'
+            if (type.indexOf("e") !== -1) {
+                suffix = 'error'
+            }
+            if (type.indexOf("t") !== -1) {
+                cmdStr = 'tail -n 50 -f'
+            }
+            path = path + '.' + suffix;
             if (!fs.existsSync(path)) {
                 console.warn('log file not found')
                 return;
             }
-            ei('less', [path])
+            ei(cmdStr, [path], true)
         },
-        short: 'L'
+        short: 'l'
+    },
+    debug: {
+        comment: 'debug mode',
+        exeFn: (args) => {
+            if (global.$DEBUG) {
+                delTips("DEBUG")
+            } else {
+                global.$DEBUG = true;
+                setTips("DEBUG", "DEBUG", () => delete global.$DEBUG);
+            }
+        },
+        short: 'D'
     }
 }
 
@@ -1562,7 +1632,7 @@ function _filterCmd(dirPath, arg) {
     for (let file of files) {
         file = trim(file)
         let uniqueName = toUniqueName(dirPath + '/' + file)
-        isArgsMatch(file, [arg], () => {
+        isMatch(file, arg, () => {
             cmdMap[uniqueName] = null;
         }, true)
     }
@@ -1668,7 +1738,6 @@ async function runCmd(str = '', uniqueName = '', text = '') {
     }
 
     let scriptArgs = await getScriptArgs(argDef, enrichArgs(str.replace(/^\d+\s*/, '')));
-    process.argv = [process.argv[0], path, ...(scriptArgs.map(String))]
     return await evalText(text, uniqueName, scriptArgs)
 }
 
@@ -1677,7 +1746,6 @@ async function runScript(uniqueName, oriArgs) {
     let text = String(fs.readFileSync(path))
     let argDef = getArgDef(text)
     let scriptArgs = await getScriptArgs(argDef, oriArgs);
-    process.argv = [process.argv[0], path, ...(scriptArgs.map(String))]
     return await evalText(text, uniqueName, scriptArgs)
 }
 
@@ -1686,7 +1754,7 @@ async function getScriptArgs(argDef, oriArgs) {
     oriArgs = oriArgs.map(i => shortDefMap[i] ? shortDefMap[i]:i)
     let argNames = Object.keys(argDef)
     let exactArgs = {}
-    let scriptArgs = []
+    let scriptArgs = {}
     for (let i = 0; i<oriArgs.length; i++) {
         let arg = oriArgs[i]
         let needTrans
@@ -1718,9 +1786,7 @@ async function getScriptArgs(argDef, oriArgs) {
         }
         pair[1] = needTrans ? await evalText( 'return ' + pair[1]):pair[1]
 
-        let curIdx = scriptArgs.length
-        scriptArgs[curIdx] = pair[1]
-
+        let curIdx = Object.keys(scriptArgs).length
         if (argNames[curIdx]) {
             scriptArgs[argNames[curIdx]] = pair[1]
         }
@@ -1747,7 +1813,7 @@ async function getScriptArgs(argDef, oriArgs) {
         }
         if (scriptArgKeys.indexOf(name) === -1 || (reg && !reg.test(scriptArgs[name]))) {
             argAbsent = true
-            console.warn(`require ${warnStr(name)}` + (defStr ? ` <${defStr}>`:''))
+            console.warn(`require ${warnStr(name)}` + (defStr ? ` ${defStr}`:''))
         }
     }
     if (argAbsent) {
@@ -1842,9 +1908,8 @@ function getArgDef(text, uniqueName) {
     let argDef = {}
     try {
         argDef = (exeStr ? evalVal(exeStr) : parseArgDef(text)) || {}
-        let array = []
         for (let key of Object.keys(argDef)) {
-            if (/\s/.test(key) || array.hasOwnProperty(key)) {
+            if (/\s/.test(key)) {
                 throw `invalid argName ${warnStr(key)}`
             }
         }
@@ -1887,8 +1952,8 @@ function filterRequire(currSpace, cmdMatchStr) {
     let uName = toUniqueName(cmdMatchStr, currSpace)
     let pr = parseUniqueName(uName)
     let fullPath;
-    if (!/^[eif]\s+/.test(pr[1])) {
-        uName = pr[0] + "/i " + pr[1]
+    if (!/^[ef]\s+/.test(pr[1])) {
+        uName = pr[0] + "/i " + pr[1].replace(/^f\s+/, '')
         fullPath = getFullPath(uName)
     }
     if (fullPath && fs.existsSync(fullPath)) {
@@ -1980,6 +2045,24 @@ async function evalText($text = '', $cmdName = '', $args = []) {
         $homeDir, $lib, _cmdMap);
 }
 
+function clearFileLock() {
+    let fileLockMap = getOr(global, `$fileLock`, {})
+    for (let file of Object.keys(fileLockMap)) {
+        fp.rmdir(file)
+        delete fileLockMap[file]
+    }
+}
+
+function sigExit() {
+    if (_noAppendNextLine) {
+        delTips();
+        clearFileLock();
+        process.exit(0);
+    } else {
+        nextLine();
+    }
+}
+
 process.on('uncaughtException',function(err){
     console.error('uncaughtException', err)
     _noAppendNextLine || nextLine()
@@ -1992,14 +2075,8 @@ process.on('rejectionHandled',function(err){
     console.error('rejectionHandled', err)
     _noAppendNextLine || nextLine()
 })
-process.on('SIGINT', function () {
-    if (_noAppendNextLine) {
-        delTips();
-        process.exit(0);
-    } else {
-        nextLine();
-    }
-});
+process.on('SIGINT', sigExit);
+process.on('SIGTERM', sigExit);
 process.on('beforeExit', function () {
     if (_noAppendNextLine) {
         delTips();

package/deps/evalCode.js

@@ -21,7 +21,7 @@ module.exports = async ($text = '', $cmdName = '', $args = [],
         $enter, $filterCmd,
         $currentSpace, $homeDir, $lib, $cmdMap
     }
-    const console = $lib.createConsole($cmdName);
+    let console = $lib.createConsole($cmdName);
     return await eval(`(async ()=>{${$text};
     })()`)
 }

package/deps/util.js

@@ -29,9 +29,9 @@ class SyncQueue {
         this.isProcessing = false;
     }
     // 添加任务到队列
-    enqueue(task) {
+    async enqueue(task) {
         this.queue.push(task);
-        this.processQueue();
+        await this.processQueue();
     }
     // 处理队列
     async processQueue() {
@@ -55,10 +55,10 @@ function syncQueue(task, key) {
     同步队列分发器
     task: function
     key: 根据key值区分不同队列, 可选
-    return void
+    return Promise
     `
     let queue = getOrFn(syncQueues, trim(key), () => new SyncQueue())
-    queue.enqueue(task)
+    return queue.enqueue(task)
 }
 
 const $log = createLimitLogger(`${setting.name}.log`, {
@@ -85,9 +85,12 @@ const draftLog = str => {
         _globalDraft(`---------${now.getTime()} ${timeStr(null, now)}\n${trimEmptyLine(str)}`)
     }
 }
-const $fnCache = {}
 
 // fix console begin
+function debugStr(str) {
+    return `\x1B[2m${str}\x1B[0m`
+}
+
 function infoStr(str) {
     return `\x1B[32m${str}\x1B[39m`
 }
@@ -106,10 +109,10 @@ function errorStr(str) {
 
 function tableStr(...args) {
     return args.map(i => {
-        if (Array.isArray(i)) {
+        if (typeof i === 'object') {
             return trim(table.getTable(i))
         } else {
-            return i
+            return i;
         }
     }).join("\n")
 }
@@ -143,48 +146,35 @@ const _console =Object.assign({}, global.console);
 const _consoleFns= {
     log: {
         fn: _console.log,
-        args: args => args,
-        $args: args => args
+        args: args => args
     },
     table: {
         fn: _console.log,
-        args: args => [tableStr(...args)],
-        $args: args => [tableStr(...args)]
+        args: args => [tableStr(...args)]
     },
     nable: {
         fn: _console.log,
-        args: args => [nableStr(...args)],
-        $args: args => [nableStr(...args)]
+        args: args => [nableStr(...args)]
     },
     info: {
         fn: _console.info,
-        args: args => [infoStr('[info]'), ...dealLevelArgs(infoStr, args)],
-        $args: args => ['[info]', ...args]
+        args: args => [infoStr('[info]'), ...dealLevelArgs(infoStr, args)]
     },
     msg: {
         fn: _console.log,
-        args: args => [msgStr('[msg]'), ...dealLevelArgs(msgStr, args)],
-        $args: args => ['[msg]', ...args]
+        args: args => [msgStr('[msg]'), ...dealLevelArgs(msgStr, args)]
     },
     warn: {
         fn: _console.warn,
         args: args => [warnStr('[warn]'), ...dealLevelArgs(warnStr, args)],
-        $args: args => ['[warn]', ...args]
     },
     error: {
         fn: _console.error,
-        args: args => [errorStr('[error]'), ...dealLevelArgs(errorStr, args)],
-        $args: args => ['[error]', ...args]
-    },
-    dir: {
-        fn: _console.dir,
-        args: args => args,
-        $args: args => args
+        args: args => [errorStr('[error]'), ...dealLevelArgs(errorStr, args)]
     },
     debug: {
         fn: _console.debug,
-        args: args => args,
-        $args: args => args
+        args: args => [debugStr('[debug]'), ...dealLevelArgs(debugStr, args)]
     }
 }
 
@@ -193,7 +183,7 @@ function createConfig(uniqueName) {
         get: getConfig,
         local: getConfig
     }
-    if (uniqueName && uniqueName.split("/")[1].startsWith('e ')) {
+    if (uniqueName) {
         result.local = (key, defaultVal) => {
             return _getConfig(key, defaultVal, uniqueName);
         }
@@ -206,8 +196,7 @@ function createConsole(uniqueName) {
     result.$log = $log;
     result.$error = $error;
     result.$draft = draftLog;
-    let logAble = uniqueName &&uniqueName.split("/")[1].startsWith('e ');
-    if (logAble) {
+    if (uniqueName) {
         result.$log = createLimitLogger(md5(uniqueName) + '.log', {
             logInfo: false
         });
@@ -217,7 +206,7 @@ function createConsole(uniqueName) {
         });
     }
     let quite = false
-    if (logAble) {
+    if (uniqueName) {
         global.$newInput = false;
     }
     for (let key of Object.keys(_consoleFns)) {
@@ -225,8 +214,14 @@ function createConsole(uniqueName) {
             if (global.$newInput) {
                 quite = true;
             }
-            if (logAble && quite) {
-                let _args = _consoleFns[key].$args(args);
+            if ('debug' === key && !global.$DEBUG) {
+                return;
+            }
+            if (uniqueName && quite) {
+                if ((key === 'table' || key === 'nable') && typeof args[0] === "object") {
+                    args = ['', ...args]
+                }
+                let _args = _consoleFns[key].args(args);
                 if ("error" === key) {
                     result.$log(..._args)
                     result.$error(..._args)
@@ -304,19 +299,37 @@ function isJsirFileName(name) {
     return /^[^./]*[^./\s]\.[^./\s]+$/.test(name)
 }
 
-function isArgsMatch(text, args, callback, useMd5) {
+function isMatch(text,
+                 matchStr, // reg,reg;reg
+                 callback, // invoke when matched, no args
+                 useMd5 // '0x' + md5(text).substring(0, 8)) === matchStr
+) {
     let match = false
-    for (let arg of args) {
+    let orStrs = matchStr.split(';').map(trim).filter(i => i);
+    for (let arg of orStrs) {
         let r = true
         for (let str of arg.split(',').map(trim).filter(i => i)) {
+            let not = false;
+            if (str.startsWith("!")) {
+                not = true;
+                str = str.substring(1);
+            }
             let reg = new RegExp(str.split(/\s+/).join('\\s+'), 'i')
             if (useMd5 && /^0x[a-z\d]{8}$/.test(str)) {
-                if (('0x' + md5(text).substr(0, 8)) !== str) {
+                let flag = ('0x' + md5(text).substring(0, 8)) !== str;
+                if (not) {
+                    flag = !flag;
+                }
+                if (flag) {
                     r = false
                     break
                 }
             } else {
-                if (!reg.test(text)) {
+                let flag = !reg.test(text);
+                if (not) {
+                    flag = !flag;
+                }
+                if (flag) {
                     r = false
                     break
                 }
@@ -327,6 +340,9 @@ function isArgsMatch(text, args, callback, useMd5) {
             break
         }
     }
+    if (orStrs.length === 0) {
+        match = true;
+    }
     if (match && callback) {
         callback()
     }
@@ -341,9 +357,10 @@ function parseDraftLog(draftPath) {
     let temp = [];
     let startIndex = 0;
     let head;
+    let splitReg = /^---------\d+/;
 
     allLines.forEach((line, i) => {
-        if (line.startsWith("---------")) {
+        if (splitReg.test(line)) {
             if (temp.length > 0) {
                 let fullText = temp.join('\n');
                 lines.push(fullText);
@@ -353,7 +370,7 @@ function parseDraftLog(draftPath) {
             temp = [];
             head = line;
         }
-        temp.push(line.startsWith("---------") ? warnStr(line) : line);
+        temp.push(splitReg.test(line) ? warnStr(line) : line);
     });
 
     if (temp.length > 0) {
@@ -401,7 +418,7 @@ function draftQuery(fLine) {
         results = lines.slice(- parseInt(filterKeywords));
     } else {
         lines.forEach(line => {
-            if (isArgsMatch(line, [filterKeywords])) {
+            if (isMatch(line, filterKeywords)) {
                 results.push(line);
             }
         });
@@ -475,12 +492,13 @@ function getEditor() {
 }
 
 function timeStr(fmt, date) {
-    return dayJs(date || new Date()).format(fmt || 'YYYY/MM/DD HH:mm:ss')
+    return dayJs(date || new Date()).format(fmt || 'YYYY-MM-DD HH:mm:ss')
 }
 
 function vl(obj) {
-    if (typeof obj === 'number') {
-        return !Number.isNaN(obj)
+    let type= typeof obj;
+    if (type === 'number') {
+        return !Number.isNaN(obj) && Number.isFinite(obj);
     }
     if (typeof obj === 'string') {
         obj = obj.trim()
@@ -496,31 +514,29 @@ function getVl(...obj) {
     }
 }
 
-const cacheFnRespMap = {};
-async function cacheFn(key, fn, validMs, awaitRefresh = true) {
+const $fnCache = {}
+async function cacheFn(key, fn, validMs = 0, awaitRefresh = true) {
     getOr($fnCache, key, {
         validMsTime: 0
     });
     if (Date.now() <= $fnCache[key].validMsTime) {
         // do nothing
     } else {
-        $fnCache[key].validMsTime = Date.now() * 3;
-        cacheFnRespMap[key] = (async () => {
+        $fnCache[key].validMsTime = Infinity;
+        $fnCache[key].promise = (async () => {
             let val;
             try {
                 val = await fn()
             } finally {
                 $fnCache[key].validMsTime = 0
             }
-            $fnCache[key] = {
-                val,
-                valInit: true,
-                validMsTime: Date.now() + (validMs || Date.now())
-            }
+            $fnCache[key].val = val;
+            $fnCache[key].valInit = true;
+            $fnCache[key].validMsTime = Date.now() + validMs;
         })();
     }
     if (awaitRefresh || !$fnCache[key].valInit) {
-        await cacheFnRespMap[key];
+        await $fnCache[key].promise;
     }
     return $fnCache[key].val
 }
@@ -582,7 +598,7 @@ function getLogDir() {
 }
 
 function createLimitLogger(fileName, {
-    maxChars,
+    maxChars = 49 * 1024 * 1024,
     logInfo = true,
     time = true,
     error = false
@@ -609,7 +625,7 @@ function createLimitLogger(fileName, {
             global.$newError = true;
         }
         if (time) {
-            text = `[${timeStr()}] ${text}`
+            text = `${timeStr('YYYY-MM-DD HH:mm:ss.SSS')} ${text}`
         }
         syncQueue(() => fp.appendFile(logPath, text + '\n'), logPath)
         let _minNum = (Date.now()/(1000 * 60 * 10)).toFixed(0)
@@ -736,8 +752,8 @@ function requireG(moduleName){
     let moduleDir = $workspaceMap[global.$defaultSpace] + '/node_modules'
     if (module.paths.indexOf(moduleDir) === -1) {
         module.paths.splice(0, module.paths.length)
-        module.paths.push(...initModulePaths)
         module.paths.push(moduleDir)
+        module.paths.push(...initModulePaths)
     }
     try {
         let result = require(moduleName);
@@ -757,8 +773,8 @@ async function importG(moduleName) {
     let moduleDir = $workspaceMap[global.$defaultSpace] + '/node_modules'
     if (module.paths.indexOf(moduleDir) === -1) {
         module.paths.splice(0, module.paths.length)
-        module.paths.push(...initModulePaths)
         module.paths.push(moduleDir)
+        module.paths.push(...initModulePaths)
     }
     try {
         let result = await import(moduleName);
@@ -771,7 +787,7 @@ async function importG(moduleName) {
         console.log(warnStr(`.npm install ${moduleName}`))
         throw `${moduleName} not found, use .npm install to add it`;
     }
-    return await import(path);
+    return await import(require.resolve(path));
 }
 
 function validStr(str, name) {
@@ -966,17 +982,22 @@ async function _fileLock(key, fn) {
     } catch (e) {
         return false;
     }
+    let fileLockMap = getOr(global, `$fileLock`, {})
+    fileLockMap[file] = true;
     try {
         await fn();
-        try {await fp.rmdir(file)} catch (_){}
         return true;
     } catch (e) {
-        try {await fp.rmdir(file)} catch (_){}
         throw e;
+    } finally {
+        try {
+            await fp.rmdir(file)
+            delete fileLockMap[file]
+        } catch (_){}
     }
 }
 
-async function fileLock(key, fn, wait = false) {
+async function fileLock(key, fn, wait = true) {
     `
     文件锁, 默认一直等待，直到加锁成功执行fn
     wait = false, 加锁失败则不执行fn
@@ -987,7 +1008,7 @@ async function fileLock(key, fn, wait = false) {
             if (await _fileLock(key, fn)) {
                 break;
             }
-            await sleep(9);
+            await sleep(49);
         }
     } else {
         await _fileLock(key, fn);
@@ -1098,7 +1119,7 @@ function fileCleaner(path, maxChars) {
     }
 }
 
-function cleanFile(path, maxChars) {
+function cleanFile(path, maxChars = 9 * 1024 * 1024) {
     `
     进入文件操作队列，不会同步去做
     `
@@ -1123,7 +1144,7 @@ function cleanFile(path, maxChars) {
         }
         await fileLock(path, async () => {
             let content = String(await fp.readFile(path))
-            let newContext = content.substr(- (maxChars * 0.9))
+            let newContext = content.slice(-Math.floor(maxChars * 0.7));
             await fp.writeFile(path, newContext)
         }, false)
     }, path)
@@ -1307,11 +1328,7 @@ async function setCbText(str) {
 }
 
 async function sleep(milliseconds) {
-    return new Promise(resolve => {
-        setTimeout(() => {
-            resolve()
-        }, milliseconds)
-    })
+    return new Promise(resolve => setTimeout(resolve, milliseconds));
 }
 
 function splitArray(items, size) {
@@ -1367,14 +1384,14 @@ function range(start, end, step) {
 }
 
 function getOr(obj, key, defaultVal) {
-    if (!obj[key]) {
+    if (!vl(obj[key])) {
         obj[key] = defaultVal
     }
     return obj[key]
 }
 
 function getOrFn(obj, key, defaultValFn) {
-    if (!obj[key]) {
+    if (!vl(obj[key])) {
         obj[key] = defaultValFn()
     }
     return obj[key]
@@ -1520,7 +1537,6 @@ function getInfo(obj, name, type) {
     }
     info.type = type || getType(obj)
     if (!vl(obj)) {
-        info.type = type
         info.value = String(obj);
         return info;
     }
@@ -1564,8 +1580,8 @@ function getInfo(obj, name, type) {
 function getFnArgsStr(str){
     let fnStr = trim(str.split(/=\s*>|(?<=\))\s*{/)[0])
     let argsStr
-    if (/[()]/.test(fnStr)) {
-        argsStr = fnStr.split(/[()]/)[1]
+    if (fnStr.endsWith(')')) {
+        argsStr = fnStr.substring(fnStr.indexOf("(") + 1, fnStr.length - 1)
     } else {
         argsStr = fnStr
     }
@@ -1793,7 +1809,7 @@ module.exports = {
     errorTag,
     iobjDataFile,
     iarrayDataFile,
-    isArgsMatch,
+    isMatch,
     draftQuery,
     getTextComments,
     trimText,
@@ -1814,5 +1830,6 @@ module.exports = {
     toUniqueName,
     isJsirFileName,
     toJsirFileName,
-    fileJson
+    fileJson,
+    debugStr
 }

package/package.json

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