jmri-client 4.2.0-beta.2 → 5.1.0

package/README.md

@@ -28,7 +28,9 @@ WebSocket client for [JMRI](http://jmri.sourceforge.net/) with real-time updates
 npm install jmri-client
 ```
 
-**Requirements:** Node.js 18+
+**Requirements:** Node.js 22+ · JMRI 5.0 or later
+
+> `getSystemConnections()` and per-connection power/throttle prefix support require JMRI 5.15.7+. All other features work with any JMRI 5.x release.
 
 ## Quick Start
 

package/dist/browser/jmri-client.js

@@ -723,8 +723,8 @@ var mockData = {
             { "name": "F4", "label": "Dynamic Brake", "lockable": true, "icon": null, "selectedIcon": null },
             { "name": "F5", "label": null, "lockable": false, "icon": null, "selectedIcon": null }
           ],
-          "attributes": [],
-          "rosterGroups": []
+          "attributes": [{ "name": "RosterGroup:diesels", "value": "yes" }],
+          "rosterGroups": ["diesels"]
         },
         "id": 1
       },
@@ -754,8 +754,8 @@ var mockData = {
             { "name": "F3", "label": "Steam", "lockable": true, "icon": null, "selectedIcon": null },
             { "name": "F4", "label": null, "lockable": false, "icon": null, "selectedIcon": null }
           ],
-          "attributes": [],
-          "rosterGroups": []
+          "attributes": [{ "name": "RosterGroup:steam", "value": "yes" }],
+          "rosterGroups": ["steam"]
         },
         "id": 2
       },
@@ -786,13 +786,19 @@ var mockData = {
             { "name": "F4", "label": null, "lockable": false, "icon": null, "selectedIcon": null },
             { "name": "F5", "label": "Mars Light", "lockable": true, "icon": null, "selectedIcon": null }
           ],
-          "attributes": [],
-          "rosterGroups": []
+          "attributes": [{ "name": "RosterGroup:diesels", "value": "yes" }],
+          "rosterGroups": ["diesels"]
         },
         "id": 3
       }
     ]
   },
+  "rosterGroup": {
+    "list": [
+      { "type": "rosterGroup", "data": { "name": "diesels", "length": 2 } },
+      { "type": "rosterGroup", "data": { "name": "steam", "length": 1 } }
+    ]
+  },
   "throttle": {
     "acquire": {
       "success": {
@@ -891,6 +897,7 @@ var mockData = {
 // src/mocks/mock-response-manager.ts
 var MockResponseManager = class {
   constructor(options = {}) {
+    this.powerStateByPrefix = /* @__PURE__ */ new Map();
     this.throttles = /* @__PURE__ */ new Map();
     this.lights = /* @__PURE__ */ new Map([
       ["IL1", 4 /* OFF */],
@@ -919,6 +926,8 @@ var MockResponseManager = class {
         return this.getPowerResponse(message);
       case "roster":
         return this.getRosterResponse(message);
+      case "rosterGroup":
+        return this.getRosterGroupResponse();
       case "throttle":
         return this.getThrottleResponse(message);
       case "light":
@@ -940,34 +949,48 @@ var MockResponseManager = class {
     return JSON.parse(JSON.stringify(mockData.hello));
   }
   /**
-   * Get power response
+   * Get power response, with optional per-prefix state tracking
    */
   getPowerResponse(message) {
-    if (message.data?.state !== void 0) {
+    const prefix = message.data?.prefix;
+    if (message.method === "post" && message.data?.state !== void 0) {
+      if (prefix !== void 0) {
+        this.powerStateByPrefix.set(prefix, message.data.state);
+        return { type: "power", data: { state: message.data.state, prefix } };
+      }
       this.powerState = message.data.state;
-      return {
-        type: "power",
-        data: { state: this.powerState }
-      };
+      return { type: "power", data: { state: this.powerState } };
     }
-    return {
-      type: "power",
-      data: { state: this.powerState }
-    };
+    if (prefix !== void 0) {
+      const state = this.powerStateByPrefix.get(prefix) ?? 0 /* UNKNOWN */;
+      return { type: "power", data: { state, prefix } };
+    }
+    return { type: "power", data: { state: this.powerState } };
   }
   /**
-   * Get roster response
+   * Get roster response, optionally filtered by group
    */
   getRosterResponse(message) {
     if (message.type === "roster" && message.method === "list") {
-      return {
-        type: "roster",
-        data: JSON.parse(JSON.stringify(mockData.roster.list))
-      };
+      const all = JSON.parse(JSON.stringify(mockData.roster.list));
+      const group = message.params?.group;
+      if (group) {
+        return {
+          type: "roster",
+          data: all.filter((e) => e.data.rosterGroups?.includes(group))
+        };
+      }
+      return { type: "roster", data: all };
     }
+    return { type: "roster", data: [] };
+  }
+  /**
+   * Get roster group response
+   */
+  getRosterGroupResponse() {
     return {
-      type: "roster",
-      data: []
+      type: "rosterGroup",
+      data: JSON.parse(JSON.stringify(mockData.rosterGroup.list))
     };
   }
   /**
@@ -986,13 +1009,11 @@ var MockResponseManager = class {
         F1: false,
         F2: false,
         F3: false,
-        F4: false
+        F4: false,
+        ...data.prefix !== void 0 && { prefix: data.prefix }
       };
       this.throttles.set(throttleId, throttleState);
-      return {
-        type: "throttle",
-        data: { ...throttleState }
-      };
+      return { type: "throttle", data: { ...throttleState } };
     }
     if (data.release !== void 0 && data.throttle) {
       this.throttles.delete(data.throttle);
@@ -1125,6 +1146,7 @@ var MockResponseManager = class {
    */
   reset() {
     this.powerState = 4 /* OFF */;
+    this.powerStateByPrefix.clear();
     this.throttles.clear();
     this.lights = /* @__PURE__ */ new Map([
       ["IL1", 4 /* OFF */],
@@ -1608,6 +1630,32 @@ var RosterManager = class {
     }
     return results;
   }
+  /**
+   * Get all roster groups
+   */
+  async getRosterGroups() {
+    const message = {
+      type: "rosterGroup",
+      method: "list"
+    };
+    const response = await this.client.request(message);
+    if (!response.data) return [];
+    return response.data.map((wrapper) => wrapper.data);
+  }
+  /**
+   * Get roster entries belonging to a specific group
+   */
+  async getRosterEntriesByGroup(group) {
+    const message = {
+      type: "roster",
+      method: "list",
+      params: { group }
+    };
+    const response = await this.client.request(message);
+    if (!response.data) return [];
+    const entries = response.data;
+    return entries.filter((e) => e.type === "rosterEntry");
+  }
   /**
    * Get cached roster (no network request)
    */
@@ -2315,6 +2363,18 @@ var JmriClient = class extends import_index.default {
   async searchRoster(query) {
     return this.rosterManager.searchRoster(query);
   }
+  /**
+   * Get all roster groups
+   */
+  async getRosterGroups() {
+    return this.rosterManager.getRosterGroups();
+  }
+  /**
+   * Get roster entries belonging to a specific group
+   */
+  async getRosterEntriesByGroup(group) {
+    return this.rosterManager.getRosterEntriesByGroup(group);
+  }
   // ============================================================================
   // Turnout Control
   // ============================================================================