homey-api 1.5.13 → 1.5.14

package/lib/HomeyAPI/HomeyAPIV2/Device.js

@@ -114,7 +114,7 @@ class Device extends Item {
     this.__debug('connect');
 
     if (!this.io) {
-      this.io = await this.homey.subscribe(this.uri, {
+      this.io = this.homey.subscribe(this.uri, {
         onConnect: () => {
           this.__debug('onConnect');
           this.__connected = true;
@@ -123,6 +123,34 @@ class Device extends Item {
           this.__debug('onDisconnect');
           this.__connected = false;
         },
+        onReconnect: () => {
+          this.__debug('onDisconnect');
+
+          const capabilityInstances = this.__capabilityInstances;
+          if (Object.keys(capabilityInstances).length > 0) {
+            // Get the device's latest values
+            // TODO: Optimize this with `getDevices()` when >1 device has >0 capability instances.
+            this.manager.getDevice({
+              id: this.id,
+            }).then(async device => {
+              Object.entries(capabilityInstances).forEach(([capabilityId, capabilityInstance]) => {
+                const value = device.capabilitiesObj
+                  ? typeof device.capabilitiesObj[capabilityId] !== 'undefined'
+                    ? device.capabilitiesObj[capabilityId].value
+                    : null
+                  : null;
+
+                capabilityInstance.__onCapabilityValue({
+                  capabilityId,
+                  value,
+                  transactionId: Util.uuid(),
+                });
+              });
+            })
+              // eslint-disable-next-line no-console
+              .catch(err => console.error(`Device[${this.id}].onReconnectError:`, err));
+          }
+        },
         onEvent: (event, data) => {
           // // Fire event listeners
           if (Array.isArray(this.__listeners[event])) {
@@ -131,13 +159,17 @@ class Device extends Item {
         },
       });
     }
+
+    await this.io;
   }
 
   async disconnect() {
     this.__debug('disconnect');
 
     if (this.io) {
-      this.io.unsubscribe();
+      this.io
+        .then(io => io.unsubscribe())
+        .catch(err => this.__debug('Error Disconnecting:', err));
     }
   }
 

package/lib/HomeyAPI/HomeyAPIV2/DeviceCapability.js

@@ -74,6 +74,7 @@ class DeviceCapability extends EventEmitter {
     this.emit('destroy');
     this.device.off('capability', this.__onCapabilityValue);
     this.device.off('delete', this.__onDeviceDelete);
+    this.removeAllListeners();
   }
 
   __onCapabilityValue({

package/lib/HomeyAPI/HomeyAPIV2/Manager.js

@@ -384,7 +384,7 @@ class Manager extends EventEmitter {
     this.__debug('connect');
 
     if (!this.io) {
-      this.io = await this.homey.subscribe(this.uri, {
+      this.io = this.homey.subscribe(this.uri, {
         onConnect: () => {
           this.__debug('onConnect');
           this.__connected = true;
@@ -457,6 +457,8 @@ class Manager extends EventEmitter {
         },
       });
     }
+
+    await this.io;
   }
 
   /**
@@ -467,11 +469,14 @@ class Manager extends EventEmitter {
     this.__debug('disconnect');
 
     if (this.io) {
-      this.io.unsubscribe();
+      this.io
+        .then(io => io.unsubscribe())
+        .catch(err => this.__debug('Error Disconnecting:', err));
     }
   }
 
   destroy() {
+    // Clear cache
     for (const id of Object.keys(this.__cache)) {
       this.__cache[id] = {};
     }
@@ -480,6 +485,10 @@ class Manager extends EventEmitter {
       this.__cacheAllComplete[id] = false;
     }
 
+    // Remove all event listeners
+    this.removeAllListeners();
+
+    // Disconnect from Socket.io
     this.disconnect().catch(() => { });
   }
 

package/lib/HomeyAPI/HomeyAPIV2.js

@@ -184,9 +184,12 @@ class HomeyAPIV2 extends HomeyAPI {
 
     // Don't discover, just set the only strategy
     if (Object.keys(urls).length === 1) {
+      this.__baseUrl = Object.values(urls)[0];
+      this.__strategyId = Object.keys(urls)[0];
+
       return {
-        strategyId: Object.keys(urls)[0],
-        baseUrl: Object.values(urls)[0],
+        baseUrl: this.__baseUrl,
+        strategyId: this.__strategyId,
       };
     }
 
@@ -526,6 +529,7 @@ class HomeyAPIV2 extends HomeyAPI {
 
     return {
       unsubscribe: () => {
+        this.__ioNamespace.emit('unsubscribe', uri);
         this.__ioNamespace.removeListener(uri, __onEvent);
         this.__io.removeListener('disconnect', __onDisconnect);
         this.__io.removeListener('reconnect', __onReconnect);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homey-api",
-  "version": "1.5.13",
+  "version": "1.5.14",
   "description": "Homey API",
   "main": "src/index.js",
   "types": "assets/types/homey-api.d.ts",