homey-api 3.4.25 → 3.4.26

package/lib/HomeyAPI/HomeyAPIV2.js

@@ -17,6 +17,8 @@ const ManagerInsights = require('./HomeyAPIV2/ManagerInsights');
  */
 class HomeyAPIV2 extends HomeyAPIV3 {
 
+  static DEFAULT_TIMEOUT = 1000 * 30;
+
   static MANAGERS = {
     ...super.MANAGERS,
     ManagerFlow,

package/lib/HomeyAPI/HomeyAPIV3/Manager.js

@@ -102,7 +102,7 @@ class Manager extends EventEmitter {
             $validate = true,
             $cache = true,
             $updateCache = true,
-            $timeout = operation.timeout ?? 5000,
+            $timeout = operation.timeout ?? this.homey.constructor.DEFAULT_TIMEOUT,
             $socket = operation.socket ?? true,
             $body = {},
             $query = {},

package/lib/HomeyAPI/HomeyAPIV3.js

@@ -36,6 +36,10 @@ class HomeyAPIV3 extends HomeyAPI {
     ManagerUsers,
   };
 
+  static DEFAULT_TIMEOUT = 1000 * 10;
+  static HANDSHAKE_TIMEOUT = 1000 * 10;
+  static SUBSCRIBE_TIMEOUT = 1000 * 10;
+
   constructor({
     properties,
     strategy = [
@@ -274,6 +278,7 @@ class HomeyAPIV3 extends HomeyAPI {
           if (text === 'false') throw new Error('Invalid Homey ID');
 
           const homeyId = res.headers.get('X-Homey-ID');
+
           if (homeyId) {
             if (homeyId !== this.id) throw new Error('Invalid Homey ID'); // TODO: Add to Homey Connect
           }
@@ -414,13 +419,13 @@ class HomeyAPIV3 extends HomeyAPI {
     return promise;
   }
 
-  async call({ 
-    $timeout = 10000, 
-    method, 
-    headers, 
-    path, 
-    body, 
-    json = true, 
+  async call({
+    $timeout = this.constructor.DEFAULT_TIMEOUT,
+    method,
+    headers,
+    path,
+    body,
+    json = true,
     isRetryAfterRefresh = false,
     shouldRetry = true,
   }) {
@@ -626,9 +631,9 @@ class HomeyAPIV3 extends HomeyAPI {
         .finally(() => {
           // Delete after 30 seconds some requests might still be pending an they should be able
           // to receive a rejected promise for this token.
-          this.__refreshMap[token+'timeout'] = setTimeout(() => {
+          this.__refreshMap[token + 'timeout'] = setTimeout(() => {
             delete this.__refreshMap[token];
-            delete this.__refreshMap[token+'timeout'];
+            delete this.__refreshMap[token + 'timeout'];
           }, 30 * 1000);
         });
     }
@@ -678,8 +683,8 @@ class HomeyAPIV3 extends HomeyAPI {
           return resolve();
         });
       }),
-      10000,
-      `Failed to subscribe to ${uri} (Timeout after 10000ms).`
+      this.constructor.SUBSCRIBE_TIMEOUT,
+      `Failed to subscribe to ${uri} (Timeout after ${this.constructor.SUBSCRIBE_TIMEOUT}ms).`
     );
 
     // On Connect
@@ -722,8 +727,8 @@ class HomeyAPIV3 extends HomeyAPI {
                 return resolve();
               });
             }),
-            10000,
-            `Failed to subscribe to ${uri} (Timeout after 10000ms).`
+            this.constructor.SUBSCRIBE_TIMEOUT,
+            `Failed to subscribe to ${uri} (Timeout after ${this.constructor.SUBSCRIBE_TIMEOUT}ms).`
           );
 
           this.__homeySocket.on(uri, __onEvent);
@@ -975,8 +980,8 @@ class HomeyAPIV3 extends HomeyAPI {
     try {
       const result = await Util.timeout(
         handshakeClient(token),
-        5000,
-        `Failed to handshake client (Timeout after 5000ms).`
+        this.constructor.HANDSHAKE_TIMEOUT,
+        `Failed to handshake client (Timeout after ${this.constructor.HANDSHAKE_TIMEOUT}ms).`
       );
 
       return onResult(result);
@@ -986,8 +991,8 @@ class HomeyAPIV3 extends HomeyAPI {
         await this.refreshForToken(token, false);
         const result = await Util.timeout(
           handshakeClient(this.__token),
-          5000,
-          `Failed to handshake client (Timeout after 5000ms).`
+          this.constructor.HANDSHAKE_TIMEOUT,
+          `Failed to handshake client (Timeout after ${this.constructor.HANDSHAKE_TIMEOUT}ms).`
         );
 
         return onResult(result);

package/package.json

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