homey-api 3.1.0 → 3.2.0

package/lib/HomeyAPI/HomeyAPIV3.js

@@ -638,7 +638,17 @@ class HomeyAPIV3 extends HomeyAPI {
     };
   }
 
-  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
@@ -657,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');
@@ -722,8 +740,12 @@ class HomeyAPIV3 extends HomeyAPI {
 
     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;
       });

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.1.0",
+  "version": "3.2.0",
   "description": "Homey API",
   "main": "index.js",
   "files": [