homey-api 1.10.7 → 1.10.9

package/lib/HomeyAPI/HomeyAPIV2/Device.js

@@ -48,7 +48,11 @@ class Device extends Item {
       this.__capabilityInstances[capabilityId] = this.__capabilityInstances[capabilityId] || [];
       this.__capabilityInstances[capabilityId] = this.__capabilityInstances[capabilityId].filter(i => i !== instance);
 
-      if (Object.keys(this.__capabilityInstances[capabilityId]).length === 0) {
+      if (this.__capabilityInstances[capabilityId].length === 0) {
+        delete this.__capabilityInstances[capabilityId];
+      }
+
+      if (Object.keys(this.__capabilityInstances).length === 0) {
         this.__debug('No more Capability instances, disconnecting...');
         this.disconnect().catch(err => this.__debug(err));
       }

package/lib/HomeyAPI/HomeyAPIV2/DeviceCapability.js

@@ -104,6 +104,13 @@ class DeviceCapability extends EventEmitter {
     this.__value = value;
     this.__lastChanged = new Date(transactionTime);
 
+    // Mutate the current device capabilitiesObj so it always reflects the last value.
+    const capabilityReference = this.device.capabilitiesObj && this.device.capabilitiesObj[this.id];
+    if (capabilityReference) {
+      capabilityReference.value = value;
+      capabilityReference.lastUpdated = this.__lastChanged.toISOString();
+    }
+
     this.__listener(value);
   }
 
@@ -152,6 +159,13 @@ class DeviceCapability extends EventEmitter {
 
     this.__value = value;
     this.__lastChanged = new Date();
+
+    // Mutate the current device capabilitiesObj so it always reflects the last value.
+    const capabilityReference = this.device.capabilitiesObj && this.device.capabilitiesObj[this.id];
+    if (capabilityReference) {
+      capabilityReference.value = value;
+      capabilityReference.lastUpdated = this.__lastChanged.toISOString();
+    }
   }
 
 }

package/lib/HomeyAPI/HomeyAPIV2/Item.js

@@ -74,6 +74,10 @@ class Item extends EventEmitter {
 
     // If disconnecting, await that first
     try {
+      // Ensure all microtasks are done first. E.g. if disconnect is called in the same tick as
+      // connect. This way the disconnect is always started first so we can await the disconnect
+      // promise before we try to connect again.
+      await Promise.resolve();
       await this.__disconnectPromise;
     } catch (err) { }
 
@@ -141,6 +145,8 @@ class Item extends EventEmitter {
       .catch(() => { })
       .finally(() => {
         delete this.__disconnectPromise;
+        // Delete this.io so connect can start new connections.
+        delete this.io;
       });
 
     await this.__disconnectPromise;

package/lib/HomeyAPI/HomeyAPIV2/Manager.js

@@ -255,8 +255,25 @@ class Manager extends EventEmitter {
                   args,
                   operation: operationId,
                   uri: this.uri,
-                }, (error, result) => {
-                  if (error) return reject(new HomeyAPIError({ error }));
+                }, (err, result) => {
+                  // String Error
+                  if (typeof err === 'string') {
+                    err = new HomeyAPIError({
+                      error: err,
+                    }, 500);
+                    return reject(err);
+                  }
+
+                  // Object Error
+                  if (typeof err === 'object' && err !== null) {
+                    err = new HomeyAPIError({
+                      stack: err.stack,
+                      error: err.error,
+                      error_description: err.error_description,
+                    }, err.statusCode || 500);
+                    return reject(err);
+                  }
+
                   return resolve(result);
                 });
               }), $timeout);

package/lib/HomeyAPI/HomeyAPIV2.js

@@ -655,7 +655,7 @@ class HomeyAPIV2 extends HomeyAPI {
         this.__io = null;
       });
     }
-    // TODO
+    // TODO todo what?
   }
 
   destroy() {

package/lib/HomeyAPI/HomeyAPIV3/ManagerFlow.js

@@ -0,0 +1,34 @@
+'use strict';
+
+const Manager = require('./Manager');
+
+class ManagerFlow extends Manager {
+
+  async getFlowCardTrigger(args = {}, ...rest) {
+    args.uri = '';
+    return this.__super__getFlowCardTrigger(args, ...rest);
+  }
+
+  async getFlowCardCondition(args = {}, ...rest) {
+    args.uri = '';
+    return this.__super__getFlowCardCondition(args, ...rest);
+  }
+
+  async runFlowCardCondition(args = {}, ...rest) {
+    args.uri = '';
+    return this.__super__runFlowCardCondition(args, ...rest);
+  }
+
+  async getFlowCardAction(args = {}, ...rest) {
+    args.uri = '';
+    return this.__super__getFlowCardAction(args, ...rest);
+  }
+
+  async runFlowCardAction(args = {}, ...rest) {
+    args.uri = '';
+    return this.__super__runFlowCardAction(args, ...rest);
+  }
+
+}
+
+module.exports = ManagerFlow;

package/lib/HomeyAPI/HomeyAPIV3.js

@@ -2,6 +2,8 @@
 
 const HomeyAPIV2 = require('./HomeyAPIV2');
 
+const ManagerFlow = require('./HomeyAPIV3/ManagerFlow');
+
 /**
  * @class
  * @hideconstructor
@@ -9,6 +11,11 @@ const HomeyAPIV2 = require('./HomeyAPIV2');
  */
 class HomeyAPIV3 extends HomeyAPIV2 {
 
+  static MANAGERS = {
+    ...HomeyAPIV2.MANAGERS,
+    ManagerFlow,
+  };
+
 }
 
 module.exports = HomeyAPIV3;

package/package.json

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