jsir 2.3.3 → 2.3.5

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
+    getAlias, wrapperJsirText, eia, getKeyTips, getValTips, getRoomsDir
 } = $lib;
 const _args = process.argv.slice(2).map(trim);
 const evalCode = require('../deps/evalCode')
@@ -562,13 +562,13 @@ async function wrapperInput(str) {
 }
 
 function wrapperAlias(str) {
-    let aliasMap = {};
+    let aliasMap = null;
     try {
         aliasMap = getConfig("alias");
     } catch (e) {
         console.$error("getAlias failed ", e);
     }
-    if (Object.keys(aliasMap).length <= 0) {
+    if (!aliasMap || Object.keys(aliasMap).length <= 0) {
         return str;
     }
     let fstr = str.split(/\s+/)[0];
@@ -1342,8 +1342,6 @@ const keywordDef = {
             _noAppendNextLine = false
             resetCmdMap()
             console.log(warnStr(`(${setting.name} ${packageJson.version}) You can start with .help, use * to expand context.`))
-            room.onRoom()
-            nextLine()
         },
         short: 'p'
     },
@@ -1404,6 +1402,44 @@ const keywordDef = {
             }
         },
         short: 'D'
+    },
+    room: {
+        comment: 'manage room',
+        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 (results.length > 0) {
+                console.nable(results)
+            } else {
+                console.warn("no items")
+            }
+        },
+        short: 'm'
     }
 }
 
@@ -2097,6 +2133,7 @@ process.on('beforeExit', function () {
         delTips();
     } else {
         nextLine();
+        room.onRoom()
     }
 });
 

package/deps/room.js

@@ -1,10 +1,18 @@
 const os = require('os');
-const {fileJson, fileLock, vl, createConsole, getKeyTips, getValTips} = require('./util');
+const {fileJson, fileLock, vl, createConsole, getKeyTips, getValTips,
+    getRoomsDir, e, regEach} = require('./util');
+const server = require('../deps/server')
 const roomDataFile = "jsirRoom.json"
+const roomsDirLockKey = "RW_" + getRoomsDir();
+const syncRoomsLockKey = "SyncRooms_" + getRoomsDir();
+const enrichRoomInfoLockKey = "ENRICH_" + roomDataFile
 const console = createConsole();
-const ping = require("ping");
 const net = require("net");
 const setting = require('../deps/setting')
+const fp = require('fs').promises
+const http = require('http');
+let tailscalePath = os.platform() === 'darwin' ?
+    '/Applications/Tailscale.app/Contents/MacOS/Tailscale':'tailscale';
 
 function isPidAlive(pid) {
     try {
@@ -20,8 +28,13 @@ function isPidAlive(pid) {
 }
 
 function onRoom() {
-    return
     if (!setting.roomTid[0]) {
+        try {
+            server.setRoute("post", "/", (req, res) => setting.selfRoom)
+            server.setRoute("get", "/", (req, res) => setting.selfRoom)
+        } catch (e) {
+            console.$error("initRoute failed", e)
+        }
         _onRoom();
     }
 }
@@ -29,56 +42,135 @@ function onRoom() {
 function _onRoom() {
     setting.roomTid[0] = setTimeout(async () => {
         try {
-            await _initRoom();
+            await initRoom();
         } catch (e) {
             console.$error('initRoom', e)
         }
         if (setting.roomTid[0]) {
             _onRoom();
         }
-    }, 1000)
+    }, 3000)
 }
 
 function offRoom() {
-    return;
     if (setting.roomTid[0]) {
         clearTimeout(setting.roomTid[0])
         setting.roomTid[0] = null
+        if (setting.server) {
+            setting.server.close(() => {
+                console.$log('Existing server shut down.');
+            });
+        }
     }
 }
 
-async function getTailScaleNodes() {
-    console.$log("getNodes")
+function getSelfIP(nodes) {
     let ips = getLocalIPs().ipv4;
-    ips = ips.filter(i => i.startsWith("100.")); // tailScale ip前缀
+    ips = ips.filter(i => nodes.indexOf(i) !== -1);
+    return ips[0]
+}
+
+async function getTailscaleNodes() {
+    console.$log("getNodes")
+    let resp = await e(`${tailscalePath} status`);
     let nodes = []
-    for (let ip of ips) {
-        let netIps = await scanLocalNetwork(ip);
-        netIps = netIps.filter(i => i !== ip)
-        nodes.push(...netIps)
+    regEach(resp, /^(\d+\.\d+\.\d+\.\d+)\s+/mg, arr => {
+        nodes.push(arr[1])
+    });
+    return [...new Set(nodes)];
+}
+
+async function enrichRoomInfo() {
+    let nodes = await getTailscaleNodes();
+    let ip = getSelfIP(nodes)
+    await fileJson(roomDataFile, async room => {
+        // 设置roomName
+        let name = os.hostname();
+        if (!vl(room.name) || room.name !== name) {
+            room.name = name;
+            console.$log("set roomName", name)
+        }
+        room.selfNode = ip;
+        room.nodes = nodes;
+        room.lastUpdateTime = Date.now()
+        console.$log("init room", room.name)
+    })
+}
+
+async function syncRooms() {
+    console.$log('syncRooms')
+    let roomsDir = getRoomsDir();
+    let room = await fileJson(roomDataFile)
+
+    let syncRooms = []
+    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);
+        }
     }
-    return await sshEnables(nodes);
-}
-
-async function initRoomInfo() {
-    await fileLock(roomDataFile + "getNodes", async () => {
-        let nodes = await getTailScaleNodes();
-        await fileJson(roomDataFile, async room => {
-            // 设置roomName
-            let name = os.hostname();
-            if (!vl(room.name) || room.name !== name) {
-                room.name = name;
-                console.$log("set roomName", name)
+    await fileLock(roomsDirLockKey, async () => {
+        for (let syncRoom of syncRooms) {
+            if (syncRoom.selfNode) {
+                await fp.writeFile(syncRoom.selfNode, JSON.stringify(syncRoom, null, 2))
             }
+        }
+    })
 
-            room.nodes = nodes;
-            room.lastUpdateTime = Date.now()
-            console.$log("init room", room.name)
-        })
-    }, false)
+    // 清理 roomsDir
+    let files = await fp.readdir(roomsDir)
+    let nodes = room.nodes;
+    for (let file of files) {
+        if (nodes.indexOf(file) === -1) {
+            try {
+                await fp.unlink(roomsDir + '/' + file)
+            } catch (e) {
+                console.$error(e);
+            }
+        }
+    }
+}
+
+async function syncSetting() {
+    let room = await fileJson(roomDataFile)
+    await fileLock(roomsDirLockKey, async () => await _syncSetting(room));
 }
 
-async function _initRoom() {
+async function _syncSetting(room) {
+    setting.selfRoom = room;
+    setting.selfRoom.local = true;
+    let roomDir = getRoomsDir();
+    let rooms = []
+    let files = await fp.readdir(roomDir);
+    for (let node of setting.selfRoom.nodes) {
+        if (files.indexOf(node) !== -1) {
+            let resp = String(await fp.readFile(roomDir + '/' + node));
+            let room = JSON.parse(resp);
+            if (room.selfNode !== setting.selfRoom.selfNode) {
+                rooms.push(room)
+            }
+        } else {
+            rooms.push({
+                selfNode: node,
+                jsirs: []
+            })
+        }
+    }
+    setting.rooms = [setting.selfRoom, ...rooms]
+        .map(room => {
+            room.active = Date.now() - (room.lastUpdateTime || 0) <= 18000;
+            Object.entries(room.jsirs).forEach(([key, jsir]) =>
+                jsir.active = Date.now() - (jsir.lastUpdateTime || 0) <= 6000)
+            return room;
+        });
+}
+
+async function initRoom() {
     let roomUpdateTouchTime = false;
     await fileJson(roomDataFile, async room => {
         await initRoomJsir(room)
@@ -88,8 +180,11 @@ async function _initRoom() {
     })
 
     if (roomUpdateTouchTime) {
-        initRoomInfo();
+        await fileLock(enrichRoomInfoLockKey, enrichRoomInfo, false)
+        await fileLock(syncRoomsLockKey, syncRooms, false);
     }
+
+    await syncSetting();
 }
 
 async function getEventLoopDelay() {
@@ -103,14 +198,10 @@ async function getEventLoopDelay() {
 }
 
 async function initRoomJsir(room) {
-    room.jsir = room.jsir || {};
-
-    for (let pid of [...Object.keys(room.jsir)]) {
-        if (!isPidAlive(pid)) {
-            delete room.jsir[pid]
-        }
-    }
-    room.jsir[process.pid] = {
+    room.jsirs = Object.fromEntries(
+        Object.entries(room.jsirs || {}).filter(([pid]) => isPidAlive(pid))
+    );
+    room.jsirs[process.pid] = {
         pid: process.pid,
         space: setting.defaultSpace,
         tips: getKeyTips().reduce((obj, key, index) => {
@@ -119,7 +210,8 @@ async function initRoomJsir(room) {
         }, {}),
         busy: await getEventLoopDelay(),
         back: isRunningInBackground(),
-        lastUpdateTime: Date.now()
+        lastUpdateTime: Date.now(),
+        port: setting.server.address().port
     }
     console.$log("init jsir", process.pid)
 }
@@ -200,33 +292,48 @@ function checkPortOpen(ip, port) {
     });
 }
 
-/**
- * 扫描局域网中的可访问IP
- * @param {string} localIP - 本机内网IP地址
- * @returns {Promise<string[]>} - 可访问的IP地址列表
- */
-async function scanLocalNetwork(localIP) {
-    const subnet = localIP.substring(0, localIP.lastIndexOf('.') + 1); // 例如 "192.168.1."
-    const reachableIPs = [];
-
-    // 扫描 1 到 254 的 IP
-    const promises = [];
-    for (let i = 1; i <= 254; i++) {
-        const ip = `${subnet}${i}`;
-        promises.push(
-            ping.promise.probe(ip, { timeout: 1 }).then((res) => {
-                if (res.alive) {
-                    reachableIPs.push(ip);
-                }
-            })
-        );
+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);
+        if (activeJsir.length > 0) {
+            port = activeJsir[0].port;
+        }
     }
+    let opt = {
+        hostname: node,
+        port: port, // HTTP 默认端口
+        path: url,
+        method: method.toUpperCase(),
+    };
+    console.$log('reqRoom', JSON.stringify(opt))
+    return await new Promise((resolve, reject) => {
+        const req = http.request(opt, (res) => {
+            let data = '';
+            // 数据块接收
+            res.on('data', (chunk) => {
+                data += chunk;
+            });
+            // 响应结束
+            res.on('end', () => {
+                resolve(data)
+            });
+        });
+
+        // 错误处理
+        req.on('error', (e) => {
+            reject(e)
+        });
 
-    await Promise.all(promises);
-    return reachableIPs;
+        // 结束请求
+        req.end();
+    })
 }
 
 module.exports = {
     onRoom,
-    offRoom
+    offRoom,
+    syncSetting
 }

package/deps/server.js

@@ -0,0 +1,110 @@
+const http = require('http');
+const {createConsole, vl} = require('./util');
+const console = createConsole();
+const setting = require('../deps/setting')
+
+// 尝试监听的端口
+const preferredPort = 52108;
+
+// 路由存储
+const routes = {};
+
+// 创建一个 HTTP 服务
+function createServer(port) {
+    const server = http.createServer(async (req, res) => {
+        const method = req.method.toLowerCase();
+        const url = req.url;
+
+        // 查找对应的路由处理函数
+        const routeKey = `${method} ${url}`;
+        if (routes[routeKey]) {
+            await routes[routeKey](req, res);
+        } else {
+            res.writeHead(404, { 'Content-Type': 'text/plain' });
+            res.end('Not Found\n');
+        }
+    });
+
+    server.listen(port, () => {
+        const address = server.address();
+        console.$log(`Server listening on port ${address.port}`);
+    });
+
+    server.on('error', (err) => {
+        console.$error(`Error occurred: ${err.message}`);
+    });
+
+    return server;
+}
+
+// 尝试启动服务的逻辑
+function startServer() {
+    if (!setting.server) {
+        try {
+            setting.server = createServer(preferredPort);
+        } catch (e) {
+            console.$error("startServer failed", e)
+            setting.server = createServer(0);
+        }
+    }
+}
+
+// 设置路由的方法
+function setRoute(method, url, fn, handler = jsonHandle) {
+    startServer();
+
+    const routeKey = `${method.toLowerCase()} ${url}`;
+    if (handler) {
+        routes[routeKey] = async (req, res) => {
+            await handler(req, res, fn)
+        };
+    } else {
+        routes[routeKey] = fn;
+    }
+    console.$log(`AddRoute: ${method.toUpperCase()} ${url} ${handler ? handler.constructor.name:''}`);
+    return setting.server;
+}
+
+function delRoute(method, url) {
+    const routeKey = `${method.toLowerCase()} ${url}`;
+    delete routes[routeKey];
+    console.$log(`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):{};
+
+            // 创建响应 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' }));
+        }
+    });
+}
+
+module.exports = {
+    setRoute,
+    delRoute,
+    jsonHandle
+};

package/deps/setting.js

@@ -23,5 +23,8 @@ module.exports = {
     defaultSpace: 'local',
     workspaceMap: {},
     enableNextLine: true,
-    roomTid: []
+    roomTid: [],
+    selfRoom: {},
+    rooms: [],
+    server: null
 }

package/deps/util.js

@@ -23,6 +23,8 @@ let lockDir;
 let logDir;
 let tempDir;
 let configDir;
+let roomsDir;
+let dataDir;
 
 class SyncQueue {
     constructor() {
@@ -708,7 +710,7 @@ function getInitName(fileName) {
 }
 
 function dataFile(fileName, fn, fmt, defaultObj = {}, returnStr = false) {
-    let dataDir = getLibDataDir() + "/data"
+    let dataDir = getDataDir()
     fileName = trim(fileName)
     let path
     if (fileName.startsWith("/")) {
@@ -758,11 +760,11 @@ async function fileExist(path) {
     }
 }
 
-async function fileJson(key, fn, fmt = true, safeMs = 49000) {
+async function fileJson(key, fn = null, fmt = true, safeMs = 49000) {
     `
     多进程安全文件读写
     `
-    let dataDir = getLibDataDir() + "/data"
+    let dataDir = getDataDir()
     let fileName = trim(key)
     let path = dataDir + "/" + fileName;
     let homeDir = setting.workspaceMap[setting.defaultSpace]
@@ -901,6 +903,24 @@ function getConfigDir() {
     return configDir;
 }
 
+function getRoomsDir() {
+    if (roomsDir) {
+        return roomsDir
+    }
+    roomsDir = getLibDataDir() + '/rooms';
+    mkdir(roomsDir);
+    return roomsDir;
+}
+
+function getDataDir() {
+    if (dataDir) {
+        return dataDir
+    }
+    dataDir = getLibDataDir() + '/data';
+    mkdir(dataDir);
+    return dataDir;
+}
+
 function getAlias(aliasMap, key) {
     key = trim(key)
     if (!key) {
@@ -2062,5 +2082,7 @@ module.exports = {
     terminalRun,
     eia,
     getKeyTips,
-    getValTips
+    getValTips,
+    getRoomsDir,
+    getDataDir
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsir",
-  "version": "2.3.3",
+  "version": "2.3.5",
   "description": "JavaScript Script Management Tool",
   "main": "index.js",
   "scripts": {
@@ -22,7 +22,6 @@
     "chokidar": "^3.5.2",
     "console.table": "^0.10.0",
     "dayjs": "^1.10.4",
-    "pad": "^3.2.0",
-    "ping": "^0.4.4"
+    "pad": "^3.2.0"
   }
 }