jsir 2.6.12 → 2.6.14

package/cmd/oaa.js

@@ -4,7 +4,7 @@ const {
     getLibDataDir, trim, regEach, getConfig, mkdir, reget,
     getCbText, e, sleep, objDataFile, vl, md5, BigNumber,
     arrayDataFile, infoStr, warnStr,
-    getInfo, pad, msgStr, getType,
+    getInfo, msgStr, getType,
     isMatch, draftQuery, setConfig,
     getTextComments, importG, requireG,
     clearConsole, trimText, getFnArgsStr,
@@ -13,7 +13,7 @@ const {
     getFullPath, parseUniqueName, toUniqueName, isJsirFileName, toJsirFileName,
     getAlias, wrapperJsirText, eia, getKeyTips, getValTips, getJsirTypeKey,
     createDetachedProcess, interceptStdStreams,
-    draftModify, isRunningInBackground, fileJson, fileLock, processLock, cleanFileLocks, getMd5Key
+    draftModify, isRunningInBackground, fileJson, fileLock, processLock, cleanFileLocks, getMd5Key, terminalTitle
 } = $lib;
 const _args = process.argv.slice(2).map(trim);
 const evalCode = require('../deps/evalCode')
@@ -131,10 +131,24 @@ const $data = {
         `
         get or set by async function
         `
-        if (!vl(_data[key])) {
-            return _dataSet(key, await fn(), onLazyTempCode)
+        if (vl(_data[key])) {
+            return _dealOnLazyGet(key, onLazyTempCode);
         }
-        return _dealOnLazyGet(key, onLazyTempCode)
+        let result = null;
+        await processLock('gafs:' + key, async () => {
+            if (!vl(_data[key])) {
+                result = _dataSet(key, await fn(), onLazyTempCode)
+            } else {
+                result = _dealOnLazyGet(key, onLazyTempCode)
+            }
+        }, async () => {
+            if (!vl(_data[key])) {
+                return true;
+            } else {
+                result = _dealOnLazyGet(key, onLazyTempCode)
+            }
+        })
+        return result;
     },
     set: _dataSet,
     del: (key) => {
@@ -184,6 +198,7 @@ function checkWorkspaces() {
 }
 
 async function start() {
+    terminalTitle()
     cleanFileLocks();
 
     setting.wrapperInput = wrapperInput;
@@ -337,8 +352,8 @@ function initRl(callback, promptStr, hidden) {
         })
         _rl.on("SIGINT", async () => {
             if (_noAppendNextLine) {
-                delTips();
-                process.exit(0);
+                setting.promptId = Date.now();
+                await delTips();
             } else {
                 _rl._writeToOutput = origin_writeToOutput;
                 _haveWrapperInput = true;
@@ -350,12 +365,12 @@ function initRl(callback, promptStr, hidden) {
     }
     origin_writeToOutput = _rl._writeToOutput
     if (promptStr !== '') {
-        promptStr = promptStr || ((callback && callback !== wrapperInput) ? "-> ":"")
+        promptStr = promptStr || (callback !== wrapperInput ? "-> ":"")
         if (promptStr) {
             promptStr = infoStr(promptStr);
         } else {
-            if (global.$newError) {
-                global.$newError = false;
+            if (setting.newError) {
+                setting.newError = false;
                 promptStr = errorStr(defaultPromptStr())
             } else {
                 promptStr = infoStr(defaultPromptStr())
@@ -394,6 +409,7 @@ function closeRl() {
 }
 
 function _nextLine(callback, promptStr, hidden, resolve, end, isText) {
+    callback = callback || wrapperInput;
     if (!setting.enableNextLine) {
         console.$log(warnStr("[warn]"), "NextLine Disabled");
         resolve(null);
@@ -405,15 +421,11 @@ function _nextLine(callback, promptStr, hidden, resolve, end, isText) {
         return;
     }
     initRl(callback, promptStr, hidden);
-    let isJsirNext = !callback || callback === wrapperInput
-    if (!isJsirNext) {
+    if (callback !== wrapperInput) {
         _haveWrapperInput = false
     }
-    if (isJsirNext) {
-        global.$newInput = true;
-    }
     end = trim(end)
-    let inputStr = ''
+    let inputs = []
     let lineHandler = async line => {
         let textLine = line
         line = trim(line)
@@ -422,33 +434,32 @@ function _nextLine(callback, promptStr, hidden, resolve, end, isText) {
                 end = line
                 line = ''
             } else if (line !== end) {
-                inputStr += textLine + '\n'
+                inputs.push(textLine)
             }
         } else {
-            inputStr = line
+            inputs.push(line)
         }
-        if (trim(textLine) && (hidden || (callback && callback !== wrapperInput))) {
+        if (trim(textLine) && (hidden || callback !== wrapperInput)) {
             _rl.history = _rl.history.slice(1)
         }
         if (!isText || line === end) {
+            let promptId = setting.promptId;
             _haveWrapperInput = true;
             closeRl()
-            inputStr = inputStr.replace(/\s+$/, '');
-            if (!isText && /^\d+$/.test(inputStr) && /^\s+/.test(textLine) && (!callback || callback === wrapperInput)) {
+            let inputStr = inputs.join("\n");
+            if (callback === wrapperInput && !isText && /^\d+$/.test(inputStr) && /^\s+/.test(textLine)) {
                 inputStr = '.e ' + inputStr;
             }
-            let pro = (callback || wrapperInput)(inputStr);
-            resolve(inputStr);
             try {
-                await pro;
+                resolve(await callback(inputStr));
             } finally {
-                if ((callback || wrapperInput) === wrapperInput) {
+                if (callback === wrapperInput) {
                     if (!_noAppendNextLine) {
                         if (/^\s+$/.test(textLine)) {
                             clearConsole(textLine.length - 1)
                             filterCmdAndList();
                             nextLine(null, defaultPromptStr(true))
-                        } else {
+                        } else if (promptId === setting.promptId) {
                             nextLine()
                         }
                     }
@@ -460,6 +471,9 @@ function _nextLine(callback, promptStr, hidden, resolve, end, isText) {
     _rl.removeAllListeners('line')
     _rl.on('line', lineHandler)
     _rl.prompt()
+    if (callback === wrapperInput) {
+        setting.promptId = Date.now();
+    }
     setting.lastOutput = null;
 }
 
@@ -470,7 +484,11 @@ async function nextText(callback, end, hidden) {
 }
 
 async function save(args) {
-    let uniqueName = toUniqueName(toJsirFileName(args.join(' ')))
+    let pair = parseUniqueName(args.join(' '));
+    if (pair[0] && !setting.workspaceMap[pair[0]]) {
+        throw 'invalid name'
+    }
+    let uniqueName = toUniqueName(toJsirFileName(pair[1]), pair[0])
     let path = getFullPath(uniqueName)
     if (fs.existsSync(path)) {
         console.warn(`${path} already exist`)
@@ -612,10 +630,15 @@ async function wrapperInput(str, packOutput = false) {
     if (packOutput) {
         setting.enterOutputs = []
     }
+    const promptId = setting.promptId;
     try {
         await _wrapperInput(str);
     } catch (e) {
-        console.error(e)
+        if (promptId === setting.promptId) {
+            console.error(e)
+        } else {
+            console.$error(e)
+        }
     }
     if (packOutput) {
         let outputs = setting.enterOutputs || [];
@@ -639,16 +662,16 @@ async function _wrapperInput(str) {
     if (!str) {
         return;
     }
-    global.$newError = false;
+    setting.newError = false;
     str = wrapperAlias(str);
 
     if (/^[`'"]/.test(str)) {
-        let fstr = str.substr(0, 1);
+        let fstr = str.substring(0, 1);
         if (fstr === '`') {
-            let text = str.substr(1) + "\n" + await nextText(line => line, fstr)
+            let text = str.substring(1) + "\n" + await nextText(line => line, fstr)
             await wrapperInput(text)
         } else {
-            let fLine = trim(str.substr(1))
+            let fLine = trim(str.substring(1))
             if (fLine) {
                 if (/\s+[+-]$/.test(fLine)) {
                     console.log((await draftModify(fLine)).join("\n"))
@@ -701,6 +724,7 @@ async function runInit(uniqueName, args) {
     if (arg === '-') {
         await offServer(uniqueName)
     } else {
+        console.$log(`Execute ${uniqueName}`);
         let exportLib = await _requireSource(setting.defaultSpace, uniqueName, true);
         if (typeof exportLib === "function") {
             await execLibFn(exportLib, args)
@@ -930,7 +954,7 @@ function dealStarCmd(rows, cmd, filterStr) {
         }
 
         // Capture single-line comments
-        if (line.trim().startsWith('//')) {
+        if (line.trim().startsWith('//') || line.trim().startsWith("@")) {
             potentialComments.push(line);
         }
 
@@ -968,7 +992,8 @@ function dealStarCmd(rows, cmd, filterStr) {
         }
 
         // If not capturing function, reset potential comments
-        if (!capturingFunction && !inMultiLineComment && line.trim() !== '' && !line.trim().startsWith('//')) {
+        if (!capturingFunction && !inMultiLineComment && line.trim() !== ''
+            && !line.trim().startsWith('//') && !line.trim().startsWith('@')) {
             potentialComments = [];
         }
     }
@@ -1039,7 +1064,7 @@ function delTipsByIndex(idxs) {
         console.warn("no items")
         return;
     }
-    delTips(...params)
+    return delTips(...params)
 }
 
 function getPackageVersion(space, name) {
@@ -1185,8 +1210,8 @@ const keywordDef = {
     },
     clear: {
         comment: 'Clear task',
-        exeFn: (args) => {
-            delTipsByIndex(args.filter(i => i))
+        exeFn: async (args) => {
+            await delTipsByIndex(args.filter(i => i))
         },
         args: {
             tipIndex: 'left prompt index, can be separated by spaces for multiple'
@@ -1550,11 +1575,11 @@ const keywordDef = {
     },
     quit: {
         comment: 'Exit',
-        exeFn: (args) => {
+        exeFn: async (args) => {
             Room.offRoom();
-            delTips();
-            console.log(infoStr("Bye!"));
+            await delTips();
             _noAppendNextLine = true;
+            console.log(infoStr("Bye!"));
         },
         short: 'q'
     },
@@ -1625,7 +1650,7 @@ const keywordDef = {
     },
     debug: {
         comment: 'debug mode',
-        exeFn: (args) => {
+        exeFn: async (args) => {
             if ('+' === args[0]) {
                 if (!global.$DEBUG) {
                     global.$DEBUG = true;
@@ -1633,11 +1658,11 @@ const keywordDef = {
                 }
             } else if ('-' === args[0]) {
                 if (global.$DEBUG) {
-                    delTips("DEBUG")
+                    await delTips("DEBUG")
                 }
             } else {
                 if (global.$DEBUG) {
-                    delTips("DEBUG")
+                    await delTips("DEBUG")
                 } else {
                     global.$DEBUG = true;
                     setTips("DEBUG", "DEBUG", () => delete global.$DEBUG);
@@ -1648,7 +1673,7 @@ const keywordDef = {
     },
     test: {
         comment: 'test mode',
-        exeFn: (args) => {
+        exeFn: async (args) => {
             if ('+' === args[0]) {
                 if (!global.$TEST) {
                     global.$TEST = true;
@@ -1656,11 +1681,11 @@ const keywordDef = {
                 }
             } else if ('-' === args[0]) {
                 if (global.$TEST) {
-                    delTips("TEST")
+                    await delTips("TEST")
                 }
             } else {
                 if (global.$TEST) {
-                    delTips("TEST")
+                    await delTips("TEST")
                 } else {
                     global.$TEST = true;
                     setTips("TEST", "TEST", () => delete global.$TEST);
@@ -1999,12 +2024,6 @@ function getArgComments(argDef, showShort = false) {
             let item = warnStr(k) + (shortMap[k] ? ` ${warnStr(shortMap[k])}`:'') + (argDef[k] ? ` ${argDef[k]}`:'')
             comments.push(item)
         }
-        comments[0] = comments[0]
-        if (comments.length > 1) {
-            for(let i = 1; i< comments.length; i++) {
-                comments[i] = comments[i]
-            }
-        }
     }
     return comments
 }
@@ -2079,6 +2098,9 @@ async function runCmd(str = '', uniqueName = '', text = '') {
     }
 
     let scriptArgs = await getScriptArgs(argDef, enrichArgs(str.replace(/^\d+\s*/, '')));
+    if (uniqueName) {
+        console.$log(`Execute ${uniqueName}`);
+    }
     return await evalText(text, uniqueName, scriptArgs)
 }
 
@@ -2224,20 +2246,22 @@ function parseArgDef(inputString) {
             result[s1] = '';
         }
     }
+    let tempResult = {}
     for (let key of Object.keys(result)) {
         let comment = result[key];
         let defaultValStr = ''
         if (key.indexOf("=") !== -1) {
-            delete result[key];
             let ss = key.split('=').map(trim);
             key = ss[0]
             defaultValStr = ss[1]
         }
         if (defaultValStr) {
-            result[key] = ['<' + warnStr(defaultValStr) + '>', comment].join(' ')
+            tempResult[key] = ['<' + warnStr(defaultValStr) + '>', comment].join(' ')
+        } else {
+            tempResult[key] = comment
         }
     }
-    return result;
+    return tempResult;
 }
 
 function getArgDef(text, uniqueName) {
@@ -2279,7 +2303,7 @@ function getArgDef(text, uniqueName) {
 
 function filterRequire(currSpace, cmdMatchStr) {
     if (typeof cmdMatchStr === 'number') {
-        cmdMatchStr = '0x' + pad(8, BigNumber(cmdMatchStr).toString(16), '0');
+        cmdMatchStr = '0x' + BigNumber(cmdMatchStr).toString(16).padStart(8, '0');
     }
     cmdMatchStr = trim(cmdMatchStr);
 
@@ -2435,9 +2459,6 @@ function _addErrorTag(lines) {
 }
 
 async function evalText($text = '', $cmdName = '', $args = {}) {
-    if ($cmdName) {
-        console.$log(`Execute ${$cmdName}`);
-    }
     let currSpace;
     if ($cmdName) {
         let pair = parseUniqueName($cmdName)
@@ -2464,10 +2485,15 @@ async function evalText($text = '', $cmdName = '', $args = {}) {
         $homeDir, $lib, _cmdMap);
 }
 
-function sigExit() {
+let sigExitCount = 0
+async function sigExit() {
     if (_noAppendNextLine) {
-        delTips();
-        process.exit(0);
+        setting.promptId = Date.now();
+        sigExitCount ++;
+        if (sigExitCount > 1) {
+            process.exit(0);
+        }
+        await delTips();
     } else {
         nextLine();
     }
@@ -2484,9 +2510,9 @@ process.on('rejectionHandled',function(err){
 })
 process.on('SIGINT', sigExit);
 process.on('SIGTERM', sigExit);
-process.on('beforeExit', function () {
+process.on('beforeExit', async function () {
     if (_noAppendNextLine) {
-        delTips();
+        terminalTitle(null)
     } else {
         nextLine();
         Room.onRoom()

package/deps/evalCode.js

@@ -19,23 +19,17 @@ module.exports = async ($text = '', $cmdName = '', $args = [],
 
     const $setTips = $lib.setTips;
     const $delTips = $lib.delTips;
-    const $tips = {
-        set: $lib.setTips,
-        del: $lib.delTips,
-        has: $lib.hasTips,
-        key: $lib.tipKeys
-    }
+    const $tips = $lib.tipFns;
     const $errorTag = $lib.errorTag;
     const $aop = $lib.aop;
     const $aopAsync = $lib.aopAsync;
 
     const $context = {
         $defArgs,
-        $data, $config,
+        $data, $config, $tips,
         $require, $requires, $import,
         $text, $cmdName, $args,
         $nextLine, $nextText,
-        $setTips, $delTips, $tips,
         $enter, $filterCmd,
         $currentSpace, $defaultSpace, $workspaceMap,
         $homeDir, $lib, $cmdMap

package/deps/room.js

@@ -57,7 +57,7 @@ function onRoom() {
                         return;
                     }
                     res.output = await setting.wrapperInput(req.input, true)
-                    global.$newInput = true;
+                    setting.promptId = Date.now()
                 }
             })
         } catch (e) {
@@ -113,7 +113,12 @@ async function initNodes() {
             }
         }
     } else {
-        let resp = await e(`${tailscalePath} status`);
+        let resp = '';
+        try {
+            resp = await e(`${tailscalePath} status`);
+        } catch (e) {
+            debug("initNodes", e)
+        }
         for (let line of resp.split("\n").map(trim)) {
             let offline = line.indexOf('offline') !== -1
             let ss = line.split(/\s+/);
@@ -248,8 +253,8 @@ async function _syncSetting(room) {
     setting.services = {}
     setting.serviceFns = {}
     for (const room of setting.rooms) {
-        if (setting.nodeMap[room.selfNode]?.offline) {
-            continue
+        if (!room.active) {
+            continue;
         }
         for (const pid of Object.keys(room.jsirs || {})) {
             let jsir = room.jsirs[pid];
@@ -297,7 +302,7 @@ async function processTasks() {
         if (unHandleKey) {
             console.$log(process.pid, `run task ${unHandleKey}[${defTasks[unHandleKey]}]`)
             await setting.wrapperInput(defTasks[unHandleKey]);
-            if (!global.$newError) {
+            if (!setting.newError) {
                 tasks[unHandleKey] = process.pid;
                 console.$log(process.pid, `handle task ${unHandleKey}[${defTasks[unHandleKey]}]`)
             }
@@ -431,7 +436,7 @@ async function initRoomJsir(room) {
         lastUpdateTime: setting.roomTime,
         port: setting.server ? setting.server.address()?.port:null,
         services: services,
-        newError: global.$newError,
+        newError: setting.newError,
         version: packageJson.version,
         upTime: formatUptime()
     }

package/deps/setting.js

@@ -46,6 +46,8 @@ module.exports = {
     serviceReg: /[^a-zA-Z]service[^a-zA-Z]|[^a-zA-Z]service$/i,
     wrapperInput: null,
     lastOutput: null,
-    locks: {},
-    lastChangeFlag: null
+    lastChangeFlag: null,
+    terminalTitle: null,
+    promptId: Date.now(),
+    newError: false
 }

package/deps/util.js

@@ -6,7 +6,6 @@ const readline = require('readline')
 const fs = require('fs')
 const fp = require('fs').promises
 const BigNumber = require('bignumber.js');
-const pad = require('pad');
 const crypto = require('crypto');
 const dayJs = require('dayjs')
 const table = require('console.table')
@@ -16,9 +15,6 @@ const _types = setting.fileType
 const _typeKeys = Object.keys(_types)
 const util = require('util')
 
-global.$newInput = false
-global.$newError = false
-
 let libDataDir;
 let lockDir;
 let logDir;
@@ -255,6 +251,7 @@ function createConsole(uniqueName) {
     result.$log = $log;
     result.$error = $error;
     result.$draft = draftLog;
+    result.$abort = () => false;
     if (uniqueName) {
         let pair = parseUniqueName(uniqueName)
         let fileName = pair[0] + '/' +  pair[1].split(".")[0]
@@ -267,21 +264,24 @@ function createConsole(uniqueName) {
             error: true,
             syncLogs: [result.$log, roomError]
         });
+        const promptId = setting.promptId;
+        result.$abort = () => promptId !== setting.promptId;
     }
     let quite = false
+    let promptId = 0
     if (uniqueName) {
-        global.$newInput = false;
+        promptId = setting.promptId;
     }
     for (let key of Object.keys(_consoleFns)) {
         result[key] = (...args) => {
-            if (global.$newInput) {
+            if (promptId !== setting.promptId) {
                 quite = true;
             }
             if ('debug' === key && !global.$DEBUG) {
                 return;
             }
             if ('error' === key) {
-                global.$newError = true;
+                setting.newError = true;
             }
             let hasFlag = false;
             let sameFlag = false;
@@ -309,6 +309,7 @@ function createConsole(uniqueName) {
                 let _args = _consoleFns[key].args(args);
                 let lastOutput = null;
                 if (hasFlag) {
+                    terminalTitle(setting.lastChangeFlag.replace(/^\*/, '').replace(/\*$/, '').trim())
                     lastOutput = _args.join(" ")
                     if (!isRunningInBackground() && setting.lastOutput && sameFlag) {
                         let lines = setting.lastOutput.split('\n').length;
@@ -336,6 +337,20 @@ console = createConsole();
 // fix console done
 
 
+function terminalTitle(title = 'jsir') {
+    if (isRunningInBackground()) {
+        return;
+    }
+    if (setting.terminalTitle !== title) {
+        setting.terminalTitle = title;
+        if (title) {
+            process.stdout.write(`\x1b]0;${setting.terminalTitle}\x07`);
+        } else {
+            process.stdout.write('\x1b]0;\x07');
+        }
+    }
+}
+
 function getFullPath(name) {
     name = trim(name)
     if (!name) {
@@ -787,10 +802,10 @@ function createLimitLogger(fileName, {
 
         let text = consoleStrs(...args)
         if (error) {
-            global.$newError = true;
+            setting.newError = true;
         }
         if (time) {
-            text = `${timeStr('YYYY-MM-DD HH:mm:ss.SSS')} ${pad(3, String(process.pid%1000), process.pid >= 1000 ? '0':' ')}> ${text}`
+            text = `${timeStr('YYYY-MM-DD HH:mm:ss.SSS')} ${String(process.pid%1000).padStart(3, '0')}> ${text}`
         }
         syncQueue(() => fp.appendFile(logPath, text + '\n'), logPath)
         let _minNum = (Date.now()/(1000 * 60 * 10)).toFixed(0)
@@ -983,16 +998,17 @@ function aesCipher(str, key, useIv = false){
     if (!key || key.length > 16) {
         throw "aesCipher key length should be between 1 and 16"
     }
+    key = key.padEnd(16, '0');
     if (useIv) {
         // Generate random IV
         const iv = crypto.randomBytes(16);
-        const cipher = crypto.createCipheriv('aes-128-cbc', pad(key, 16, '0'), iv);
+        const cipher = crypto.createCipheriv('aes-128-cbc', key, iv);
 
         // Return IV and ciphertext, as IV is needed for decryption
         const ciphertext = cipher.update(str, 'utf8', 'hex') + cipher.final('hex');
         return iv.toString('hex') + ':' + ciphertext; // Combine IV and ciphertext
     }
-    const cipher = crypto.createCipheriv('aes-128-ecb', pad(key, 16, '0'), null);
+    const cipher = crypto.createCipheriv('aes-128-ecb', key, null);
     return cipher.update(str, 'utf8', 'hex') + cipher.final('hex');
 }
 
@@ -1004,7 +1020,7 @@ function aesDecipher(str, key){
     if (!key || key.length > 16) {
         throw "aesCipher key length should be between 1 and 16";
     }
-
+    key = key.padEnd(16, '0');
     // Extract IV and ciphertext
     if(str.indexOf(":") !== -1) {
         const [ivHex, ciphertext] = str.split(':');
@@ -1012,10 +1028,10 @@ function aesDecipher(str, key){
             throw "Invalid encrypted string format";
         }
         const iv = Buffer.from(ivHex, 'hex');
-        const decipher = crypto.createDecipheriv('aes-128-cbc', pad(key, 16, '0'), iv);
+        const decipher = crypto.createDecipheriv('aes-128-cbc', key, iv);
         return decipher.update(ciphertext, 'hex', 'utf8') + decipher.final('utf8');
     }
-    const decipher = crypto.createDecipheriv('aes-128-ecb', pad(key, 16, '0'), null);
+    const decipher = crypto.createDecipheriv('aes-128-ecb', key, null);
     return decipher.update(str, 'hex', 'utf8') + decipher.final('utf8');
 }
 
@@ -1286,19 +1302,21 @@ async function _fileLock(key, fn) {
 
 async function fileLock(key, fn, wait = true) {
     `
-    文件锁, 默认一直等待expireMs，直到加锁成功执行fn
+    文件锁, 默认一直等待直到加锁成功执行fn
     wait = false, 加锁失败则不执行fn
     return void
     `
-    if (wait) {
-        while (true) {
-            if (await _fileLock(key, fn)) {
-                break;
-            }
-            await sleep(9);
+    while (true) {
+        if (await _fileLock(key, fn)) {
+            break;
         }
-    } else {
-        await _fileLock(key, fn);
+        if (typeof wait === 'function') {
+            wait = await wait();
+        }
+        if (!wait) {
+            break;
+        }
+        await sleep(9);
     }
 }
 
@@ -1308,32 +1326,35 @@ async function processLock(key, fn, wait = true) {
     wait = false, 加锁失败则不执行fn
     return void
     `
-    if (wait) {
-        while (true) {
-            if (await _processLock(key, fn)) {
-                break;
-            }
-            await sleep(9);
+    while (true) {
+        if (await _processLock(key, fn)) {
+            break;
         }
-    } else {
-        await _processLock(key, fn);
+        if (typeof wait === 'function') {
+            wait = await wait();
+        }
+        if (!wait) {
+            break;
+        }
+        await sleep(9);
     }
 }
 
+const $locks = {}
 async function _processLock(key, fn) {
     if (!key || typeof fn !== 'function') {
         throw new Error('invalid arguments');
     }
     key = key.trim();
-    if (setting.locks.hasOwnProperty(key)) {
+    if ($locks.hasOwnProperty(key)) {
         return false;
     }
-    setting.locks[key] = true;
+    $locks[key] = true;
     try {
         await fn();
         return true;
     } finally {
-        delete setting.locks[key];
+        delete $locks[key];
     }
 }
 
@@ -1356,23 +1377,25 @@ function setTips(key, value, onRm) {
     if (!vl(key) || key.indexOf(",") !== -1) {
         throw "invalid tip key";
     }
-    getOr(setting.tips, key, []).push(value);
+    key = trim(key)
+    getOr(setting.tips, key, []).push(vl(value) ? value:'');
     if (onRm) {
         getOr(_tipsOnRm, key, []).push(onRm)
     }
 }
 
 function delTips(...keys) {
+    let pros = []
     for (let key of Object.keys(setting.tips)) {
         if (keys.length === 0) {
             if (key === 'DEBUG') {
                 continue
             }
             delete setting.tips[key]
-            tipsOnRmCallback(key)
+            pros.push(tipsOnRmCallback(key))
         } else if (keys.indexOf(key) !== -1) {
             delete setting.tips[key]
-            tipsOnRmCallback(key)
+            pros.push(tipsOnRmCallback(key))
         }
     }
     if (keys.length === 0) {
@@ -1380,13 +1403,22 @@ function delTips(...keys) {
             if (key === 'DEBUG') {
                 continue
             }
-            tipsOnRmCallback(key)
+            pros.push(tipsOnRmCallback(key))
         }
     }
+    pros = pros.filter(i => i);
+    if (pros.length > 0) {
+        return Promise.all(pros)
+    }
 }
 
-function hasTips(key) {
-    return setting.tips.hasOwnProperty(key);
+function hasTips(key, value) {
+    key = trim(key)
+    if (vl(value)) {
+        return setting.tips.hasOwnProperty(key) && setting.tips[key].includes(value);
+    } else {
+        return setting.tips.hasOwnProperty(key);
+    }
 }
 
 function tipKeys() {
@@ -1396,15 +1428,22 @@ function tipKeys() {
 function tipsOnRmCallback(key) {
     let callbacks = _tipsOnRm[key]
     delete _tipsOnRm[key]
+    const pros = [];
     if (callbacks && callbacks.length > 0) {
         for (let callback of callbacks) {
             try {
-                callback()
+                let result = callback()
+                if (getType(result) === 'Promise') {
+                    pros.push(result.catch(e => $error(`[${key}] OnRmCallback`, e)))
+                }
             } catch (e) {
                 $error(`[${key}] OnRmCallback`, e)
             }
         }
     }
+    if (pros.length > 0) {
+        return  Promise.all(pros);
+    }
 }
 
 async function timer(key, ms, fn, label, printInfo = true){
@@ -2147,6 +2186,9 @@ end tell
 function getKeyTips() {
     let items = [];
     for (let key of Object.keys(setting.tips)) {
+        if (key.startsWith("_")) {
+            continue;
+        }
         items.push(trim(key))
     }
     return items
@@ -2155,6 +2197,9 @@ function getKeyTips() {
 function getValTips() {
     let items = [];
     for (let key of Object.keys(setting.tips)) {
+        if (key.startsWith("_")) {
+            continue;
+        }
         let val = setting.tips[key].map(i => {
             if (typeof i === 'function') {
                 try {
@@ -2260,13 +2305,20 @@ async function aopAsync(items, fn, args) {
 }
 
 function getMd5Key(str) {
-    return '0x' + md5(str).substr(0, 8);
+    return '0x' + md5(str).substring(0, 8);
 }
 
 function isMd5Key(str) {
     return /^0x[a-z\d]{8}$/.test(str);
 }
 
+const tipFns = {
+    set: setTips,
+    del: delTips,
+    has: hasTips,
+    key: tipKeys
+}
+
 module.exports = {
     formatUptime,
     wrapperJsirText,
@@ -2291,7 +2343,6 @@ module.exports = {
     bMul,
     getConfig,
     getCbText,
-    pad,
     aesCipher,
     aesDecipher,
     requireG,
@@ -2387,5 +2438,7 @@ module.exports = {
     isPidAlive,
     cleanFileLocks,
     getMd5Key,
-    isMd5Key
+    isMd5Key,
+    terminalTitle,
+    tipFns
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsir",
-  "version": "2.6.12",
+  "version": "2.6.14",
   "description": "JavaScript Script Management Tool",
   "main": "index.js",
   "scripts": {
@@ -21,7 +21,6 @@
     "bignumber.js": "^9.0.0",
     "chokidar": "^3.5.2",
     "console.table": "^0.10.0",
-    "dayjs": "^1.10.4",
-    "pad": "^3.2.0"
+    "dayjs": "^1.10.4"
   }
 }