homey-api 1.5.15 → 1.5.18

package/lib/HomeyAPI/HomeyAPIV2/DeviceCapability.js

@@ -50,9 +50,20 @@ class DeviceCapability extends EventEmitter {
 
     // Set Value
     Object.defineProperty(this, '__value', {
-      value: device.capabiltiesObj
-        ? device.capabiltiesObj[this.id]
-          ? device.capabiltiesObj[this.id].value
+      value: device.capabilitiesObj
+        ? device.capabilitiesObj[this.id]
+          ? device.capabilitiesObj[this.id].value
+          : null
+        : null,
+      enumerable: false,
+      writable: true,
+    });
+
+    // Set Last Changed
+    Object.defineProperty(this, '__lastChanged', {
+      value: device.capabilitiesObj
+        ? device.capabilitiesObj[this.id]
+          ? device.capabilitiesObj[this.id].lastUpdated
           : null
         : null,
       enumerable: false,
@@ -91,6 +102,7 @@ class DeviceCapability extends EventEmitter {
 
     if (value === this.__value) return;
     this.__value = value;
+    this.__lastChanged = new Date(transactionTime);
 
     this.__listener(value);
   }
@@ -103,7 +115,20 @@ class DeviceCapability extends EventEmitter {
    * @type {boolean|number|string|null}
    */
   get value() {
-    return this.__value;
+    return typeof this.__value !== 'undefined'
+      ? this.__value
+      : null;
+  }
+
+  /**
+   * @type {Date|null}
+   */
+  get lastChanged() {
+    return (this.__lastChanged instanceof Date)
+      ? this.__lastChanged
+      : (typeof this.__lastChanged === 'string')
+        ? new Date(this.__lastChanged)
+        : null;
   }
 
   /**
@@ -126,6 +151,7 @@ class DeviceCapability extends EventEmitter {
     });
 
     this.__value = value;
+    this.__lastChanged = new Date();
   }
 
 }

package/lib/HomeyAPI/HomeyAPIV2/Manager.js

@@ -167,10 +167,7 @@ class Manager extends EventEmitter {
                     }
                     case 'body': {
                       if (parameter.root) {
-                        body = {
-                          ...body,
-                          ...value,
-                        };
+                        body = value;
                       } else {
                         body[parameterId] = value;
                       }
@@ -253,6 +250,7 @@ class Manager extends EventEmitter {
             } else {
               // Get from HTTP
               result = await this.homey.call({
+                $timeout,
                 headers,
                 body,
                 path: `/api/manager/${this.id}${path}`,

package/lib/HomeyAPI/HomeyAPIV2.js

@@ -288,8 +288,6 @@ class HomeyAPIV2 extends HomeyAPI {
             promises.push(pings[HomeyAPI.DISCOVERY_STRATEGIES.MDNS]);
           }
 
-          // TODO: Move this to the catch handler to always fallback on cloud
-          // Now mdns or local will error first and cloud won't have a chance!!
           if (pings[HomeyAPI.DISCOVERY_STRATEGIES.CLOUD]) {
             promises.push(pings[HomeyAPI.DISCOVERY_STRATEGIES.CLOUD]);
           }
@@ -301,7 +299,16 @@ class HomeyAPIV2 extends HomeyAPI {
           return Promise.race(promises);
         })
         .then(result => resolve(result))
-        .catch(() => reject(new HomeyOfflineError()));
+        .catch(err => {
+          // Last resort: try cloud
+          if (pings[HomeyAPI.DISCOVERY_STRATEGIES.CLOUD]) {
+            return pings[HomeyAPI.DISCOVERY_STRATEGIES.CLOUD].catch(err => {
+              throw new HomeyOfflineError(err);
+            });
+          }
+
+          reject(new HomeyOfflineError(err));
+        });
     } else if (pings[HomeyAPI.DISCOVERY_STRATEGIES.LOCAL]) {
       pings[HomeyAPI.DISCOVERY_STRATEGIES.LOCAL]
         .then(result => resolve(result))

package/package.json

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