jsir 2.3.6 → 2.3.8

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)
         }
@@ -166,9 +166,9 @@ async function _syncSetting(room) {
     }
     setting.rooms = [setting.selfRoom, ...rooms]
         .map(room => {
-            room.active = Date.now() - (room.lastUpdateTime || 0) <= 18000;
+            room.active = Date.now() - (room.lastUpdateTime || 0) <= 9000;
             Object.entries(room.jsirs).forEach(([key, jsir]) =>
-                jsir.active = Date.now() - (jsir.lastUpdateTime || 0) <= 6000)
+                jsir.active = Date.now() - (jsir.lastUpdateTime || 0) <= 9000)
             return room;
         });
 }
@@ -177,7 +177,7 @@ async function initRoom() {
     let roomUpdateTouchTime = false;
     await fileJson(roomDataFile, async room => {
         await initRoomJsir(room)
-        if (!vl(room.lastUpdateTime) || (Date.now() - room.lastUpdateTime) > 9000) {
+        if (!vl(room.lastUpdateTime) || (Date.now() - room.lastUpdateTime) > 3000) {
             roomUpdateTouchTime = true;
         }
     })
@@ -214,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, try other port")
+            setting.server = await createServer(0);
         }
     }
 }

package/package.json

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