homey-api 1.5.15 → 1.5.16

package/lib/HomeyAPI/HomeyAPIV2/Manager.js

@@ -253,6 +253,7 @@ class Manager extends EventEmitter {
             } else {
               // Get from HTTP
               result = await this.homey.call({
+                $timeout,
                 headers,
                 body,
                 path: `/api/manager/${this.id}${path}`,

package/lib/HomeyAPI/HomeyAPIV2.js

@@ -288,8 +288,6 @@ class HomeyAPIV2 extends HomeyAPI {
             promises.push(pings[HomeyAPI.DISCOVERY_STRATEGIES.MDNS]);
           }
 
-          // TODO: Move this to the catch handler to always fallback on cloud
-          // Now mdns or local will error first and cloud won't have a chance!!
           if (pings[HomeyAPI.DISCOVERY_STRATEGIES.CLOUD]) {
             promises.push(pings[HomeyAPI.DISCOVERY_STRATEGIES.CLOUD]);
           }
@@ -301,7 +299,16 @@ class HomeyAPIV2 extends HomeyAPI {
           return Promise.race(promises);
         })
         .then(result => resolve(result))
-        .catch(() => reject(new HomeyOfflineError()));
+        .catch(err => {
+          // Last resort: try cloud
+          if (pings[HomeyAPI.DISCOVERY_STRATEGIES.CLOUD]) {
+            return pings[HomeyAPI.DISCOVERY_STRATEGIES.CLOUD].catch(err => {
+              throw new HomeyOfflineError(err);
+            });
+          }
+
+          reject(new HomeyOfflineError(err));
+        });
     } else if (pings[HomeyAPI.DISCOVERY_STRATEGIES.LOCAL]) {
       pings[HomeyAPI.DISCOVERY_STRATEGIES.LOCAL]
         .then(result => resolve(result))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homey-api",
-  "version": "1.5.15",
+  "version": "1.5.16",
   "description": "Homey API",
   "main": "src/index.js",
   "types": "assets/types/homey-api.d.ts",