homebridge-shelly-blu-trv 1.0.8 → 1.0.10

package/dist/shellyApi.js

@@ -46,10 +46,17 @@ class ShellyApi {
     async rpcCall(id, method, params) {
         // Try several RPC variants for wider compatibility with firmware differences
         const paramsStr = params ? `&params=${encodeURIComponent(JSON.stringify(params))}` : '';
-        const candidates = [
-            `/rpc/BluTrv.call?id=${id}&method=${method}${paramsStr}`,
-            `/rpc/BluTrv.call&id=${id}&method=${method}${paramsStr}`
-        ];
+        // Try direct GetStatus endpoints first (some firmwares expose dedicated GET endpoints)
+        const candidates = [];
+        if (method === 'TRV.GetStatus') {
+            candidates.push(`/rpc/BluTrv.GetStatus?id=${id}`);
+            candidates.push(`/rpc/BluTrv.GetStatus&id=${id}`);
+        }
+        // Common CALL variants (different firmware use call vs Call and different query separators)
+        candidates.push(`/rpc/BluTrv.Call?id=${id}&method=${method}${paramsStr}`);
+        candidates.push(`/rpc/BluTrv.call?id=${id}&method=${method}${paramsStr}`);
+        candidates.push(`/rpc/BluTrv.Call&id=${id}&method=${method}${paramsStr}`);
+        candidates.push(`/rpc/BluTrv.call&id=${id}&method=${method}${paramsStr}`);
         for (const path of candidates) {
             try {
                 return await this.get(path);
@@ -112,15 +119,37 @@ class ShellyApi {
     async getTrvState(id) {
         this.log.debug(`[ShellyApi] Fetching state for TRV ${id}`);
         try {
-            const rpc = await this.rpcCall(id, 'TRV.GetStatus');
-            const status = await this.get("/status");
-            const dev = status.ble?.devices?.find((d) => d.id === id);
+            // RPC variant may return battery/paired status directly (BluTrv.GetStatus). Use RPC result first.
+            const rpcAny = await this.rpcCall(id, 'TRV.GetStatus');
+            const rpc = rpcAny;
+            // Validate required fields
+            if (typeof rpc.current_C !== 'number' ||
+                typeof rpc.target_C !== 'number' ||
+                typeof rpc.pos !== 'number') {
+                throw new Error(`Missing required TRV state fields in RPC response: ${JSON.stringify(rpc)}`);
+            }
+            // Prefer battery/online information from RPC response; if missing, try /status as a graceful fallback
+            let battery = typeof rpc.battery === 'number' ? rpc.battery : undefined;
+            let online = typeof rpc.paired === 'boolean' ? rpc.paired : undefined;
+            if (battery === undefined || online === undefined) {
+                try {
+                    const status = await this.get("/status");
+                    const dev = status.ble?.devices?.find((d) => d.id === id);
+                    battery = battery ?? dev?.battery ?? 0;
+                    online = online ?? !!dev?.online;
+                }
+                catch (err) {
+                    this.log.debug(`[ShellyApi] /status fallback failed for TRV ${id}: ${err instanceof Error ? err.message : String(err)}`);
+                    battery = battery ?? 0;
+                    online = online ?? true;
+                }
+            }
             const state = {
                 currentTemp: rpc.current_C,
                 targetTemp: rpc.target_C,
                 valve: rpc.pos,
-                battery: dev?.battery ?? 0,
-                online: !!dev?.online
+                battery: battery ?? 0,
+                online: !!online
             };
             this.log.debug(`[ShellyApi] TRV ${id} state: temp=${state.currentTemp}°C, target=${state.targetTemp}°C, valve=${state.valve}%, battery=${state.battery}%, online=${state.online}`);
             return state;
@@ -133,7 +162,8 @@ class ShellyApi {
     async setTargetTemp(id, value) {
         this.log.debug(`[ShellyApi] Setting target temperature for TRV ${id} to ${value}°C`);
         try {
-            await this.rpcCall(id, 'TRV.SetTarget', { target_C: value });
+            // Include an explicit id:0 in params (observed in some firmware examples)
+            await this.rpcCall(id, 'TRV.SetTarget', { id: 0, target_C: value });
             this.log.debug(`[ShellyApi] Successfully set target temperature for TRV ${id}`);
         }
         catch (error) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "homebridge-shelly-blu-trv",
   "displayName": "Shelly BLU TRV",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "description": "Homebridge plugin for Shelly BLU TRV thermostats via Shelly BLU Gateway Gen3",
   "license": "MIT",
   "author": "agiplv",