jsir 2.4.5 → 2.4.8

package/cmd/oaa.js

@@ -30,9 +30,8 @@ const _libDataDir = getLibDataDir()
 const _fileWatcherMap = {}
 const _types = setting.fileType
 const console = createConsole();
-const room = require('../deps/room');
-const server = require('../deps/server')
-const {reqNode} = require("../deps/room");
+const Room = require('../deps/room');
+const Server = require('../deps/server')
 
 let lastFilterArg = '';
 let _cmdMapFile = setting.name + 'CmdMap.json'
@@ -675,9 +674,12 @@ async function joinServer(uniqueName) {
     let pair = parseUniqueName(uniqueName)
     for (let key of Object.keys(exportLib)) {
         let val = exportLib[key];
-        server.setRoute('post', `/${pair[0]}/${trimJsirFileName(pair[1])}/${key}`,async (req, res) => {
+        Server.setRoute('get', `/${pair[0]}/${trimJsirFileName(pair[1])}/${key}`,async (req, res) => {
             res.result = await val(...req);
-        }, server.jsonHandle)
+        })
+        Server.setRoute('post', `/${pair[0]}/${trimJsirFileName(pair[1])}/${key}`,async (req, res) => {
+            res.result = await val(...req);
+        })
     }
     console.msg(uniqueName, 'has become a service.');
 }
@@ -1032,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,
@@ -1041,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')
             });
         }
@@ -1187,11 +1189,13 @@ const keywordDef = {
     setting: {
         comment: 'Global settings',
         exeFn: async (args) => {
-            let uniqueName = _cmdMap[args[0]];
-            if (uniqueName) {
-                let configDir = `${getLibDataDir()}/config`;
-                mkdir(configDir)
-                await eia(getEditor(), [`${configDir}/${md5(uniqueName)}.json`])
+            if (args[0]) {
+                if (_cmdMap[args[0]]){
+                    let uniqueName = _cmdMap[args[0]];
+                    await eia(getEditor(), [`${getConfigDir()}/${md5(uniqueName)}.json`])
+                } else {
+                    console.warn('invalid args')
+                }
             } else {
                 await eia(getEditor(), [`${getLibDataDir()}/config.json`])
             }
@@ -1428,7 +1432,7 @@ const keywordDef = {
     quit: {
         comment: 'Exit',
         exeFn: (args) => {
-            room.offRoom();
+            Room.offRoom();
             delTips();
             console.log(infoStr("Bye!"));
             _noAppendNextLine = true;
@@ -1483,14 +1487,18 @@ 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)) {
                 console.warn('log file not found')
                 return;
             }
-            await eia(cmdStr, [`"${path}"`], true)
+            if (isRunningInBackground()) {
+                console.log(await e(`tail -n 500 "${path}"`))
+            } else {
+                await eia(cmdStr, [`"${path}"`], true)
+            }
         },
         short: 'l'
     },
@@ -1509,7 +1517,7 @@ const keywordDef = {
     room: {
         comment: 'manage room ([node])',
         exeFn: async (args) => {
-            await room.syncSetting();
+            await Room.syncSetting();
             if (args.length > 0) {
                 let have = false;
                 let tasks = []
@@ -1525,7 +1533,7 @@ const keywordDef = {
                         tasks.push(async (input) => {
                             let jsir = room.jsirs[pid];
                             console.log(infoStr(`[${pid}]`))
-                            let resp = await reqNode(room.selfNode, "post", "/enter", jsir.port, JSON.stringify({input}))
+                            let resp = await Room.reqNode(room.selfNode, "post", "/enter", jsir.port, JSON.stringify({input}))
                             console.log(JSON.parse(resp).output)
                         })
                     }
@@ -2162,20 +2170,7 @@ async function _requireSource(currSpace, cmdMatchStr, force = false) {
             let serviceObj = {};
             for (let fn of setting.services[serviceKey]) {
                 serviceObj[fn] = async (...args) => {
-                    let key = `${serviceKey}/${fn}`;
-                    let targets = setting.serviceFns[key] || []
-                    targets = targets
-                        .filter(i => i.active)
-                        .filter(i => !room.isDisableConnect(i.node, i.port));
-                    let target = null;
-                    if (targets.length > 0) {
-                        target = room.busyPick(targets);
-                    } else {
-                        throw `service function ${key} not found`;
-                    }
-                    let resp = await room.reqNode(target.node, 'post',
-                        `/${pair[0]}/${encodeURIComponent(trimJsirFileName(pair[1]))}/${fn}`, target.port, JSON.stringify(args))
-                    return JSON.parse(resp).result;
+                    return await Room.reqFn(`${serviceKey}/${fn}`, args);
                 }
             }
             return serviceObj
@@ -2271,7 +2266,7 @@ process.on('beforeExit', function () {
         delTips();
     } else {
         nextLine();
-        room.onRoom(wrapperInput)
+        Room.onRoom(wrapperInput)
     }
 });
 

package/deps/room.js

@@ -1,20 +1,23 @@
 const os = require('os');
 const {fileJson, fileLock, vl, createConsole, getKeyTips, getValTips,
     getRoomsDir, e, regEach, isRunningInBackground,
-    batchAsync, debugStr, trim, getOr, errorTag, warnStr, getConfig
+    batchAsync, debugStr, trim, getOr, errorTag, warnStr, getConfig, getConfigDir,
+    fileExist, formatUptime
 } = require('./util');
 const {setRoute, createSign} = require('../deps/server')
 const roomDataFile = "jsirRoom.json"
 const roomsDirLockKey = "RW_" + getRoomsDir();
 const syncRoomsLockKey = "SyncRooms_" + getRoomsDir();
+const syncConfigsLockKey = "SyncConfigs_" + getConfigDir();
 const updateRoomInfoLockKey = "UPDATE_" + roomDataFile
 const console = createConsole();
-const net = require("net");
 const setting = require('../deps/setting')
 const fp = require('fs').promises
 const http = require('http');
-let tailscalePath = os.platform() === 'darwin' ?
+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) {
@@ -35,6 +38,19 @@ function isPidAlive(pid) {
     }
 }
 
+async function localConfigs() {
+    let configDir = getConfigDir();
+    let configFiles = await fp.readdir(configDir)
+    let fns = configFiles
+        .map(i => () => fp.readFile(`${configDir}/${i}`));
+    let buffers = await batchAsync(fns, 33);
+    let configs = {}
+    for (let i = 0; i < configFiles.length; i++) {
+        configs[configFiles[i]] = String(buffers[i]);
+    }
+    return configs;
+}
+
 function onRoom(wrapperInput) {
     if (!setting.roomTid[0]) {
         try {
@@ -42,12 +58,12 @@ function onRoom(wrapperInput) {
             setRoute("get", "/", (req, res) => setting.selfRoom)
             setRoute("post", "/enter", async (req, res) => {
                 if (!getConfig("enableRemote", true)) {
-                    res.output = warnStr("Disable Remote!")
+                    res.output = warnStr("Disable Remote")
                     return;
                 }
                 if (vl(req.input)) {
                     if (!isRunningInBackground() && ['.nsir', '.N'].indexOf(req.input.trim()) === -1) {
-                        res.output = warnStr("Disable Remote!")
+                        res.output = warnStr("Disable Remote")
                         return;
                     }
                     setting.enterOutputs = []
@@ -57,6 +73,11 @@ function onRoom(wrapperInput) {
                     res.output = outputs.join('');
                 }
             })
+            if (configMain) {
+                setRoute("post", "/" + setting.configMainFnKey, async (req, res) => {
+                    res.result = await localConfigs();
+                })
+            }
         } catch (e) {
             debug("initRoute failed", e)
         }
@@ -252,17 +273,50 @@ async function initRoom() {
     if (roomUpdateTouchTime) {
         await fileLock(updateRoomInfoLockKey, updateRoomInfo, false)
         fileLock(syncRoomsLockKey, syncRooms, false);
+        if (!configMain && setting.serviceFns.hasOwnProperty(setting.configMainFnKey)) {
+            fileLock(syncConfigsLockKey, syncConfigs, false);
+        }
     }
 
     await syncSetting();
 }
 
+async function syncConfigs() {
+    let configs;
+    try {
+        configs = await reqFn(setting.configMainFnKey);
+    } catch (e) {
+        debug("syncConfigs failed", e)
+        return;
+    }
+    let configDir = getConfigDir();
+    let fns = [];
+    for (let key of Object.keys(configs)) {
+        let path = configDir + "/" + key;
+        let text = configs[key];
+        fns.push(async () => {
+            if (await fileExist(path)) {
+                let currText = String(await fp.readFile(path));
+                if (currText !== text) {
+                    await fp.writeFile(path, text)
+                    debug(`sync ${key} success`);
+                }
+            } else {
+                await fp.writeFile(path, text)
+                debug(`sync ${key} success`);
+            }
+        });
+    }
+    await batchAsync(fns, 33)
+    debug('syncConfigs done')
+}
+
 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'); // 强制终止进程
@@ -297,7 +351,11 @@ async function initRoomJsir(room) {
     for (let key of Object.keys(setting.routes)) {
         let ss = key.split("/").map(trim).filter(i => i);
         if (ss.length > 3) {
+            // 脚本空间service
             getOr(services, ss[1] + '/' + ss[2], []).push(ss[3])
+        } else if (ss.length > 2) {
+            // jsir service
+            getOr(services, ss[1], []).push(ss[2])
         }
     }
     // 初始化jsir
@@ -314,7 +372,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()
     }
 }
 
@@ -374,53 +434,57 @@ async function reqNode(node, method, url, port, body) {
             'sign': createSign()
         }
     };
-    debug('reqRoom', JSON.stringify(opt))
-    return await new Promise((resolve, reject) => {
-        try {
-            let timeoutMs = setting.reqNodeTimeouts[url] || setting.reqNodeDefaultTimeout;
-            let timeout = null
-
-            const req = http.request(opt, (res) => {
-                let data = '';
-                // 数据块接收
-                res.on('data', (chunk) => {
-                    data += chunk;
+    let time = Date.now();
+    try {
+        return await new Promise((resolve, reject) => {
+            try {
+                let timeoutMs = setting.reqNodeTimeouts[url] || setting.reqNodeDefaultTimeout;
+                let timeout = null
+
+                const req = http.request(opt, (res) => {
+                    let data = '';
+                    // 数据块接收
+                    res.on('data', (chunk) => {
+                        data += chunk;
+                    });
+                    // 响应结束
+                    res.on('end', () => {
+                        clearTimeout(timeout)
+                        // 检查响应状态码
+                        if (res.statusCode !== 200) {
+                            reject(errorTag(new Error(data), decodeURIComponent(url)));
+                            return;
+                        }
+                        resolve(data)
+                    });
                 });
-                // 响应结束
-                res.on('end', () => {
-                    clearTimeout(timeout)
-                    // 检查响应状态码
-                    if (res.statusCode !== 200) {
-                        reject(errorTag(new Error(data), decodeURIComponent(url)));
-                        return;
+
+                // 设置超时逻辑
+                timeout = setTimeout(() => {
+                    req.destroy(); // 中断请求
+                }, timeoutMs); // 10秒超时
+
+                // 错误处理
+                req.on('error', (e) => {
+                    clearTimeout(timeout); // 清除超时定时器
+                    if (room) {
+                        setting.disableConnect[node + ":" + port] = Date.now() + setting.disableConnectLimit
                     }
-                    resolve(data)
+                    reject(e)
                 });
-            });
 
-            // 设置超时逻辑
-            timeout = setTimeout(() => {
-                req.destroy(); // 中断请求
-            }, timeoutMs); // 10秒超时
-
-            // 错误处理
-            req.on('error', (e) => {
-                clearTimeout(timeout); // 清除超时定时器
-                if (room) {
-                    setting.disableConnect[node + ":" + port] = Date.now() + setting.disableConnectLimit
+                if (body) {
+                    req.write(body)
                 }
+                // 结束请求
+                req.end();
+            } catch (e) {
                 reject(e)
-            });
-
-            if (body) {
-                req.write(body)
             }
-            // 结束请求
-            req.end();
-        } catch (e) {
-            reject(e)
-        }
-    })
+        });
+    } finally {
+        debug(`reqRoom cost ${Date.now() - time}ms`, JSON.stringify(opt), )
+    }
 }
 
 function busyPick(busyItems) {
@@ -441,11 +505,26 @@ function busyPick(busyItems) {
     }
 }
 
+async function reqFn(fnKey, args = []) {
+    let targets = setting.serviceFns[fnKey] || []
+    targets = targets
+        .filter(i => i.active)
+        .filter(i => !isDisableConnect(i.node, i.port));
+    let target = null;
+    if (targets.length > 0) {
+        target = busyPick(targets);
+    } else {
+        throw `service function ${fnKey} not found`;
+    }
+    let resp = await reqNode(target.node, 'post',
+        `/${encodeURI(fnKey)}`, target.port, JSON.stringify(args || []))
+    return JSON.parse(resp).result;
+}
+
 module.exports = {
     onRoom,
     offRoom,
     syncSetting,
     reqNode,
-    isDisableConnect,
-    busyPick
+    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 = decodeURIComponent(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/setting.js

@@ -39,5 +39,5 @@ module.exports = {
     roomTimer: 1000,
     serverSignExpire: 6000,
     roomHeartbeatExpire: 9000,
-    consoleMap: {}
+    configMainFnKey: "config/main"
 }

package/deps/util.js

@@ -256,7 +256,7 @@ function createConsole(uniqueName) {
             if ('debug' === key && !global.$DEBUG) {
                 return;
             }
-            if (uniqueName && (quite || isRunningInBackground())) {
+            if (uniqueName && quite) {
                 if ((key === 'table' || key === 'nable') && typeof args[0] === "object") {
                     args = ['', ...args]
                 }
@@ -272,9 +272,6 @@ function createConsole(uniqueName) {
             }
         }
     }
-    if (uniqueName) {
-        setting.consoleMap[uniqueName] = result;
-    }
     return result;
 }
 
@@ -1017,9 +1014,6 @@ function _getConfig(key, defaultVal, uniqueName) {
     if (key === undefined) {
         return config
     }
-    if (uniqueName && setting.consoleMap[uniqueName]) {
-        setting.consoleMap[uniqueName].msg(`require ${uniqueName} config "${key}"`)
-    }
     let writeFlag = false
     if (!(key in config)) {
         writeFlag = true
@@ -1175,14 +1169,7 @@ async function _fileLock(key, fn, expireMs = 49000) {
     const expireAt = expireMs > 0 ? now + expireMs : 0;
 
     // 1. 尝试判断锁目录是否已存在
-    let lockExists = false;
-    try {
-        await fp.access(lockKeyDir);  // 若存在则不抛错
-        lockExists = true;
-    } catch (_) {
-        // 不存在时会抛ENOENT错误，说明还没有锁
-        lockExists = false;
-    }
+    let lockExists = await fileExist(lockKeyDir);
 
     if (lockExists) {
         // 目录存在时，读取文件名中的过期时间戳
@@ -1569,6 +1556,9 @@ async function eia(cmd, args = [], shell = false) {
     `
     当前进程不会卡住，输入输出由cmd进程持有
     `
+    if (isRunningInBackground()) {
+        throw 'Unsupported Operation';
+    }
     setting.enableNextLine = false;
     let child = spawn(cmd, args, {stdio:"inherit", shell});
     return new Promise((resolve, reject) => {
@@ -1895,7 +1885,7 @@ function md5(message) {
     return crypto.createHash('md5').update(message).digest('hex');
 }
 
-async function batchAsync(fns = [], asyncNum = 1, limitMs = 49000) {
+async function batchAsync(fns = [], asyncNum = 9, limitMs = 0) {
     if (fns.length <= 0 || asyncNum < 1) {
         return []
     }
@@ -1905,7 +1895,12 @@ async function batchAsync(fns = [], asyncNum = 1, limitMs = 49000) {
     for(let i = 0; i< fns.length; i++) {
         let pro = new Promise(async (resolve, reject) => {
             try {
-                let resp = await timeLimit([fns[i]()], limitMs);
+                let resp;
+                if (limitMs) {
+                    resp = await timeLimit([fns[i]()], limitMs);
+                } else {
+                    resp = [await fns[i]()];
+                }
                 doneMap[i] = pro;
                 resolve(resp[0])
             } catch (e) {
@@ -2053,7 +2048,7 @@ function getValTips() {
             }
             return item;
         }).join("|");
-        items.push(val)
+        items.push(val || trim(key))
     }
     return items
 }
@@ -2082,6 +2077,8 @@ function interceptStdStreams() {
     process.stdout.write = (chunk, ...args) => {
         if(setting.enterOutputs) {
             setting.enterOutputs.push(chunk.toString());
+        } else if (isRunningInBackground()) {
+            console.$log(process.pid, "stdout", "\n" + chunk.toString().trimEnd());
         } else {
             originalStdoutWrite(chunk, ...args); // 保留原始行为
         }
@@ -2091,13 +2088,35 @@ function interceptStdStreams() {
     process.stderr.write = (chunk, ...args) => {
         if(setting.enterOutputs) {
             setting.enterOutputs.push(chunk.toString());
+        } else if (isRunningInBackground()) {
+            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,
@@ -2206,5 +2225,6 @@ module.exports = {
     isRunningInBackground,
     createDetachedProcess,
     interceptStdStreams,
-    draftModify
+    draftModify,
+    fileExist
 }

package/package.json

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