homey-api 3.4.2 → 3.4.4

package/lib/AthomCloudAPI.js

@@ -381,7 +381,12 @@ for(const {@link HomeyAPIV2.ManagerDevices.Device device} of Object.values(devic
       },
     });
 
-    const responseBody = await response.json();
+    let responseBody;
+    try {
+      responseBody = await response.json();
+    } catch (err) {
+      throw new APIError(`Invalid response from server: ${response.text()}`, response.status);
+    }
 
     if (!response.ok) {
       throw new APIError(responseBody.error_description || responseBody.error, response.status);
@@ -444,7 +449,12 @@ for(const {@link HomeyAPIV2.ManagerDevices.Device device} of Object.values(devic
       },
     });
 
-    const responseBody = await response.json();
+    let responseBody;
+    try {
+      responseBody = await response.json();
+    } catch (err) {
+      throw new APIError(`Invalid response from server: ${response.text()}`, response.status);
+    }
 
     if (!response.ok) {
       throw new APIError(responseBody.error_description || responseBody.error, response.status);
@@ -506,7 +516,12 @@ for(const {@link HomeyAPIV2.ManagerDevices.Device device} of Object.values(devic
       },
     });
 
-    const responseBody = await response.json();
+    let responseBody;
+    try {
+      responseBody = await response.json();
+    } catch (err) {
+      throw new APIError(`Invalid response from server: ${response.text()}`, response.status);
+    }
 
     if (!response.ok) {
       throw new APIError(responseBody.error_description || responseBody.error, response.status);
@@ -552,7 +567,12 @@ for(const {@link HomeyAPIV2.ManagerDevices.Device device} of Object.values(devic
           },
         });
 
-        const responseBody = await response.json();
+        let responseBody;
+        try {
+          responseBody = await response.json();
+        } catch (err) {
+          throw new APIError(`Invalid response from server: ${response.text()}`, response.status);
+        }
 
         if (!response.ok) {
           throw new APIError(responseBody.error_description || responseBody.error, response.status);

package/lib/HomeyAPI/HomeyAPIV2/ManagerFlow.js

@@ -133,6 +133,12 @@ class ManagerFlow extends ManagerFlowV3 {
     });
   }
 
+  async testFlow({flow, ...props}) {
+    return this.__super__testFlow({
+      flow: Flow.transformSet(flow),
+      ...props,
+    });
+  }
 }
 
 module.exports = ManagerFlow;

package/lib/HomeyAPI/HomeyAPIV3.js

@@ -639,14 +639,6 @@ class HomeyAPIV3 extends HomeyAPI {
   }
 
   async connect({
-    onDisconnect = () => {},
-    onError = () => {},
-    onReconnect = () => {},
-    onReconnectAttempt = () => {},
-    onReconnecting = () => {},
-    onReconnectError = () => {},
-    onConnect = () => {},
-    onConnectError = () => {},
     reconnect = true
   } = {}) {
     if (!this.__connectPromise) {
@@ -672,43 +664,43 @@ class HomeyAPIV3 extends HomeyAPI {
 
           this.__socket.on('disconnect', reason => {
             this.__debug('SocketIOClient.onDisconnect', reason);
-            onDisconnect(reason);
+            this.emit('disconnect', reason);
           });
 
           this.__socket.on('error', err => {
             this.__debug('SocketIOClient.onError', err.message);
-            onError(err);
+            this.emit('error', err);
           });
 
           this.__socket.on('reconnect', () => {
             this.__debug('SocketIOClient.onReconnect');
-            onReconnect();
+            this.emit('reconnect');
           });
           
           this.__socket.on('reconnect_attempt', () => {
             this.__debug(`SocketIOClient.onReconnectAttempt`);
-            onReconnectAttempt();
+            this.emit('reconnect_attempt');
           });
 
           this.__socket.on('reconnecting', attempt => {
             this.__debug(`SocketIOClient.onReconnecting (Attempt #${attempt})`);
-            onReconnecting(attempt);
+            this.emit('reconnecting');
           });
 
           this.__socket.on('reconnect_error', err => {
             this.__debug('SocketIOClient.onReconnectError', err.message, err);
-            onReconnectError(err);
+            this.emit('reconnect_error');
           });
 
           this.__socket.on('connect_error', err => {
             this.__debug('SocketIOClient.onConnectError', err.message);
-            onConnectError(err);
+            this.emit('connect_error');
             reject(err);
           });
 
           this.__socket.on('connect', () => {
             this.__debug('SocketIOClient.onConnect');
-            onConnect();
+            this.emit('connect');
             this.__handshakeClient()
               .then(() => {
                 this.__debug('SocketIOClient.onConnect.onHandshakeClientSuccess');
@@ -766,6 +758,8 @@ class HomeyAPIV3 extends HomeyAPI {
       this.__socket.close();
       this.__socket = null;
     }
+
+    this.removeAllListeners();
   }
 
   async __handshakeClient() {

package/package.json

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