homey-api 3.0.27 → 3.2.0

package/assets/specifications/AthomCloudAPI.json

@@ -1095,6 +1095,25 @@
         }
       }
     },
+    "addTagToMailChimpUser": {
+      "path": "/mail/mailchimp/tag",
+      "method": "post",
+      "private": true,
+      "parameters": {
+        "listId": {
+          "type": "string",
+          "in": "body"
+        },
+        "userId": {
+          "type": "string",
+          "in": "body"
+        },
+        "tag": {
+          "type": "string",
+          "in": "body"
+        }
+      }
+    },
     "getAppInstallsStatistics": {
       "path": "/stats/app-installs",
       "method": "get",

package/assets/types/homey-api.private.d.ts

@@ -2659,6 +2659,14 @@ export class AthomCloudAPI {
     userId?: string;
   }): Promise<any>;
 
+  addTagToMailChimpUser(opts: {
+    listId?: string;
+
+    userId?: string;
+
+    tag?: string;
+  }): Promise<any>;
+
   getAppInstallsStatistics(): Promise<any>;
 
   getAppDriversStatistics(): Promise<any>;
@@ -3183,6 +3191,14 @@ export class AthomCloudAPI {
     userId?: string;
   }): Promise<any>;
 
+  addTagToMailChimpUser(opts: {
+    listId?: string;
+
+    userId?: string;
+
+    tag?: string;
+  }): Promise<any>;
+
   getAppInstallsStatistics(): Promise<any>;
 
   getAppDriversStatistics(): Promise<any>;
@@ -5687,6 +5703,14 @@ export class AthomCloudAPI {
     userId?: string;
   }): Promise<any>;
 
+  addTagToMailChimpUser(opts: {
+    listId?: string;
+
+    userId?: string;
+
+    tag?: string;
+  }): Promise<any>;
+
   getAppInstallsStatistics(): Promise<any>;
 
   getAppDriversStatistics(): Promise<any>;
@@ -6211,6 +6235,14 @@ export class AthomCloudAPI {
     userId?: string;
   }): Promise<any>;
 
+  addTagToMailChimpUser(opts: {
+    listId?: string;
+
+    userId?: string;
+
+    tag?: string;
+  }): Promise<any>;
+
   getAppInstallsStatistics(): Promise<any>;
 
   getAppDriversStatistics(): Promise<any>;

package/lib/HomeyAPI/HomeyAPIV3/Manager.js

@@ -433,7 +433,7 @@ class Manager extends EventEmitter {
   }
 
   __debug(...props) {
-    this.homey.__debug(`[${this.constructor.name}]`, ...props);
+    this.homey.__debug(`[Manager${this.constructor.ID[0].toUpperCase() + this.constructor.ID.slice(1)}]`, ...props);
   }
 
   /**

package/lib/HomeyAPI/HomeyAPIV3.js

@@ -625,15 +625,30 @@ class HomeyAPIV3 extends HomeyAPI {
 
     return {
       unsubscribe: () => {
-        this.__homeySocket.emit('unsubscribe', uri);
-        this.__homeySocket.removeListener(uri, __onEvent);
-        this.__socket.removeListener('disconnect', __onDisconnect);
-        this.__socket.removeListener('reconnect', __onReconnect);
+        if (this.__homeySocket) {
+          this.__homeySocket.emit('unsubscribe', uri);
+          this.__homeySocket.removeListener(uri, __onEvent);
+        }
+
+        if (this.__socket) {
+          this.__socket.removeListener('disconnect', __onDisconnect);
+          this.__socket.removeListener('reconnect', __onReconnect);
+        }
       },
     };
   }
 
-  async connect() {
+  async connect({
+    onDisconnect = () => {},
+    onError = () => {},
+    onReconnect = () => {},
+    onReconnectAttempt = () => {},
+    onReconnecting = () => {},
+    onReconnectError = () => {},
+    onConnect = () => {},
+    onConnectError = () => {},
+    reconnect = true
+  } = {}) {
     if (!this.__connectPromise) {
       this.__connectPromise = Promise.resolve().then(async () => {
         // Ensure Base URL
@@ -652,40 +667,48 @@ class HomeyAPIV3 extends HomeyAPI {
               pingTimeout: 8000,
               pingInterval: 5000,
             },
-            reconnection: true,
+            reconnection: reconnect,
           });
 
           this.__socket.on('disconnect', reason => {
             this.__debug('SocketIOClient.onDisconnect', reason);
+            onDisconnect(reason);
           });
 
           this.__socket.on('error', err => {
             this.__debug('SocketIOClient.onError', err.message);
+            onError(err);
           });
 
           this.__socket.on('reconnect', () => {
             this.__debug('SocketIOClient.onReconnect');
+            onReconnect();
           });
           
           this.__socket.on('reconnect_attempt', () => {
             this.__debug(`SocketIOClient.onReconnectAttempt`);
+            onReconnectAttempt();
           });
 
           this.__socket.on('reconnecting', attempt => {
             this.__debug(`SocketIOClient.onReconnecting (Attempt #${attempt})`);
+            onReconnecting(attempt);
           });
 
           this.__socket.on('reconnect_error', err => {
-            this.__debug('SocketIOClient.onReconnectError', err.message);
+            this.__debug('SocketIOClient.onReconnectError', err.message, err);
+            onReconnectError(err);
           });
 
           this.__socket.on('connect_error', err => {
             this.__debug('SocketIOClient.onConnectError', err.message);
+            onConnectError(err);
             reject(err);
           });
 
           this.__socket.on('connect', () => {
             this.__debug('SocketIOClient.onConnect');
+            onConnect();
             this.__handshakeClient()
               .then(() => {
                 this.__debug('SocketIOClient.onConnect.onHandshakeClientSuccess');
@@ -713,10 +736,16 @@ class HomeyAPIV3 extends HomeyAPI {
   async disconnect() {
     // Should we wait for connect here?
 
+    // Also disconnect __homeySocket?
+
     if (this.__socket) {
       await new Promise(resolve => {
-        this.__socket.once('disconnect', resolve());
-        this.__socket.disconnect();
+        if (this.__socket.connected) {
+          this.__socket.once('disconnect', () => resolve());
+          this.__socket.disconnect();
+        } else {
+          resolve();
+        }
         this.__socket.removeAllListeners();
         this.__socket = null;
       });
@@ -726,9 +755,16 @@ class HomeyAPIV3 extends HomeyAPI {
   }
 
   destroy() {
+    if (this.__homeySocket) {
+      this.__homeySocket.removeAllListeners();
+      this.__homeySocket.close();
+      this.__homeySocket = null;
+    }
+
     if (this.__socket) {
       this.__socket.removeAllListeners();
       this.__socket.close();
+      this.__socket = null;
     }
   }
 

package/lib/Util.js

@@ -93,6 +93,7 @@ class Util {
    * @returns {boolean}
    */
   static isHTTPUnsecureSupported() {
+    if (this.isReactNative()) return true;
     if (typeof window === 'undefined') return true;
     if (typeof window.location === 'undefined') return false;
     return window.location.protocol === 'http:';

package/package.json

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