jsir 3.0.7 → 3.0.8

package/deps/room.js

@@ -112,17 +112,14 @@ async function initNodes() {
         } catch (e) {
             console.$debug("initNodes", e)
         }
-        let isFirst = true
         for (let line of resp.split("\n").map(trim)) {
             let ss = line.split(/\s+/);
             if (/^\d+\.\d+\.\d+\.\d+$/.test(ss[0])) {
-                let offline = line.indexOf('offline') !== -1 || line.indexOf('active') === -1
                 nodes[ss[0]] = {
                     name: ss[1],
-                    offline: !isFirst && offline,
+                    offline: line.indexOf('offline') !== -1 ,
                     account: ss[2]
                 }
-                isFirst = false
             }
         }
     }
@@ -255,9 +252,11 @@ async function _syncSetting(room) {
         }
         for (const pid of Object.keys(room.jsirs || {})) {
             let jsir = room.jsirs[pid];
-            for (const service of Object.keys(jsir.services || {})) {
+            for (let service of Object.keys(jsir.services || {})) {
                 let serviceFns = jsir.services[service] || [];
-
+                if (service.endsWith("+")) {
+                    service = service.substring(0, service.length - 1)
+                }
                 let existFns = setting.services[service] || [];
                 existFns.push(...serviceFns)
                 setting.services[service] = [...new Set(existFns)]
@@ -423,7 +422,12 @@ async function initRoomJsir(room) {
         let ss = key.split("/").map(trim).filter(i => i);
         if (ss.length > 3) {
             // 脚本空间service
-            getOr(services, ss[1] + '/' + ss[2], []).push(ss[3])
+            let route = setting.routes[key]
+            let serviceKey = ss[1] + '/' + ss[2]
+            if (route.isApi) {
+                serviceKey = serviceKey + '+'
+            }
+            getOr(services, serviceKey, []).push(ss[3])
         } else if (ss.length > 2) {
             // jsir service
             getOr(services, ss[1], []).push(ss[2])

package/package.json

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