homey-api 3.0.23 → 3.0.25

package/lib/HomeyAPI/HomeyAPIV3/Manager.js

@@ -480,11 +480,17 @@ class Manager extends EventEmitter {
             this.__debug(`onDisconnect Reason:${reason}`);
             this.__connected = false;
 
+            // Disable for now. We should probably only set the cache to invalid.
+
             // Clear CRUD Item cache
-            for (const itemId of Object.keys(this.__cache)) {
-              this.__cache[itemId] = {};
-              this.__cacheAllComplete[itemId] = false;
-            }
+            // for (const itemId of Object.keys(this.__cache)) {
+            //   this.__cache[itemId] = {};
+            //   this.__cacheAllComplete[itemId] = false;
+            // }
+          },
+          onReconnect: () => {
+            this.__debug(`onReconnect`);
+            this.__connected = true;
           },
           onEvent: (event, data) => {
             this.__debug('onEvent', event);
@@ -552,7 +558,9 @@ class Manager extends EventEmitter {
 
     // Delete the connecting Promise
     this.__connectPromise
-      .catch(() => { })
+      .catch(() => { 
+        delete this.io;
+      })
       .finally(() => {
         delete this.__connectPromise;
       });

package/lib/HomeyAPI/HomeyAPIV3.js

@@ -566,7 +566,7 @@ class HomeyAPIV3 extends HomeyAPI {
     this.__debug('subscribe', uri);
 
     await this.connect();
-    await new Promise((resolve, reject) => {
+    await Util.timeout(new Promise((resolve, reject) => {
       this.__homeySocket.once('disconnect', (reason) => {
         reject(new Error(reason));
       });
@@ -580,7 +580,7 @@ class HomeyAPIV3 extends HomeyAPI {
         this.__debug('subscribed', uri);
         return resolve();
       });
-    });
+    }), 5000, `Failed to subscribe to ${uri} (Timeout after 5000ms).`);
 
     // On Connect
     const __onEvent = (event, data) => {
@@ -600,16 +600,21 @@ class HomeyAPIV3 extends HomeyAPI {
     const __onReconnect = () => {
       Promise.resolve().then(async () => {
         await this.connect();
-        await new Promise((resolve, reject) => {
+        await Util.timeout(new Promise((resolve, reject) => {
+          this.__homeySocket.once('disconnect', (reason) => {
+            reject(new Error(reason));
+          });
+          this.__debug('subscribing', uri);
           this.__homeySocket.emit('subscribe', uri, err => {
             if (err) {
               this.__debug('Failed to subscribe', uri, err);
               return reject(err)
             }
-            
+          
+            this.__debug('subscribed', uri);
             return resolve();
           });
-        });
+        }), 5000, `Failed to subscribe to ${uri} (Timeout after 5000ms).`);
 
         this.__homeySocket.on(uri, __onEvent);
 
@@ -652,23 +657,6 @@ class HomeyAPIV3 extends HomeyAPI {
 
           this.__socket.on('disconnect', reason => {
             this.__debug('SocketIOClient.onDisconnect', reason);
-            // this.emit('state', { 
-            //   socketConnected: this.__socket.connected,
-            //   homeySocketConnected: this.__homeySocket && this.__homeySocket.connected
-            // });
-
-            if (this.__homeySocket) {
-              this.__homeySocket.disconnect();
-              this.__homeySocket.destroy();
-              this.__homeySocket.removeAllListeners();
-            }
-
-            if (reason === 'io server disconnect') {
-              // The disconnect was initiated by the server.
-              // this.__socket.open();
-            }
-
-            reject(new Error('Disconnected'));
           });
 
           this.__socket.on('error', err => {
@@ -677,15 +665,6 @@ class HomeyAPIV3 extends HomeyAPI {
 
           this.__socket.on('reconnect', () => {
             this.__debug('SocketIOClient.onReconnect');
-            this.__handshakeClient()
-              .then(() => {
-                this.__debug('SocketIOClient.onReconnect.onHandshakeClientSuccess');
-                resolve();
-              })
-              .catch(err => {
-                this.__debug('SocketIOClient.onReconnect.onHandshakeClientError', err.message);
-                reject(err);
-              });
           });
           
           this.__socket.on('reconnect_attempt', () => {
@@ -706,7 +685,6 @@ class HomeyAPIV3 extends HomeyAPI {
           });
 
           this.__socket.on('connect', () => {
-            // this.emit('state', { connected: this.__homeySocket?.connected });
             this.__debug('SocketIOClient.onConnect');
             this.__handshakeClient()
               .then(() => {
@@ -725,6 +703,7 @@ class HomeyAPIV3 extends HomeyAPI {
 
       this.__connectPromise.catch(err => {
         this.__debug('SocketIOClient Error', err.message);
+        delete this.__connectPromise;
       });
     }
 
@@ -732,6 +711,8 @@ class HomeyAPIV3 extends HomeyAPI {
   }
 
   async disconnect() {
+    // Should we wait for connect here?
+
     if (this.__socket) {
       await new Promise(resolve => {
         this.__socket.once('disconnect', resolve());
@@ -740,6 +721,7 @@ class HomeyAPIV3 extends HomeyAPI {
         this.__socket = null;
       });
     }
+    
     // TODO todo what?
   }
 
@@ -753,70 +735,71 @@ class HomeyAPIV3 extends HomeyAPI {
   async __handshakeClient() {
     this.__debug('__handshakeClient');
 
-    return new Promise((resolve, reject) => {
-      this.__socket.emit('handshakeClient', {
-        token: this.__token,
-        homeyId: this.id,
-      }, (err, result) => {
-        if (err) return reject(err);
-        return resolve(result);
-      });
-    })
-      .catch(async err => {
-        // If token is expired, try to refresh, statusCode is for apiVersion 3 and code for apiVersion 2.
-        if (err.statusCode === 401 || err.code === 401) {
-          this.__debug('Token expired, refreshing...');
-          await this.logout();
-          await this.login();
-
-          return new Promise((resolve, reject) => {
-            this.__socket.emit('handshakeClient', {
-              token: this.__token,
-              homeyId: this.id,
-            }, (err, result) => {
-              if (err) return reject(err);
-              return resolve(result);
-            });
-          });
-        }
+    const onResult = ({ namespace }) => {
+      this.__debug('SocketIOClient.onHandshakeClientSuccess', `Namespace: ${namespace}`);
 
-        throw err;
-      })
-      .then(({ namespace }) => {
-        this.__debug('SocketIOClient.onHandshakeClientSuccess', `Namespace: ${namespace}`);
+      return new Promise((resolve, reject) => {
+        this.__homeySocket = this.__socket.io.socket(namespace);
 
-        return new Promise((resolve, reject) => {
-          this.__homeySocket = this.__socket.io.socket(namespace);
+        this.__homeySocket.once('connect', () => {
+          this.__debug(`SocketIOClient.Namespace[${namespace}].onConnect`);
+          resolve();
+        });
 
-          this.__homeySocket.once('connect', () => {
-            this.__debug(`SocketIOClient.Namespace[${namespace}].onConnect`);
-            resolve();
-          });
+        this.__homeySocket.once('connect_error', err => {
+          this.__debug(`SocketIOClient.Namespace[${namespace}].onConnectError`, err.message);
+          reject(err);
+        });
 
-          this.__homeySocket.once('connect_error', err => {
-            this.__debug(`SocketIOClient.Namespace[${namespace}].onConnectError`, err.message);
-            reject(err);
-          });
+        this.__homeySocket.on('disconnect', reason => {
+          this.__debug(`SocketIOClient.Namespace[${namespace}].onDisconnect`, reason);
+        });
 
-          this.__homeySocket.on('disconnect', reason => {
-            this.__debug(`SocketIOClient.Namespace[${namespace}].onDisconnect`, reason);
-          });
+        this.__homeySocket.on('reconnecting', attempt => {
+          this.__debug(`SocketIOClient.Namespace[${namespace}].onReconnecting (Attempt #${attempt})`);
+        });
 
-          this.__homeySocket.on('reconnecting', attempt => {
-            this.__debug(`SocketIOClient.Namespace[${namespace}].onReconnecting (Attempt #${attempt})`);
-          });
+        this.__homeySocket.on('reconnect', () => {
+          this.__debug(`SocketIOClient.Namespace[${namespace}].onReconnect`);
+        });
 
-          this.__homeySocket.on('reconnect', () => {
-            this.__debug(`SocketIOClient.Namespace[${namespace}].onReconnect`);
-          });
+        this.__homeySocket.on('reconnect_error', err => {
+          this.__debug(`SocketIOClient.Namespace[${namespace}].onReconnectError`, err.message);
+        });
 
-          this.__homeySocket.on('reconnect_error', err => {
-            this.__debug(`SocketIOClient.Namespace[${namespace}].onReconnectError`, err.message);
-          });
+        this.__homeySocket.open();
+      });
+    }
 
-          this.__homeySocket.open();
+    const handshakeClient = async () => {
+      return new Promise((resolve, reject) => {
+        this.__socket.emit('handshakeClient', {
+          token: this.__token,
+          homeyId: this.id,
+        }, (err, result) => {
+          if (err) return reject(err);
+          return resolve(result);
         });
       });
+    }
+
+    try {
+      const result = await Util.timeout(handshakeClient(), 5000, `Failed to handshake client (Timeout after 5000ms).`);
+
+      return onResult(result);
+    } catch (err) {
+      if (err.statusCode === 401 || err.code === 401) {
+        this.__debug('Token expired, refreshing...');
+        await this.logout();
+        await this.login();
+
+        const result = await Util.timeout(handshakeClient(), 5000, `Failed to handshake client (Timeout after 5000ms).`);
+
+        return onResult(result);
+      }
+
+      throw err;
+    }
   }
 
   hasScope(scope) {

package/package.json

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