jsir 2.6.13 → 3.0.0

package/deps/util.js

@@ -2,7 +2,6 @@ const setting = require('./setting')
 const os = require('os')
 const home = os.homedir()
 const {exec, spawnSync, spawn} = require('child_process');
-const readline = require('readline')
 const fs = require('fs')
 const fp = require('fs').promises
 const BigNumber = require('bignumber.js');
@@ -24,7 +23,6 @@ let roomsDir;
 let dataDir;
 let console = global.console
 
-
 function isRunningInBackground() {
     return !(process.stdout.isTTY && process.stdin.isTTY);
 }
@@ -61,42 +59,73 @@ function hasFormat(str) {
     return /%[sdjifoO%]/.test(str);
 }
 
-class SyncQueue {
-    constructor() {
-        this.queue = [];
-        this.isProcessing = false;
-    }
-    // 添加任务到队列
-    async enqueue(task) {
-        this.queue.push(task);
-        await 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);
-            }
+async function taskQueue(task, { key, size = 1, runner = 1 } = {}) {
+    if (size < 1) throw new Error('invalid queue size');
+    if (runner < 1) throw new Error('invalid queue runner');
+    key = trim(key);
+
+    let ins = getOr(setting.syncQueues, key, {
+        name: key,
+        queue: [],
+        isProcessing: false,
+        waiter: null
+    });
+
+    ins.size = size;
+    ins.runner = runner;
+
+    // 如果队列满了，等待空位
+    while (ins.size !== Infinity && ins.queue.length >= ins.size) {
+        if (!ins.waiter) {
+            ins.waiter = {};
+            ins.waiter.promise = new Promise(resolve => ins.waiter.resolve = resolve);
         }
-        this.isProcessing = false;
+        await ins.waiter.promise;
     }
+
+    ins.queue.push(task);
+    _processQueue(ins);
 }
 
-const syncQueues = {}
-function syncQueue(task, key) {
-    `
-    同步队列分发器
-    task: function
-    key: 根据key值区分不同队列, 可选
-    return Promise
-    `
-    let queue = getOrFn(syncQueues, trim(key), () => new SyncQueue())
-    return queue.enqueue(task)
+async function _processQueue(ins) {
+    if (ins.isProcessing) return;
+    ins.isProcessing = true;
+
+    const runs = new Set();
+
+    while (ins.queue.length > 0 || runs.size > 0) {
+        // 启动任务，控制并发数量
+        while (ins.queue.length > 0 && runs.size < ins.runner) {
+            const task = ins.queue.shift();
+
+            const promise = (async () => {
+                try {
+                    await task();
+                } catch (error) {
+                    console.$error(`Error during [${ins.name}] SyncQueue`, error);
+                }
+            })();
+
+            promise.finally(() => {
+                runs.delete(promise);
+
+                // 唤醒等待者
+                if (ins.waiter && ins.queue.length < ins.size) {
+                    ins.waiter.resolve();
+                    ins.waiter = null;
+                }
+            });
+
+            runs.add(promise);
+        }
+
+        if (runs.size > 0) {
+            await Promise.race(runs);
+        }
+    }
+
+    ins.isProcessing = false;
+    delete setting.syncQueues[ins.name];
 }
 
 const $log = createLimitLogger(`${setting.name}.log`, {
@@ -107,15 +136,18 @@ const $error = createLimitLogger(`${setting.name}.error`, {
     error: true,
     syncLogs: [$log]
 });
+const $errorOnly = createLimitLogger(`${setting.name}.error`, {
+    logInfo: false,
+    error: true
+});
 
 const roomLog = createLimitLogger(`room.log`, {
-    logInfo: false,
-    syncLogs: [$log]
+    logInfo: false
 });
 const roomError = createLimitLogger(`room.error`, {
     logInfo: false,
     error: true,
-    syncLogs: [roomLog, $error]
+    syncLogs: [roomLog]
 });
 
 let _globalDraft= createLimitLogger(`draft.log`, {
@@ -246,23 +278,23 @@ function createConfig(uniqueName) {
     return result;
 }
 
-function createConsole(uniqueName) {
+function createConsole(uniqueName, _logToFile, _errorToFile) {
     let result = Object.assign({}, _console);
-    result.$log = $log;
-    result.$error = $error;
+    let logToFile = _logToFile || $log;
+    let errorToFile = _errorToFile || $error;
     result.$draft = draftLog;
     result.$abort = () => false;
     if (uniqueName) {
         let pair = parseUniqueName(uniqueName)
         let fileName = pair[0] + '/' +  pair[1].split(".")[0]
-        result.$log = createLimitLogger(fileName + '.log', {
+        logToFile = createLimitLogger(fileName + '.log', {
             logInfo: false,
-            syncLogs: [roomLog]
+            syncLogs: [$log]
         });
-        result.$error = createLimitLogger(fileName + '.error', {
+        errorToFile = createLimitLogger(fileName + '.error', {
             logInfo: false,
             error: true,
-            syncLogs: [result.$log, roomError]
+            syncLogs: [logToFile, $errorOnly]
         });
         const promptId = setting.promptId;
         result.$abort = () => promptId !== setting.promptId;
@@ -272,8 +304,14 @@ function createConsole(uniqueName) {
     if (uniqueName) {
         promptId = setting.promptId;
     }
-    for (let key of Object.keys(_consoleFns)) {
-        result[key] = (...args) => {
+    for (let key of [...Object.keys(_consoleFns), ...Object.keys(_consoleFns).map(i => '$' + i)]) {
+        let fnKey = key;
+        result[fnKey] = (...args) => {
+            let is$ = false;
+            if (fnKey.startsWith("$")) {
+                is$ = true;
+                key = fnKey.substring(1)
+            }
             if (promptId !== setting.promptId) {
                 quite = true;
             }
@@ -295,15 +333,15 @@ function createConsole(uniqueName) {
                 }
                 setting.lastChangeFlag = flag
             }
-            if (uniqueName && quite) {
+            if (is$ || (uniqueName && quite) || (setting.lastOutput && !hasFlag && 'debug' === key)) {
                 if ((key === 'table' || key === 'nable') && typeof args[0] === "object") {
                     args = ['', ...args]
                 }
                 let _args = _consoleFns[key].args(args);
                 if ("error" === key) {
-                    result.$error(..._args)
+                    errorToFile(..._args)
                 } else {
-                    result.$log(..._args)
+                    logToFile(..._args)
                 }
             } else {
                 let _args = _consoleFns[key].args(args);
@@ -321,12 +359,7 @@ function createConsole(uniqueName) {
                 }
 
                 _consoleFns[key].fn(..._args);
-
-                if (hasFlag) {
-                    setting.lastOutput = lastOutput;
-                } else {
-                    setting.lastOutput = null;
-                }
+                setting.lastOutput = lastOutput;
             }
         }
     }
@@ -594,7 +627,7 @@ async function draftModify(fLine) {
     if (isEdit && results.length === 1) {
         let tempPath = getLibDataDir() + "/log/draft.temp";
         fs.writeFileSync(tempPath, results[0].split(/\n/).slice(1).join('\n'))
-        await eia(getEditor(), [tempPath])
+        await eia(getEditor(), [`"${tempPath}"`], true)
         let tempText = String(fs.readFileSync(tempPath))
         let lineRange = lineRanges.get(results[0]);
         let before = allLines.filter((_, index) => {
@@ -640,6 +673,10 @@ function getEditor() {
     return getConfig("defaultEditor", "vi")
 }
 
+function getFileOpenExe() {
+    return getConfig("defaultExe", "open")
+}
+
 function timeStr(fmt, date) {
     return dayJs(date || new Date()).format(fmt || 'YYYY-MM-DD HH:mm:ss')
 }
@@ -663,31 +700,29 @@ function getVl(...obj) {
     }
 }
 
-const $fnCache = {}
 async function cacheFn(key, fn, validMs = 0, awaitRefresh = true) {
-    getOr($fnCache, key, {
-        validMsTime: 0
+    const cacheItem = getOr(setting.fnCache, key, {
+        createdAt: 0,
     });
-    if (Date.now() <= $fnCache[key].validMsTime) {
-        // do nothing
-    } else {
-        $fnCache[key].validMsTime = Infinity;
-        $fnCache[key].promise = (async () => {
+    if (Date.now() - cacheItem.createdAt > validMs) {
+        // 临时设为已创建，防止并发请求多次调用 fn
+        cacheItem.createdAt = Infinity;
+        cacheItem.promise = (async () => {
             let val;
             try {
                 val = await fn()
             } finally {
-                $fnCache[key].validMsTime = 0
+                cacheItem.createdAt = 0; // 恢复为无效状态
             }
-            $fnCache[key].val = val;
-            $fnCache[key].valInit = true;
-            $fnCache[key].validMsTime = Date.now() + validMs;
+            cacheItem.val = val;
+            cacheItem.valInit = true;
+            cacheItem.createdAt = Date.now(); // 设置新的创建时间
         })();
     }
-    if (awaitRefresh || !$fnCache[key].valInit) {
-        await $fnCache[key].promise;
+    if (awaitRefresh || !cacheItem.valInit) {
+        await cacheItem.promise;
     }
-    return $fnCache[key].val
+    return cacheItem.val;
 }
 
 function getFnVl(...fns) {
@@ -703,9 +738,9 @@ function getFnVl(...fns) {
 function randomInt(min,max){
     switch(arguments.length){
         case 1:
-            return parseInt(String(Math.random()*min+1),10);
+            return Math.floor(Math.random()*min+1);
         case 2:
-            return parseInt(String(Math.random()*(max-min+1)+min),10);
+            return Math.floor(Math.random()*(max-min+1)+min);
         default:
             return 0;
     }
@@ -713,8 +748,12 @@ function randomInt(min,max){
 
 async function timeLimit(proms, mills) {
     let tIds = []
-    let result = await Promise.race([Promise.all(proms), sleep(mills, tIds)])
-    clearTimeout(tIds[0])
+    let result
+    try {
+        result = await Promise.race([Promise.all(proms), sleep(mills, tIds)])
+    } finally {
+        clearTimeout(tIds[0])
+    }
     if (!result) {
         throw new Error(`timeLimit: exceed ${mills} ms`)
     }
@@ -807,7 +846,7 @@ function createLimitLogger(fileName, {
         if (time) {
             text = `${timeStr('YYYY-MM-DD HH:mm:ss.SSS')} ${String(process.pid%1000).padStart(3, '0')}> ${text}`
         }
-        syncQueue(() => fp.appendFile(logPath, text + '\n'), logPath)
+        fp.appendFile(logPath, text + '\n')
         let _minNum = (Date.now()/(1000 * 60 * 10)).toFixed(0)
         if (_minNum !== minNum) {
             minNum = _minNum
@@ -850,17 +889,20 @@ function dataFile(fileName, fn, fmt, defaultObj = {}, returnStr = false) {
     if (fileName.startsWith("/")) {
         path = fileName
     } else {
+        if (fileName.includes('/')) {
+            throw 'invalid fileName';
+        }
         path = dataDir + "/" + fileName
     }
     let prefixStr = returnStr ? 'return ' : '';
     if (!fs.existsSync(path)) {
-        mkdir(dataDir)
+        createDirs(dataDir)
         fs.writeFileSync(path, prefixStr + JSON.stringify(defaultObj, null, fmt ? 2:null))
     }
 
     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) {
@@ -900,13 +942,16 @@ async function fileJson(key, fn = null, fmt = true) {
     `
     let dataDir = getDataDir()
     let fileName = trim(key)
+    if (fileName.includes('/')) {
+        throw 'invalid fileName';
+    }
     let path = dataDir + "/" + fileName;
     let homeDir = setting.workspaceMap[setting.defaultSpace]
     let isInit = getJsirTypeKey(fileName) === setting.initKey;
     if (isInit) {
         path = homeDir + '/' + toJsirFileName(fileName);
     }
-    let prefixStr = isInit ? 'return ' : '';
+    let prefixStr = isInit ? 'module.exports = ' : '';
     let result = null;
     await fileLock(path, async () => {
         if (!await fileExist(path)) {
@@ -914,7 +959,7 @@ async function fileJson(key, fn = null, fmt = true) {
         }
         let text = String(await fp.readFile(path));
         if (isInit) {
-            text = text.replace(/^return\s+/, '')
+            text = text.replace(/^module\.exports =\s*/, '')
         }
         result = JSON.parse(text)
         if (!fn) {
@@ -1097,7 +1142,7 @@ function _getConfig(key, defaultVal, uniqueName) {
         return config
     }
     if (uniqueName) {
-        console.debug(`use ${uniqueName} config "${key}"`)
+        console.$debug(`use ${uniqueName} config "${key}"`)
     }
     let writeFlag = false
     if (!(key in config)) {
@@ -1122,7 +1167,7 @@ function _getConfig(key, defaultVal, uniqueName) {
     return val
 }
 
-function setConfig(key, val) {
+function setConfig(key, val, uniqueName) {
     if (typeof val === "string") {
         val = trim(val)
     }
@@ -1131,6 +1176,9 @@ function setConfig(key, val) {
         configInit[key] = val
     }
     let configFile = getLibDataDir() + '/config.json';
+    if (uniqueName) {
+        configFile = getConfigDir() + "/" + md5(uniqueName + (global.$TEST ? ".test":"")) + ".json"
+    }
     if (!fs.existsSync(configFile)) {
         fs.writeFileSync(configFile, JSON.stringify(configInit, null, 2));
         return val
@@ -1369,7 +1417,6 @@ function removeFirst(array, obj) {
     return array.splice(deleteIndex, 1)
 }
 
-const _tipsOnRm = {}
 function setTips(key, value, onRm) {
     `
     可以设置相同的key, value值，会在左侧提示符体现出来
@@ -1378,17 +1425,22 @@ function setTips(key, value, onRm) {
         throw "invalid tip key";
     }
     key = trim(key)
-    getOr(setting.tips, key, []).push(vl(value) ? value:'');
+    value = vl(value) ? value:key
+    if (typeof value === 'string') {
+        value = trim(value)
+    }
+    getOr(setting.tips, key, []).push(value);
     if (onRm) {
-        getOr(_tipsOnRm, key, []).push(onRm)
+        getOr(setting.tipsOnRm, key, []).push(onRm)
     }
 }
 
 function delTips(...keys) {
+    keys = keys.map(trim).filter(i => i)
     let pros = []
     for (let key of Object.keys(setting.tips)) {
         if (keys.length === 0) {
-            if (key === 'DEBUG') {
+            if (['TEST', 'DEBUG'].includes(key)) {
                 continue
             }
             delete setting.tips[key]
@@ -1399,8 +1451,8 @@ function delTips(...keys) {
         }
     }
     if (keys.length === 0) {
-        for (let key of Object.keys(_tipsOnRm)) {
-            if (key === 'DEBUG') {
+        for (let key of Object.keys(setting.tipsOnRm)) {
+            if (['TEST', 'DEBUG'].includes(key)) {
                 continue
             }
             pros.push(tipsOnRmCallback(key))
@@ -1415,6 +1467,9 @@ function delTips(...keys) {
 function hasTips(key, value) {
     key = trim(key)
     if (vl(value)) {
+        if (typeof value === 'string') {
+            value = trim(value)
+        }
         return setting.tips.hasOwnProperty(key) && setting.tips[key].includes(value);
     } else {
         return setting.tips.hasOwnProperty(key);
@@ -1426,18 +1481,18 @@ function tipKeys() {
 }
 
 function tipsOnRmCallback(key) {
-    let callbacks = _tipsOnRm[key]
-    delete _tipsOnRm[key]
+    let callbacks = setting.tipsOnRm[key]
+    delete setting.tipsOnRm[key]
     const pros = [];
     if (callbacks && callbacks.length > 0) {
         for (let callback of callbacks) {
             try {
                 let result = callback()
                 if (getType(result) === 'Promise') {
-                    pros.push(result.catch(e => $error(`[${key}] OnRmCallback`, e)))
+                    pros.push(result.catch(e => console.$error(`[${key}] OnRmCallback`, e)))
                 }
             } catch (e) {
-                $error(`[${key}] OnRmCallback`, e)
+                console.$error(`[${key}] OnRmCallback`, e)
             }
         }
     }
@@ -1446,66 +1501,12 @@ function tipsOnRmCallback(key) {
     }
 }
 
-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 (!setting.tips.hasOwnProperty(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.$error(e)
-                }
-            }
-        }, "f", false);
-    }
-}
-
-function cleanFile(path, maxChars = 9 * 1024 * 1024) {
-    `
-    进入文件操作队列，不会同步去做
-    `
+async function cleanFile(path, maxChars = 9 * 1024 * 1024) {
     path = trim(path);
     if (!path) {
         return
     }
-    syncQueue(async () => {
-        maxChars = maxChars || 1024 * 1024
+    await fileLock(path, async () => {
         // 获取文件信息
         let stats;
         try {
@@ -1519,46 +1520,15 @@ function cleanFile(path, maxChars = 9 * 1024 * 1024) {
         if (fileSize <= maxChars) {
             return;
         }
-        await fileLock(path, async () => {
-            const bakFile = `${path}.bak`;
-            // 备份日志
-            try {
-                await fp.rename(path, bakFile);
-            } catch (e) {
-                console.$error(`Failed to rename ${path} -> ${bakFile}`, e);
-            }
-        }, false)
-    }, path)
-}
 
-function lisPid(name) {
-    `
-    调用此方法后，将会创建一个 ${dir}/${name}.pid 文件
-    删除该文件，当前进程将会结束
-    `
-    let dir = getLisPidDir()
-    let pidFile = `${dir}/${name}.pid`
-    fs.writeFileSync(pidFile, String(process.pid))
-    let beforeExit = () => {
-        fs.writeFileSync(pidFile, '')
-        process.exit()
-    }
-    process.on('SIGINT', beforeExit)
-    process.on('exit', beforeExit)
-    timeLoop(()=>{
-        if (fs.existsSync(pidFile) && String(process.pid) !== String(fs.readFileSync(pidFile))) {
-            process.exit(0)
+        const bakFile = `${path}.bak`;
+        // 备份日志
+        try {
+            await fp.rename(path, bakFile);
+        } catch (e) {
+            console.$error(`Failed to rename ${path} -> ${bakFile}`, e);
         }
-    }, 1000 * 3)
-}
-
-function getLisPidDir() {
-    let home = getLibDataDir()
-    let dir = `${home}/pid`
-    try {
-        fs.mkdirSync(dir)
-    } catch(e) {}
-    return dir
+    }, false)
 }
 
 function isPidAlive(pid) {
@@ -1574,72 +1544,6 @@ function isPidAlive(pid) {
     }
 }
 
-function linuxAskAndKill(...keys){
-    let rl = readline.createInterface({
-        input: process.stdin,
-        output: process.stdout
-    })
-    rl.on('line', (str) => {
-        str = trim(str)
-        if (str) {
-            if (['q', 'exit', 'bye'].indexOf(str) !== -1) {
-                rl.close()
-                return;
-            }
-            e(`kill -9 ${str}`).then(() => {
-                _linuxAskAndKill(rl, keys)
-            })
-        } else {
-            process.stdout.write("> ")
-        }
-    })
-    rl.on('close', () => {
-        process.exit(0)
-    })
-    _linuxAskAndKill(rl, keys)
-}
-
-function timeLoop(fn, timestamp, lastIds = []){
-    `
-    fn的结果===true, 则退出；
-    lastIds[0]===false, 则退出；
-    return lastIds;
-    `
-    let val
-    try {
-        val = fn()
-    } catch (e) {
-        $error(e)
-    }
-    if (vl(val) && getType(val) === 'Promise') {
-        return val.then(result => {
-            if (lastIds[0] !== false && result !== true) {
-                lastIds[0] = setTimeout(() => timeLoop(fn, timestamp, lastIds), timestamp)
-            }
-            return lastIds
-        }).catch(e => {
-            $error(e)
-
-            if (lastIds[0] !== false) {
-                lastIds[0] = setTimeout(() => timeLoop(fn, timestamp, lastIds), timestamp)
-            }
-            return lastIds
-        })
-    } else {
-        if (lastIds[0] !== false && val !== true) {
-            lastIds[0] = setTimeout(() => timeLoop(fn, timestamp, lastIds), timestamp)
-        }
-        return lastIds
-    }
-}
-
-function _linuxAskAndKill(rl, keys){
-    e(`ps -ef | ${keys.filter(item => item).map(item => 'grep ' + item).join(' | ')}`).then(resp => {
-        console.log(resp.replace(/\n\s+/g, '\n'))
-        process.stdout.write("> ")
-    })
-}
-
 function trim(obj) {
     `
     返回值一定是string
@@ -1801,14 +1705,14 @@ function range(start, end, step) {
 }
 
 function getOr(obj, key, defaultVal) {
-    if (!vl(obj[key])) {
+    if (!Object.prototype.hasOwnProperty.call(obj, key) || !vl(obj[key])) {
         obj[key] = defaultVal
     }
     return obj[key]
 }
 
 function getOrFn(obj, key, defaultValFn) {
-    if (!vl(obj[key])) {
+    if (!Object.prototype.hasOwnProperty.call(obj, key) || !vl(obj[key])) {
         obj[key] = defaultValFn()
     }
     return obj[key]
@@ -2111,7 +2015,10 @@ function errorTag(e, tag) {
     }
     let newError = isError(e) ? e:new Error(e);
     let stack = newError.stack
-    newError.stack = stack + `\n    at ${tag}`
+    let append = `    at ${tag}`;
+    if (!stack.endsWith(append)) {
+        newError.stack = stack + '\n' + append
+    }
     return newError
 }
 
@@ -2157,7 +2064,8 @@ function getTextComments(text) {
 
 function wrapperJsirText(text) {
     return text
-        .replace(/^require\s*\(\s*(["'`][ei][^a-zA-Z]+)/mg, 'await $require($2')
+        .replace(/^require\s*\(\s*(["'`][ei][^a-zA-Z]+)/mg, 'await $require($1')
+        .replace(/([\s=;]require\s*\(\s*["'`])\.\/([ei][^a-zA-Z]+)/g, '$1$2')
         .replace(/([\s=;])require\s*\(\s*(["'`][ei][^a-zA-Z]+)/g, '$1await $require($2')
         .replace(/([\s=;])import\s*\(/g, '$1$import(')
         .replace(/^import\s*\(/mg, '$import(')
@@ -2165,24 +2073,6 @@ function wrapperJsirText(text) {
         ;
 }
 
-async function terminalRun(cmd) {
-    `
-    打开新的苹果终端并执行命令
-    `
-    const scriptText = `tell application "Terminal"
-    activate
-    do script "${cmd}"
-end tell
-`;
-    let tempScriptPath = getTempDir() + `/terminalRun_${Date.now()}.scpt`
-    fs.writeFileSync(tempScriptPath, scriptText);
-    try {
-        console.log(await e(`osascript ${tempScriptPath}`))
-    } finally {
-        fs.unlinkSync(tempScriptPath)
-    }
-}
-
 function getKeyTips() {
     let items = [];
     for (let key of Object.keys(setting.tips)) {
@@ -2200,7 +2090,7 @@ function getValTips() {
         if (key.startsWith("_")) {
             continue;
         }
-        let val = setting.tips[key].map(i => {
+        let vals = setting.tips[key].map(i => {
             if (typeof i === 'function') {
                 try {
                     i = i();
@@ -2214,8 +2104,18 @@ function getValTips() {
                 item = `[${item}]`;
             }
             return item;
-        }).join("|");
-        items.push(val || trim(key))
+        });
+        let valMap = {}
+        for (let val of vals) {
+            valMap[val] = getOr(valMap, val, 0) + 1
+        }
+        items.push(Object.keys(valMap).map(i => {
+            if (valMap[i] > 1) {
+                return i + '*' + valMap[i]
+            } else {
+                return i;
+            }
+        }).join("|"))
     }
     return items
 }
@@ -2263,13 +2163,21 @@ function interceptStdStreams() {
     };
 }
 
-function formatUptime() {
-    const uptimeSeconds = process.uptime();
+function formatMb(mb) {
+    if (typeof mb !== 'number') {
+        return mb;
+    }
+    return  mb > 1024 ? ((mb/1024).toFixed(2) + 'G') : (mb + 'M')
+}
 
-    const days = Math.floor(uptimeSeconds / (3600 * 24)); // 计算天数
-    const hours = Math.floor((uptimeSeconds % (3600 * 24)) / 3600); // 计算小时
-    const minutes = Math.floor((uptimeSeconds % 3600) / 60); // 计算分钟
-    const seconds = Math.floor(uptimeSeconds % 60); // 计算秒数
+function formatSec(sec) {
+    if (typeof sec !== 'number') {
+        return sec;
+    }
+    const days = Math.floor(sec / (3600 * 24)); // 计算天数
+    const hours = Math.floor((sec % (3600 * 24)) / 3600); // 计算小时
+    const minutes = Math.floor((sec % 3600) / 60); // 计算分钟
+    const seconds = Math.floor(sec % 60); // 计算秒数
 
     if (days > 0) {
         return `${days}d${hours}h`;
@@ -2286,22 +2194,28 @@ function aop(items, fn, args) {
     let runners = [fn]
     let i = 0
     for (let item of [...items].reverse()) {
+        if (!item.run) {
+            throw `${item.constructor.name} not suitable for sync function`
+        }
         const j = i;
-        runners.push((args) => item.run(runners[j], args))
+        runners.push(() => item.run(runners[j], args))
         i ++;
     }
-    return runners[i](args)
+    return runners[i]()
 }
 
 async function aopAsync(items, fn, args) {
     let runners = [fn]
     let i = 0
     for (let item of [...items].reverse()) {
+        if (!item.runAsync) {
+            throw `${item.constructor.name} not suitable for async function`
+        }
         const j = i;
-        runners.push(async (args) => await item.runAsync(runners[j], args))
+        runners.push(async () => await item.runAsync(runners[j], args))
         i ++;
     }
-    return await runners[i](args)
+    return await runners[i]()
 }
 
 function getMd5Key(str) {
@@ -2320,7 +2234,7 @@ const tipFns = {
 }
 
 module.exports = {
-    formatUptime,
+    formatSec,
     wrapperJsirText,
     run,
     reget,
@@ -2329,13 +2243,8 @@ module.exports = {
     ee,
     regEach,
     runSync,
-    linuxAskAndKill,
     cleanFile,
-    fileCleaner,
     getLibDataDir,
-    lisPid,
-    timeLoop,
-    getLisPidDir,
     mkdir,
     bAdd,
     bDiv,
@@ -2400,12 +2309,11 @@ module.exports = {
     createConsole,
     setTips,
     delTips,
-    timer,
     createConfig,
     getEditor,
     setConfig,
     trimEmptyLine,
-    syncQueue,
+    taskQueue,
     getLogDir,
     getConfigDir,
     getFullPath,
@@ -2418,7 +2326,6 @@ module.exports = {
     getAlias,
     createDirs,
     getTempDir,
-    terminalRun,
     eia,
     getKeyTips,
     getValTips,
@@ -2440,5 +2347,8 @@ module.exports = {
     getMd5Key,
     isMd5Key,
     terminalTitle,
-    tipFns
+    tipFns,
+    getFileOpenExe,
+    roomConsole: createConsole(null, roomLog, roomError),
+    formatMb
 }