jsir 2.3.1 → 2.3.3

package/cmd/oaa.js

@@ -11,7 +11,7 @@ const {
     createConsole, setTips, delTips,
     getEditor, errorStr, getConfigDir,
     getFullPath, parseUniqueName, toUniqueName, isJsirFileName, toJsirFileName,
-    getOr, 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'
@@ -138,7 +139,7 @@ function getFileOpenExe(fileName) {
 
 function checkWorkspaces() {
     let localWorkspace = _libDataDir + '/local';
-    global.$workspaceMap = {
+    setting.workspaceMap = {
         'local': localWorkspace
     }
     mkdir(localWorkspace)
@@ -149,15 +150,15 @@ function checkWorkspaces() {
             continue
         }
         if (fs.existsSync(workspace)) {
-            $workspaceMap[space] = workspace;
+            setting.workspaceMap[space] = workspace;
         }
     }
-    arrayDataFile(_workspaceConfigFile, () => Object.values($workspaceMap))
-    initWorkspace()
+    arrayDataFile(_workspaceConfigFile, () => Object.values(setting.workspaceMap))
 }
 
 async function start() {
     checkWorkspaces()
+    initWorkspace()
 
     lastFilterArg = getConfig("lastFilterArg");
     _cmdMap = objDataFile(_cmdMapFile);
@@ -288,7 +289,7 @@ async function nextLine(callback, promptStr, hidden) {
 }
 
 function defaultPromptStr(showKey = false) {
-    let tips = [getTipStr(showKey), $defaultSpace].filter(i => i).join(':') + `> `;
+    let tips = [getTipStr(showKey), setting.defaultSpace].filter(i => i).join(':') + `> `;
     _isTipsDoneShowKey  = showKey;
     return tips;
 }
@@ -345,28 +346,7 @@ function initRl(callback, promptStr, hidden) {
 }
 
 function getTipStr(showKey = false) {
-    let items = [];
-    for (let key of Object.keys(global.$tips)) {
-        let val = global.$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
@@ -872,14 +856,14 @@ function help(filterFn) {
 }
 
 function delTipsByIndex(idxs) {
-    let keys = Object.keys($tips)
+    let keys = Object.keys(setting.tips)
     let indexKeyMap = {}
     for(let i = 1;i<=keys.length;i++) {
         indexKeyMap[i] = keys[i - 1]
     }
     let params = []
     for (const index of idxs) {
-        if ($tips.hasOwnProperty(index)) {
+        if (setting.tips.hasOwnProperty(index)) {
             params.push(index)
         } else if (indexKeyMap[Number(index)]) {
             params.push(indexKeyMap[Number(index)])
@@ -895,7 +879,7 @@ function delTipsByIndex(idxs) {
 }
 
 function getPackageVersion(space, name) {
-    let moduleDir = $workspaceMap[space] + '/node_modules'
+    let moduleDir = setting.workspaceMap[space] + '/node_modules'
     let dir = moduleDir + "/" + name;
     if (fs.existsSync(dir) && fs.existsSync(dir + '/package.json')) {
         return require(dir + '/package.json').version;
@@ -908,12 +892,12 @@ function copyToSpace(uniqueName) {
     let path = getFullPath(uniqueName)
     let text = String(fs.readFileSync(path))
     let fileName = parseUniqueName(uniqueName)[1];
-    let targetPath = $workspaceMap[$defaultSpace] + '/' + fileName;
+    let targetPath = setting.workspaceMap[setting.defaultSpace] + '/' + fileName;
     if (fs.existsSync(targetPath)) {
-        console.warn(`${fileName} already exist in ${$defaultSpace}`)
+        console.warn(`${fileName} already exist in ${setting.defaultSpace}`)
     } else {
         fs.writeFileSync(targetPath, text)
-        console.info(`get ${uniqueName} to ${$defaultSpace}`)
+        console.info(`get ${uniqueName} to ${setting.defaultSpace}`)
     }
 }
 
@@ -1076,7 +1060,7 @@ const keywordDef = {
             } else {
                 let pair = parseUniqueName(uniqueName)
                 let newName =trim(args.slice(1).join(" "))
-                rename($workspaceMap[pair[0]], pair[1], toJsirFileName(newName), true)
+                rename(setting.workspaceMap[pair[0]], pair[1], toJsirFileName(newName), true)
             }
         },
         args: {
@@ -1165,8 +1149,8 @@ const keywordDef = {
                     return;
                 }
 
-                let aFiles = fs.readdirSync($workspaceMap[aSpace]).filter(isJsirFileName)
-                let bFiles = fs.readdirSync($workspaceMap[bSpace]).filter(isJsirFileName)
+                let aFiles = fs.readdirSync(setting.workspaceMap[aSpace]).filter(isJsirFileName)
+                let bFiles = fs.readdirSync(setting.workspaceMap[bSpace]).filter(isJsirFileName)
 
                 let result = compareMode[mode](aSpace, bSpace, aFiles, bFiles);
                 resetCmdMap(arrayToCmdMap(result))
@@ -1208,8 +1192,8 @@ const keywordDef = {
                 Object.keys(packages).forEach(key => {
                     let info = packages[key];
                     info.version = getPackageVersion(info.space, info.name)
-                    if (global.$packages.hasOwnProperty(info.name)) {
-                        info.loaded = global.$packages[info.name]
+                    if (setting.packages.hasOwnProperty(info.name)) {
+                        info.loaded = setting.packages[info.name]
                     }
                     if (info.loaded && info.loaded !== info.space) {
                         let version = getPackageVersion(info.loaded, info.name)
@@ -1252,14 +1236,14 @@ const keywordDef = {
             let newWorkspace = args.join(' ')
             let isSwitch = false
             if (newWorkspace) {
-                if ($workspaceMap[newWorkspace]) {
+                if (setting.workspaceMap[newWorkspace]) {
                     isSwitch = true;
                     initWorkspace(newWorkspace)
                 } else if (newWorkspace.startsWith('-')) {
                     let name = newWorkspace.replace(/^-\s*/, '');
                     arrayDataFile(_workspaceConfigFile, arr => arr.filter(path => name !== getSpaceFromDir(path)))
                 } else if (newWorkspace.startsWith("/")) {
-                    let workspaces = Object.values($workspaceMap)
+                    let workspaces = Object.values(setting.workspaceMap)
                     workspaces.push(newWorkspace)
                     arrayDataFile(_workspaceConfigFile, () => workspaces)
                 } else {
@@ -1267,10 +1251,11 @@ const keywordDef = {
                 }
             }
             checkWorkspaces()
-            let workspaces = Object.values($workspaceMap)
+            initWorkspace(setting.defaultSpace)
+            let workspaces = Object.values(setting.workspaceMap)
             let items = workspaces.map((path, index) => {
                 return {
-                    name: (getSpaceFromDir(path) === $defaultSpace ? '*':' ') + getSpaceFromDir(path),
+                    name: (getSpaceFromDir(path) === setting.defaultSpace ? '*':' ') + getSpaceFromDir(path),
                     path
                 }
             })
@@ -1344,6 +1329,7 @@ const keywordDef = {
     quit: {
         comment: 'Exit',
         exeFn: (args) => {
+            room.offRoom();
             delTips();
             console.log(infoStr("Bye!"));
             _noAppendNextLine = true;
@@ -1356,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'
     },
@@ -1370,7 +1358,7 @@ const keywordDef = {
             if (args.length > 1) {
                 _args = args.slice(1)
             }
-            await eia(`cd "${$workspaceMap[global.$defaultSpace]}";${cmd}`, _args, true)
+            await eia(`cd "${setting.workspaceMap[setting.defaultSpace]}";${cmd}`, _args, true)
         },
         short: 'E'
     },
@@ -1389,12 +1377,12 @@ const keywordDef = {
                 }
             }
             let suffix = 'log'
-            let cmdStr = 'less -R'
+            let cmdStr = 'less -R +G'
             if (type.indexOf("e") !== -1) {
                 suffix = 'error'
             }
             if (type.indexOf("t") !== -1) {
-                cmdStr = 'tail -n 50 -f'
+                cmdStr = 'less -R +F'
             }
             path = path + '.' + suffix;
             if (!fs.existsSync(path)) {
@@ -1623,13 +1611,13 @@ function getJsirFileSuffix(name) {
 function initWorkspace(space) {
     let current = getConfig("workspace");
     let workspace = space || current || 'local'
-    if (!$workspaceMap[current]) {
+    if (!setting.workspaceMap[workspace]) {
         workspace = 'local'
     }
-    if (workspace !== current) {
+    if (workspace !== current && _noAppendNextLine) {
         setConfig("workspace", workspace)
     }
-    global.$defaultSpace = workspace;
+    setting.defaultSpace = workspace;
 }
 
 function filterCmdAndList(arg) {
@@ -1655,10 +1643,10 @@ function filterCmd(arg){
     let spaceName
     if (arg.indexOf('/') !== -1) {
         let index = arg.indexOf('/');
-        spaceName = trim(arg.substring(0, index)) || $defaultSpace
+        spaceName = trim(arg.substring(0, index)) || setting.defaultSpace
         arg = trim(arg.substring(index + 1))
     }
-    for (let workspace of Object.values($workspaceMap)) {
+    for (let workspace of Object.values(setting.workspaceMap)) {
         let spaceTmp = getSpaceFromDir(workspace);
         if (!spaceName || spaceName === spaceTmp) {
             cmds.push(..._filterCmd(workspace, arg));
@@ -2063,7 +2051,7 @@ async function evalText($text = '', $cmdName = '', $args = []) {
         let pair = parseUniqueName($cmdName)
         currSpace = pair[0]
     } else {
-        currSpace = $defaultSpace
+        currSpace = setting.defaultSpace
     }
     let $requires = async (...matchItems) => {
         let result = []
@@ -2080,22 +2068,13 @@ async function evalText($text = '', $cmdName = '', $args = []) {
         $require, $requires,
         nextLine, nextText,
         wrapperInput, filterCmd,
-        currSpace,
+        currSpace, setting.defaultSpace, setting.workspaceMap,
         $homeDir, $lib, _cmdMap);
 }
 
-function clearFileLock() {
-    let fileLockMap = getOr(global, `$fileLock`, {})
-    for (let file of Object.keys(fileLockMap)) {
-        fp.rmdir(file)
-        delete fileLockMap[file]
-    }
-}
-
 function sigExit() {
     if (_noAppendNextLine) {
         delTips();
-        clearFileLock();
         process.exit(0);
     } else {
         nextLine();
@@ -2104,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/evalCode.js

@@ -3,7 +3,7 @@ module.exports = async ($text = '', $cmdName = '', $args = [],
                         $require, $requires,
                         $nextLine, $nextText,
                         $enter, $filterCmd,
-                        $currentSpace,
+                        $currentSpace, $defaultSpace, $workspaceMap,
                         $homeDir, $lib,
                         $cmdMap) => {
     const $defArgs = () => $args;
@@ -26,13 +26,15 @@ module.exports = async ($text = '', $cmdName = '', $args = [],
     const $errorTag = $lib.errorTag;
 
     const $context = {
+        $defArgs,
         $data, $config, $file,
         $require, $requires, $import,
         $text, $cmdName, $args,
         $nextLine, $nextText,
         $setTips, $delTips,
         $enter, $filterCmd,
-        $currentSpace, $homeDir, $lib, $cmdMap,
+        $currentSpace, $defaultSpace, $workspaceMap,
+        $homeDir, $lib, $cmdMap
     }
     let console = $lib.createConsole($cmdName);
     return await eval(`(async ()=>{${$text};

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

@@ -17,5 +17,11 @@ module.exports = {
     exeKey,
     initKey,
     fileKey,
-    defaultType
+    defaultType,
+    packages: {},
+    tips: {},
+    defaultSpace: 'local',
+    workspaceMap: {},
+    enableNextLine: true,
+    roomTid: []
 }

package/deps/util.js

@@ -16,11 +16,7 @@ const _types = setting.fileType
 const _typeKeys = Object.keys(_types)
 
 global.$newInput = false
-global.$workspaceMap = {}
-global.$defaultSpace = 'local'
 global.$newError = false
-global.$tips = {}
-global.$packages = {}
 
 let libDataDir;
 let lockDir;
@@ -256,7 +252,7 @@ function getFullPath(name) {
     }
     let uniqueName = toUniqueName(name)
     let pair = parseUniqueName(uniqueName)
-    let space = $workspaceMap[pair[0]]
+    let space = setting.workspaceMap[pair[0]]
     if (!space) {
         return ''
     }
@@ -282,10 +278,10 @@ function toUniqueName(name, space) {
     } else if (name.indexOf('/') !== -1) {
         uniqueName = name;
     } else {
-        uniqueName = (space || $defaultSpace) + '/' + name;
+        uniqueName = (space || setting.defaultSpace) + '/' + name;
     }
     let pair = parseUniqueName(uniqueName);
-    return (pair[0] || space || $defaultSpace) + '/' + toJsirFileName(pair[1])
+    return (pair[0] || space || setting.defaultSpace) + '/' + toJsirFileName(pair[1])
 }
 
 function toJsirFileName(name) {
@@ -700,7 +696,7 @@ function iarrayDataFile(fileName, fn, fmt) {
 }
 function getInitName(fileName) {
     fileName = trim(fileName)
-    let homeDir = global.$workspaceMap[$defaultSpace]
+    let homeDir = setting.workspaceMap[setting.defaultSpace]
     if (!fileName.startsWith("/")) {
         fileName = setting.initKey + ' ' + fileName.replace(new RegExp(`^${setting.initKey}\\s+`), '')
         if (!/\..+/.test(fileName)) {
@@ -762,14 +758,14 @@ async function fileExist(path) {
     }
 }
 
-async function fileJson(key, fn, fmt = true) {
+async function fileJson(key, fn, fmt = true, safeMs = 49000) {
     `
     多进程安全文件读写
     `
     let dataDir = getLibDataDir() + "/data"
     let fileName = trim(key)
     let path = dataDir + "/" + fileName;
-    let homeDir = global.$workspaceMap[$defaultSpace]
+    let homeDir = setting.workspaceMap[setting.defaultSpace]
     let isInit = fileName.startsWith(setting.initKey);
     if (isInit) {
         path = homeDir + '/' + toJsirFileName(fileName);
@@ -793,12 +789,12 @@ 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;
 }
 
 function setModulePaths(space) {
-    let moduleDir = $workspaceMap[space] + '/node_modules'
+    let moduleDir = setting.workspaceMap[space] + '/node_modules'
     if (module.paths.indexOf(moduleDir) === -1) {
         module.paths.splice(0, module.paths.length)
         module.paths.push(moduleDir)
@@ -808,13 +804,13 @@ function setModulePaths(space) {
 }
 
 function enrichPackages(moduleName, space) {
-    if (!global.$packages.hasOwnProperty(moduleName)) {
-        global.$packages[moduleName] = space
+    if (!setting.packages.hasOwnProperty(moduleName)) {
+        setting.packages[moduleName] = space
     }
 }
 
 function requireG(moduleName, space){
-    space = space || global.$defaultSpace;
+    space = space || setting.defaultSpace;
     let moduleDir = setModulePaths(space);
     if (module.paths.indexOf(moduleDir) === -1) {
         module.paths.splice(0, module.paths.length)
@@ -836,7 +832,7 @@ function requireG(moduleName, space){
 }
 
 async function importG(moduleName, space) {
-    space = space || global.$defaultSpace;
+    space = space || setting.defaultSpace;
     let moduleDir = setModulePaths(space);
     try {
         let result = await import(moduleName);
@@ -1041,7 +1037,7 @@ function getLockDir() {
     return lockDir;
 }
 
-function getLockFile(key) {
+function getLockKeyDir(key) {
     if (!key) {
         throw "invalid args"
     }
@@ -1050,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;
+    }
+
+    // 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;
     }
-    let fileLockMap = getOr(global, `$fileLock`, {})
-    fileLockMap[file] = true;
+
+    // 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
@@ -1087,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);
     }
 }
 
@@ -1116,19 +1186,19 @@ function setTips(key, value, onRm) {
     if (!vl(key) || key.indexOf(",") !== -1) {
         throw "invalid tip key";
     }
-    getOr(global.$tips, key, []).push(value);
+    getOr(setting.tips, key, []).push(value);
     if (onRm) {
         getOr(_tipsOnRm, key, []).push(onRm)
     }
 }
 
 function delTips(...keys) {
-    for (let key of Object.keys($tips)) {
+    for (let key of Object.keys(setting.tips)) {
         if (keys.length === 0) {
-            delete $tips[key]
+            delete setting.tips[key]
             tipsOnRmCallback(key)
         } else if (keys.indexOf(key) !== -1) {
-            delete $tips[key]
+            delete setting.tips[key]
             tipsOnRmCallback(key)
         }
     }
@@ -1186,7 +1256,7 @@ function fileCleaner(path, maxChars) {
     `
     cleanFiles[path] = Date.now() + (1000 * 60)
     let flag = "sys"
-    if (!$tips[flag]) {
+    if (!setting.tips.hasOwnProperty(flag)) {
         timer(flag, 1000 * 9, () => {
             for (let aPath of Object.keys(cleanFiles)) {
                 if (cleanFiles[aPath] < Date.now()) {
@@ -1399,14 +1469,17 @@ async function eia(cmd, args = [], shell = false) {
     `
     当前进程不会卡住，输入输出由cmd进程持有
     `
+    setting.enableNextLine = false;
     let child = spawn(cmd, args, {stdio:"inherit", shell});
     return new Promise((resolve, reject) => {
         // 监听子进程的关闭事件
         child.on('close', (code) => {
+            setting.enableNextLine = true;
             resolve(code);
         });
         // 可选：监听子进程的错误事件
         child.on('error', (err) => {
+            setting.enableNextLine = true;
             reject(err)
         });
     })
@@ -1864,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,
@@ -1964,5 +2060,7 @@ module.exports = {
     createDirs,
     getTempDir,
     terminalRun,
-    eia
+    eia,
+    getKeyTips,
+    getValTips
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsir",
-  "version": "2.3.1",
+  "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"
   }
 }