homey-api 3.4.4 → 3.4.7

package/lib/AthomCloudAPI.js

@@ -385,6 +385,7 @@ for(const {@link HomeyAPIV2.ManagerDevices.Device device} of Object.values(devic
     try {
       responseBody = await response.json();
     } catch (err) {
+      this.__debug(`Invalid response from server (${response.status}): ${response.text()}`);
       throw new APIError(`Invalid response from server: ${response.text()}`, response.status);
     }
 
@@ -453,6 +454,7 @@ for(const {@link HomeyAPIV2.ManagerDevices.Device device} of Object.values(devic
     try {
       responseBody = await response.json();
     } catch (err) {
+      this.__debug(`Invalid response from server (${response.status}): ${response.text()}`);
       throw new APIError(`Invalid response from server: ${response.text()}`, response.status);
     }
 
@@ -520,6 +522,7 @@ for(const {@link HomeyAPIV2.ManagerDevices.Device device} of Object.values(devic
     try {
       responseBody = await response.json();
     } catch (err) {
+      this.__debug(`Invalid response from server (${response.status}): ${response.text()}`);
       throw new APIError(`Invalid response from server: ${response.text()}`, response.status);
     }
 
@@ -571,6 +574,7 @@ for(const {@link HomeyAPIV2.ManagerDevices.Device device} of Object.values(devic
         try {
           responseBody = await response.json();
         } catch (err) {
+          this.__debug(`Invalid response from server (${response.status}): ${response.text()}`);
           throw new APIError(`Invalid response from server: ${response.text()}`, response.status);
         }
 

package/lib/HomeyAPI/HomeyAPIV3/Item.js

@@ -37,27 +37,30 @@ class Item extends EventEmitter {
       writable: false,
     });
 
-    // Set Homey
     Object.defineProperty(this, '__homey', {
       value: homey,
       enumerable: false,
       writable: false,
     });
 
-    // Set Manager
     Object.defineProperty(this, '__manager', {
       value: manager,
       enumerable: false,
       writable: false,
     });
-
-    // Set Connected
+    
     Object.defineProperty(this, '__connected', {
       value: false,
       enumerable: false,
       writable: true,
     });
 
+    Object.defineProperty(this, '__lastUpdated', {
+      value: new Date(),
+      enumerable: false,
+      writable: true,
+    });
+
     // Set Properties
     for (const [key, value] of Object.entries(properties)) {
       if (key === 'id') continue;
@@ -97,6 +100,8 @@ class Item extends EventEmitter {
       this[key] = value;
     }
 
+    this.__lastUpdated = new Date();
+
     this.emit('update', properties);
   }
 

package/lib/HomeyAPI/HomeyAPIV3/Manager.js

@@ -27,14 +27,12 @@ class Manager extends EventEmitter {
   }) {
     super();
 
-    // Set Homey
     Object.defineProperty(this, '__homey', {
       value: homey,
       enumerable: false,
       writable: false,
     });
 
-    // Set Items
     Object.defineProperty(this, 'itemClasses', {
       value: Object.entries(items).reduce((obj, [itemName, item]) => {
         const ItemClass = this.constructor.CRUD[itemName]
@@ -62,14 +60,12 @@ class Manager extends EventEmitter {
       writable: false,
     });
 
-    // Set Connected
     Object.defineProperty(this, '__connected', {
       value: false,
       enumerable: false,
       writable: true,
     });
 
-    // Set Cache
     Object.defineProperty(this, '__cache', {
       value: Object.values(items).reduce((obj, item) => ({
         ...obj,

package/lib/HomeyAPI/HomeyAPIV3/ManagerDevices/Device.js

@@ -69,6 +69,13 @@ class Device extends Item {
     this.__capabilityInstances[capabilityId] = this.__capabilityInstances[capabilityId] || [];
     this.__capabilityInstances[capabilityId].push(instance);
 
+    // Schedule a refresh if it's been more than a second since the device has updated.
+    const now = Date.now();
+
+    if (this.__lastUpdated.getTime() + 1000 < now) {
+      this.manager.scheduleRefresh();
+    }
+
     return instance;
   }
 
@@ -117,31 +124,32 @@ class Device extends Item {
   }
 
   onReconnect() {
-    if (Object.keys(this.__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(this.__capabilityInstances).forEach(([capabilityId, capabilityInstances]) => {
-          const value = device.capabilitiesObj
-            ? typeof device.capabilitiesObj[capabilityId] !== 'undefined'
-              ? device.capabilitiesObj[capabilityId].value
-              : null
-            : null;
-
-          for (const capabilityInstance of capabilityInstances) {
-            capabilityInstance.__onCapabilityValue({
-              capabilityId,
-              value,
-              transactionId: Util.uuid(),
-            });
-          }
+    this.manager.scheduleRefresh();
+  }
+
+  refreshCapabilityInstances() {
+    Object.entries(this.__capabilityInstances).forEach(([capabilityId, capabilityInstances]) => {
+      const value = this.capabilitiesObj
+        ? this.capabilitiesObj[capabilityId] != null
+          ? this.capabilitiesObj[capabilityId].value
+          : null
+        : null;
+
+      const lastUpdated = this.capabilitiesObj
+        ? this.capabilitiesObj[capabilityId] != null
+          ? this.capabilitiesObj[capabilityId].lastUpdated
+          : null
+        : null;
+
+      for (const capabilityInstance of capabilityInstances) {
+        capabilityInstance.__onCapabilityValue({
+          capabilityId,
+          value,
+          transactionId: Util.uuid(),
+          transactionTime: lastUpdated
         });
-      })
-        // eslint-disable-next-line no-console
-        .catch(err => this.__debug(`Device[${this.id}].onReconnectError:`, err));
-    }
+      }
+    });
   }
 
   /**

package/lib/HomeyAPI/HomeyAPIV3/ManagerDevices.js

@@ -12,6 +12,31 @@ class ManagerDevices extends Manager {
     Device,
   }
 
+  scheduleRefresh() {
+    if (this.__refreshTimeout) {
+      clearTimeout(this.__refreshTimeout);
+    }
+
+    if (this.__pendingRefreshDevicesCall != null) {
+      return;
+    }
+
+    this.__refreshTimeout = setTimeout(() => {
+      if (this.isConnected()) {
+        this.__debug('Refreshing devices...');
+        this.__pendingRefreshDevicesCall = this.getDevices({ $cache: false }).then(devices => {
+          for (const device of Object.values(devices)) {
+            device.refreshCapabilityInstances();
+          }
+        }).catch(err => {
+          this.__debug('Failed to refresh devices.', err);
+        }).finally(() => {
+          this.__pendingRefreshDevicesCall = null;
+        });
+      }
+    }, 1000);
+  }
+
 }
 
 module.exports = ManagerDevices;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homey-api",
-  "version": "3.4.4",
+  "version": "3.4.7",
   "description": "Homey API",
   "main": "index.js",
   "files": [