jsir 2.6.7 → 2.6.9

package/cmd/oaa.js

@@ -106,6 +106,9 @@ const $data = {
         return _dealOnLazyGet(key, onLazyTempCode)
     },
     gos: (key, defaultVal, onLazyTempCode) => {
+        `
+        get or set
+        `
         if (!vl(_data[key])) {
             if (defaultVal !== undefined) {
                 return _dataSet(key, defaultVal, onLazyTempCode)
@@ -116,8 +119,20 @@ const $data = {
         return _dealOnLazyGet(key, onLazyTempCode)
     },
     gfs: (key, fn, onLazyTempCode) => {
+        `
+        get or set by function
+        `
         if (!vl(_data[key])) {
-            return _dataSet(key,  fn(), onLazyTempCode)
+            return _dataSet(key, fn(), onLazyTempCode)
+        }
+        return _dealOnLazyGet(key, onLazyTempCode)
+    },
+    gafs: async (key, fn, onLazyTempCode) => {
+        `
+        get or set by async function
+        `
+        if (!vl(_data[key])) {
+            return _dataSet(key, await fn(), onLazyTempCode)
         }
         return _dealOnLazyGet(key, onLazyTempCode)
     },
@@ -591,12 +606,20 @@ function listCmd(tmpMap) {
     }
 }
 
-async function wrapperInput(str) {
+async function wrapperInput(str, packOutput = false) {
+    if (packOutput) {
+        setting.enterOutputs = []
+    }
     try {
         await _wrapperInput(str);
     } catch (e) {
         console.error(e)
     }
+    if (packOutput) {
+        let outputs = setting.enterOutputs || [];
+        setting.enterOutputs = null;
+        return outputs.join('');
+    }
 }
 
 function wrapperAlias(str) {

package/deps/room.js

@@ -2,7 +2,7 @@ const os = require('os');
 const {fileJson, fileLock, vl, createConsole, getKeyTips, getValTips,
     getRoomsDir, e, isRunningInBackground,
     batchAsync, debugStr, trim, getOr, errorTag, warnStr, getConfig, getConfigDir,
-    fileExist, formatUptime, processLock
+    fileExist, formatUptime, processLock, isPidAlive, cleanFileLocks
 } = require('./util');
 const {setRoute, createSign} = require('../deps/server')
 const roomDataFile = "jsirRoom.json"
@@ -25,19 +25,6 @@ function debug(...args) {
     }
 }
 
-function isPidAlive(pid) {
-    try {
-        process.kill(Number(pid), 0); // 信号 0 不会实际发送，但会检查进程是否存在
-        return true; // PID 存在
-    } catch (err) {
-        if (err.code === 'ESRCH') {
-            return false; // 进程不存在
-        }
-        debug(`check isPidAlive ${pid} failed`, err)
-        return false;
-    }
-}
-
 async function localConfigs() {
     let configDir = getConfigDir();
     let configFiles = await fp.readdir(configDir)
@@ -69,11 +56,7 @@ function onRoom() {
                         res.output = warnStr("Disable Remote")
                         return;
                     }
-                    setting.enterOutputs = []
-                    await setting.wrapperInput(req.input)
-                    let outputs = setting.enterOutputs || [];
-                    setting.enterOutputs = null;
-                    res.output = outputs.join('');
+                    res.output = await setting.wrapperInput(req.input, true)
                     global.$newInput = true;
                 }
             })
@@ -337,6 +320,7 @@ async function initRoom() {
     if (roomUpdateTouchTime) {
         fileLock(updateRoomInfoLockKey, async () => {
             let pros = []
+            pros.push(cleanFileLocks())
             pros.push(syncRooms())
             if (setting.serviceFns[setting.configMainFnKey] && !getConfig("configMain")) {
                 pros.push(syncConfigs())
@@ -390,7 +374,7 @@ async function cleanRoom(room) {
                 debug(`kill inactive jsir ${pid}`)
                 process.kill(parseInt(pid), 'SIGKILL'); // 强制终止进程
             } catch (e) {
-                debug(`clearRoom ${pid} failed`, e)
+                debug(`cleanRoom ${pid} failed`, e)
             }
         }
     }

package/deps/util.js

@@ -879,7 +879,7 @@ async function fileExist(path) {
     }
 }
 
-async function fileJson(key, fn = null, fmt = true, safeMs = 49000) {
+async function fileJson(key, fn = null, fmt = true) {
     `
     多进程安全文件读写
     `
@@ -910,7 +910,7 @@ async function fileJson(key, fn = null, fmt = true, safeMs = 49000) {
             result = val
         }
         await fp.writeFile(path, prefixStr + JSON.stringify(result, null, fmt ? 2:null))
-    }, true, safeMs);
+    }, true);
     return result;
 }
 
@@ -1203,28 +1203,41 @@ function getLockKeyDir(key) {
     return lockDir + "/" + key;
 }
 
-/**
- * 从目录中读取过期时间戳
- * @param {string} lockDir - 锁目录路径
- * @returns {Promise<number | null>} 如果目录下存在过期时间戳文件，则返回其数值；否则返回 null
- */
-async function readExpireTimestamp(lockDir) {
+async function readLockPid(lockDir) {
     try {
         const files = await fp.readdir(lockDir);
-        // 假设我们只会创建一个文件，其文件名包含过期时间，如 `expire-1672531200000`
-        const expireFile = files.find(name => name.startsWith('expire-'));
-        if (!expireFile) {
+        const pidFile = files.find(name => name.startsWith('pid-'));
+        if (!pidFile) {
             return null;
         }
-        const timestamp = parseInt(expireFile.replace('expire-', ''), 10);
-        return isNaN(timestamp) ? null : timestamp;
+        return pidFile.split("-")[1];
     } catch (err) {
         // 读取目录出错（可能不存在？）直接返回 null
         return null;
     }
 }
 
-async function _fileLock(key, fn, expireMs = 49000) {
+async function cleanFileLocks() {
+    let lockDir = getLockDir();
+    const files = await fp.readdir(lockDir);
+    for (let file of files) {
+        let lockKeyDir = lockDir + '/' + file;
+        let pid = await readLockPid(lockKeyDir);
+        if (!pid) {
+            continue;
+        }
+        if (!isPidAlive(pid)) {
+            // 持有锁的进程已经没了，则删除锁文件
+            try {
+                await fp.rm(lockKeyDir, { recursive: true, force: true });
+            } catch (err) {
+                console.$error(`cleanLock ${lockKeyDir} failed`, err);
+            }
+        }
+    }
+}
+
+async function _fileLock(key, fn) {
     `
     文件锁，返回true/false,
     如果没锁住则不执行fn
@@ -1232,31 +1245,12 @@ async function _fileLock(key, fn, expireMs = 49000) {
     if (!key || typeof fn !== 'function') {
         throw new Error('invalid arguments');
     }
-    if (expireMs < 1000) {
-        throw new Error("expireMs can not less than 1000")
-    }
 
     let lockKeyDir = getLockKeyDir(key)
-    const now = Date.now();
-    const expireAt = now + expireMs;
-
     // 1. 尝试判断锁目录是否已存在
     let lockExists = await fileExist(lockKeyDir);
-
     if (lockExists) {
-        // 目录存在时，读取文件名中的过期时间戳
-        const storedExpireAt = await readExpireTimestamp(lockKeyDir) || 0;
-        if (storedExpireAt > now) {
-            // 说明锁尚未过期
-            return false;
-        }
-        // 如果过期了，则清理原目录，以便重新加锁
-        try {
-            await fp.rm(lockKeyDir, { recursive: true, force: true });
-        } catch (err) {
-            // 删除失败，可能是权限问题；这里直接返回 false 或者抛错
-            return false;
-        }
+        return false;
     }
 
     // 2. 创建锁目录
@@ -1267,12 +1261,10 @@ async function _fileLock(key, fn, expireMs = 49000) {
         return false;
     }
 
-    // 3. 在锁目录下创建一个文件，文件名带“过期时间戳”
-    //    expireAt === 0 表示永不过期
-    const expireFilename = `expire-${expireAt}`;
-    const expireFilePath = path.join(lockKeyDir, expireFilename);
+    const lockPidFile = `pid-${process.pid}`;
+    const lockPidFilePath = path.join(lockKeyDir, lockPidFile);
     try {
-        await fp.writeFile(expireFilePath, '');
+        await fp.writeFile(lockPidFilePath, '');
     } catch (err) {
         // 无法写文件就释放锁并抛错
         try {
@@ -1283,19 +1275,16 @@ async function _fileLock(key, fn, expireMs = 49000) {
 
     // 4. 成功加锁后执行 fn
     try {
-        await timeLimit([fn()], expireMs)
+        await fn();
         return true;
     } finally {
-        if (Date.now() <= expireAt - 9) {
-            // 5. 执行完毕后，手动释放锁目录（也可选择保留到过期自动失效，但一般都建议主动释放）
-            try {
-                await fp.rm(lockKeyDir, { recursive: true, force: true });
-            } catch (_) {}
-        }
+        try {
+            await fp.rm(lockKeyDir, { recursive: true, force: true });
+        } catch (_) {}
     }
 }
 
-async function fileLock(key, fn, wait = true, expireMs = 49000) {
+async function fileLock(key, fn, wait = true) {
     `
     文件锁, 默认一直等待expireMs，直到加锁成功执行fn
     wait = false, 加锁失败则不执行fn
@@ -1303,13 +1292,13 @@ async function fileLock(key, fn, wait = true, expireMs = 49000) {
     `
     if (wait) {
         while (true) {
-            if (await _fileLock(key, fn, expireMs)) {
+            if (await _fileLock(key, fn)) {
                 break;
             }
             await sleep(9);
         }
     } else {
-        await _fileLock(key, fn, expireMs);
+        await _fileLock(key, fn);
     }
 }
 
@@ -1533,6 +1522,19 @@ function getLisPidDir() {
     return dir
 }
 
+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 linuxAskAndKill(...keys){
     let rl = readline.createInterface({
         input: process.stdin,
@@ -2373,5 +2375,7 @@ module.exports = {
     aopAsync,
     processLock,
     hasTips,
-    tipKeys
+    tipKeys,
+    isPidAlive,
+    cleanFileLocks
 }

package/package.json

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