jsir 2.2.1 → 2.2.3

package/deps/util.js

@@ -4,31 +4,85 @@ const home = os.homedir()
 const {exec, spawnSync} = require('child_process');
 const readline = require('readline')
 const fs = require('fs')
-const http = require("http");
-const querystring = require('querystring');
+const fp = require('fs').promises
 const BigNumber = require('bignumber.js');
 const pad = require('pad');
 const crypto = require('crypto');
-const emptyFn = ()=>{}
 const dayJs = require('dayjs')
 const table = require('console.table')
 const initModulePaths = Object.assign([], module.paths)
 
-let _globalLog = createLimitLogger2(`${setting.name}.log`, null, false)
-const $log = str => {
-    str = trim(str)
-    if (str) {
-        _globalLog(`[${timeStr()}] ${str}`)
+global.$newInput = false
+global.$workspaceMap = {}
+global.$defaultSpace = 'local'
+global.$newError = false
+global.$tips = {}
+
+let libDataDir;
+let lockDir;
+let logDir;
+let configDir;
+
+class SyncQueue {
+    constructor() {
+        this.queue = [];
+        this.isProcessing = false;
+    }
+    // 添加任务到队列
+    enqueue(task) {
+        this.queue.push(task);
+        this.processQueue();
+    }
+    // 处理队列
+    async processQueue() {
+        if (this.isProcessing) return;
+        this.isProcessing = true;
+        while (this.queue.length > 0) {
+            const task = this.queue.shift();
+            try {
+                await task();
+            } catch (error) {
+                console.error('Error during SyncQueue operation:', error);
+            }
+        }
+        this.isProcessing = false;
     }
 }
-let _globalDraft= createLimitLogger2(`draft.log`, null, false)
-const $draft = str => {
+
+const syncQueues = {}
+function syncQueue(task, key) {
+    `
+    同步队列分发器
+    task: function
+    key: 根据key值区分不同队列, 可选
+    return void
+    `
+    let queue = getOrFn(syncQueues, trim(key), () => new SyncQueue())
+    queue.enqueue(task)
+}
+
+const $log = createLimitLogger(`${setting.name}.log`, {
+    logInfo: false
+});
+const $error = createLimitLogger(`${setting.name}.error`, {
+    logInfo: false,
+    error: true
+});
+let _globalDraft= createLimitLogger(`draft.log`, {
+    logInfo: false,
+    time: false
+})
+const draftLog = str => {
+    `
+    (/regStr/) => query from draft
+    (str) => save to draft
+    `
     if (getType(str) === 'RegExp') {
         let results = draftQuery(trim(str.source))
         return results.map(i => i.split(/\n/).slice(1).join('\n'))
     } else if (trim(str)) {
         let now = new Date();
-        _globalDraft(`---------${now.getTime()} ${timeStr(null, now)}\n${str.split("\n").filter(i => trim(i)).join("\n")}`)
+        _globalDraft(`---------${now.getTime()} ${timeStr(null, now)}\n${trimEmptyLine(str)}`)
     }
 }
 const $fnCache = {}
@@ -51,30 +105,25 @@ function errorStr(str) {
 }
 
 function tableStr(...args) {
-    return trim(table.getTable(...args))
-}
-function nableStr(rows) {
-    return tableStr(wrapRows(rows))
-}
-const _console = Object.assign({}, global.console);
-global.console.table = (...args) => {
-    _console.log(tableStr(...args))
-}
-global.console.nable = (rows) => {
-    _console.log(nableStr(rows))
-}
-global.console.info = (...args) => {
-    _console.log(infoStr('[info]'), ...dealLevelArgs(infoStr, args))
-}
-global.console.msg = (...args) => {
-    _console.log(msgStr('[msg]'), ...dealLevelArgs(msgStr, args))
-}
-global.console.warn = (...args) => {
-    _console.warn(warnStr('[warn]'), ...dealLevelArgs(warnStr, args))
+    return args.map(i => {
+        if (typeof i === 'object') {
+            return trim(table.getTable(i))
+        } else {
+            return i;
+        }
+    }).join("\n")
 }
-global.console.error = (...args) => {
-    _console.error(errorStr('[error]'), ...dealLevelArgs(errorStr, args))
+
+function nableStr(...args) {
+    return tableStr(...args.map(i => {
+        if (Array.isArray(i)) {
+            return wrapRows(i)
+        } else {
+            return i
+        }
+    }))
 }
+
 function dealLevelArgs(levelStrFn, args) {
     if (args.length <= 0) {
         return args;
@@ -90,22 +139,192 @@ function dealLevelArgs(levelStrFn, args) {
     return args
 }
 
-const console = Object.assign({}, global.console);
+const _console =Object.assign({}, global.console);
+const _consoleFns= {
+    log: {
+        fn: _console.log,
+        args: args => args
+    },
+    table: {
+        fn: _console.log,
+        args: args => [tableStr(...args)]
+    },
+    nable: {
+        fn: _console.log,
+        args: args => [nableStr(...args)]
+    },
+    info: {
+        fn: _console.info,
+        args: args => [infoStr('[info]'), ...dealLevelArgs(infoStr, args)]
+    },
+    msg: {
+        fn: _console.log,
+        args: args => [msgStr('[msg]'), ...dealLevelArgs(msgStr, args)]
+    },
+    warn: {
+        fn: _console.warn,
+        args: args => [warnStr('[warn]'), ...dealLevelArgs(warnStr, args)],
+    },
+    error: {
+        fn: _console.error,
+        args: args => [errorStr('[error]'), ...dealLevelArgs(errorStr, args)]
+    },
+    dir: {
+        fn: _console.dir,
+        args: args => args
+    },
+    debug: {
+        fn: _console.debug,
+        args: args => args
+    }
+}
+
+function createConfig(uniqueName) {
+    let result = {
+        get: getConfig,
+        local: getConfig
+    }
+    if (uniqueName) {
+        result.local = (key, defaultVal) => {
+            return _getConfig(key, defaultVal, uniqueName);
+        }
+    }
+    return result;
+}
+
+function createConsole(uniqueName) {
+    let result = Object.assign({}, _console);
+    result.$log = $log;
+    result.$error = $error;
+    result.$draft = draftLog;
+    if (uniqueName) {
+        result.$log = createLimitLogger(md5(uniqueName) + '.log', {
+            logInfo: false
+        });
+        result.$error = createLimitLogger(md5(uniqueName) + '.error', {
+            logInfo: false,
+            error: true
+        });
+    }
+    let quite = false
+    if (uniqueName) {
+        global.$newInput = false;
+    }
+    for (let key of Object.keys(_consoleFns)) {
+        result[key] = (...args) => {
+            if (global.$newInput) {
+                quite = true;
+            }
+            if (uniqueName && quite) {
+                let _args = _consoleFns[key].args(args);
+                if ("error" === key) {
+                    result.$log(..._args)
+                    result.$error(..._args)
+                } else {
+                    result.$log(..._args)
+                }
+            } else {
+                let _args = _consoleFns[key].args(args);
+                _consoleFns[key].fn(..._args);
+            }
+        }
+    }
+    return result;
+}
+
+const console = createConsole();
 // fix console done
 
-function isArgsMatch(text, args, callback, useMd5) {
+
+function getFullPath(name) {
+    name = trim(name)
+    if (!name) {
+        return name;
+    }
+    let uniqueName = toUniqueName(name)
+    let pair = parseUniqueName(uniqueName)
+    let space = $workspaceMap[pair[0]]
+    if (!space) {
+        return ''
+    }
+    return `${space}/${pair[1]}`
+}
+
+function parseUniqueName(uniqueName) {
+    let pair = uniqueName.split('/').map(trim).filter(i => i)
+    let len = pair.length;
+    return [pair[len - 2], pair[len - 1]]
+}
+
+
+function toUniqueName(name, space) {
+    name = trim(name)
+    if (!name) {
+        throw `invalid name '${name}'`
+    }
+    let uniqueName
+    if (name.startsWith('/')) {
+        let items = name.split('/').map(trim).filter(i => i).reverse()
+        uniqueName = items[1] + '/' + items[0]
+    } else if (name.indexOf('/') !== -1) {
+        uniqueName = name;
+    } else {
+        uniqueName = (space || $defaultSpace) + '/' + name;
+    }
+    let pair = parseUniqueName(uniqueName);
+    return (pair[0] || space || $defaultSpace) + '/' + toJsirFileName(pair[1])
+}
+
+function toJsirFileName(name) {
+    name = trim(name)
+    if (!name) {
+        throw `invalid name '${name}'`
+    }
+    if (isJsirFileName(name)) {
+        return name;
+    }
+    name = name + '.js'
+    if (!isJsirFileName(name)) {
+        throw `invalid name '${name}'`
+    }
+    return name
+}
+
+function isJsirFileName(name) {
+    return /^[^./]*[^./\s]\.[^./\s]+$/.test(name)
+}
+
+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
                 }
@@ -116,6 +335,9 @@ function isArgsMatch(text, args, callback, useMd5) {
             break
         }
     }
+    if (orStrs.length === 0) {
+        match = true;
+    }
     if (match && callback) {
         callback()
     }
@@ -129,26 +351,27 @@ function parseDraftLog(draftPath) {
     let allLines = text.split("\n");
     let temp = [];
     let startIndex = 0;
+    let head;
+    let splitReg = /^---------\d+/;
 
     allLines.forEach((line, i) => {
-        if (!line.trim()) return;
-
-        if (line.startsWith("---------")) {
+        if (splitReg.test(line)) {
             if (temp.length > 0) {
                 let fullText = temp.join('\n');
                 lines.push(fullText);
-                lineRanges.set(fullText, { start: startIndex, end: i - 1 });
+                lineRanges.set(fullText, { start: startIndex, end: i - 1, head });
             }
             startIndex = i;
             temp = [];
+            head = line;
         }
-        temp.push(line.startsWith("---------") ? warnStr(line) : line);
+        temp.push(splitReg.test(line) ? warnStr(line) : line);
     });
 
     if (temp.length > 0) {
-        let fullText = temp.join('\n');
+        let fullText = temp.join('\n').replace(/\n$/, '');
         lines.push(fullText);
-        lineRanges.set(fullText, { start: startIndex, end: allLines.length - 1 });
+        lineRanges.set(fullText, { start: startIndex, end: allLines.length - 1, head });
     }
 
     return { lines, lineRanges, allLines };
@@ -168,12 +391,17 @@ function draftQuery(fLine) {
     let limit = 0;
     let filterKeywords = '';
     let isDelete = false;
+    let isEdit = false;
 
     // 解析 fLine 来确定过滤关键词和操作
     if (/\s+-$/.test(fLine)) {
         fLine = fLine.replace(/\s+-$/, '');
         isDelete = true;
     }
+    if (/\s+\+$/.test(fLine)) {
+        fLine = fLine.replace(/\s+\+$/, '');
+        isEdit = true;
+    }
     if (/\s+\d+$/.test(fLine)) {
         filterKeywords = fLine.replace(/\s+\d+$/, '');
         limit = parseInt(fLine.match(/\d+$/)[0]);
@@ -185,7 +413,7 @@ function draftQuery(fLine) {
         results = lines.slice(- parseInt(filterKeywords));
     } else {
         lines.forEach(line => {
-            if (isArgsMatch(line, [filterKeywords])) {
+            if (isMatch(line, filterKeywords)) {
                 results.push(line);
             }
         });
@@ -209,16 +437,63 @@ function draftQuery(fLine) {
         fs.writeFileSync(draftPath, allLines.join("\n") + "\n");
         console.info("removed")
     }
+    if (isEdit && results.length === 1) {
+        let tempPath = getLibDataDir() + "/log/draft.temp";
+        fs.writeFileSync(tempPath, results[0].split(/\n/).slice(1).join('\n'))
+        ei(getEditor(), [tempPath])
+        let tempText = String(fs.readFileSync(tempPath))
+        let lineRange = lineRanges.get(results[0]);
+        let before = allLines.filter((_, index) => {
+            return index < lineRange.start;
+        }).join("\n");
+        let after = allLines.filter((_, index) => {
+            return index > lineRange.end;
+        }).join("\n");
+        if (trim(tempText)) {
+            tempText = trimEmptyLine(tempText)
+            results = [warnStr(lineRange.head) + '\n' + tempText]
+            let newText = [before, lineRange.head + '\n' + tempText, after].filter(i => i).join('\n')
+            if (!newText.endsWith('\n')) {
+                newText += '\n';
+            }
+            fs.writeFileSync(draftPath, newText);
+        }
+    }
     return results;
 }
 
+function trimEmptyLine(text) {
+    `
+    去除开头和末尾的空白行
+    `
+    // 将字符串按行分割成数组
+    const lines = text.split('\n');
+    let start = 0;
+    let end = lines.length - 1;
+    // 循环查找开头的空白行
+    while (start < end && lines[start].trim() === '') {
+        start++;
+    }
+    // 循环查找末尾的空白行
+    while (end > start && lines[end].trim() === '') {
+        end--;
+    }
+    // 返回去除空白行后的字符串
+    return lines.slice(start, end + 1).join('\n');
+}
+
+function getEditor() {
+    return getConfig("defaultEditor", "vi")
+}
+
 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()
@@ -310,53 +585,51 @@ function clearConsole(cleanType = 0) {
     }
 }
 
-function appendLog(fileName, text) {
-    let logDir = getLibDataDir() + "/log"
+function getLogDir() {
+    if (logDir) {
+        return logDir;
+    }
+    logDir = getLibDataDir() + "/log"
     mkdir(logDir)
-    let logPath = logDir + "/" + fileName
-    fs.appendFile(logPath, text + '\n', emptyFn)
+    return logDir;
 }
 
-function createLimitLogger(fileName, maxChars, logInfo = true) {
-    let logDir = getLibDataDir() + "/log"
-    mkdir(logDir)
-    let logPath = logDir + "/" + fileName
-    fileCleaner(logPath, maxChars)
-
-    if (logInfo) {
-        console.info(`log: ${logPath}`)
-    }
-
-    return (text) => {
-        text = trim(text)
-        if (!text) {
-            return
-        }
-        fs.appendFile(logPath, text + '\n', emptyFn)
+function createLimitLogger(fileName, {
+    maxChars = 49 * 1024 * 1024,
+    logInfo = true,
+    time = true,
+    error = false
+} = {}) {
+    fileName = trim(fileName)
+    if (!fileName) {
+        throw 'log fileName missing';
     }
-}
-
-function createLimitLogger2(fileName, maxChars, logInfo = true) {
-    let logDir = getLibDataDir() + "/log"
-    mkdir(logDir)
+    let logDir = getLogDir()
     let logPath = logDir + "/" + fileName
-
     if (logInfo) {
         console.info(`log: ${logPath}`)
     }
-
+    if (fs.existsSync(logPath)) {
+        cleanFile(logPath, maxChars)
+    }
     let minNum = (Date.now()/(1000 * 60 * 10)).toFixed(0)
-    return (text) => {
-        text = trim(text)
+    return (...args) => {
+        let text = args.join(" ")
         if (!text) {
             return
         }
+        if (error) {
+            global.$newError = true;
+        }
+        if (time) {
+            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)
         if (_minNum !== minNum) {
             minNum = _minNum
             cleanFile(logPath, maxChars)
         }
-        fs.appendFile(logPath, text + '\n', emptyFn)
     }
 }
 
@@ -403,7 +676,7 @@ function dataFile(fileName, fn, fmt, defaultObj = {}, returnStr = false) {
 
     let text = String(fs.readFileSync(path));
     if (returnStr) {
-        text = text.replace(/return\s+/, '')
+        text = text.replace(/^return\s+/, '')
     }
     let obj = JSON.parse(text)
     if (!fn) {
@@ -416,24 +689,68 @@ function dataFile(fileName, fn, fmt, defaultObj = {}, returnStr = false) {
             if (result && typeof result === 'object') {
                 obj = result
             }
-            fileLock(fileName, () => fs.writeFileSync(path, prefixStr + JSON.stringify(obj, null, fmt ? 2:null)))
+            fs.writeFileSync(path, prefixStr + JSON.stringify(obj, null, fmt ? 2:null))
             resolve(obj)
         })
     } else {
         if (val && typeof val === 'object') {
             obj = val
         }
-        fileLock(fileName, () => fs.writeFileSync(path, prefixStr + JSON.stringify(obj, null, fmt ? 2:null)))
+        fs.writeFileSync(path, prefixStr + JSON.stringify(obj, null, fmt ? 2:null))
         return obj
     }
 }
 
+async function fileExist(path) {
+    try {
+        await fp.access(path);
+        return true;
+    } catch (_){
+        return false;
+    }
+}
+
+async function fileJson(key, fn, fmt = true) {
+    `
+    多进程安全文件读写
+    `
+    let dataDir = getLibDataDir() + "/data"
+    let fileName = trim(key)
+    let path = dataDir + "/" + fileName;
+    let homeDir = global.$workspaceMap[$defaultSpace]
+    let isInit = fileName.startsWith("i ");
+    if (isInit) {
+        path = homeDir + '/' + toJsirFileName(fileName);
+    }
+    let prefixStr = isInit ? 'return ' : '';
+    let result = null;
+    await fileLock(path, async () => {
+        if (!await fileExist(path)) {
+            await fp.writeFile(path, prefixStr + '{}')
+        }
+        let text = String(await fp.readFile(path));
+        if (isInit) {
+            text = text.replace(/^return\s+/, '')
+        }
+        result = JSON.parse(text)
+        if (!fn) {
+            return;
+        }
+        let val = await fn(result)
+        if (val && typeof val === 'object') {
+            result = val
+        }
+        await fp.writeFile(path, prefixStr + JSON.stringify(result, null, fmt ? 2:null))
+    });
+    return result;
+}
+
 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);
@@ -453,8 +770,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);
@@ -467,7 +784,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) {
@@ -511,8 +828,24 @@ function aesDecipher(str, key){
 }
 
 function getConfig(key, defaultVal) {
+    return _getConfig(key, defaultVal)
+}
+
+function getConfigDir() {
+    if (configDir) {
+        return configDir
+    }
+    configDir = getLibDataDir() + '/config';
+    mkdir(configDir);
+    return configDir;
+}
+
+function _getConfig(key, defaultVal, uniqueName) {
     let configInit = {}
     let configFile = getLibDataDir() + '/config.json';
+    if (uniqueName) {
+        configFile = getConfigDir() + "/" + md5(uniqueName) + ".json"
+    }
     if (!fs.existsSync(configFile)) {
         fs.writeFileSync(configFile, JSON.stringify(configInit, null, 2));
     }
@@ -525,7 +858,7 @@ function getConfig(key, defaultVal) {
     if (!(key in config)) {
         writeFlag = true
         config[key] = null
-        console.warn(`require config "${key}" in ${configFile}`)
+        console.warn(`require config "${key}", use .setting`)
     }
     if (writeFlag) {
         fs.writeFileSync(configFile, JSON.stringify(config, null, 2))
@@ -614,67 +947,68 @@ function eFn(fn, ...args) {
     return fn(...args);
 }
 
-function globalLock(key, expiredMs) {
-    let lockKeys = global.$lockKeys || {}
-    if (!global.$lockKeys) {
-        global.$lockKeys = lockKeys
-    }
-    if (lockKeys[key] && (Date.now() <= lockKeys[key])) {
-        return false;
-    } else {
-        lockKeys[key] = Date.now() + (expiredMs || 1000 * 60 * 60 * 24 * 1000)
-        return true
+function getLockDir() {
+    if (lockDir) {
+        return lockDir;
     }
+    lockDir = getLibDataDir() + "/lock";
+    mkdir(lockDir);
+    return lockDir;
 }
 
-function globalUnLock(key) {
-    if (global.$lockKeys) {
-        delete global.$lockKeys[key]
+function getLockFile(key) {
+    if (!key) {
+        throw "invalid args"
     }
+    key = md5(key.trim());
+    let lockDir = getLockDir();
+    return lockDir + "/" + key;
 }
 
-function fileLock(key, fn) {
-    if (!(fn && key)) {
-        return;
-    }
-    key = md5(trim(key))
-    let lockDir = getLibDataDir() + "/lock"
-    mkdir(lockDir)
-    let file = lockDir + "/" + key
-    if (fs.existsSync(file)) {
-        return;
+async function _fileLock(key, fn) {
+    `
+    文件锁，返回true/false,
+    如果没锁住则不执行fn
+    `
+    if (!key || !fn) {
+        throw new Error('invalid args')
     }
+    let file = getLockFile(key)
     try {
-        fs.mkdirSync(file)
+        await fp.mkdir(file);
     } catch (e) {
-        return;
+        return false;
     }
-
-    let obj
+    let fileLockMap = getOr(global, `$fileLock`, {})
+    fileLockMap[file] = true;
     try {
-        obj = fn()
+        await fn();
+        return true;
     } catch (e) {
-        rmDir(file)
-    }
-    if (getType(obj)=== 'Promise') {
-        return obj.then(result => {
-            rmDir(file)
-            return result
-        }).catch(e => {
-            rmDir(file)
-            throw e
-        })
-    } else {
-        rmDir(file)
-        return obj
+        throw e;
+    } finally {
+        try {
+            await fp.rmdir(file)
+            delete fileLockMap[file]
+        } catch (_){}
     }
 }
 
-function rmDir(dir) {
-    if (fs.existsSync(dir)) {
-        try {
-            fs.rmdirSync(dir)
-        } catch (e) {}
+async function fileLock(key, fn, wait = true) {
+    `
+    文件锁, 默认一直等待，直到加锁成功执行fn
+    wait = false, 加锁失败则不执行fn
+    return void
+    `
+    if (wait) {
+        while (true) {
+            if (await _fileLock(key, fn)) {
+                break;
+            }
+            await sleep(49);
+        }
+    } else {
+        await _fileLock(key, fn);
     }
 }
 
@@ -689,52 +1023,135 @@ function removeFirst(array, obj) {
     return array.splice(deleteIndex, 1)
 }
 
-function fileCleaner(path, maxChars) {
-    if (!globalLock("cleaner: " + path)) {
-        return
+const _tipsOnRm = {}
+function setTips(key, value, onRm) {
+    `
+    可以设置相同的key, value值，会在左侧提示符体现出来
+    `
+    getOr(global.$tips, key, []).push(value);
+    if (onRm) {
+        getOr(_tipsOnRm, key, []).push(onRm)
+    }
+}
+
+function delTips(...keys) {
+    for (let key of Object.keys($tips)) {
+        if (keys.length === 0) {
+            delete $tips[key]
+            tipsOnRmCallback(key)
+        } else if (keys.indexOf(key) !== -1) {
+            delete $tips[key]
+            tipsOnRmCallback(key)
+        }
     }
-    if (!global.$cleanFiles) {
-        global.$cleanFiles = {}
+    if (keys.length === 0) {
+        for (let key of Object.keys(_tipsOnRm)) {
+            tipsOnRmCallback(key)
+        }
     }
-    if (!global.$cleanFiles[path]) {
-        global.$cleanFiles[path] = 0
+}
+
+function tipsOnRmCallback(key) {
+    let callbacks = _tipsOnRm[key]
+    delete _tipsOnRm[key]
+    if (callbacks && callbacks.length > 0) {
+        for (let callback of callbacks) {
+            try {
+                callback()
+            } catch (e) {
+                $log(errorStack(e))
+                console.error(`[${key}] OnRmCallback: ${String(e)}`)
+            }
+        }
     }
+}
 
-    if (!global.$fileCleanerOn) {
-        timeLoop(() => {
-            for (let aPath of Object.keys(global.$cleanFiles)) {
+async function timer(key, ms, fn, label, printInfo = true){
+    `
+    定时控制器
+    clear tips退出
+    fn方法返回true退出
+    return void;
+    `
+    if (!(key && ms && fn)) {
+        throw 'invalid args'
+    }
+    let ids = []
+    let showLabel = vl(label) ? label : key;
+    let flag = [...new Set([key, showLabel].map(trim))].filter(i => i).join(' ')
+    setTips(key, showLabel, () => {
+        clearTimeout(ids[0])
+        ids[0] = false
+        if (printInfo) {
+            console.info(`${flag} stop`)
+        }
+    })
+    if (printInfo) {
+        console.info(`${flag} start`)
+    }
+    await timeLoop(fn, ms, ids)
+}
+
+const cleanFiles = {}
+function fileCleaner(path, maxChars) {
+    `
+    文件清理器，提示符为sys f
+    `
+    cleanFiles[path] = Date.now() + (1000 * 60)
+    let flag = "sys"
+    if (!$tips[flag]) {
+        timer(flag, 1000 * 9, () => {
+            for (let aPath of Object.keys(cleanFiles)) {
+                if (cleanFiles[aPath] < Date.now()) {
+                    delete cleanFiles[path]
+                    continue;
+                }
                 try {
                     cleanFile(path, maxChars)
                 } catch (e) {
-                    console.log(String(e))
+                    console.error(e)
                 }
-                global.$cleanFiles[path] ++
             }
-        }, 1000 * 60 * 10)
-        global.$fileCleanerOn = true
+        }, "f", false);
     }
 }
 
-function cleanFile(path, maxChars) {
-    if (!fs.existsSync(path)) {
+function cleanFile(path, maxChars = 9 * 1024 * 1024) {
+    `
+    进入文件操作队列，不会同步去做
+    `
+    path = trim(path);
+    if (!path) {
         return
     }
-    maxChars = maxChars || 1024 * 1024
-
-    // 获取文件信息
-    const stats = fs.statSync(path);
-    const fileSize = stats.size;
-    // 只有当文件大小超过限制时才需要清理
-    if (fileSize <= maxChars) {
-        return;
-    }
-
-    let content = String(fs.readFileSync(path))
-    let newContext = content.substr(- (maxChars * 0.9))
-    fs.writeFileSync(path, newContext)
+    syncQueue(async () => {
+        maxChars = maxChars || 1024 * 1024
+        // 获取文件信息
+        let stats;
+        try {
+            stats = await fp.stat(path);
+        } catch (e) {
+            console.$error('cleanFile stat failed', errorMsg(e));
+            return;
+        }
+        const fileSize = stats.size;
+        // 只有当文件大小超过限制时才需要清理
+        if (fileSize <= maxChars) {
+            return;
+        }
+        await fileLock(path, async () => {
+            let content = String(await fp.readFile(path))
+            let newContext = content.slice(-Math.floor(maxChars * 0.7));
+            await fp.writeFile(path, newContext)
+        }, false)
+    }, path)
 }
 
 function lisPid(name) {
+    `
+    调用此方法后，将会创建一个 ${dir}/${name}.pid 文件
+    删除该文件，当前进程将会结束
+    `
     let dir = getLisPidDir()
     let pidFile = `${dir}/${name}.pid`
     fs.writeFileSync(pidFile, String(process.pid))
@@ -760,34 +1177,6 @@ function getLisPidDir() {
     return dir
 }
 
-function fanyi(content) {
-    return new Promise(resolve => {
-        let params = querystring.stringify({
-            word: content
-        })
-        let req = http.request({
-            host: 'api.bejson.com',
-            port: 80,
-            path: '/Bejson/Api/Zh2en/toEnglish',
-            method: 'post',
-            headers: {
-                'Content-Type':'application/x-www-form-urlencoded',
-                'Content-Length': params.length
-            }},function(res){
-            let str="";
-            res.on("data",function(chunk){
-                str+=chunk;
-            });
-            res.on("end",function(){
-                resolve(JSON.parse(str)['data']['target_text'])
-            })
-        })
-
-        req.write(params + "\n");
-        req.end();
-    })
-}
-
 function linuxAskAndKill(...keys){
     let rl = readline.createInterface({
         input: process.stdin,
@@ -814,6 +1203,11 @@ function linuxAskAndKill(...keys){
 }
 
 function timeLoop(fn, timestamp, lastIds = []){
+    `
+    fn的结果===true, 则退出；
+    lastIds[0]===false, 则退出；
+    return lastIds;
+    `
     let val
     try {
         val = fn()
@@ -852,13 +1246,19 @@ function _linuxAskAndKill(rl, keys){
 }
 
 function trim(obj) {
+    `
+    返回值一定是string
+    `
     return vl(obj) ? String(obj).trim():""
 }
 
 function getLibDataDir() {
-    let dir = `${home}/${setting.libDataDir}`
-    mkdir(dir)
-    return dir
+    if (libDataDir) {
+        return libDataDir;
+    }
+    libDataDir = `${home}/${setting.libDataDir}`
+    mkdir(libDataDir)
+    return libDataDir
 }
 
 function mkdir(dir) {
@@ -868,11 +1268,14 @@ function mkdir(dir) {
     try {
         fs.mkdirSync(dir)
     } catch (e) {
-
+        console.$error(errorStack(e))
     }
 }
 
 function e(cmd, mbNum = 3, doTrim = true){
+    `
+    return Promise(result)
+    `
     return new Promise((resolve, reject) => {
         exec(`${cmd}`, {
                 maxBuffer: 1024 * 1024 * (mbNum || 3) //quick fix
@@ -887,6 +1290,9 @@ function e(cmd, mbNum = 3, doTrim = true){
 }
 
 function ee(cmd, mbNum = 3, doTrim = true){
+    `
+    return Promise([stdout, stderr])
+    `
     return new Promise((resolve, reject) => {
         exec(`${cmd}`, {
                 maxBuffer: 1024 * 1024 * (mbNum || 3) //quick fix
@@ -898,11 +1304,14 @@ function ee(cmd, mbNum = 3, doTrim = true){
 }
 
 function ei(cmd, args = [], shell = false) {
+    `
+    当前进程会卡住，输入输出由cmd进程持有
+    `
     spawnSync(cmd, args, {stdio:"inherit", shell});
 }
 
-async function getCbText() {
-    return await e(`pbpaste`, null, false)
+async function getCbText(mbNum) {
+    return await e(`pbpaste`, mbNum, false)
 }
 
 async function setCbText(str) {
@@ -943,7 +1352,7 @@ function splitArray(items, size) {
 }
 
 function isError(obj) {
-    return getType(obj).endsWith('Error')
+    return obj instanceof Error;
 }
 
 class Range {
@@ -976,14 +1385,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]
@@ -1119,14 +1528,16 @@ function getType(obj) {
     return typeof obj
 }
 
-function getInfo(obj, key, type) {
+function getInfo(obj, name, type) {
+    `
+    return {key, type, value}
+    `
     let info = {}
-    if (key) {
-        info.key = key
+    if (name) {
+        info.name = name
     }
     info.type = type || getType(obj)
     if (!vl(obj)) {
-        info.type = type
         info.value = String(obj);
         return info;
     }
@@ -1135,15 +1546,20 @@ function getInfo(obj, key, type) {
     let fnName
     if (info.type === 'Function' || info.type === 'AsyncFunction') {
         fnName = obj.name
-        let fnStr = trim(str.split(/=\s*>|(?<=\))\s*{/)[0])
-        if (/[()]/.test(fnStr)) {
-            value = fnStr.split(/[()]/)[1]
-        } else {
-            value = fnStr
-        }
-        value = warnStr('args: ' + trim(value.split('\n').map(trim).join('\n      ')))
-
-        let docRegResult = /\n(\s*`[^`]+`)/.exec(str)
+        value = getFnArgsStr(str).split('\n').map(i => {
+            let index = i.indexOf('//');
+            let begin = i;
+            let end = '';
+            if (index !== -1) {
+                begin = i.substring(0, index);
+                end = i.substring(index);
+            }
+            if (begin) {
+                return warnStr(begin) + end;
+            }
+            return end;
+        }).join('\n')
+        let docRegResult = /\{\s*\n(\s*`[^`]+`)/.exec(str)
         let doc = docRegResult ? docRegResult[1]: ""
         if (doc) {
             value += `\n` + trimText(doc)
@@ -1154,15 +1570,29 @@ function getInfo(obj, key, type) {
         let len = Object.keys(obj).length;
         value = len > 0 ? ('keys: ' + len) : (str.length <= 64 ? str : `${str.substring(0, 64)}...[length: ${str.length}]`);
     }
-    key = key || fnName
-    if (key) {
-        info.key = key;
+    name = name || fnName
+    if (name) {
+        info.name = name;
     }
     info.value = value;
     return info;
 }
 
+function getFnArgsStr(str){
+    let fnStr = trim(str.split(/=\s*>|(?<=\))\s*{/)[0])
+    let argsStr
+    if (fnStr.endsWith(')')) {
+        argsStr = fnStr.substring(fnStr.indexOf("(") + 1, fnStr.length - 1)
+    } else {
+        argsStr = fnStr
+    }
+    return trim(argsStr.split('\n').map(trim).filter(i => i).join('\n'))
+}
+
 function trimText(str) {
+    `
+    对多行文本进行trim，相当于列操作去除空格
+    `
     if (!trim(str)) {
         return ""
     }
@@ -1258,12 +1688,14 @@ function errorTag(e, tag) {
     if (!tag) {
         return e;
     }
-    if (!isError(e)) {
-        e = new Error(e)
-        e.stack = e.stack.split(/\n/)[0]
+    let newError = new Error(getVl(e.message, e))
+    let stack = newError.stack
+    if (isError(e)) {
+        newError.name = e.name;
+        stack = e.stack;
     }
-    e.stack = e.stack + `\n    at ${tag}`
-    return e
+    newError.stack = stack + `\n    at ${tag}`
+    return newError
 }
 
 function getTextComments(text) {
@@ -1315,7 +1747,6 @@ module.exports = {
     regEach,
     runSync,
     linuxAskAndKill,
-    fanyi,
     cleanFile,
     fileCleaner,
     getLibDataDir,
@@ -1336,13 +1767,9 @@ module.exports = {
     importG,
     toBigNum,
     objDataFile,
-    appendLog,
     createLimitLogger,
     clearConsole,
     fileLock,
-    globalLock,
-    globalUnLock,
-    rmDir,
     eFn,
     removeFirst,
     sleep,
@@ -1357,21 +1784,15 @@ module.exports = {
     splitArray,
     BigNumber,
     range,
-    Range,
     getOr,
-    $log,
-    createLimitLogger2,
     cacheFn,
     isError,
     getOrFn,
-    emptyFn,
-    setConfig,
     arrayDataFile,
-    dataFile,
     strEq,
     wrapRows,
     parseSteps,
-    $draft,
+    draftLog,
     infoStr,
     warnStr,
     errorStr,
@@ -1389,8 +1810,26 @@ module.exports = {
     errorTag,
     iobjDataFile,
     iarrayDataFile,
-    isArgsMatch,
+    isMatch,
     draftQuery,
     getTextComments,
-    trimText
+    trimText,
+    getFnArgsStr,
+    createConsole,
+    setTips,
+    delTips,
+    timer,
+    createConfig,
+    getEditor,
+    setConfig,
+    trimEmptyLine,
+    syncQueue,
+    getLogDir,
+    getConfigDir,
+    getFullPath,
+    parseUniqueName,
+    toUniqueName,
+    isJsirFileName,
+    toJsirFileName,
+    fileJson
 }