homey-api 1.5.20 → 1.5.21

package/lib/HomeyAPI/HomeyAPIV2.js

@@ -211,40 +211,39 @@ class HomeyAPIV2 extends HomeyAPI {
 
     // Ping method
     const ping = async (strategyId, timeout) => {
+      let pingTimeout;
       const baseUrl = urls[strategyId];
-      const res = await Promise.race([
+      return Promise.race([
         Util.fetch(`${baseUrl}/api/manager/system/ping?id=${this.id}`, {
           headers: {
             'X-Homey-ID': this.id,
           },
+        }).then(async res => {
+          const text = await res.text();
+          if (!res.ok) throw new Error(text || res.statusText);
+          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
+          }
+
+          // Set the version that Homey told us.
+          // It's the absolute truth, because the Cloud API may be behind.
+          const homeyVersion = res.headers.get('X-Homey-Version');
+          if (homeyVersion !== this.version) {
+            this.version = homeyVersion;
+          }
+
+          return {
+            baseUrl,
+            strategyId,
+          };
         }),
         new Promise((_, reject) => {
-          const pingTimeout = setTimeout(() => reject(new Error('PingTimeout')), timeout);
-          promise
-            .catch(() => { })
-            .finally(() => clearTimeout(pingTimeout));
+          pingTimeout = setTimeout(() => reject(new Error('PingTimeout')), timeout);
         }),
-      ]);
-      const text = await res.text();
-      if (!res.ok) throw new Error(text || res.statusText);
-      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
-      }
-
-      // Set the version that Homey told us.
-      // It's the absolute truth, because the Cloud API may be behind.
-      const homeyVersion = res.headers.get('X-Homey-Version');
-      if (homeyVersion !== this.version) {
-        this.version = homeyVersion;
-      }
-
-      return {
-        baseUrl,
-        strategyId,
-      };
+      ]).finally(() => clearTimeout(pingTimeout));
     };
 
     const pings = {};
@@ -296,19 +295,10 @@ class HomeyAPIV2 extends HomeyAPI {
             throw new HomeyOfflineError();
           }
 
-          return Promise.race(promises);
+          return Promise.any(promises);
         })
         .then(result => resolve(result))
-        .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));
-        });
+        .catch(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.20",
+  "version": "1.5.21",
   "description": "Homey API",
   "main": "index.js",
   "types": "assets/types/homey-api.d.ts",