jsir 2.4.0 → 2.4.2

package/cmd/oaa.js

@@ -11,7 +11,8 @@ const {
     createConsole, setTips, delTips,
     getEditor, errorStr, getConfigDir,
     getFullPath, parseUniqueName, toUniqueName, isJsirFileName, toJsirFileName,
-    getAlias, wrapperJsirText, eia, getKeyTips, getValTips, getJsirTypeKey
+    getAlias, wrapperJsirText, eia, getKeyTips, getValTips, getJsirTypeKey,
+    createDetachedProcess, interceptStdStreams
 } = $lib;
 const _args = process.argv.slice(2).map(trim);
 const evalCode = require('../deps/evalCode')
@@ -29,6 +30,9 @@ 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 {isRunningInBackground} = require("../deps/util");
 
 let lastFilterArg = '';
 let _cmdMapFile = setting.name + 'CmdMap.json'
@@ -157,6 +161,7 @@ function checkWorkspaces() {
 }
 
 async function start() {
+    interceptStdStreams()
     checkWorkspaces()
     initWorkspace()
 
@@ -391,7 +396,7 @@ function _nextLine(callback, promptStr, hidden, resolve, end, isText) {
             _haveWrapperInput = true;
             closeRl()
             inputStr = inputStr.replace(/\s+$/, '');
-            if (!isText && /^\d+$/.test(inputStr) && /^\s+/.test(textLine)) {
+            if (!isText && /^\d+$/.test(inputStr) && /^\s+/.test(textLine) && (!callback || callback === wrapperInput)) {
                 inputStr = '.e ' + inputStr;
             }
             let pro = (callback || wrapperInput)(inputStr);
@@ -580,11 +585,11 @@ function wrapperAlias(str) {
 async function _wrapperInput(str) {
     _haveWrapperInput = true;
     global.$newInput = true;
-
     str = trim(str)
     if (!str) {
         return;
     }
+    global.$newError = false;
     str = wrapperAlias(str);
 
     if (/^[`'"]/.test(str)) {
@@ -624,10 +629,16 @@ async function _wrapperInput(str) {
             let firstName = getJsirTypeKey(fileName)
             if (firstName === setting.fileKey) {
                 await workFile(uniqueName)
-            } else if (firstName !== setting.exeKey) {
-                console.log(String(fs.readFileSync(path)));
-            } else {
+            } else if (firstName === setting.exeKey) {
                 await runCmd(str)
+            } else if (firstName === setting.initKey) {
+                if (strs[1] === '-') {
+                    await offServer(uniqueName)
+                } else {
+                    await joinServer(uniqueName)
+                }
+            } else {
+                console.log(String(fs.readFileSync(path)));
             }
         } else {
             await runCmd(str)
@@ -635,6 +646,44 @@ async function _wrapperInput(str) {
     }
 }
 
+async function joinServer(uniqueName) {
+    let exportLib = await _requireSource(setting.defaultSpace, uniqueName, true);
+    let asyncFnSize = 0
+    for (let key of Object.keys(exportLib)) {
+        let val = exportLib[key];
+        if (getType(val) !== 'AsyncFunction') {
+            throw `service function must be async`;
+        }
+        asyncFnSize ++
+    }
+    if (asyncFnSize <= 0) {
+        console.warn('no items');
+        return;
+    }
+    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) => {
+            res.result = await val(...req);
+        }, server.jsonHandle)
+    }
+    console.msg(uniqueName, 'has become a service.');
+}
+
+async function offServer(uniqueName) {
+    let pair = parseUniqueName(uniqueName)
+    let service = `${pair[0]}/${trimJsirFileName(pair[1])}`;
+
+    for (let key of Object.keys(setting.routes)) {
+        let ss = key.split("/").map(trim).filter(i => i);
+        let keyService = ss[1] + '/' + ss[2]
+        if (keyService === service) {
+            delete setting.routes[key]
+        }
+    }
+    console.msg(uniqueName, 'service has been offline.');
+}
+
 async function dealStartGlobalMode(rows, items, text) {
     console.info('global search mode');
     rows.push(...await dealStarCase(await evalText('return $context'), items, '$context'))
@@ -978,18 +1027,20 @@ async function showRooms() {
         })
         for (let key of Object.keys(room.jsirs)) {
             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: (process.pid === jsir.pid ? "*" : " ") + jsir.pid,
+                pid: jsir.newError ? errorStr(pidStr):pidStr,
                 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 => i + ': ' + jsir.tips[i]).join('\n'),
+                services: Object.keys(jsir.services || []).map(msgStr).join('\n')
             });
         }
     }
@@ -1392,7 +1443,11 @@ const keywordDef = {
             if (args.length > 1) {
                 _args = args.slice(1)
             }
-            await eia(`cd "${setting.workspaceMap[setting.defaultSpace]}";${cmd}`, _args, true)
+            if (isRunningInBackground()) {
+                console.log(await e(`cd "${setting.workspaceMap[setting.defaultSpace]}";${args.join(' ')}`))
+            } else {
+                await eia(`cd "${setting.workspaceMap[setting.defaultSpace]}";${cmd}`, _args, true)
+            }
         },
         short: 'E'
     },
@@ -1443,17 +1498,48 @@ const keywordDef = {
         comment: 'manage room ([node])',
         exeFn: async (args) => {
             await room.syncSetting();
-            if (args[0]) {
-                if (setting.selfRoom.nodes.indexOf(args[0]) !== -1) {
-                    await eia("ssh", [args[0]])
-                } else {
-                    console.warn("invalid node")
+            if (args.length > 0) {
+                let have = false;
+                let tasks = []
+                for (let room of setting.rooms) {
+                    for (let pid of Object.keys(room.jsirs || {})) {
+                        if (args.indexOf(room.selfNode) === -1 && args.indexOf(pid) === -1) {
+                            continue;
+                        }
+                        if (setting.selfRoom.selfNode === room.selfNode && String(process.pid) === pid) {
+                            continue;
+                        }
+                        have = true;
+                        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}))
+                            console.log(JSON.parse(resp).output)
+                        })
+                    }
+                }
+                let input = have ? await nextLine(i => i):''
+                if (vl(input)) {
+                    for (let task of tasks) {
+                        try {
+                            await task(input)
+                        } catch (e) {
+                            console.error(e)
+                        }
+                    }
                 }
             } else {
                 await showRooms();
             }
         },
         short: 'm'
+    },
+    nsir: {
+        comment: 'new jsir',
+        exeFn: async (args) => {
+            await createDetachedProcess('jsir', ['.p'])
+        },
+        short: 'N'
     }
 }
 
@@ -2050,7 +2136,7 @@ function filterRequire(currSpace, cmdMatchStr) {
     return cmds[0];
 }
 
-async function _requireSource(currSpace, cmdMatchStr) {
+async function _requireSource(currSpace, cmdMatchStr, force = false) {
     let result
     let uniqueName = filterRequire(currSpace, cmdMatchStr);
     let path = getFullPath(uniqueName)
@@ -2058,7 +2144,32 @@ async function _requireSource(currSpace, cmdMatchStr) {
     let pair = parseUniqueName(uniqueName)
     let typeKey = getJsirTypeKey(pair[1]);
     if (typeKey === setting.initKey) {
-        result = await evalText(text, uniqueName)
+        let pair = parseUniqueName(uniqueName)
+        let serviceKey = `${pair[0]}/${trimJsirFileName(pair[1])}`
+        if (setting.defaultSpace !== 'local' && !force && setting.services[serviceKey]) {
+            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 serviceObj
+        } else {
+            result = await evalText(text, uniqueName)
+        }
     } else if (typeKey === setting.exeKey) {
         result = async (argsStr) => {
             return await runCmd(trim(argsStr), uniqueName, text)
@@ -2148,7 +2259,7 @@ process.on('beforeExit', function () {
         delTips();
     } else {
         nextLine();
-        room.onRoom()
+        room.onRoom(wrapperInput)
     }
 });
 

package/deps/evalCode.js

@@ -37,10 +37,6 @@ module.exports = async ($text = '', $cmdName = '', $args = [],
         $homeDir, $lib, $cmdMap
     }
     let console = $lib.createConsole($cmdName);
-    try {
-        return await eval(`(async ()=>{${$text};
-        })()`)
-    } catch (e) {
-        console.error(e)
-    }
+    return await eval(`(async ()=>{${$text};
+    })()`)
 }

package/deps/room.js

@@ -1,7 +1,7 @@
 const os = require('os');
 const {fileJson, fileLock, vl, createConsole, getKeyTips, getValTips,
     getRoomsDir, e, regEach, isRunningInBackground,
-    batchAsync, debugStr
+    batchAsync, debugStr, trim, getOr, errorTag, warnStr, getConfig
 } = require('./util');
 const {setRoute, createSign} = require('../deps/server')
 const roomDataFile = "jsirRoom.json"
@@ -35,11 +35,28 @@ function isPidAlive(pid) {
     }
 }
 
-function onRoom() {
+function onRoom(wrapperInput) {
     if (!setting.roomTid[0]) {
         try {
             setRoute("post", "/", (req, res) => setting.selfRoom)
             setRoute("get", "/", (req, res) => setting.selfRoom)
+            setRoute("post", "/enter", async (req, res) => {
+                if (!getConfig("enableRemote", true)) {
+                    res.output = warnStr("Disable Remote!")
+                    return;
+                }
+                if (vl(req.input)) {
+                    if (!isRunningInBackground() && ['.nsir', '.N'].indexOf(req.input.trim()) === -1) {
+                        res.output = warnStr("Disable Remote!")
+                        return;
+                    }
+                    setting.enterOutputs = []
+                    await wrapperInput(req.input)
+                    let outputs = setting.enterOutputs || [];
+                    setting.enterOutputs = null;
+                    res.output = outputs.join('\n');
+                }
+            })
         } catch (e) {
             debug("initRoute failed", e)
         }
@@ -57,7 +74,7 @@ function _onRoom() {
         if (setting.roomTid[0]) {
             _onRoom();
         }
-    }, 3000)
+    }, setting.roomTimer)
 }
 
 function offRoom() {
@@ -120,7 +137,12 @@ async function syncRooms() {
         fns.push(async () => {
             let respBody = ''
             try {
-                respBody = await reqNode(node, "get", "/");
+                try {
+                    respBody = await reqNode(node, "get", "/");
+                } catch (e) {
+                    debug(`sync ${node} failed:`, e);
+                    respBody = await reqNode(node, "get", "/", setting.defaultPort);
+                }
                 syncRooms.push(JSON.parse(respBody))
                 debug(`sync ${node} success`);
             } catch (e) {
@@ -128,7 +150,7 @@ async function syncRooms() {
             }
         })
     }
-    await batchAsync(fns, 9, 3000);
+    await batchAsync(fns, 33);
     await fileLock(roomsDirLockKey, async () => {
         for (let syncRoom of [...syncRooms]) {
             if (syncRoom.selfNode) {
@@ -186,6 +208,30 @@ async function _syncSetting(room) {
                 jsir.active = Date.now() - (jsir.lastUpdateTime || 0) <= 9000)
             return room;
         });
+
+    setting.services = {}
+    setting.serviceFns = {}
+    for (const room of setting.rooms) {
+        for (const pid of Object.keys(room.jsirs || [])) {
+            let jsir = room.jsirs[pid];
+            for (const service of Object.keys(jsir.services || [])) {
+                let serviceFns = jsir.services[service] || [];
+
+                let existFns = setting.services[service] || [];
+                existFns.push(...serviceFns)
+                setting.services[service] = [...new Set(existFns)]
+
+                for (const fn of serviceFns) {
+                    getOr(setting.serviceFns, service + '/' + fn, []).push({
+                        node: room.selfNode,
+                        port: jsir.port,
+                        busy: jsir.busy,
+                        active: jsir.active
+                    });
+                }
+            }
+        }
+    }
 }
 
 async function initRoom() {
@@ -205,6 +251,10 @@ async function initRoom() {
     await syncSetting();
 }
 
+/*
+最小为0
+100 为1 毫秒
+ */
 async function getEventLoopDelay() {
     const start = process.hrtime.bigint();
     const delay = 1; // 用于测量的短暂延迟（单位：毫秒）
@@ -219,6 +269,15 @@ async function initRoomJsir(room) {
     room.jsirs = Object.fromEntries(
         Object.entries(room.jsirs || {}).filter(([pid]) => isPidAlive(pid))
     );
+
+    let services = {}
+    for (let key of Object.keys(setting.routes)) {
+        let ss = key.split("/").map(trim).filter(i => i);
+        if (ss.length > 3) {
+            getOr(services, ss[1] + '/' + ss[2], []).push(ss[3])
+        }
+    }
+    let lastJsir = room.jsirs[process.pid]
     room.jsirs[process.pid] = {
         pid: process.pid,
         space: setting.defaultSpace,
@@ -226,10 +285,12 @@ async function initRoomJsir(room) {
             obj[key] = getValTips()[index];
             return obj;
         }, {}),
-        busy: await getEventLoopDelay(),
+        busy: await getEventLoopDelay() || (lastJsir ? lastJsir.busy:0),
         back: isRunningInBackground(),
         lastUpdateTime: Date.now(),
-        port: setting.server ? setting.server.address().port:null
+        port: setting.server ? setting.server.address().port:null,
+        services: services,
+        newError: global.$newError
     }
 }
 
@@ -263,62 +324,21 @@ function getLocalIPs() {
     return result;
 }
 
-async function sshEnables(ips) {
-    // 检查开放 22 端口的 IP
-    const sshEnabledIPs = [];
-    const portCheckPromises = ips.map((ip) =>
-        checkPortOpen(ip, 22).then((isOpen) => {
-            if (isOpen) {
-                sshEnabledIPs.push(ip);
-            }
-        })
-    );
-
-    await Promise.all(portCheckPromises);
-    return sshEnabledIPs;
-}
-
-/**
- * 检查指定 IP 的指定端口是否开放
- * @param {string} ip - 目标 IP 地址
- * @param {number} port - 目标端口
- * @returns {Promise<boolean>} - 是否开放
- */
-function checkPortOpen(ip, port) {
-    return new Promise((resolve) => {
-        const socket = new net.Socket();
-        socket.setTimeout(1000); // 设置超时时间
-
-        socket
-            .connect(port, ip, () => {
-                socket.destroy(); // 成功连接后关闭 socket
-                resolve(true);
-            })
-            .on("error", () => {
-                socket.destroy(); // 遇到错误时关闭 socket
-                resolve(false);
-            })
-            .on("timeout", () => {
-                socket.destroy(); // 超时时关闭 socket
-                resolve(false);
-            });
-    });
-}
-
 function isDisableConnect(node, port) {
     let disableTime = setting.disableConnect[node + ":" + port] || 0;
     return disableTime > Date.now()
 }
 
-async function reqNode(node, method, url) {
-    let port = 52108;
+async function reqNode(node, method, url, port, body) {
     let room = setting.rooms.filter(i => i.selfNode === node)[0]
-    if (room) {
-        let activeJsir = Object.values(room.jsirs)
-            .filter(i => !isDisableConnect(node, i.port))
-            .sort((a,b) => a.busy - b.busy);
-        if (activeJsir.length > 0) {
-            port = activeJsir[0].port;
+    if (!port) {
+        port = setting.defaultPort;
+        if (room) {
+            let activeJsir = Object.values(room.jsirs)
+                .filter(i => !isDisableConnect(node, i.port));
+            if (activeJsir.length > 0) {
+                port = busyPick(activeJsir).port;
+            }
         }
     }
     let opt = {
@@ -332,33 +352,76 @@ async function reqNode(node, method, url) {
     };
     debug('reqRoom', JSON.stringify(opt))
     return await new Promise((resolve, reject) => {
-        const req = http.request(opt, (res) => {
-            let data = '';
-            // 数据块接收
-            res.on('data', (chunk) => {
-                data += chunk;
+        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', () => {
-                resolve(data)
+
+            // 设置超时逻辑
+            timeout = setTimeout(() => {
+                req.destroy(); // 中断请求
+            }, timeoutMs); // 10秒超时
+
+            // 错误处理
+            req.on('error', (e) => {
+                clearTimeout(timeout); // 清除超时定时器
+                if (room) {
+                    setting.disableConnect[node + ":" + port] = Date.now() + setting.disableConnectLimit
+                }
+                reject(e)
             });
-        });
 
-        // 错误处理
-        req.on('error', (e) => {
-            if (room) {
-                setting.disableConnect[node + ":" + port] = Date.now() + 9000
+            if (body) {
+                req.write(body)
             }
+            // 结束请求
+            req.end();
+        } catch (e) {
             reject(e)
-        });
-
-        // 结束请求
-        req.end();
+        }
     })
 }
 
+function busyPick(busyItems) {
+    if (busyItems.length === 1) {
+        return busyItems[0]
+    }
+    // 反转权重：计算 1 / busy 值作为权重
+    const weights = busyItems.map(item => 1 / (item.busy || 1));
+    const totalWeight = weights.reduce((sum, weight) => sum + weight, 0);
+    const random = Math.random() * totalWeight;
+
+    let cumulativeWeight = 0;
+    for (let i = 0; i < busyItems.length; i++) {
+        cumulativeWeight += weights[i];
+        if (random < cumulativeWeight) {
+            return busyItems[i]; // 选中反转权重命中的对象
+        }
+    }
+}
+
 module.exports = {
     onRoom,
     offRoom,
-    syncSetting
+    syncSetting,
+    reqNode,
+    isDisableConnect,
+    busyPick
 }

package/deps/server.js

@@ -1,11 +1,11 @@
 const http = require('http');
-const {createConsole, vl, aesDecipher, md5, aesCipher, debugStr} = require('./util');
+const {createConsole, vl, aesDecipher, md5, aesCipher, debugStr, isError} = require('./util');
 const console = createConsole();
 const setting = require('../deps/setting')
 // 尝试监听的端口
-const preferredPort = 52108;
+const preferredPort = setting.defaultPort;
 // 路由存储
-const routes = {};
+const routes = setting.routes;
 let invokeStart = false;
 
 function debug(...args) {
@@ -36,10 +36,14 @@ function createSign() {
 async function createServer(port) {
     const server = http.createServer(async (req, res) => {
         const method = req.method.toLowerCase();
-        const url = req.url;
+        const url = decodeURIComponent(req.url);
 
+        // 获取客户端的 IP 地址
+        const clientIp = req.socket.remoteAddress || req.connection.remoteAddress;
         // 查找对应的路由处理函数
         const routeKey = `${method} ${url}`;
+        debug(`Received ${routeKey} from ${clientIp}`);
+
         if (routes[routeKey]) {
             // 取header里的sign字段
             const sign = req.headers['sign'];
@@ -47,24 +51,40 @@ async function createServer(port) {
                 const decodedTime = verifySign(sign);
                 const currentTime = Date.now();
 
-                if (decodedTime === null || Math.abs(currentTime - decodedTime) > 3000) {
-                    // 解码失败或者时间差大于9秒，返回403
+                if (decodedTime === null || Math.abs(currentTime - decodedTime) > setting.serverSignExpire) {
                     res.writeHead(403, { 'Content-Type': 'text/plain' });
-                    res.end('Forbidden: Invalid Sign\n');
+                    res.end('Forbidden: Invalid Sign');
                     return;
                 }
             } else {
                 // 如果没有sign字段，返回403
                 res.writeHead(403, { 'Content-Type': 'text/plain' });
-                res.end('Forbidden: Missing Sign\n');
+                res.end('Forbidden: Missing Sign');
                 return;
             }
-
             // 如果签名通过，继续处理请求
-            await routes[routeKey](req, res);
+            try {
+                let body = '';
+                await new Promise((resolve, reject) => {
+                    // 监听请求数据
+                    req.on('data', chunk => {
+                        body += chunk;
+                    });
+                    req.on('error', (err) => {
+                        reject(err)
+                    });
+                    req.on('end', async () => {
+                        resolve()
+                    })
+                })
+                await routes[routeKey](body, res);
+            } catch (e) {
+                res.writeHead(500, { 'Content-Type': 'text/plain' });
+                res.end(String(isError(e) ? e.message:e));
+            }
         } else {
             res.writeHead(404, { 'Content-Type': 'text/plain' });
-            res.end('Not Found\n');
+            res.end('Not Found');
         }
     });
 
@@ -95,6 +115,12 @@ async function startServer() {
 }
 
 // 设置路由的方法
+/*
+    exam:
+    method, url, fn, handler(req, res, fn, err)
+    method, url, fn(req, res, err), null
+    err: {code, msg}
+ */
 function setRoute(method, url, fn, handler = jsonHandle) {
     startServer();
 
@@ -106,51 +132,29 @@ function setRoute(method, url, fn, handler = jsonHandle) {
     } else {
         routes[routeKey] = fn;
     }
-    debug(`AddRoute: ${method.toUpperCase()} ${url} ${handler ? handler.constructor.name:''}`);
+    debug(`setRoute: ${method.toUpperCase()} ${url} ${handler ? handler.name:''}`);
     return setting.server;
 }
 
-function delRoute(method, url) {
-    const routeKey = `${method.toLowerCase()} ${url}`;
-    delete routes[routeKey];
-    debug(`DelRoute: ${method.toUpperCase()} ${url}`);
-}
-
-function jsonHandle(req, res, fn) {
-    let body = '';
-
-    // 监听请求数据
-    req.on('data', chunk => {
-        body += chunk;
-    });
-
-    req.on('end', async () => {
-        try {
-            // 解析 JSON 请求体
-            const requestData = body ? JSON.parse(body):{};
+async function jsonHandle(req, res, fn) {
+    // 解析 JSON 请求体
+    const requestData = req ? JSON.parse(req):{};
 
-            // 创建响应 JSON 数据
-            let responseData = {};
-            let result = await fn(requestData, responseData);
-            if (vl(result)) {
-                responseData = result;
-            }
+    // 创建响应 JSON 数据
+    let responseData = {};
+    let result = await fn(requestData, responseData);
+    if (vl(result)) {
+        responseData = result;
+    }
 
-            // 设置响应头
-            res.writeHead(200, { 'Content-Type': 'application/json' });
-            // 返回 JSON 响应
-            res.end(JSON.stringify(responseData));
-        } catch (error) {
-            // 错误处理：如果 JSON 解析失败
-            res.writeHead(400, { 'Content-Type': 'application/json' });
-            res.end(JSON.stringify({ error: 'Invalid JSON format' }));
-        }
-    });
+    // 设置响应头
+    res.writeHead(200, { 'Content-Type': 'application/json' });
+    // 返回 JSON 响应
+    res.end(JSON.stringify(responseData));
 }
 
 module.exports = {
     setRoute,
-    delRoute,
     jsonHandle,
     createSign
 };

package/deps/setting.js

@@ -8,8 +8,6 @@ fileType[exeKey] = "exe";
 fileType[initKey] = "init";
 fileType[fileKey] = "file";
 
-const defaultType = 'note';
-
 module.exports = {
     name: 'jsir',
     libDataDir: '.jsirData',
@@ -17,7 +15,7 @@ module.exports = {
     exeKey,
     initKey,
     fileKey,
-    defaultType,
+    defaultType: 'note',
     packages: {},
     tips: {},
     defaultSpace: 'local',
@@ -27,5 +25,17 @@ module.exports = {
     selfRoom: {},
     rooms: [],
     server: null,
-    disableConnect: {}
+    disableConnect: {},
+    disableConnectLimit: 6000,
+    routes: {},
+    services: {},
+    serviceFns: {},
+    enterOutputs: null,
+    defaultPort: 52108,
+    reqNodeDefaultTimeout: 9000,
+    reqNodeTimeouts: {
+        '/': 3000
+    },
+    roomTimer: 1000,
+    serverSignExpire: 6000
 }

package/deps/util.js

@@ -256,7 +256,7 @@ function createConsole(uniqueName) {
             if ('debug' === key && !global.$DEBUG) {
                 return;
             }
-            if (isRunningInBackground() || (uniqueName && quite)) {
+            if (uniqueName && (quite || isRunningInBackground())) {
                 if ((key === 'table' || key === 'nable') && typeof args[0] === "object") {
                     args = ['', ...args]
                 }
@@ -702,7 +702,7 @@ function createLimitLogger(fileName, {
         if (error) {
             global.$newError = true;
         }
-        text = `${pad(3, String(process.pid%1000), ' ')}> ${text}`
+        text = `${pad(3, String(process.pid%1000), process.pid >= 1000 ? '0':' ')}> ${text}`
         if (time) {
             text = `${timeStr('YYYY-MM-DD HH:mm:ss.SSS')} ${text}`
         }
@@ -1204,7 +1204,7 @@ async function _fileLock(key, fn, expireMs = 49000) {
 
 async function fileLock(key, fn, wait = true, expireMs = 49000) {
     `
-    文件锁, 默认一直等待，直到加锁成功执行fn
+    文件锁, 默认一直等待expireMs，直到加锁成功执行fn
     wait = false, 加锁失败则不执行fn
     return void
     `
@@ -1854,7 +1854,7 @@ function md5(message) {
     return crypto.createHash('md5').update(message).digest('hex');
 }
 
-async function batchAsync(fns = [], asyncNum = 1, limitMs = 9000) {
+async function batchAsync(fns = [], asyncNum = 1, limitMs = 49000) {
     if (fns.length <= 0 || asyncNum < 1) {
         return []
     }
@@ -1920,12 +1920,8 @@ function errorTag(e, tag) {
     if (!tag) {
         return e;
     }
-    let newError = new Error(getVl(e.message, e))
+    let newError = isError(e) ? e:new Error(e);
     let stack = newError.stack
-    if (isError(e)) {
-        newError.name = e.name;
-        stack = e.stack;
-    }
     newError.stack = stack + `\n    at ${tag}`
     return newError
 }
@@ -2025,6 +2021,41 @@ function getJsirTypeKey(fileName) {
     return fileName.split(/[^a-zA-Z]+/)[0] || ''
 }
 
+function createDetachedProcess(cmd, args = []) {
+    // 创建子进程
+    const subprocess = spawn(cmd, [...args], {
+        detached: true, // 独立运行
+        stdio: ['ignore']
+    });
+    // 让主进程不再等待子进程
+    subprocess.unref();
+    console.log(`New ${cmd} process started with PID:`, subprocess.pid);
+}
+
+function interceptStdStreams() {
+    // 保存原始的 stdout 和 stderr 写入方法
+    const originalStdoutWrite = process.stdout.write.bind(process.stdout);
+    const originalStderrWrite = process.stderr.write.bind(process.stderr);
+
+    // 重写 process.stdout.write
+    process.stdout.write = (chunk, ...args) => {
+        if(setting.enterOutputs) {
+            setting.enterOutputs.push(chunk.toString());
+        } else {
+            originalStdoutWrite(chunk, ...args); // 保留原始行为
+        }
+    };
+
+    // 重写 process.stderr.write
+    process.stderr.write = (chunk, ...args) => {
+        if(setting.enterOutputs) {
+            setting.enterOutputs.push(chunk.toString());
+        } else {
+            originalStderrWrite(chunk, ...args); // 保留原始行为
+        }
+    };
+}
+
 module.exports = {
     wrapperJsirText,
     run,
@@ -2131,5 +2162,7 @@ module.exports = {
     getRoomsDir,
     getDataDir,
     getJsirTypeKey,
-    isRunningInBackground
+    isRunningInBackground,
+    createDetachedProcess,
+    interceptStdStreams
 }

package/package.json

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