homey-api 3.4.12 → 3.4.14

package/lib/AthomCloudAPI/Homey.js

@@ -29,7 +29,7 @@ class Homey extends APIDefinition {
    * @param {string|array} [opts.strategy] - One string, or an array of {@link HomeyAPI#DISCOVERY_STRATEGIES} strings, to connect to the Homey.
    * @returns {Promise<HomeyAPI>}
    */
-  async authenticate({ strategy } = {}) {
+  async authenticate({ strategy, reconnect } = {}) {
     const HomeyAPI = (() => {
       if (this.apiVersion === 1) return HomeyAPIV1;
       if (this.apiVersion === 2) return HomeyAPIV2;
@@ -40,6 +40,7 @@ class Homey extends APIDefinition {
 
     const homey = new HomeyAPI({
       strategy,
+      reconnect,
       api: this.__api,
       properties: this.__properties,
       debug: (...props) => {

package/lib/HomeyAPI/HomeyAPIV2/ManagerFlow/Flow.js

@@ -34,20 +34,20 @@ class Flow extends FlowV3 {
   static transformSet(item) {
     if (item.trigger) {
       item.trigger.uri = item.trigger.id.split(':', 3).join(':');
-      item.trigger.id = item.trigger.id.split(':').reverse()[0];
+      item.trigger.id = item.trigger.id.split(':').slice(3).join(':');
     }
 
     if (Array.isArray(item.conditions)) {
       item.conditions.forEach(card => {
         card.uri = card.id.split(':', 3).join(':');
-        card.id = card.id.split(':').reverse()[0];
+        card.id = card.id.split(':').slice(3).join(':');
       });
     }
 
     if (Array.isArray(item.actions)) {
       item.actions.forEach(card => {
         card.uri = card.id.split(':', 3).join(':');
-        card.id = card.id.split(':').reverse()[0];
+        card.id = card.id.split(':').slice(3).join(':');
       });
     }
 

package/lib/HomeyAPI/HomeyAPIV2/ManagerFlow.js

@@ -67,7 +67,7 @@ class ManagerFlow extends ManagerFlowV3 {
     }
 
     return this.__super__getFlowCardTrigger({
-      id: id.split(':').reverse()[0],
+      id: id.split(':').slice(3).join(':'),
       uri: id.split(':', 3).join(':'),
     });
   }
@@ -81,7 +81,7 @@ class ManagerFlow extends ManagerFlowV3 {
     }
 
     return this.__super__getFlowCardCondition({
-      id: id.split(':').reverse()[0],
+      id: id.split(':').slice(3).join(':'),
       uri: id.split(':', 3).join(':'),
     });
   }
@@ -91,7 +91,7 @@ class ManagerFlow extends ManagerFlowV3 {
     ...props
   }) {
     return this.__super__runFlowCardCondition({
-      id: id.split(':').reverse()[0],
+      id: id.split(':').slice(3).join(':'),
       uri: id.split(':', 3).join(':'),
       ...props,
     });
@@ -106,7 +106,7 @@ class ManagerFlow extends ManagerFlowV3 {
     }
 
     return this.__super__getFlowCardAction({
-      id: id.split(':').reverse()[0],
+      id: id.split(':').slice(3).join(':'),
       uri: id.split(':', 3).join(':'),
     });
   }
@@ -116,7 +116,7 @@ class ManagerFlow extends ManagerFlowV3 {
     ...props
   }) {
     return this.__super__runFlowCardAction({
-      id: id.split(':').reverse()[0],
+      id: id.split(':').slice(3).join(':'),
       uri: id.split(':', 3).join(':'),
       ...props,
     });
@@ -127,7 +127,7 @@ class ManagerFlow extends ManagerFlowV3 {
     ...props
   }) {
     return this.__super__getFlowCardAutocomplete({
-      id: id.split(':').reverse()[0],
+      id: id.split(':').slice(3).join(':'),
       uri: id.split(':', 3).join(':'),
       ...props,
     });

package/lib/HomeyAPI/HomeyAPIV3.js

@@ -49,6 +49,7 @@ class HomeyAPIV3 extends HomeyAPI {
     baseUrl = null,
     token = null,
     session = null,
+    reconnect = true,
     ...props
   }) {
     super({ properties, ...props });
@@ -65,6 +66,12 @@ class HomeyAPIV3 extends HomeyAPI {
       writable: true,
     });
 
+    Object.defineProperty(this, '__reconnect', {
+      value: reconnect,
+      enumerable: false,
+      writable: true,
+    });
+
     Object.defineProperty(this, '__token', {
       value: token,
       enumerable: false,
@@ -584,6 +591,11 @@ class HomeyAPIV3 extends HomeyAPI {
 
     await this.connect();
     await Util.timeout(new Promise((resolve, reject) => {
+      if (this.isConnected() !== true) {
+        reject(new Error('Not connected after connect.'));
+        return;
+      }
+
       this.__homeySocket.once('disconnect', (reason) => {
         reject(new Error(reason));
       });
@@ -655,9 +667,7 @@ class HomeyAPIV3 extends HomeyAPI {
     };
   }
 
-  async connect({
-    reconnect = true
-  } = {}) {
+  async connect() {
     if (!this.__connectPromise) {
       this.__connectPromise = Promise.resolve().then(async () => {
         // Ensure Base URL
@@ -676,7 +686,7 @@ class HomeyAPIV3 extends HomeyAPI {
               pingTimeout: 8000,
               pingInterval: 5000,
             },
-            reconnection: reconnect,
+            reconnection: this.__reconnect,
           });
 
           this.__socket.on('disconnect', reason => {

package/package.json

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