jsir 2.6.2 → 2.6.3

package/cmd/oaa.js

@@ -385,6 +385,9 @@ function _nextLine(callback, promptStr, hidden, resolve, end, isText) {
     }
     initRl(callback, promptStr, hidden);
     _haveWrapperInput = false
+    if (!callback || callback === wrapperInput) {
+        global.$newInput = true;
+    }
     let inputStr = ''
     let lineHandler = async line => {
         let textLine = line
@@ -593,7 +596,6 @@ function wrapperAlias(str) {
 
 async function _wrapperInput(str) {
     _haveWrapperInput = true;
-    global.$newInput = true;
     str = trim(str)
     if (!str) {
         return;

package/deps/room.js

@@ -8,10 +8,7 @@ const {setRoute, createSign} = require('../deps/server')
 const roomDataFile = "jsirRoom.json"
 const jsirNodesFile = "jsirNodes.json"
 const roomTasksFile = "roomTasks.json"
-const roomTasksLockKey = "LOCK_roomTasks.json"
 const roomsDirLockKey = "RW_" + getRoomsDir();
-const syncRoomsLockKey = "SyncRooms_" + getRoomsDir();
-const syncConfigsLockKey = "SyncConfigs_" + getConfigDir();
 const updateRoomInfoLockKey = "UPDATE_" + roomDataFile
 const console = createConsole();
 const setting = require('../deps/setting')
@@ -145,11 +142,7 @@ async function updateRoomInfo() {
             jsirs: room.jsirs
         }
         // 设置roomName
-        let name = setting.nodeMap[ip]?.name || os.hostname();
-        if (!vl(room.name) || room.name !== name) {
-            room.name = name;
-            debug("set roomName", name)
-        }
+        room.name = setting.nodeMap[ip]?.name || os.hostname();
         room.selfNode = ip;
         room.lastUpdateTime = Date.now()
         debug("init room", room.name)
@@ -329,18 +322,20 @@ async function initRoom() {
             roomUpdateTouchTime = true;
         }
     })
-    if (defTasks) {
-        fileLock(roomTasksLockKey, processTasks, false)
-    }
-
     if (roomUpdateTouchTime) {
-        await fileLock(updateRoomInfoLockKey, updateRoomInfo, false)
-        fileLock(syncRoomsLockKey, syncRooms, false);
-        if (setting.serviceFns[setting.configMainFnKey] && !getConfig("configMain")) {
-            fileLock(syncConfigsLockKey, syncConfigs, false);
-        }
+        fileLock(updateRoomInfoLockKey, async () => {
+            await updateRoomInfo()
+            let pros = []
+            pros.push(syncRooms())
+            if (setting.serviceFns[setting.configMainFnKey] && !getConfig("configMain")) {
+                pros.push(syncConfigs())
+            }
+            await Promise.all(pros);
+        }, false)
+    }
+    if (defTasks) {
+        await processTasks();
     }
-
     await syncSetting();
 }
 

package/package.json

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