jsir 2.3.9 → 2.4.0

package/deps/evalCode.js

@@ -37,6 +37,10 @@ module.exports = async ($text = '', $cmdName = '', $args = [],
         $homeDir, $lib, $cmdMap
     }
     let console = $lib.createConsole($cmdName);
-    return await eval(`(async ()=>{${$text};
-    })()`)
+    try {
+        return await eval(`(async ()=>{${$text};
+        })()`)
+    } catch (e) {
+        console.error(e)
+    }
 }

package/deps/room.js

@@ -1,7 +1,7 @@
 const os = require('os');
 const {fileJson, fileLock, vl, createConsole, getKeyTips, getValTips,
     getRoomsDir, e, regEach, isRunningInBackground,
-    batchAsync
+    batchAsync, debugStr
 } = require('./util');
 const {setRoute, createSign} = require('../deps/server')
 const roomDataFile = "jsirRoom.json"
@@ -16,6 +16,12 @@ const http = require('http');
 let tailscalePath = os.platform() === 'darwin' ?
     '/Applications/Tailscale.app/Contents/MacOS/Tailscale':'tailscale';
 
+function debug(...args) {
+    if (global.$DEBUG) {
+        console.$log(debugStr('[debug]'), ...args);
+    }
+}
+
 function isPidAlive(pid) {
     try {
         process.kill(Number(pid), 0); // 信号 0 不会实际发送，但会检查进程是否存在
@@ -24,7 +30,7 @@ function isPidAlive(pid) {
         if (err.code === 'ESRCH') {
             return false; // 进程不存在
         }
-        console.$error(`check isPidAlive ${pid} failed`, err)
+        debug(`check isPidAlive ${pid} failed`, err)
         return false;
     }
 }
@@ -35,7 +41,7 @@ function onRoom() {
             setRoute("post", "/", (req, res) => setting.selfRoom)
             setRoute("get", "/", (req, res) => setting.selfRoom)
         } catch (e) {
-            console.$error("initRoute failed", e)
+            debug("initRoute failed", e)
         }
         _onRoom();
     }
@@ -46,7 +52,7 @@ function _onRoom() {
         try {
             await initRoom();
         } catch (e) {
-            console.$error('initRoom', e)
+            debug('initRoom', e)
         }
         if (setting.roomTid[0]) {
             _onRoom();
@@ -60,7 +66,7 @@ function offRoom() {
         setting.roomTid[0] = null
         if (setting.server) {
             setting.server.close(() => {
-                console.$log('Existing server shut down.');
+                debug('Existing server shut down.');
             });
         }
     }
@@ -89,12 +95,12 @@ async function enrichRoomInfo() {
         let name = os.hostname();
         if (!vl(room.name) || room.name !== name) {
             room.name = name;
-            console.$log("set roomName", name)
+            debug("set roomName", name)
         }
         room.selfNode = ip;
         room.nodes = nodes;
         room.lastUpdateTime = Date.now()
-        console.$log("init room", room.name)
+        debug("init room", room.name)
 
         // 提前设置一下
         setting.selfRoom = Object.assign(setting.selfRoom || {}, room);
@@ -116,9 +122,9 @@ async function syncRooms() {
             try {
                 respBody = await reqNode(node, "get", "/");
                 syncRooms.push(JSON.parse(respBody))
-                console.$log(`sync ${node} success`);
+                debug(`sync ${node} success`);
             } catch (e) {
-                console.$log(`sync ${node} failed:`, respBody, e);
+                debug(`sync ${node} failed:`, respBody, e);
             }
         })
     }
@@ -139,11 +145,11 @@ async function syncRooms() {
             try {
                 await fp.unlink(roomsDir + '/' + file)
             } catch (e) {
-                console.$error(e);
+                debug(e);
             }
         }
     }
-    console.$log('syncRooms done')
+    debug('syncRooms done')
 }
 
 async function syncSetting() {
@@ -324,7 +330,7 @@ async function reqNode(node, method, url) {
             'sign': createSign()
         }
     };
-    console.$log('reqRoom', JSON.stringify(opt))
+    debug('reqRoom', JSON.stringify(opt))
     return await new Promise((resolve, reject) => {
         const req = http.request(opt, (res) => {
             let data = '';

package/deps/server.js

@@ -1,5 +1,5 @@
 const http = require('http');
-const {createConsole, vl, aesDecipher, md5, aesCipher} = require('./util');
+const {createConsole, vl, aesDecipher, md5, aesCipher, debugStr} = require('./util');
 const console = createConsole();
 const setting = require('../deps/setting')
 // 尝试监听的端口
@@ -8,6 +8,12 @@ const preferredPort = 52108;
 const routes = {};
 let invokeStart = false;
 
+function debug(...args) {
+    if (global.$DEBUG) {
+        console.$log(debugStr('[debug]'), ...args);
+    }
+}
+
 function verifySign(sign) {
     try {
         let key = md5([...setting.selfRoom.nodes].sort().join(":")).substring(0, 16);
@@ -65,11 +71,11 @@ async function createServer(port) {
     return await new Promise((resolve, reject) => {
         server.listen(port, () => {
             const address = server.address();
-            console.$log(`Server listening on port ${address.port}`);
+            debug(`Server listening on port ${address.port}`);
             resolve(server)
         });
         server.on('error', (err) => {
-            console.$log(`Error occurred: ${err.message}`);
+            debug(`Error occurred: ${err.message}`);
             reject(err)
         });
     })
@@ -82,7 +88,7 @@ async function startServer() {
         try {
             setting.server = await createServer(preferredPort);
         } catch (e) {
-            console.$log("startServer failed, try other port")
+            debug("startServer failed, try other port")
             setting.server = await createServer(0);
         }
     }
@@ -100,14 +106,14 @@ function setRoute(method, url, fn, handler = jsonHandle) {
     } else {
         routes[routeKey] = fn;
     }
-    console.$log(`AddRoute: ${method.toUpperCase()} ${url} ${handler ? handler.constructor.name:''}`);
+    debug(`AddRoute: ${method.toUpperCase()} ${url} ${handler ? handler.constructor.name:''}`);
     return setting.server;
 }
 
 function delRoute(method, url) {
     const routeKey = `${method.toLowerCase()} ${url}`;
     delete routes[routeKey];
-    console.$log(`DelRoute: ${method.toUpperCase()} ${url}`);
+    debug(`DelRoute: ${method.toUpperCase()} ${url}`);
 }
 
 function jsonHandle(req, res, fn) {

package/deps/util.js

@@ -610,7 +610,9 @@ function randomInt(min,max){
 }
 
 async function timeLimit(proms, mills) {
-    let result = await Promise.race([Promise.all(proms), sleep(mills)])
+    let tIds = []
+    let result = await Promise.race([Promise.all(proms), sleep(mills, tIds)])
+    clearTimeout(tIds[0])
     if (!result) {
         throw new Error(`timeLimit: exceed ${mills} ms`)
     }
@@ -1246,6 +1248,9 @@ function setTips(key, value, onRm) {
 function delTips(...keys) {
     for (let key of Object.keys(setting.tips)) {
         if (keys.length === 0) {
+            if (key === 'DEBUG') {
+                continue
+            }
             delete setting.tips[key]
             tipsOnRmCallback(key)
         } else if (keys.indexOf(key) !== -1) {
@@ -1255,6 +1260,9 @@ function delTips(...keys) {
     }
     if (keys.length === 0) {
         for (let key of Object.keys(_tipsOnRm)) {
+            if (key === 'DEBUG') {
+                continue
+            }
             tipsOnRmCallback(key)
         }
     }
@@ -1550,8 +1558,10 @@ async function setCbText(str) {
     fs.unlinkSync(copyFile)
 }
 
-async function sleep(milliseconds) {
-    return new Promise(resolve => setTimeout(resolve, milliseconds));
+async function sleep(milliseconds, tIds = []) {
+    return new Promise(resolve => {
+        tIds.push(setTimeout(resolve, milliseconds))
+    });
 }
 
 function splitArray(items, size) {

package/package.json

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