jsir 2.3.5 → 2.3.7

package/deps/room.js

@@ -1,7 +1,7 @@
 const os = require('os');
 const {fileJson, fileLock, vl, createConsole, getKeyTips, getValTips,
     getRoomsDir, e, regEach} = require('./util');
-const server = require('../deps/server')
+const {setRoute} = require('../deps/server')
 const roomDataFile = "jsirRoom.json"
 const roomsDirLockKey = "RW_" + getRoomsDir();
 const syncRoomsLockKey = "SyncRooms_" + getRoomsDir();
@@ -30,8 +30,8 @@ function isPidAlive(pid) {
 function onRoom() {
     if (!setting.roomTid[0]) {
         try {
-            server.setRoute("post", "/", (req, res) => setting.selfRoom)
-            server.setRoute("get", "/", (req, res) => setting.selfRoom)
+            setRoute("post", "/", (req, res) => setting.selfRoom)
+            setRoute("get", "/", (req, res) => setting.selfRoom)
         } catch (e) {
             console.$error("initRoute failed", e)
         }
@@ -117,7 +117,7 @@ async function syncRooms() {
     await fileLock(roomsDirLockKey, async () => {
         for (let syncRoom of syncRooms) {
             if (syncRoom.selfNode) {
-                await fp.writeFile(syncRoom.selfNode, JSON.stringify(syncRoom, null, 2))
+                await fp.writeFile(roomsDir + "/" + syncRoom.selfNode, JSON.stringify(syncRoom, null, 2))
             }
         }
     })
@@ -148,6 +148,9 @@ async function _syncSetting(room) {
     let rooms = []
     let files = await fp.readdir(roomDir);
     for (let node of setting.selfRoom.nodes) {
+        if (setting.selfRoom.selfNode === node) {
+            continue
+        }
         if (files.indexOf(node) !== -1) {
             let resp = String(await fp.readFile(roomDir + '/' + node));
             let room = JSON.parse(resp);
@@ -211,7 +214,7 @@ async function initRoomJsir(room) {
         busy: await getEventLoopDelay(),
         back: isRunningInBackground(),
         lastUpdateTime: Date.now(),
-        port: setting.server.address().port
+        port: setting.server ? setting.server.address().port:null
     }
     console.$log("init jsir", process.pid)
 }

package/deps/server.js

@@ -2,15 +2,14 @@ const http = require('http');
 const {createConsole, vl} = require('./util');
 const console = createConsole();
 const setting = require('../deps/setting')
-
 // 尝试监听的端口
 const preferredPort = 52108;
-
 // 路由存储
 const routes = {};
+let invokeStart = false;
 
 // 创建一个 HTTP 服务
-function createServer(port) {
+async function createServer(port) {
     const server = http.createServer(async (req, res) => {
         const method = req.method.toLowerCase();
         const url = req.url;
@@ -25,26 +24,28 @@ function createServer(port) {
         }
     });
 
-    server.listen(port, () => {
-        const address = server.address();
-        console.$log(`Server listening on port ${address.port}`);
-    });
-
-    server.on('error', (err) => {
-        console.$error(`Error occurred: ${err.message}`);
-    });
-
-    return server;
+    return await new Promise((resolve, reject) => {
+        server.listen(port, () => {
+            const address = server.address();
+            console.$log(`Server listening on port ${address.port}`);
+            resolve(server)
+        });
+        server.on('error', (err) => {
+            console.$log(`Error occurred: ${err.message}`);
+            reject(err)
+        });
+    })
 }
 
 // 尝试启动服务的逻辑
-function startServer() {
-    if (!setting.server) {
+async function startServer() {
+    if (!invokeStart) {
+        invokeStart = true;
         try {
-            setting.server = createServer(preferredPort);
+            setting.server = await createServer(preferredPort);
         } catch (e) {
-            console.$error("startServer failed", e)
-            setting.server = createServer(0);
+            console.$log("startServer failed", e)
+            setting.server = await createServer(0);
         }
     }
 }

package/package.json

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