jsir 2.3.2 → 2.3.3

package/cmd/oaa.js

@@ -11,7 +11,7 @@ const {
     createConsole, setTips, delTips,
     getEditor, errorStr, getConfigDir,
     getFullPath, parseUniqueName, toUniqueName, isJsirFileName, toJsirFileName,
-    getAlias, wrapperJsirText, eia
+    getAlias, wrapperJsirText, eia, getKeyTips, getValTips
 } = $lib;
 const _args = process.argv.slice(2).map(trim);
 const evalCode = require('../deps/evalCode')
@@ -28,6 +28,7 @@ const _libDataDir = getLibDataDir()
 const _fileWatcherMap = {}
 const _types = setting.fileType
 const console = createConsole();
+const room = require('../deps/room');
 
 let lastFilterArg = '';
 let _cmdMapFile = setting.name + 'CmdMap.json'
@@ -345,28 +346,7 @@ function initRl(callback, promptStr, hidden) {
 }
 
 function getTipStr(showKey = false) {
-    let items = [];
-    for (let key of Object.keys(setting.tips)) {
-        let val = setting.tips[key].map(i => {
-            let item = trim(i)
-            if (item.indexOf(',') !== -1) {
-                item = `[${item}]`;
-            }
-            return item;
-        }).join("|");
-        key = trim(key)
-
-        let item
-        if (!showKey && vl(val)) {
-            item = val;
-        } else if (vl(key)) {
-            item = key
-        }
-        if (item) {
-            items.push(item)
-        }
-    }
-    let tips = items.join(',')
+    let tips = showKey ? getKeyTips().join(","):getValTips().join(",")
     if (!showKey && !_isTipsDoneShowKey && tips.length > 64) {
         return '...'
     }
@@ -380,6 +360,10 @@ function closeRl() {
 }
 
 function _nextLine(callback, promptStr, hidden, resolve, end, isText) {
+    if (!setting.enableNextLine) {
+        console.$log(warnStr("[warn]"), "NextLine Disabled");
+        return
+    }
     end = trim(end)
     if (!_haveWrapperInput) {
         return
@@ -1345,6 +1329,7 @@ const keywordDef = {
     quit: {
         comment: 'Exit',
         exeFn: (args) => {
+            room.offRoom();
             delTips();
             console.log(infoStr("Bye!"));
             _noAppendNextLine = true;
@@ -1357,6 +1342,8 @@ 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'
     },
@@ -2085,20 +2072,9 @@ async function evalText($text = '', $cmdName = '', $args = []) {
         $homeDir, $lib, _cmdMap);
 }
 
-function clearFileLock() {
-    for (let file of Object.keys(fileLockMap)) {
-        fp.rmdir(file)
-        delete setting.fileLock[file]
-    }
-}
-
 function sigExit() {
-    if (!setting.sigExit) {
-        return;
-    }
     if (_noAppendNextLine) {
         delTips();
-        clearFileLock();
         process.exit(0);
     } else {
         nextLine();
@@ -2107,15 +2083,12 @@ function sigExit() {
 
 process.on('uncaughtException',function(err){
     console.$error('uncaughtException', err)
-    _noAppendNextLine || nextLine()
 })
 process.on('unhandledRejection',function(err){
     console.$error('unhandledRejection', err)
-    _noAppendNextLine || nextLine()
 })
 process.on('rejectionHandled',function(err){
     console.$error('rejectionHandled', err)
-    _noAppendNextLine || nextLine()
 })
 process.on('SIGINT', sigExit);
 process.on('SIGTERM', sigExit);

package/deps/room.js

@@ -0,0 +1,232 @@
+const os = require('os');
+const {fileJson, fileLock, vl, createConsole, getKeyTips, getValTips} = require('./util');
+const roomDataFile = "jsirRoom.json"
+const console = createConsole();
+const ping = require("ping");
+const net = require("net");
+const setting = require('../deps/setting')
+
+function isPidAlive(pid) {
+    try {
+        process.kill(Number(pid), 0); // 信号 0 不会实际发送，但会检查进程是否存在
+        return true; // PID 存在
+    } catch (err) {
+        if (err.code === 'ESRCH') {
+            return false; // 进程不存在
+        }
+        console.$error(`check isPidAlive ${pid} failed`, err)
+        return false;
+    }
+}
+
+function onRoom() {
+    return
+    if (!setting.roomTid[0]) {
+        _onRoom();
+    }
+}
+
+function _onRoom() {
+    setting.roomTid[0] = setTimeout(async () => {
+        try {
+            await _initRoom();
+        } catch (e) {
+            console.$error('initRoom', e)
+        }
+        if (setting.roomTid[0]) {
+            _onRoom();
+        }
+    }, 1000)
+}
+
+function offRoom() {
+    return;
+    if (setting.roomTid[0]) {
+        clearTimeout(setting.roomTid[0])
+        setting.roomTid[0] = null
+    }
+}
+
+async function getTailScaleNodes() {
+    console.$log("getNodes")
+    let ips = getLocalIPs().ipv4;
+    ips = ips.filter(i => i.startsWith("100.")); // tailScale ip前缀
+    let nodes = []
+    for (let ip of ips) {
+        let netIps = await scanLocalNetwork(ip);
+        netIps = netIps.filter(i => i !== ip)
+        nodes.push(...netIps)
+    }
+    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)
+            }
+
+            room.nodes = nodes;
+            room.lastUpdateTime = Date.now()
+            console.$log("init room", room.name)
+        })
+    }, false)
+}
+
+async function _initRoom() {
+    let roomUpdateTouchTime = false;
+    await fileJson(roomDataFile, async room => {
+        await initRoomJsir(room)
+        if (!vl(room.lastUpdateTime) || (Date.now() - room.lastUpdateTime) > 9000) {
+            roomUpdateTouchTime = true;
+        }
+    })
+
+    if (roomUpdateTouchTime) {
+        initRoomInfo();
+    }
+}
+
+async function getEventLoopDelay() {
+    const start = process.hrtime.bigint();
+    const delay = 1; // 用于测量的短暂延迟（单位：毫秒）
+    const timeoutPromise = new Promise(resolve => setTimeout(resolve, delay));
+    return await timeoutPromise.then(() => {
+        const end = process.hrtime.bigint();
+        return Number(Math.max(Number(end - start) / 1e4 - (delay * 1e2), 0).toFixed(0)); // 避免负值
+    });
+}
+
+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] = {
+        pid: process.pid,
+        space: setting.defaultSpace,
+        tips: getKeyTips().reduce((obj, key, index) => {
+            obj[key] = getValTips()[index];
+            return obj;
+        }, {}),
+        busy: await getEventLoopDelay(),
+        back: isRunningInBackground(),
+        lastUpdateTime: Date.now()
+    }
+    console.$log("init jsir", process.pid)
+}
+
+function isRunningInBackground() {
+    return !(process.stdout.isTTY && process.stdin.isTTY);
+}
+
+/**
+ * 获取本机所有内网 IP
+ * @returns {{ ipv4: string[], ipv6: string[] }}
+ */
+function getLocalIPs() {
+    const networkInterfaces = os.networkInterfaces();
+
+    const result = {
+        ipv4: [],
+        ipv6: []
+    };
+
+    for (const interfaceName of Object.keys(networkInterfaces)) {
+        for (const netInfo of networkInterfaces[interfaceName]) {
+            const { family, address, internal } = netInfo;
+
+            // 只关心非回环地址
+            if (!internal) {
+                if (family === 'IPv4') {
+                    result.ipv4.push(address);
+                } else if (family === 'IPv6') {
+                    result.ipv6.push(address);
+                }
+            }
+        }
+    }
+
+    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);
+            });
+    });
+}
+
+/**
+ * 扫描局域网中的可访问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);
+                }
+            })
+        );
+    }
+
+    await Promise.all(promises);
+    return reachableIPs;
+}
+
+module.exports = {
+    onRoom,
+    offRoom
+}

package/deps/setting.js

@@ -18,10 +18,10 @@ module.exports = {
     initKey,
     fileKey,
     defaultType,
-    sigExit: true,
     packages: {},
-    fileLock: {},
     tips: {},
     defaultSpace: 'local',
-    workspaceMap: {}
+    workspaceMap: {},
+    enableNextLine: true,
+    roomTid: []
 }

package/deps/util.js

@@ -758,7 +758,7 @@ async function fileExist(path) {
     }
 }
 
-async function fileJson(key, fn, fmt = true) {
+async function fileJson(key, fn, fmt = true, safeMs = 49000) {
     `
     多进程安全文件读写
     `
@@ -789,7 +789,7 @@ async function fileJson(key, fn, fmt = true) {
             result = val
         }
         await fp.writeFile(path, prefixStr + JSON.stringify(result, null, fmt ? 2:null))
-    });
+    }, true, safeMs);
     return result;
 }
 
@@ -1037,7 +1037,7 @@ function getLockDir() {
     return lockDir;
 }
 
-function getLockFile(key) {
+function getLockKeyDir(key) {
     if (!key) {
         throw "invalid args"
     }
@@ -1046,36 +1046,110 @@ function getLockFile(key) {
     return lockDir + "/" + key;
 }
 
-async function _fileLock(key, fn) {
+/**
+ * 从目录中读取过期时间戳
+ * @param {string} lockDir - 锁目录路径
+ * @returns {Promise<number | null>} 如果目录下存在过期时间戳文件，则返回其数值；否则返回 null
+ */
+async function readExpireTimestamp(lockDir) {
+    try {
+        const files = await fp.readdir(lockDir);
+        // 假设我们只会创建一个文件，其文件名包含过期时间，如 `expire-1672531200000`
+        const expireFile = files.find(name => name.startsWith('expire-'));
+        if (!expireFile) {
+            return null;
+        }
+        const timestamp = parseInt(expireFile.replace('expire-', ''), 10);
+        return isNaN(timestamp) ? null : timestamp;
+    } catch (err) {
+        // 读取目录出错（可能不存在？）直接返回 null
+        return null;
+    }
+}
+
+async function _fileLock(key, fn, expireMs = 49000) {
     `
     文件锁，返回true/false,
     如果没锁住则不执行fn
     `
-    if (!key || !fn) {
-        throw new Error('invalid args')
+    if (!key || typeof fn !== 'function') {
+        throw new Error('invalid arguments');
     }
-    let file = getLockFile(key)
+
+    let lockKeyDir = getLockKeyDir(key)
+    const now = Date.now();
+    const expireAt = expireMs > 0 ? now + expireMs : 0;
+
+    // 1. 尝试判断锁目录是否已存在
+    let lockExists = false;
     try {
-        await fp.mkdir(file);
-    } catch (e) {
+        await fp.access(lockKeyDir);  // 若存在则不抛错
+        lockExists = true;
+    } catch (_) {
+        // 不存在时会抛ENOENT错误，说明还没有锁
+        lockExists = false;
+    }
+
+    if (lockExists) {
+        // 目录存在时，读取文件名中的过期时间戳
+        const storedExpireAt = await readExpireTimestamp(lockKeyDir);
+        if (storedExpireAt === null) {
+            // 理论上不会出现没有“expire-xxxx”文件的情况，除非中途被手动改动
+            // 可以选择强制删除目录，或者直接返回 false
+            return false;
+        }
+        if (storedExpireAt === 0) {
+            // 说明当时设置的是永不过期
+            return false;
+        }
+        if (storedExpireAt > now) {
+            // 说明锁尚未过期
+            return false;
+        }
+        // 如果过期了，则清理原目录，以便重新加锁
+        try {
+            await fp.rm(lockKeyDir, { recursive: true, force: true });
+        } catch (err) {
+            // 删除失败，可能是权限问题；这里直接返回 false 或者抛错
+            return false;
+        }
+    }
+
+    // 2. 创建锁目录
+    try {
+        await fp.mkdir(lockKeyDir, { recursive: false });
+    } catch (err) {
+        // 如果 mkdir 依旧失败，说明在这段时间里又被别人抢先创建了
         return false;
     }
-    let fileLockMap = setting.fileLock;
-    fileLockMap[file] = true;
+
+    // 3. 在锁目录下创建一个文件，文件名带“过期时间戳”
+    //    expireAt === 0 表示永不过期
+    const expireFilename = `expire-${expireAt}`;
+    const expireFilePath = path.join(lockKeyDir, expireFilename);
+    try {
+        await fp.writeFile(expireFilePath, '');
+    } catch (err) {
+        // 无法写文件就释放锁并抛错
+        try {
+            await fp.rm(lockKeyDir, { recursive: true, force: true });
+        } catch (_) {}
+        return false;
+    }
+
+    // 4. 成功加锁后执行 fn
     try {
         await fn();
         return true;
-    } catch (e) {
-        throw e;
     } finally {
+        // 5. 执行完毕后，手动释放锁目录（也可选择保留到过期自动失效，但一般都建议主动释放）
         try {
-            await fp.rmdir(file)
-            delete fileLockMap[file]
-        } catch (_){}
+            await fp.rm(lockKeyDir, { recursive: true, force: true });
+        } catch (_) {}
     }
 }
 
-async function fileLock(key, fn, wait = true) {
+async function fileLock(key, fn, wait = true, expireMs = 49000) {
     `
     文件锁, 默认一直等待，直到加锁成功执行fn
     wait = false, 加锁失败则不执行fn
@@ -1083,13 +1157,13 @@ async function fileLock(key, fn, wait = true) {
     `
     if (wait) {
         while (true) {
-            if (await _fileLock(key, fn)) {
+            if (await _fileLock(key, fn, expireMs)) {
                 break;
             }
-            await sleep(49);
+            await sleep(9);
         }
     } else {
-        await _fileLock(key, fn);
+        await _fileLock(key, fn, expireMs);
     }
 }
 
@@ -1395,17 +1469,17 @@ async function eia(cmd, args = [], shell = false) {
     `
     当前进程不会卡住，输入输出由cmd进程持有
     `
-    setting.sigExit = false;
+    setting.enableNextLine = false;
     let child = spawn(cmd, args, {stdio:"inherit", shell});
     return new Promise((resolve, reject) => {
         // 监听子进程的关闭事件
         child.on('close', (code) => {
-            setting.sigExit = true;
+            setting.enableNextLine = true;
             resolve(code);
         });
         // 可选：监听子进程的错误事件
         child.on('error', (err) => {
-            setting.sigExit = true;
+            setting.enableNextLine = true;
             reject(err)
         });
     })
@@ -1863,6 +1937,29 @@ end tell
     }
 }
 
+function getKeyTips() {
+    let items = [];
+    for (let key of Object.keys(setting.tips)) {
+        items.push(trim(key))
+    }
+    return items
+}
+
+function getValTips() {
+    let items = [];
+    for (let key of Object.keys(setting.tips)) {
+        let val = setting.tips[key].map(i => {
+            let item = trim(i)
+            if (item.indexOf(',') !== -1) {
+                item = `[${item}]`;
+            }
+            return item;
+        }).join("|");
+        items.push(val)
+    }
+    return items
+}
+
 module.exports = {
     wrapperJsirText,
     run,
@@ -1963,5 +2060,7 @@ module.exports = {
     createDirs,
     getTempDir,
     terminalRun,
-    eia
+    eia,
+    getKeyTips,
+    getValTips
 }

package/package.json

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