jsir 2.4.6 → 2.4.9

package/cmd/oaa.js

@@ -674,6 +674,9 @@ async function joinServer(uniqueName) {
     let pair = parseUniqueName(uniqueName)
     for (let key of Object.keys(exportLib)) {
         let val = exportLib[key];
+        Server.setRoute('get', `/${pair[0]}/${trimJsirFileName(pair[1])}/${key}`,async (req, res) => {
+            res.result = await val(...req);
+        })
         Server.setRoute('post', `/${pair[0]}/${trimJsirFileName(pair[1])}/${key}`,async (req, res) => {
             res.result = await val(...req);
         })
@@ -1031,7 +1034,6 @@ async function showRooms() {
         let room = setting.rooms[i]
         let isLocal = setting.selfRoom.selfNode === room.selfNode;
         results.push({
-            mid: i,
             name: (isLocal ? "*" : " ") + room.name,
             node: room.selfNode,
             active: room.active,
@@ -1040,17 +1042,18 @@ async function showRooms() {
             let jsir = room.jsirs[key]
             let pidStr = (process.pid === jsir.pid ? "*" : " ") + jsir.pid;
             results.push({
-                mid: i,
                 name: (isLocal ? "*" : " ") + room.name,
                 node: room.selfNode,
                 active: room.active,
                 pid: jsir.newError ? errorStr(pidStr):pidStr,
+                up: jsir.upTime || '',
+                version: jsir.version || '',
                 space: jsir.space,
                 running: jsir.active,
                 port: jsir.port,
                 back: jsir.back,
                 busy: jsir.busy,
-                tips: Object.keys(jsir.tips).map(i => i + ': ' + jsir.tips[i]).join('\n'),
+                tips: Object.keys(jsir.tips).map(i => infoStr(i) + ': ' + jsir.tips[i]).join('\n'),
                 services: Object.keys(jsir.services || []).map(msgStr).join('\n')
             });
         }
@@ -1484,7 +1487,7 @@ const keywordDef = {
                 suffix = 'error'
             }
             if (type.indexOf("t") !== -1) {
-                cmdStr = 'less -R +F'
+                cmdStr = 'tail -n 50 -f'
             }
             path = path + '.' + suffix;
             if (!fs.existsSync(path)) {

package/deps/room.js

@@ -2,7 +2,7 @@ const os = require('os');
 const {fileJson, fileLock, vl, createConsole, getKeyTips, getValTips,
     getRoomsDir, e, regEach, isRunningInBackground,
     batchAsync, debugStr, trim, getOr, errorTag, warnStr, getConfig, getConfigDir,
-    fileExist
+    fileExist, formatUptime
 } = require('./util');
 const {setRoute, createSign} = require('../deps/server')
 const roomDataFile = "jsirRoom.json"
@@ -17,6 +17,7 @@ const http = require('http');
 const tailscalePath = os.platform() === 'darwin' ?
     '/Applications/Tailscale.app/Contents/MacOS/Tailscale':'tailscale';
 const configMain = getConfig("configMain");
+const packageJson = require("../package.json");
 
 function debug(...args) {
     if (global.$DEBUG) {
@@ -117,19 +118,26 @@ function getSelfIP(nodes) {
 
 async function getTailscaleNodes() {
     let resp = await e(`${tailscalePath} status`);
-    let nodes = []
-    regEach(resp, /^(\d+\.\d+\.\d+\.\d+)\s+/mg, arr => {
-        nodes.push(arr[1])
-    });
-    return [...new Set(nodes)];
+    let nodes = {}
+    for (let line of resp.split("\n").map(trim)) {
+        if (line.indexOf('offline') !== -1) {
+            continue
+        }
+        let ss = line.split(/\s+/);
+        if (/^\d+\.\d+\.\d+\.\d+$/.test(ss[0])) {
+            nodes[ss[0]] = ss[1]
+        }
+    }
+    return nodes;
 }
 
 async function updateRoomInfo() {
-    let nodes = await getTailscaleNodes();
+    let nodeMap = await getTailscaleNodes();
+    let nodes = Object.keys(nodeMap)
     let ip = getSelfIP(nodes)
     await fileJson(roomDataFile, async room => {
         // 设置roomName
-        let name = os.hostname();
+        let name = nodeMap[ip] || os.hostname();
         if (!vl(room.name) || room.name !== name) {
             room.name = name;
             debug("set roomName", name)
@@ -315,7 +323,7 @@ async function cleanRoom(room) {
     for (let pid of Object.keys(room.jsirs || {})) {
         let jsir = room.jsirs[pid]
         let active = Date.now() - (jsir.lastUpdateTime || 0) <= setting.roomHeartbeatExpire;
-        if (!active && isPidAlive(pid)) {
+        if (jsir.back && !active && isPidAlive(pid)) {
             try {
                 debug(`kill inactive jsir ${pid}`)
                 process.kill(parseInt(pid), 'SIGKILL'); // 强制终止进程
@@ -371,7 +379,9 @@ async function initRoomJsir(room) {
         lastUpdateTime: Date.now(),
         port: setting.server ? setting.server.address().port:null,
         services: services,
-        newError: global.$newError
+        newError: global.$newError,
+        version: packageJson.version,
+        upTime: formatUptime()
     }
 }
 
@@ -523,6 +533,5 @@ module.exports = {
     offRoom,
     syncSetting,
     reqNode,
-    reqFn,
-    localConfigs
+    reqFn
 }

package/deps/server.js

@@ -7,6 +7,7 @@ const preferredPort = setting.defaultPort;
 // 路由存储
 const routes = setting.routes;
 let invokeStart = false;
+const apiReg = /[^a-zA-Z]api[^a-zA-Z]|[^a-zA-Z]api$/i;
 
 function debug(...args) {
     if (global.$DEBUG) {
@@ -36,7 +37,15 @@ function createSign() {
 async function createServer(port) {
     const server = http.createServer(async (req, res) => {
         const method = req.method.toLowerCase();
-        const url = decodeURI(req.url);
+        const originUrl = decodeURI(req.url);
+
+        let url = originUrl;
+        let params = '[]'
+        let sepIndex = originUrl.indexOf("?");
+        if (sepIndex !== -1) {
+            url = originUrl.substring(0, sepIndex).trim()
+            params = JSON.stringify([...new URLSearchParams(originUrl.substring(sepIndex).trim()).values()]);
+        }
 
         // 获取客户端的 IP 地址
         const clientIp = req.socket.remoteAddress || req.connection.remoteAddress;
@@ -45,22 +54,25 @@ async function createServer(port) {
         debug(`Received ${routeKey} from ${clientIp}`);
 
         if (routes[routeKey]) {
-            // 取header里的sign字段
-            const sign = req.headers['sign'];
-            if (sign) {
-                const decodedTime = verifySign(sign);
-                const currentTime = Date.now();
+            if (!apiReg.test(routeKey)) {
+                // 如果不是api接口，则校验签名
+                // 取header里的sign字段
+                const sign = req.headers['sign'];
+                if (sign) {
+                    const decodedTime = verifySign(sign);
+                    const currentTime = Date.now();
 
-                if (decodedTime === null || Math.abs(currentTime - decodedTime) > setting.serverSignExpire) {
+                    if (decodedTime === null || Math.abs(currentTime - decodedTime) > setting.serverSignExpire) {
+                        res.writeHead(403, { 'Content-Type': 'text/plain' });
+                        res.end('Forbidden: Invalid Sign');
+                        return;
+                    }
+                } else {
+                    // 如果没有sign字段，返回403
                     res.writeHead(403, { 'Content-Type': 'text/plain' });
-                    res.end('Forbidden: Invalid Sign');
+                    res.end('Forbidden: Missing Sign');
                     return;
                 }
-            } else {
-                // 如果没有sign字段，返回403
-                res.writeHead(403, { 'Content-Type': 'text/plain' });
-                res.end('Forbidden: Missing Sign');
-                return;
             }
             // 如果签名通过，继续处理请求
             try {
@@ -77,7 +89,7 @@ async function createServer(port) {
                         resolve()
                     })
                 })
-                await routes[routeKey](body, res);
+                await routes[routeKey](body || params, res);
             } catch (e) {
                 res.writeHead(500, { 'Content-Type': 'text/plain' });
                 res.end(String(isError(e) ? e.message:e));

package/deps/util.js

@@ -2048,7 +2048,7 @@ function getValTips() {
             }
             return item;
         }).join("|");
-        items.push(val)
+        items.push(val || trim(key))
     }
     return items
 }
@@ -2078,7 +2078,7 @@ function interceptStdStreams() {
         if(setting.enterOutputs) {
             setting.enterOutputs.push(chunk.toString());
         } else if (isRunningInBackground()) {
-            console.$log(process.pid, "STDOUT", "\n" + chunk.toString().trimEnd());
+            console.$log(process.pid, "stdout", "\n" + chunk.toString().trimEnd());
         } else {
             originalStdoutWrite(chunk, ...args); // 保留原始行为
         }
@@ -2089,14 +2089,34 @@ function interceptStdStreams() {
         if(setting.enterOutputs) {
             setting.enterOutputs.push(chunk.toString());
         } else if (isRunningInBackground()) {
-            console.$error(process.pid, errorStr("STDERR"), "\n" + chunk.toString().trimEnd());
+            console.$error(process.pid, errorStr("stderr"), "\n" + chunk.toString().trimEnd());
         } else {
             originalStderrWrite(chunk, ...args); // 保留原始行为
         }
     };
 }
 
+function formatUptime() {
+    const uptimeSeconds = process.uptime();
+
+    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); // 计算秒数
+
+    if (days > 0) {
+        return `${days}d${hours}h`;
+    } else if (hours > 0) {
+        return `${hours}h${minutes}m`;
+    } else if (minutes > 0) {
+        return `${minutes}m${seconds}s`;
+    } else {
+        return `${seconds}s`;
+    }
+}
+
 module.exports = {
+    formatUptime,
     wrapperJsirText,
     run,
     reget,

package/package.json

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