jsir 3.0.0 → 3.0.2

package/cmd/oaa.js

@@ -351,6 +351,8 @@ function initRl(callback, promptStr, hidden, reject) {
                 _rl.clearLine(0)
                 if (callback === wrapperInput) {
                     nextLine();
+                } else {
+                    closeRl()
                 }
             }
         });
@@ -1128,23 +1130,24 @@ async function showRooms() {
     for (let i = 0; i < setting.rooms.length; i++) {
         let room = setting.rooms[i]
         let isLocal = setting.selfRoom.selfNode === room.selfNode;
+        let roomName = room.active ? infoStr(room.name):room.name;
+        let delayStr = vl(room.delay) ? (room.delay + "ms"):"";
         results.push({
-            name: (isLocal ? "*" : " ") + room.name,
+            name: (isLocal ? infoStr("*") : " ") + roomName,
             node: room.selfNode,
-            active: room.active,
+            delay: delayStr
         })
         for (let key of Object.keys(room.jsirs)) {
             let jsir = room.jsirs[key]
-            let pidStr = (process.pid === jsir.pid ? "*" : " ") + jsir.pid;
+            let pidStr = (process.pid === jsir.pid ? infoStr("*") : " ") + (jsir.newError ? errorStr(jsir.pid):(jsir.active ? infoStr(jsir.pid):jsir.pid));
             results.push({
-                name: (isLocal ? "*" : " ") + room.name,
+                name: (isLocal ? infoStr("*") : " ") + roomName,
                 node: room.selfNode,
-                active: room.active,
-                pid: jsir.newError ? errorStr(pidStr):pidStr,
+                delay: delayStr,
+                pid: pidStr,
                 up: formatSec(jsir.upTime) || '',
                 version: jsir.version || '',
                 space: jsir.space,
-                running: jsir.active,
                 port: jsir.port,
                 back: jsir.back,
                 busy: jsir.busy,
@@ -1320,12 +1323,22 @@ const keywordDef = {
                     console.msg("config service offline")
                 } else if (_cmdMap[args[0]]){
                     let uniqueName = _cmdMap[args[0]];
-                    await eia(getEditor(), [`"${getConfigDir()}/${md5(uniqueName + (global.$TEST ? '.test':''))}.json"`], true)
+                    let configPath = `${getConfigDir()}/${md5(uniqueName + (global.$TEST ? '.test':''))}.json`;
+                    if (isRunningInBackground()) {
+                        console.log(String(await fp.readFile(configPath)).trim())
+                    } else {
+                        await eia(getEditor(), [`"${configPath}"`], true)
+                    }
                 } else {
                     console.warn('invalid args')
                 }
             } else {
-                await eia(getEditor(), [`"${getLibDataDir()}/config.json"`], true)
+                let configPath = `${getLibDataDir()}/config.json`;
+                if (isRunningInBackground()) {
+                    console.log(String(await fp.readFile(configPath)).trim())
+                } else {
+                    await eia(getEditor(), [`"${configPath}"`], true)
+                }
             }
         },
         short: 's'
@@ -1703,6 +1716,10 @@ const keywordDef = {
                         if (setting.selfRoom.selfNode === room.selfNode && String(process.pid) === pid) {
                             continue;
                         }
+                        if (setting.selfRoom.selfNode !== room.selfNode && args.includes(room.selfNode) && !args.includes(pid)
+                            && room.jsirs[pid].port === setting.defaultPort) {
+                            continue;
+                        }
                         have = true;
                         tasks.push(async (input) => {
                             let jsir = room.jsirs[pid];

package/deps/room.js

@@ -3,7 +3,7 @@ const {fileJson, fileLock, vl, getKeyTips, getValTips,
     getRoomsDir, e, isRunningInBackground,
     batchAsync, trim, getOr, errorTag, warnStr, getConfig, getConfigDir,
     fileExist, processLock, isPidAlive, cleanFileLocks,
-    roomConsole: console
+    roomConsole: console, reget
 } = require('./util');
 const {setRoute, createSign} = require('../deps/server')
 const roomDataFile = "jsirRoom.json"
@@ -17,7 +17,6 @@ const http = require('http');
 const tailscalePath = os.platform() === 'darwin' ?
     '/Applications/Tailscale.app/Contents/MacOS/Tailscale':'tailscale';
 const packageJson = require("../package.json");
-const defTasks = getConfig("tasks");
 
 async function localConfigs() {
     let configDir = getConfigDir();
@@ -161,6 +160,7 @@ async function syncRooms() {
         fns.push(async () => {
             let respBody = ''
             try {
+                let begin = Date.now();
                 try {
                     respBody = await reqNode(node, "get", "/");
                 } catch (e) {
@@ -178,6 +178,7 @@ async function syncRooms() {
                             Object.entries(currRoom.jsirs || {}).filter(([pid, jsir]) => jsir.port === setting.defaultPort)
                         );
                     }
+                    currRoom.delay = Date.now() - begin;
                     syncRooms.push(currRoom)
                     console.$debug(`sync ${node} success`);
                 }
@@ -272,32 +273,45 @@ async function _syncSetting(room) {
     }
 }
 
-async function processTasks() {
+async function processTasks(defTasks) {
     await fileJson(roomTasksFile, async tasks => {
-        tasks = Object.fromEntries(
-            Object.entries(tasks).filter(([key, pid]) => isPidAlive(pid))
-        );
-        if (Object.values(tasks).includes(process.pid)) {
-            return tasks;
+        for (let key of Object.keys(tasks)) {
+            let pids = tasks[key] || []
+            // 清理已经结束的进程
+            for (let i = 0; i < pids.length; i++) {
+                let pid = pids[i];
+                if (!isPidAlive(pid)) {
+                    pids.splice(i, 1);
+                }
+            }
+            if (pids.length === 0) {
+                delete tasks[key]
+            }
         }
+
         let unHandleKey = null;
         for (let key of Object.keys(defTasks)) {
-            if (!tasks[key]) {
-                if (key.indexOf("*") !== -1 && setting.defaultPort !== setting.selfJsir.port) {
-                    continue;
-                }
-                if (key.indexOf("*") === -1 && setting.defaultPort === setting.selfJsir.port) {
-                    continue;
-                }
-                unHandleKey = key
-                break;
+            let isMainPid = setting.defaultPort === setting.selfJsir.port;
+            let isMainTask = key.includes("*");
+            if (isMainPid !== isMainTask) {
+                continue;
+            }
+
+            let num = Number(reget(trim(key), /(\d+)$/) || 1);
+            let taskKey = trim(trim(key).replace(/\d+$/, ''));
+            let pids = tasks[taskKey] || [];
+            if (pids.length >= num || pids.includes(process.pid)) {
+                continue;
             }
+
+            unHandleKey = key;
         }
         if (unHandleKey) {
             console.$log(process.pid, `run task ${unHandleKey}[${defTasks[unHandleKey]}]`)
             await setting.wrapperInput(defTasks[unHandleKey]);
             if (!setting.newError) {
-                tasks[unHandleKey] = process.pid;
+                let taskKey = trim(trim(unHandleKey).replace(/\d+$/, ''));
+                tasks[taskKey] = [...(tasks[taskKey] || []), process.pid];
                 console.$log(process.pid, `handle task ${unHandleKey}[${defTasks[unHandleKey]}]`)
             }
         }
@@ -329,8 +343,9 @@ async function initRoom() {
             await Promise.all(pros);
         }, false).catch(console.$debug)
     }
+    const defTasks = getConfig("tasks");
     if (defTasks && Object.keys(defTasks).length > 0) {
-        processLock(roomTasksFile, processTasks, false).catch(console.$debug)
+        processLock(roomTasksFile, () => processTasks(defTasks), false).catch(console.$debug)
     }
     await syncSetting();
 }
@@ -353,11 +368,11 @@ async function syncConfigs() {
                 let currText = String(await fp.readFile(path));
                 if (currText !== text) {
                     await fp.writeFile(path, text)
-                    console.$debug(`sync ${key} success`);
+                    console.$debug(`update config ${key} success`);
                 }
             } else {
                 await fp.writeFile(path, text)
-                console.$debug(`sync ${key} success`);
+                console.$debug(`create config ${key} success`);
             }
         });
     }
@@ -520,10 +535,12 @@ async function reqNode(node, method, url, port, body) {
             });
 
             // 设置超时逻辑
-            if (setting.reqNodeTimeouts[url]) {
+            let timeoutMs = setting.reqNodeTimeouts[url];
+            if (timeoutMs) {
                 timeout = setTimeout(() => {
                     req.destroy(); // 中断请求
-                }, setting.reqNodeTimeouts[url]); // 10秒超时
+                    reject(new Error(`Timeout ${timeoutMs}ms`))
+                }, timeoutMs); // 10秒超时
             }
 
             // 错误处理

package/deps/util.js

@@ -844,7 +844,8 @@ function createLimitLogger(fileName, {
             setting.newError = true;
         }
         if (time) {
-            text = `${timeStr('YYYY-MM-DD HH:mm:ss.SSS')} ${String(process.pid%1000).padStart(3, '0')}> ${text}`
+            let prefix = debugStr(`${timeStr('YYYY-MM-DD HH:mm:ss.SSS')} ${String(process.pid%1000).padStart(3, '0')}>`)
+            text = `${prefix} ${text}`
         }
         fp.appendFile(logPath, text + '\n')
         let _minNum = (Date.now()/(1000 * 60 * 10)).toFixed(0)
@@ -1435,33 +1436,28 @@ function setTips(key, value, onRm) {
     }
 }
 
-function delTips(...keys) {
+async function delTips(...keys) {
     keys = keys.map(trim).filter(i => i)
-    let pros = []
-    for (let key of Object.keys(setting.tips)) {
+    for (let key of Object.keys(setting.tips).reverse()) {
         if (keys.length === 0) {
             if (['TEST', 'DEBUG'].includes(key)) {
                 continue
             }
             delete setting.tips[key]
-            pros.push(tipsOnRmCallback(key))
+            await tipsOnRmCallback(key)
         } else if (keys.indexOf(key) !== -1) {
             delete setting.tips[key]
-            pros.push(tipsOnRmCallback(key))
+            await tipsOnRmCallback(key)
         }
     }
     if (keys.length === 0) {
-        for (let key of Object.keys(setting.tipsOnRm)) {
+        for (let key of Object.keys(setting.tipsOnRm).reverse()) {
             if (['TEST', 'DEBUG'].includes(key)) {
                 continue
             }
-            pros.push(tipsOnRmCallback(key))
+            await tipsOnRmCallback(key)
         }
     }
-    pros = pros.filter(i => i);
-    if (pros.length > 0) {
-        return Promise.all(pros)
-    }
 }
 
 function hasTips(key, value) {
@@ -1497,7 +1493,7 @@ function tipsOnRmCallback(key) {
         }
     }
     if (pros.length > 0) {
-        return  Promise.all(pros);
+        return Promise.all(pros);
     }
 }
 
@@ -1532,8 +1528,12 @@ async function cleanFile(path, maxChars = 9 * 1024 * 1024) {
 }
 
 function isPidAlive(pid) {
+    pid = Number(pid);
+    if (process.pid === pid) {
+        return true;
+    }
     try {
-        process.kill(Number(pid), 0); // 信号 0 不会实际发送，但会检查进程是否存在
+        process.kill(pid, 0); // 信号 0 不会实际发送，但会检查进程是否存在
         return true; // PID 存在
     } catch (err) {
         if (err.code === 'ESRCH') {
@@ -2100,6 +2100,9 @@ function getValTips() {
                 }
             }
             let item = trim(i)
+            if (item.startsWith("_")) {
+                item = key;
+            }
             if (item.indexOf(',') !== -1) {
                 item = `[${item}]`;
             }
@@ -2233,6 +2236,18 @@ const tipFns = {
     key: tipKeys
 }
 
+function currentJsir() {
+    return JSON.parse(JSON.stringify(setting.selfJsir));
+}
+
+function currentRoom() {
+    return JSON.parse(JSON.stringify(setting.selfRoom));
+}
+
+function currentRooms() {
+    return JSON.parse(JSON.stringify(setting.rooms));
+}
+
 module.exports = {
     formatSec,
     wrapperJsirText,
@@ -2350,5 +2365,8 @@ module.exports = {
     tipFns,
     getFileOpenExe,
     roomConsole: createConsole(null, roomLog, roomError),
-    formatMb
+    formatMb,
+    currentJsir,
+    currentRoom,
+    currentRooms
 }

package/package.json

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