jsir 2.4.8 → 2.4.9

package/deps/room.js

@@ -118,19 +118,26 @@ function getSelfIP(nodes) {
 
 async function getTailscaleNodes() {
     let resp = await e(`${tailscalePath} status`);
-    let nodes = []
-    regEach(resp, /^(\d+\.\d+\.\d+\.\d+)\s+/mg, arr => {
-        nodes.push(arr[1])
-    });
-    return [...new Set(nodes)];
+    let nodes = {}
+    for (let line of resp.split("\n").map(trim)) {
+        if (line.indexOf('offline') !== -1) {
+            continue
+        }
+        let ss = line.split(/\s+/);
+        if (/^\d+\.\d+\.\d+\.\d+$/.test(ss[0])) {
+            nodes[ss[0]] = ss[1]
+        }
+    }
+    return nodes;
 }
 
 async function updateRoomInfo() {
-    let nodes = await getTailscaleNodes();
+    let nodeMap = await getTailscaleNodes();
+    let nodes = Object.keys(nodeMap)
     let ip = getSelfIP(nodes)
     await fileJson(roomDataFile, async room => {
         // 设置roomName
-        let name = os.hostname();
+        let name = nodeMap[ip] || os.hostname();
         if (!vl(room.name) || room.name !== name) {
             room.name = name;
             debug("set roomName", name)

package/package.json

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