jsir 3.1.3 → 3.1.6

package/deps/room.js

@@ -342,13 +342,16 @@ async function processTasks(defTasks) {
 
 function cleanFnCache() {
     const now = Date.now()
-    for (let key of Object.keys(setting.fnCache)) {
+    let countClean = 0;
+    const keys = Object.keys(setting.fnCache);
+    for (let key of keys) {
         let item = setting.fnCache[key]
-        if (item && item.validMsTime && now > item.validMsTime) {
+        if (!item || !item.validMsTime || now > item.validMsTime) {
             delete setting.fnCache[key]
+            countClean ++
         }
     }
-    console.$debug("cleanFnCache cost", `${Date.now() - now}ms`)
+    console.$debug("cleanFnCache cost", `${Date.now() - now}ms delete ${countClean} remain ${keys.length - countClean}`)
 }
 
 async function readLockPid(lockDir) {
@@ -370,6 +373,7 @@ async function cleanFileLocks() {
     let lockDir = getLockDir();
     const files = await fp.readdir(lockDir);
     const deadPid = {}
+    let countClean = 0;
     for (let file of files) {
         let lockKeyDir = lockDir + '/' + file;
         let pid = await readLockPid(lockKeyDir);
@@ -381,17 +385,23 @@ async function cleanFileLocks() {
             // 持有锁的进程已经没了，则删除锁文件
             try {
                 await fp.rm(lockKeyDir, { recursive: true, force: true });
+                countClean ++;
             } catch (err) {
                 console.$error(`cleanLock ${lockKeyDir} failed`, err);
             }
         }
     }
-    console.$debug("cleanFileLocks cost", `${Date.now() - now}ms`)
+    console.$debug("cleanFileLocks cost", `${Date.now() - now}ms delete ${countClean} remain ${files.length - countClean}`)
 }
 
 async function initRoom() {
     // 每分钟清理缓存
     cacheFn("jsir:cleanFnCache", cleanFnCache, 60_000)
+    if (setting.selfJsir?.port === setting.defaultPort) {
+        // 每分钟清理lock 文件
+        cacheFn("jsir:cleanFileLocks", cleanFileLocks, 60_000)
+    }
+
     setting.roomTime = Date.now();
     setting.nodeMap = await fileJson(jsirNodesFile);
     let roomUpdateTouchTime = false;
@@ -403,8 +413,6 @@ async function initRoom() {
         }
     })
     if (roomUpdateTouchTime) {
-        // 每分钟清理lock 文件
-        cacheFn("jsir:cleanFileLocks", cleanFileLocks, 60_000)
         fileLock(updateRoomInfoLockKey, async () => {
             let pros = []
             pros.push(syncRooms())

package/package.json

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