fix(networkadvertisement): Attempt to watch for network state changes…

… to fix advertisement after initial provisioning
Hypfer · Dec 19, 2021 · 7a2c3d1 · 7a2c3d1
1 parent 322efcc
commit 7a2c3d1
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 0 deletions.
diff --git a/backend/lib/NetworkAdvertisementManager.js b/backend/lib/NetworkAdvertisementManager.js
@@ -4,6 +4,8 @@ const Tools = require("./Tools");
 const Bonjour = require("bonjour-service");
 const nodessdp = require("node-ssdp");
 
+const NETWORK_STATE_CHECK_INTERVAL = 30 * 1000;
+
 class NetworkAdvertisementManager {
     /**
      * This class handles advertisement via both SSDP (UPnP) as well as zeroconf/mdns/bonjour
@@ -18,6 +20,9 @@ class NetworkAdvertisementManager {
 
         this.webserverPort = this.config.get("webserver")?.port ?? 80;
 
+        this.networkStateCheckTimeout = undefined;
+        this.ipAddresses = "";
+
         this.setUp();
     }
 
@@ -30,6 +35,11 @@ class NetworkAdvertisementManager {
         if (networkAdvertisementConfig.enabled === true && this.config.get("embedded") === true) {
             this.setUpSSDP();
             this.setUpBonjour();
+
+            this.ipAddresses = Tools.GET_CURRENT_HOST_IP_ADDRESSES().sort().join();
+            this.networkStateCheckTimeout = setTimeout(() => {
+                this.checkNetworkStateAndReschedule();
+            }, NETWORK_STATE_CHECK_INTERVAL);
         }
     }
 
@@ -116,6 +126,7 @@ class NetworkAdvertisementManager {
     shutdown() {
         return new Promise((resolve, reject) => {
             Logger.debug("NetworkAdvertisementManager shutdown in progress...");
+            clearTimeout(this.networkStateCheckTimeout);
 
             if (this.ssdpServer) {
                 try {
@@ -158,6 +169,25 @@ class NetworkAdvertisementManager {
             throw err;
         }
     }
+
+    /**
+     * @private
+     */
+    checkNetworkStateAndReschedule() {
+        const ipAddresses = Tools.GET_CURRENT_HOST_IP_ADDRESSES().sort().join();
+
+        if (this.ipAddresses !== ipAddresses) {
+            Logger.info("Network state changed");
+
+            this.restart().catch((err) => {
+                Logger.warn("Error while restarting NetworkAdvertisementManager due to network state change", err);
+            });
+        } else {
+            this.networkStateCheckTimeout = setTimeout(() => {
+                this.checkNetworkStateAndReschedule();
+            }, NETWORK_STATE_CHECK_INTERVAL);
+        }
+    }
 }
 
 module.exports = NetworkAdvertisementManager;
diff --git a/backend/lib/Tools.js b/backend/lib/Tools.js
@@ -228,6 +228,22 @@ class Tools {
     static CAPITALIZE(string) {
         return `${string[0].toUpperCase()}${string.slice(1)}`;
     }
+
+    static GET_CURRENT_HOST_IP_ADDRESSES() {
+        const IPs = new Set();
+
+        Object.values(os.networkInterfaces())
+            .flat()
+            .filter(i => {
+                return !i.mac.startsWith("00:00");
+            })
+            .forEach(i => {
+                IPs.add(i.address);
+            }
+            );
+
+        return Array.from(IPs.values());
+    }
 }
 
 const VALETUDO_NAMESPACE = "be5f1ffc-c150-4785-9ebb-08fcfe90c933";