homey-api 3.0.24 → 3.0.26

package/lib/AthomCloudAPI.js

@@ -489,8 +489,8 @@ for(const {@link HomeyAPIV2.ManagerDevices.Device device} of Object.values(devic
 
     const body = new URLSearchParams();
     body.append('grant_type', 'password');
-    body.append('username', username);
-    body.append('password', password);
+    body.append('username', encodeURIComponent(username));
+    body.append('password', encodeURIComponent(password));
 
     const response = await Util.fetch(`${this.baseUrl}/oauth2/token`, {
       body: body.toString(),

package/lib/HomeyAPI/HomeyAPIV3/Manager.js

@@ -558,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

@@ -735,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.24",
+  "version": "3.0.26",
   "description": "Homey API",
   "main": "index.js",
   "files": [