homey-api 3.17.9 → 3.17.10

package/lib/HomeyAPI/HomeyAPIV3/SubscriptionRegistry.js

@@ -77,6 +77,29 @@ class SubscriptionRegistry {
     };
   }
 
+  async ensureSessionSubscriptions({ revision, homeySocket, isReconnect }) {
+    if (!isReconnect) {
+      return;
+    }
+
+    const reconnectPromises = [];
+
+    for (const entry of this.__entries.values()) {
+      if (entry.consumers.size === 0) {
+        continue;
+      }
+
+      if (!entry.needsReconnect && entry.subscribedRevision === revision) {
+        continue;
+      }
+
+      this.__bindEventSocket(entry, homeySocket);
+      reconnectPromises.push(this.__resumeEntry(entry, revision));
+    }
+
+    await Promise.all(reconnectPromises);
+  }
+
   destroy() {
     if (this.__destroyed) return;
 
@@ -232,21 +255,10 @@ class SubscriptionRegistry {
   }
 
   __onSessionReady({ revision, homeySocket, isReconnect }) {
-    if (!isReconnect) {
-      return;
-    }
-
     // The transport can reconnect before the current Homey namespace is ready.
     // Listen to both reconnect and ready so entries resume promptly, while
     // ready is the point where the active namespace socket can be rebound.
-    for (const entry of this.__entries.values()) {
-      if (entry.consumers.size === 0 || !entry.needsReconnect) {
-        continue;
-      }
-
-      this.__bindEventSocket(entry, homeySocket);
-      this.__resumeEntry(entry, revision);
-    }
+    this.ensureSessionSubscriptions({ revision, homeySocket, isReconnect }).catch(() => {});
   }
 
   __onSessionReconnect() {

package/lib/HomeyAPI/HomeyAPIV3.js

@@ -529,7 +529,8 @@ class HomeyAPIV3 extends HomeyAPI {
   }
 
   async connect() {
-    await this.__socketSession.ensureConnected();
+    const readyState = await this.__socketSession.ensureConnected();
+    await this.__subscriptionRegistry.ensureSessionSubscriptions(readyState);
   }
 
   isConnecting() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homey-api",
-  "version": "3.17.9",
+  "version": "3.17.10",
   "description": "Homey API",
   "main": "index.js",
   "license": "SEE LICENSE",