homey-api 3.17.5 → 3.17.7

package/assets/types/homey-api.private.d.ts

@@ -5748,6 +5748,8 @@ export class Util {
     timeoutDuration?: number,
 
     timeoutMessage?: string,
+
+    patchOptions?: Function,
   ): Promise<any>;
 
   static wait(ms: number): Promise<void>;
@@ -5790,6 +5792,8 @@ export class Util {
     timeoutDuration?: number,
 
     timeoutMessage?: string,
+
+    patchOptions?: Function,
   ): Promise<any>;
 
   static wait(ms: number): Promise<void>;
@@ -9166,6 +9170,8 @@ export class Util {
     timeoutDuration?: number,
 
     timeoutMessage?: string,
+
+    patchOptions?: Function,
   ): Promise<any>;
 
   static wait(ms: number): Promise<void>;
@@ -9208,6 +9214,8 @@ export class Util {
     timeoutDuration?: number,
 
     timeoutMessage?: string,
+
+    patchOptions?: Function,
   ): Promise<any>;
 
   static wait(ms: number): Promise<void>;

package/lib/HomeyAPI/HomeyAPIV3/DiscoveryManager.js

@@ -5,9 +5,16 @@ const APIErrorHomeySubscriptionInactive = require('../../APIErrorHomeySubscripti
 const APIErrorHomeyInvalidSerialNumber = require('../../APIErrorHomeyInvalidSerialNumber');
 const Util = require('../../Util');
 
+function getRuntimeRequire() {
+  // Avoid webpack statically bundling Node-only discovery transport into the browser build.
+  // eslint-disable-next-line no-eval
+  return eval('require');
+}
+
 class DiscoveryManager {
   constructor(homey) {
     this.homey = homey;
+    this.discoveryNodeTransport = null;
   }
 
   async discoverBaseUrl() {
@@ -17,7 +24,10 @@ class DiscoveryManager {
     if (this.homey.__strategies.includes(DISCOVERY_STRATEGIES.MDNS)) {
       if (Util.isHTTPUnsecureSupported()) {
         if (this.homey.__properties.mdnsFqdn) {
-          const port = this.homey.__properties.portHttp && this.homey.__properties.portHttp !== 80 ? `:${this.homey.__properties.portHttp}` : '';
+          const port =
+            this.homey.__properties.portHttp && this.homey.__properties.portHttp !== 80
+              ? `:${this.homey.__properties.portHttp}`
+              : '';
           urls[DISCOVERY_STRATEGIES.MDNS] = `http://${this.homey.__properties.mdnsFqdn}${port}`;
         } else {
           urls[DISCOVERY_STRATEGIES.MDNS] = `http://homey-${this.homey.id}.local`;
@@ -112,18 +122,24 @@ class DiscoveryManager {
 
     const ping = async (strategyId, timeout) => {
       const baseUrl = urls[strategyId];
+      const pingUrl = `${baseUrl}/api/manager/system/ping?id=${this.homey.id}`;
       const abortController = new AbortController();
       pingAbortControllers[strategyId] = abortController;
-
-      const response = await Util.fetch(
-        `${baseUrl}/api/manager/system/ping?id=${this.homey.id}`,
+      const discoveryTransport = this.getDiscoveryNodeTransport();
+      const fetch =
+        discoveryTransport && discoveryTransport.shouldUseForUrl(pingUrl)
+          ? discoveryTransport.fetch.bind(discoveryTransport)
+          : Util.fetch.bind(Util);
+
+      const response = await fetch(
+        pingUrl,
         {
           headers: {
             'X-Homey-ID': this.homey.id,
           },
           signal: abortController.signal,
         },
-        timeout
+        timeout,
       );
 
       const text = await response.text();
@@ -180,15 +196,9 @@ class DiscoveryManager {
     const pings = {};
 
     if (urls[DISCOVERY_STRATEGIES.LOCAL_SECURE]) {
-      pings[DISCOVERY_STRATEGIES.LOCAL_SECURE] = ping(
-        DISCOVERY_STRATEGIES.LOCAL_SECURE,
-        1200
-      );
+      pings[DISCOVERY_STRATEGIES.LOCAL_SECURE] = ping(DISCOVERY_STRATEGIES.LOCAL_SECURE, 1200);
       pings[DISCOVERY_STRATEGIES.LOCAL_SECURE].catch((err) => {
-        this.homey.__debug(
-          `Ping ${DISCOVERY_STRATEGIES.LOCAL_SECURE} Error:`,
-          err && err.message
-        );
+        this.homey.__debug(`Ping ${DISCOVERY_STRATEGIES.LOCAL_SECURE} Error:`, err && err.message);
         this.homey.__debug(urls[DISCOVERY_STRATEGIES.LOCAL_SECURE]);
       });
     }
@@ -196,34 +206,34 @@ class DiscoveryManager {
     if (urls[DISCOVERY_STRATEGIES.LOCAL]) {
       pings[DISCOVERY_STRATEGIES.LOCAL] = ping(DISCOVERY_STRATEGIES.LOCAL, 1000);
       pings[DISCOVERY_STRATEGIES.LOCAL].catch((err) =>
-        this.homey.__debug(`Ping ${DISCOVERY_STRATEGIES.LOCAL} Error:`, err && err.message)
+        this.homey.__debug(`Ping ${DISCOVERY_STRATEGIES.LOCAL} Error:`, err && err.message),
       );
     }
 
     if (urls[DISCOVERY_STRATEGIES.MDNS]) {
       pings[DISCOVERY_STRATEGIES.MDNS] = ping(DISCOVERY_STRATEGIES.MDNS, 3000);
       pings[DISCOVERY_STRATEGIES.MDNS].catch((err) =>
-        this.homey.__debug(`Ping ${DISCOVERY_STRATEGIES.MDNS} Error:`, err && err.message)
+        this.homey.__debug(`Ping ${DISCOVERY_STRATEGIES.MDNS} Error:`, err && err.message),
       );
     }
 
     if (urls[DISCOVERY_STRATEGIES.CLOUD]) {
       pings[DISCOVERY_STRATEGIES.CLOUD] = ping(DISCOVERY_STRATEGIES.CLOUD, 5000);
       pings[DISCOVERY_STRATEGIES.CLOUD].catch((err) =>
-        this.homey.__debug(`Ping ${DISCOVERY_STRATEGIES.CLOUD} Error:`, err && err.message)
+        this.homey.__debug(`Ping ${DISCOVERY_STRATEGIES.CLOUD} Error:`, err && err.message),
       );
     }
 
     if (urls[DISCOVERY_STRATEGIES.REMOTE_FORWARDED]) {
       pings[DISCOVERY_STRATEGIES.REMOTE_FORWARDED] = ping(
         DISCOVERY_STRATEGIES.REMOTE_FORWARDED,
-        2000
+        2000,
       );
       pings[DISCOVERY_STRATEGIES.REMOTE_FORWARDED].catch((err) =>
         this.homey.__debug(
           `Ping ${DISCOVERY_STRATEGIES.REMOTE_FORWARDED} Error:`,
-          err && err.message
-        )
+          err && err.message,
+        ),
       );
     }
 
@@ -240,36 +250,35 @@ class DiscoveryManager {
     let selectedRoutePromise;
 
     if (pings[DISCOVERY_STRATEGIES.LOCAL_SECURE]) {
-      selectedRoutePromise = pings[DISCOVERY_STRATEGIES.LOCAL_SECURE]
-        .catch((error) => {
-          const fallbackPromises = [];
+      selectedRoutePromise = pings[DISCOVERY_STRATEGIES.LOCAL_SECURE].catch((error) => {
+        const fallbackPromises = [];
 
-          if (pings[DISCOVERY_STRATEGIES.LOCAL]) {
-            fallbackPromises.push(pings[DISCOVERY_STRATEGIES.LOCAL]);
-          }
+        if (pings[DISCOVERY_STRATEGIES.LOCAL]) {
+          fallbackPromises.push(pings[DISCOVERY_STRATEGIES.LOCAL]);
+        }
 
-          if (pings[DISCOVERY_STRATEGIES.REMOTE_FORWARDED]) {
-            fallbackPromises.push(pings[DISCOVERY_STRATEGIES.REMOTE_FORWARDED]);
-          }
+        if (pings[DISCOVERY_STRATEGIES.REMOTE_FORWARDED]) {
+          fallbackPromises.push(pings[DISCOVERY_STRATEGIES.REMOTE_FORWARDED]);
+        }
 
-          if (pings[DISCOVERY_STRATEGIES.MDNS]) {
-            fallbackPromises.push(pings[DISCOVERY_STRATEGIES.MDNS]);
-          }
+        if (pings[DISCOVERY_STRATEGIES.MDNS]) {
+          fallbackPromises.push(pings[DISCOVERY_STRATEGIES.MDNS]);
+        }
 
-          if (pings[DISCOVERY_STRATEGIES.CLOUD]) {
-            fallbackPromises.push(pings[DISCOVERY_STRATEGIES.CLOUD]);
-          }
+        if (pings[DISCOVERY_STRATEGIES.CLOUD]) {
+          fallbackPromises.push(pings[DISCOVERY_STRATEGIES.CLOUD]);
+        }
 
-          if (isSubscriptionError(error)) {
-            throw error;
-          }
+        if (isSubscriptionError(error)) {
+          throw error;
+        }
 
-          if (!fallbackPromises.length) {
-            throw new APIErrorHomeyOffline();
-          }
+        if (!fallbackPromises.length) {
+          throw new APIErrorHomeyOffline();
+        }
 
-          return Promise.any(fallbackPromises);
-        });
+        return Promise.any(fallbackPromises);
+      });
     } else if (pings[DISCOVERY_STRATEGIES.LOCAL]) {
       selectedRoutePromise = withCloudFallback(pings[DISCOVERY_STRATEGIES.LOCAL]);
     } else if (pings[DISCOVERY_STRATEGIES.MDNS]) {
@@ -290,6 +299,17 @@ class DiscoveryManager {
 
     return promise;
   }
+
+  getDiscoveryNodeTransport() {
+    if (!Util.isNodeJS()) {
+      return null;
+    }
+
+    this.discoveryNodeTransport =
+      this.discoveryNodeTransport || getRuntimeRequire()('./DiscoveryNodeTransport');
+
+    return this.discoveryNodeTransport;
+  }
 }
 
-module.exports = DiscoveryManager;
+module.exports = DiscoveryManager;