jsir 2.6.6 → 2.6.7

package/cmd/oaa.js

@@ -443,6 +443,7 @@ function _nextLine(callback, promptStr, hidden, resolve, end, isText) {
     _rl.removeAllListeners('line')
     _rl.on('line', lineHandler)
     _rl.prompt()
+    setting.lastOutput = null;
 }
 
 async function nextText(callback, end, hidden) {

package/deps/evalCode.js

@@ -19,6 +19,12 @@ 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 $errorTag = $lib.errorTag;
     const $aop = $lib.aop;
     const $aopAsync = $lib.aopAsync;
@@ -29,7 +35,7 @@ module.exports = async ($text = '', $cmdName = '', $args = [],
         $require, $requires, $import,
         $text, $cmdName, $args,
         $nextLine, $nextText,
-        $setTips, $delTips,
+        $setTips, $delTips, $tips,
         $enter, $filterCmd,
         $currentSpace, $defaultSpace, $workspaceMap,
         $homeDir, $lib, $cmdMap

package/deps/room.js

@@ -342,10 +342,10 @@ async function initRoom() {
                 pros.push(syncConfigs())
             }
             await Promise.all(pros);
-        }, false)
+        }, false).catch(debug)
     }
     if (defTasks && Object.keys(defTasks).length > 0) {
-        processLock(roomTasksFile, processTasks, false)
+        processLock(roomTasksFile, processTasks, false).catch(debug)
     }
     await syncSetting();
 }
@@ -510,9 +510,12 @@ async function reqNode(node, method, url, port, body) {
         return await new Promise((resolve, reject) => {
             let timeout = null
 
-            const req = http.request({...opt, headers: {
+            let options = {...opt,
+                headers: {
                     'sign': createSign()
-                }}, (res) => {
+                }};
+            options.path = encodeURI(opt.path);
+            const req = http.request(options, (res) => {
                 let data = '';
                 // 数据块接收
                 res.on('data', (chunk) => {
@@ -587,7 +590,7 @@ async function reqFn(fnKey, args = []) {
         throw `service function ${fnKey} not found`;
     }
     let resp = await reqNode(target.node, 'post',
-        `/${encodeURI(fnKey)}`, target.port, JSON.stringify(args || []))
+        `/${fnKey}`, target.port, JSON.stringify(args || []))
     return JSON.parse(resp).result;
 }
 

package/deps/setting.js

@@ -35,7 +35,8 @@ module.exports = {
     enterOutputs: null,
     defaultPort: 52108,
     reqNodeTimeouts: {
-        '/': 2000
+        '/': 2000,
+        '/config/main': 2000
     },
     roomTimer: 2000,
     roomTime: Date.now(),

package/deps/util.js

@@ -285,7 +285,7 @@ function createConsole(uniqueName) {
             }
             let hasFlag = false;
             let sameFlag = false;
-            if (args.length > 1 && typeof args[0] === 'string' && args[0].startsWith("*") && args[0].endsWith("*")) {
+            if (args.length > 1 && typeof args[0] === 'string' && args[0].length > 2 && args[0].startsWith("*") && args[0].endsWith("*")) {
                 hasFlag = true;
                 let flag = args[0]
                 args = args.slice(1)
@@ -307,19 +307,22 @@ function createConsole(uniqueName) {
                 }
             } else {
                 let _args = _consoleFns[key].args(args);
-
-                if (hasFlag && !isRunningInBackground() && setting.lastOutput && sameFlag) {
-                    let lines = (setting.lastOutput.match(/\n/g) || []).length + 1;
-                    for (let i = 0; i < lines; i++) {
-                        process.stdout.write('\x1b[A\r'+ ' '.repeat(process.stdout.columns))
+                let lastOutput = null;
+                if (hasFlag) {
+                    lastOutput = _args.join(" ")
+                    if (!isRunningInBackground() && setting.lastOutput && sameFlag) {
+                        let lines = setting.lastOutput.split('\n').length;
+                        for (let i = 0; i < lines; i++) {
+                            process.stdout.write('\x1b[A\r'+ ' '.repeat(process.stdout.columns))
+                        }
+                        _args[0] = '\r' + _args[0]
                     }
-                    _args[0] = '\r' + _args[0]
                 }
 
                 _consoleFns[key].fn(..._args);
 
                 if (hasFlag) {
-                    setting.lastOutput = _args.join(" ");
+                    setting.lastOutput = lastOutput;
                 } else {
                     setting.lastOutput = null;
                 }
@@ -1229,26 +1232,20 @@ async function _fileLock(key, fn, expireMs = 49000) {
     if (!key || typeof fn !== 'function') {
         throw new Error('invalid arguments');
     }
+    if (expireMs < 1000) {
+        throw new Error("expireMs can not less than 1000")
+    }
 
     let lockKeyDir = getLockKeyDir(key)
     const now = Date.now();
-    const expireAt = expireMs > 0 ? now + expireMs : 0;
+    const expireAt = now + expireMs;
 
     // 1. 尝试判断锁目录是否已存在
     let lockExists = await fileExist(lockKeyDir);
 
     if (lockExists) {
         // 目录存在时，读取文件名中的过期时间戳
-        const storedExpireAt = await readExpireTimestamp(lockKeyDir);
-        if (storedExpireAt === null) {
-            // 理论上不会出现没有“expire-xxxx”文件的情况，除非中途被手动改动
-            // 可以选择强制删除目录，或者直接返回 false
-            return false;
-        }
-        if (storedExpireAt === 0) {
-            // 说明当时设置的是永不过期
-            return false;
-        }
+        const storedExpireAt = await readExpireTimestamp(lockKeyDir) || 0;
         if (storedExpireAt > now) {
             // 说明锁尚未过期
             return false;
@@ -1289,10 +1286,12 @@ async function _fileLock(key, fn, expireMs = 49000) {
         await timeLimit([fn()], expireMs)
         return true;
     } finally {
-        // 5. 执行完毕后，手动释放锁目录（也可选择保留到过期自动失效，但一般都建议主动释放）
-        try {
-            await fp.rm(lockKeyDir, { recursive: true, force: true });
-        } catch (_) {}
+        if (Date.now() <= expireAt - 9) {
+            // 5. 执行完毕后，手动释放锁目录（也可选择保留到过期自动失效，但一般都建议主动释放）
+            try {
+                await fp.rm(lockKeyDir, { recursive: true, force: true });
+            } catch (_) {}
+        }
     }
 }
 
@@ -1397,6 +1396,14 @@ function delTips(...keys) {
     }
 }
 
+function hasTips(key) {
+    return setting.tips.hasOwnProperty(key);
+}
+
+function tipKeys() {
+    return Object.keys(setting.tips);
+}
+
 function tipsOnRmCallback(key) {
     let callbacks = _tipsOnRm[key]
     delete _tipsOnRm[key]
@@ -2147,6 +2154,14 @@ function getValTips() {
     let items = [];
     for (let key of Object.keys(setting.tips)) {
         let val = setting.tips[key].map(i => {
+            if (typeof i === 'function') {
+                try {
+                    i = i();
+                } catch (e) {
+                    console.$error(`tips "${key}"`, e);
+                    return '';
+                }
+            }
             let item = trim(i)
             if (item.indexOf(',') !== -1) {
                 item = `[${item}]`;
@@ -2356,5 +2371,7 @@ module.exports = {
     fileExist,
     aop,
     aopAsync,
-    processLock
+    processLock,
+    hasTips,
+    tipKeys
 }

package/package.json

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