jsir 2.3.7 → 2.3.9

package/cmd/oaa.js

@@ -11,7 +11,7 @@ const {
     createConsole, setTips, delTips,
     getEditor, errorStr, getConfigDir,
     getFullPath, parseUniqueName, toUniqueName, isJsirFileName, toJsirFileName,
-    getAlias, wrapperJsirText, eia, getKeyTips, getValTips, getRoomsDir
+    getAlias, wrapperJsirText, eia, getKeyTips, getValTips, getJsirTypeKey
 } = $lib;
 const _args = process.argv.slice(2).map(trim);
 const evalCode = require('../deps/evalCode')
@@ -437,9 +437,10 @@ async function save(args) {
         return
     }
     let resp;
-    if (args[0].startsWith(setting.exeKey)) {
+    let typeKey = getJsirTypeKey(args[0]);
+    if (typeKey === setting.exeKey) {
         resp = example.exeFile;
-    } else if (args[0].startsWith(setting.initKey)) {
+    } else if (typeKey === setting.initKey) {
         resp = example.initFile;
     } else {
         resp = await getCbText();
@@ -498,8 +499,8 @@ function listCmd(tmpMap) {
             a = parseUniqueName(a)[1];
             b = parseUniqueName(b)[1];
             let typeKeys = Object.keys(_types);
-            let orderA = typeKeys.indexOf(a.split(/\s+/)[0]);
-            let orderB = typeKeys.indexOf(b.split(/\s+/)[0]);
+            let orderA = typeKeys.indexOf(getJsirTypeKey(a));
+            let orderB = typeKeys.indexOf(getJsirTypeKey(b));
             orderA = orderA === -1 ? 999999:orderA;
             orderB = orderB === -1 ? 999999:orderB;
             return orderA - orderB
@@ -521,7 +522,7 @@ function listCmd(tmpMap) {
         let item = {
             key: ' ' + i,
             name: pair[0] + '/' + name,
-            type: [_types[name.substring(0, 1)] || setting.defaultType, suffix].map(trim).join(".")
+            type: [_types[getJsirTypeKey(name)] || setting.defaultType, suffix].map(trim).join(".")
         }
         items.push(item)
 
@@ -620,7 +621,7 @@ async function _wrapperInput(str) {
             let path = getFullPath(_cmdMap[strs[0]])
             let uniqueName = trim(_cmdMap[strs[0]]);
             let fileName = parseUniqueName(uniqueName)[1]
-            let firstName = fileName.substring(0, 1)
+            let firstName = getJsirTypeKey(fileName)
             if (firstName === setting.fileKey) {
                 await workFile(uniqueName)
             } else if (firstName !== setting.exeKey) {
@@ -964,6 +965,41 @@ let compareMode = {
     }
 }
 
+async function showRooms() {
+    let results = [];
+    for (let i = 0; i < setting.rooms.length; i++) {
+        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,
+        })
+        for (let key of Object.keys(room.jsirs)) {
+            let jsir = room.jsirs[key]
+            results.push({
+                mid: i,
+                name: (isLocal ? "*" : " ") + room.name,
+                node: room.selfNode,
+                active: room.active,
+                pid: (process.pid === jsir.pid ? "*" : " ") + jsir.pid,
+                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')
+            });
+        }
+    }
+    if (results.length > 0) {
+        console.nable(results)
+    } else {
+        console.warn("no items")
+    }
+}
+
 const keywordDef = {
     help: {
         comment: 'Help documentation',
@@ -1404,39 +1440,17 @@ const keywordDef = {
         short: 'D'
     },
     room: {
-        comment: 'manage room',
+        comment: 'manage room ([node])',
         exeFn: async (args) => {
-            let results = [];
             await room.syncSetting();
-            for (let i = 0; i < setting.rooms.length; i++) {
-                let room = setting.rooms[i]
-                results.push({
-                    mid: i,
-                    name: (room.local ? "*":" ") + room.name,
-                    node: room.selfNode,
-                    active: room.active,
-                })
-                for (let key of Object.keys(room.jsirs)) {
-                    let jsir = room.jsirs[key]
-                    results.push({
-                        mid: i,
-                        name: (room.local ? "*":"") + room.name,
-                        node: room.selfNode,
-                        active: room.active,
-                        pid: (process.pid === jsir.pid ? "*":" ") + jsir.pid,
-                        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')
-                    });
+            if (args[0]) {
+                if (setting.selfRoom.nodes.indexOf(args[0]) !== -1) {
+                    await eia("ssh", [args[0]])
+                } else {
+                    console.warn("invalid node")
                 }
-            }
-            if (results.length > 0) {
-                console.nable(results)
             } else {
-                console.warn("no items")
+                await showRooms();
             }
         },
         short: 'm'
@@ -1450,7 +1464,7 @@ function getQuickRunCmds(input, matchStr) {
     } else if (input.startsWith("/")) {
         matchStr = '/' + matchStr;
     }
-    return filterCmd(matchStr).filter(i => parseUniqueName(i)[1].startsWith(setting.exeKey))
+    return filterCmd(matchStr).filter(i => getJsirTypeKey(parseUniqueName(i)[1]) === setting.exeKey)
 }
 
 async function preLoad(text, fnNameMatch, fn, packages = [], space) {
@@ -1963,7 +1977,7 @@ function parseArgDef(inputString) {
 }
 
 function getArgDef(text, uniqueName) {
-    if (uniqueName && !parseUniqueName(uniqueName)[1].startsWith(setting.exeKey)) {
+    if (uniqueName && getJsirTypeKey(parseUniqueName(uniqueName)[1]) !== setting.exeKey) {
         return {}
     }
     if (text.indexOf("$defArgs") === -1) {
@@ -2025,7 +2039,7 @@ function filterRequire(currSpace, cmdMatchStr) {
             cmds = cmds.filter(cmd => parseUniqueName(cmd)[0] === (appointSpace || currSpace))
         }
         if (cmds.length > 0) {
-            cmds = cmds.filter(cmd => parseUniqueName(cmd)[1].startsWith(setting.initKey))
+            cmds = cmds.filter(cmd => getJsirTypeKey(parseUniqueName(cmd)[1]) === setting.initKey)
         }
     }
     if (cmds.length > 1) {
@@ -2042,9 +2056,10 @@ async function _requireSource(currSpace, cmdMatchStr) {
     let path = getFullPath(uniqueName)
     let text = String(await fp.readFile(path))
     let pair = parseUniqueName(uniqueName)
-    if (pair[1].startsWith(setting.initKey)) {
+    let typeKey = getJsirTypeKey(pair[1]);
+    if (typeKey === setting.initKey) {
         result = await evalText(text, uniqueName)
-    } else if (pair[1].startsWith(setting.exeKey)) {
+    } else if (typeKey === setting.exeKey) {
         result = async (argsStr) => {
             return await runCmd(trim(argsStr), uniqueName, text)
         }

package/deps/room.js

@@ -1,7 +1,9 @@
 const os = require('os');
 const {fileJson, fileLock, vl, createConsole, getKeyTips, getValTips,
-    getRoomsDir, e, regEach} = require('./util');
-const {setRoute} = require('../deps/server')
+    getRoomsDir, e, regEach, isRunningInBackground,
+    batchAsync
+} = require('./util');
+const {setRoute, createSign} = require('../deps/server')
 const roomDataFile = "jsirRoom.json"
 const roomsDirLockKey = "RW_" + getRoomsDir();
 const syncRoomsLockKey = "SyncRooms_" + getRoomsDir();
@@ -71,7 +73,6 @@ function getSelfIP(nodes) {
 }
 
 async function getTailscaleNodes() {
-    console.$log("getNodes")
     let resp = await e(`${tailscalePath} status`);
     let nodes = []
     regEach(resp, /^(\d+\.\d+\.\d+\.\d+)\s+/mg, arr => {
@@ -94,28 +95,36 @@ async function enrichRoomInfo() {
         room.nodes = nodes;
         room.lastUpdateTime = Date.now()
         console.$log("init room", room.name)
+
+        // 提前设置一下
+        setting.selfRoom = Object.assign(setting.selfRoom || {}, room);
     })
 }
 
 async function syncRooms() {
-    console.$log('syncRooms')
     let roomsDir = getRoomsDir();
     let room = await fileJson(roomDataFile)
 
     let syncRooms = []
+    let fns = []
     for (let node of room.nodes) {
         if (node === room.selfNode) {
             continue
         }
-        try {
-            let respBody = await reqNode(node, "get", "/");
-            syncRooms.push(JSON.parse(respBody))
-        } catch (e) {
-            console.$log(`sync ${node} failed`, e);
-        }
+        fns.push(async () => {
+            let respBody = ''
+            try {
+                respBody = await reqNode(node, "get", "/");
+                syncRooms.push(JSON.parse(respBody))
+                console.$log(`sync ${node} success`);
+            } catch (e) {
+                console.$log(`sync ${node} failed:`, respBody, e);
+            }
+        })
     }
+    await batchAsync(fns, 9, 3000);
     await fileLock(roomsDirLockKey, async () => {
-        for (let syncRoom of syncRooms) {
+        for (let syncRoom of [...syncRooms]) {
             if (syncRoom.selfNode) {
                 await fp.writeFile(roomsDir + "/" + syncRoom.selfNode, JSON.stringify(syncRoom, null, 2))
             }
@@ -134,6 +143,7 @@ async function syncRooms() {
             }
         }
     }
+    console.$log('syncRooms done')
 }
 
 async function syncSetting() {
@@ -143,7 +153,6 @@ async function syncSetting() {
 
 async function _syncSetting(room) {
     setting.selfRoom = room;
-    setting.selfRoom.local = true;
     let roomDir = getRoomsDir();
     let rooms = []
     let files = await fp.readdir(roomDir);
@@ -166,9 +175,9 @@ async function _syncSetting(room) {
     }
     setting.rooms = [setting.selfRoom, ...rooms]
         .map(room => {
-            room.active = Date.now() - (room.lastUpdateTime || 0) <= 18000;
+            room.active = Date.now() - (room.lastUpdateTime || 0) <= 9000;
             Object.entries(room.jsirs).forEach(([key, jsir]) =>
-                jsir.active = Date.now() - (jsir.lastUpdateTime || 0) <= 6000)
+                jsir.active = Date.now() - (jsir.lastUpdateTime || 0) <= 9000)
             return room;
         });
 }
@@ -177,14 +186,14 @@ async function initRoom() {
     let roomUpdateTouchTime = false;
     await fileJson(roomDataFile, async room => {
         await initRoomJsir(room)
-        if (!vl(room.lastUpdateTime) || (Date.now() - room.lastUpdateTime) > 9000) {
+        if (!vl(room.lastUpdateTime) || (Date.now() - room.lastUpdateTime) > 3000) {
             roomUpdateTouchTime = true;
         }
     })
 
     if (roomUpdateTouchTime) {
         await fileLock(enrichRoomInfoLockKey, enrichRoomInfo, false)
-        await fileLock(syncRoomsLockKey, syncRooms, false);
+        fileLock(syncRoomsLockKey, syncRooms, false);
     }
 
     await syncSetting();
@@ -216,11 +225,6 @@ async function initRoomJsir(room) {
         lastUpdateTime: Date.now(),
         port: setting.server ? setting.server.address().port:null
     }
-    console.$log("init jsir", process.pid)
-}
-
-function isRunningInBackground() {
-    return !(process.stdout.isTTY && process.stdin.isTTY);
 }
 
 /**
@@ -295,12 +299,18 @@ function checkPortOpen(ip, port) {
     });
 }
 
+function isDisableConnect(node, port) {
+    let disableTime = setting.disableConnect[node + ":" + port] || 0;
+    return disableTime > Date.now()
+}
+
 async function reqNode(node, method, url) {
     let port = 52108;
     let room = setting.rooms.filter(i => i.selfNode === node)[0]
     if (room) {
         let activeJsir = Object.values(room.jsirs)
-            .filter(i => i.active).sort((a,b) => a.busy - b.busy);
+            .filter(i => !isDisableConnect(node, i.port))
+            .sort((a,b) => a.busy - b.busy);
         if (activeJsir.length > 0) {
             port = activeJsir[0].port;
         }
@@ -310,6 +320,9 @@ async function reqNode(node, method, url) {
         port: port, // HTTP 默认端口
         path: url,
         method: method.toUpperCase(),
+        headers: {
+            'sign': createSign()
+        }
     };
     console.$log('reqRoom', JSON.stringify(opt))
     return await new Promise((resolve, reject) => {
@@ -327,6 +340,9 @@ async function reqNode(node, method, url) {
 
         // 错误处理
         req.on('error', (e) => {
+            if (room) {
+                setting.disableConnect[node + ":" + port] = Date.now() + 9000
+            }
             reject(e)
         });
 

package/deps/server.js

@@ -1,5 +1,5 @@
 const http = require('http');
-const {createConsole, vl} = require('./util');
+const {createConsole, vl, aesDecipher, md5, aesCipher} = require('./util');
 const console = createConsole();
 const setting = require('../deps/setting')
 // 尝试监听的端口
@@ -8,6 +8,24 @@ const preferredPort = 52108;
 const routes = {};
 let invokeStart = false;
 
+function verifySign(sign) {
+    try {
+        let key = md5([...setting.selfRoom.nodes].sort().join(":")).substring(0, 16);
+        return parseInt(aesDecipher(sign, key), 10);  // 假设sign是base64编码的毫秒数
+    } catch (e) {
+        return null;  // 解码失败返回null
+    }
+}
+
+function createSign() {
+    try {
+        let key = md5([...setting.selfRoom.nodes].sort().join(":")).substring(0, 16);
+        return aesCipher(String(Date.now()), key)
+    } catch (e) {
+        return null;  // 解码失败返回null
+    }
+}
+
 // 创建一个 HTTP 服务
 async function createServer(port) {
     const server = http.createServer(async (req, res) => {
@@ -17,6 +35,26 @@ async function createServer(port) {
         // 查找对应的路由处理函数
         const routeKey = `${method} ${url}`;
         if (routes[routeKey]) {
+            // 取header里的sign字段
+            const sign = req.headers['sign'];
+            if (sign) {
+                const decodedTime = verifySign(sign);
+                const currentTime = Date.now();
+
+                if (decodedTime === null || Math.abs(currentTime - decodedTime) > 3000) {
+                    // 解码失败或者时间差大于9秒，返回403
+                    res.writeHead(403, { 'Content-Type': 'text/plain' });
+                    res.end('Forbidden: Invalid Sign\n');
+                    return;
+                }
+            } else {
+                // 如果没有sign字段，返回403
+                res.writeHead(403, { 'Content-Type': 'text/plain' });
+                res.end('Forbidden: Missing Sign\n');
+                return;
+            }
+
+            // 如果签名通过，继续处理请求
             await routes[routeKey](req, res);
         } else {
             res.writeHead(404, { 'Content-Type': 'text/plain' });
@@ -44,7 +82,7 @@ async function startServer() {
         try {
             setting.server = await createServer(preferredPort);
         } catch (e) {
-            console.$log("startServer failed", e)
+            console.$log("startServer failed, try other port")
             setting.server = await createServer(0);
         }
     }
@@ -107,5 +145,6 @@ function jsonHandle(req, res, fn) {
 module.exports = {
     setRoute,
     delRoute,
-    jsonHandle
+    jsonHandle,
+    createSign
 };

package/deps/setting.js

@@ -26,5 +26,6 @@ module.exports = {
     roomTid: [],
     selfRoom: {},
     rooms: [],
-    server: null
+    server: null,
+    disableConnect: {}
 }

package/deps/util.js

@@ -14,6 +14,7 @@ const initModulePaths = Object.assign([], module.paths)
 const path = require('path')
 const _types = setting.fileType
 const _typeKeys = Object.keys(_types)
+const util = require('util')
 
 global.$newInput = false
 global.$newError = false
@@ -26,6 +27,37 @@ let configDir;
 let roomsDir;
 let dataDir;
 
+
+function isRunningInBackground() {
+    return !(process.stdout.isTTY && process.stdin.isTTY);
+}
+
+/**
+ * 模拟 console.log 的输出字符串，返回打印的完整字符串
+ * @param  {...any} args - 传入的参数
+ * @returns {string} - 返回最终打印的完整字符串
+ */
+function consoleStrs(...args) {
+    // 如果没有参数，返回空字符串
+    if (args.length === 0) {
+        return '';
+    }
+
+    // 格式化第一个参数
+    if (typeof args[0] === 'string') {
+        return util.format(...args); // 处理格式化字符串 (%s, %d 等)
+    }
+
+    // 如果第一个参数不是字符串，直接用空格拼接其他参数的字符串化结果
+    return args
+        .map((arg) =>
+            typeof arg !== 'string'
+                ? util.inspect(arg, { depth: 2, colors: true }) // 对象序列化
+                : String(arg) // 其他类型转为字符串
+        )
+        .join(' ');
+}
+
 class SyncQueue {
     constructor() {
         this.queue = [];
@@ -135,15 +167,15 @@ function dealLevelArgs(levelStrFn, args) {
     if (args.length <= 0) {
         return args;
     }
-    if (typeof args[0] !== 'string') {
-        return args;
-    }
-    let ss = args[0].split("\n");
-    if (ss[0]) {
-        ss[0] = levelStrFn(ss[0])
+    let text = consoleStrs(...args)
+    if (typeof args[0] === "string" && args[0].trim() && text.startsWith(args[0])) {
+        if(text.length === args[0].length) {
+            text = levelStrFn(args[0])
+        } else {
+            text = levelStrFn(args[0]) + ' ' + consoleStrs(...args.slice(1))
+        }
     }
-    args[0] = ss.join("\n");
-    return args
+    return text;
 }
 
 const _console =Object.assign({}, global.console);
@@ -162,23 +194,23 @@ const _consoleFns= {
     },
     info: {
         fn: _console.info,
-        args: args => [infoStr('[info]'), ...dealLevelArgs(infoStr, args)]
+        args: args => [infoStr('[info]'), dealLevelArgs(infoStr, args)]
     },
     msg: {
         fn: _console.log,
-        args: args => [msgStr('[msg]'), ...dealLevelArgs(msgStr, args)]
+        args: args => [msgStr('[msg]'), dealLevelArgs(msgStr, args)]
     },
     warn: {
         fn: _console.warn,
-        args: args => [warnStr('[warn]'), ...dealLevelArgs(warnStr, args)],
+        args: args => [warnStr('[warn]'), dealLevelArgs(warnStr, args)],
     },
     error: {
         fn: _console.error,
-        args: args => [errorStr('[error]'), ...dealLevelArgs(errorStr, args)]
+        args: args => [errorStr('[error]'), dealLevelArgs(errorStr, args)]
     },
     debug: {
         fn: _console.debug,
-        args: args => [debugStr('[debug]'), ...dealLevelArgs(debugStr, args)]
+        args: args => [debugStr('[debug]'), dealLevelArgs(debugStr, args)]
     }
 }
 
@@ -224,7 +256,7 @@ function createConsole(uniqueName) {
             if ('debug' === key && !global.$DEBUG) {
                 return;
             }
-            if (uniqueName && quite) {
+            if (isRunningInBackground() || (uniqueName && quite)) {
                 if ((key === 'table' || key === 'nable') && typeof args[0] === "object") {
                     args = ['', ...args]
                 }
@@ -660,16 +692,15 @@ function createLimitLogger(fileName, {
         if (args.length <= 0) {
             return
         }
-        // 处理参数
-        args = args.map(i => isError(i) ? errorStack(i):i);
 
         // 处理同步函数
         syncLogs.forEach(i => i(...args));
 
-        let text = args.join(" ")
+        let text = consoleStrs(...args)
         if (error) {
             global.$newError = true;
         }
+        text = `${pad(3, String(process.pid%1000), ' ')}> ${text}`
         if (time) {
             text = `${timeStr('YYYY-MM-DD HH:mm:ss.SSS')} ${text}`
         }
@@ -700,10 +731,10 @@ function getInitName(fileName) {
     fileName = trim(fileName)
     let homeDir = setting.workspaceMap[setting.defaultSpace]
     if (!fileName.startsWith("/")) {
-        fileName = setting.initKey + ' ' + fileName.replace(new RegExp(`^${setting.initKey}\\s+`), '')
-        if (!/\..+/.test(fileName)) {
-            fileName = fileName + '.js'
+        if (getJsirTypeKey(fileName) !== setting.initKey) {
+            fileName = setting.initKey + ' ' + fileName
         }
+        fileName = toJsirFileName(fileName)
         fileName = homeDir + '/' + fileName
     }
     return fileName;
@@ -768,7 +799,7 @@ async function fileJson(key, fn = null, fmt = true, safeMs = 49000) {
     let fileName = trim(key)
     let path = dataDir + "/" + fileName;
     let homeDir = setting.workspaceMap[setting.defaultSpace]
-    let isInit = fileName.startsWith(setting.initKey);
+    let isInit = getJsirTypeKey(fileName) === setting.initKey;
     if (isInit) {
         path = homeDir + '/' + toJsirFileName(fileName);
     }
@@ -868,7 +899,7 @@ function aesCipher(str, key){
         const cipher = crypto.createCipheriv('aes-128-ecb', pad(key, 16, '0'), null);
         return cipher.update(str, 'utf8', 'hex') + cipher.final('hex');
     } catch(err) {
-        $error(err)
+        $log(err)
         throw 'aesCipher failed: ' + String(err)
     }
 }
@@ -885,7 +916,7 @@ function aesDecipher(str, key){
         const decipher = crypto.createDecipheriv('aes-128-ecb', pad(key, 16, '0'), null);
         return decipher.update(str, 'hex', 'utf8') + decipher.final('utf8');
     } catch(err) {
-        $error(err)
+        $log(err)
         throw 'aesDecipher failed: ' + String(err)
     }
 }
@@ -1813,7 +1844,7 @@ function md5(message) {
     return crypto.createHash('md5').update(message).digest('hex');
 }
 
-async function batchAsync(fns = [], asyncNum = 1) {
+async function batchAsync(fns = [], asyncNum = 1, limitMs = 9000) {
     if (fns.length <= 0 || asyncNum < 1) {
         return []
     }
@@ -1823,9 +1854,9 @@ async function batchAsync(fns = [], asyncNum = 1) {
     for(let i = 0; i< fns.length; i++) {
         let pro = new Promise(async (resolve, reject) => {
             try {
-                let resp = await fns[i]();
+                let resp = await timeLimit([fns[i]()], limitMs);
                 doneMap[i] = pro;
-                resolve(resp)
+                resolve(resp[0])
             } catch (e) {
                 doneMap[i] = pro;
                 resolve(isError(e) ? e:new Error(e));
@@ -1931,8 +1962,8 @@ function getTextComments(text) {
 
 function wrapperJsirText(text) {
     return text
-        .replace(/^require\s*\(\s*(["'`][ei]\s+)/mg, 'await $require($2')
-        .replace(/([\s=;])require\s*\(\s*(["'`][ei]\s+)/g, '$1await $require($2')
+        .replace(/^require\s*\(\s*(["'`][ei][^a-zA-Z]+)/mg, 'await $require($2')
+        .replace(/([\s=;])require\s*\(\s*(["'`][ei][^a-zA-Z]+)/g, '$1await $require($2')
         .replace(/([\s=;])import\s*\(/g, '$1$import(')
         .replace(/^import\s*\(/mg, '$import(')
         .replace(/^module\.exports\s*=\s*/m, 'return ')
@@ -1980,6 +2011,10 @@ function getValTips() {
     return items
 }
 
+function getJsirTypeKey(fileName) {
+    return fileName.split(/[^a-zA-Z]+/)[0] || ''
+}
+
 module.exports = {
     wrapperJsirText,
     run,
@@ -2084,5 +2119,7 @@ module.exports = {
     getKeyTips,
     getValTips,
     getRoomsDir,
-    getDataDir
+    getDataDir,
+    getJsirTypeKey,
+    isRunningInBackground
 }

package/package.json

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