homebridge-smartsystem 7.0.6 → 7.1.1

package/README.md

@@ -322,6 +322,9 @@ Homebridge UI version
 - 4: fixed a bug when shelly has empty list of ip addresses
 - 5: better error handling in the proxy.ts + show connection in the /proxy page
 
+### v.7.1.x - jan 2026
+- 0: master + config ports in the proxy
+- 1: fix for reading the proxy config
 
 ## Hardware 
 A Raspberry Pi that connects to a Duotecno IP Node 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "homebridge-smartsystem",
   "displayname": "Duotecno Bridge",
-  "version": "7.0.6",
+  "version": "7.1.1",
   "description": "SmartServer (Proxy TCP sockets to the cloud, Smappee MQTT, Duotecno IP Nodes, Homekit interface)",
   "main": "index.js",
   "author": "Johan Coppieters",
@@ -13,9 +13,7 @@
     "build": "npx tsc --build",
     "unpublish": "npm unpublish --force homebridge-smartsystem@6.8.17",
     "prepublishOnly": "npm run build",
-    "publish": "npm publish",
-    "version:patch": "npm version patch && npm publish",
-    "version:minor": "npm version minor && npm publish"
+    "to-publish": "npm publish"
   },
   "engines": {
     "node": "^18.20.4 || ^20.15.1 || ^22",

package/server/base.js

@@ -35,7 +35,11 @@ class Base {
     write(type, config) {
         (0, config_1.setSubConfig)(type, config);
         // but better to much than not enough
+        // if (os.platform() === "darwin") {
+        //   writeFileSync(__dirname+"/../config.json", JSON.stringify(gPlatformConfig), null, 2));
+        // } else {
         (0, config_1.setAPIConfig)();
+        // }
     }
 }
 exports.Base = Base;

package/server/mDNS.js

@@ -12,6 +12,9 @@ const os = require("os");
 const logger_1 = require("../duotecno/logger");
 class MDNSService {
     constructor(config) {
+        this.registeredName = null; // Actual name registered (may have suffix)
+        this.registrationError = null; // Last error during registration
+        this.registrationStatus = 'pending';
         this.config = config;
     }
     /**
@@ -29,65 +32,132 @@ class MDNSService {
     }
     /**
      * Register both HTTP service and hostname (like ESP32 MDNS.begin())
+     * Tries alternative names with suffixes if the name is already in use
      */
     register() {
         if (!this.bonjour) {
+            this.registrationError = "Service not initialized";
+            this.registrationStatus = 'failed';
             (0, logger_1.err)("mDNS", "Service not initialized, call init() first");
             return;
         }
-        try {
-            const { name, port, version } = this.config;
-            const ports = Array.isArray(port) ? port : [port];
-            const primaryPort = ports[0];
-            // Register the HTTP service using bonjour
-            // Wrap in try-catch because bonjour can throw synchronously on conflicts
-            let service;
-            try {
-                service = this.bonjour.publish({
-                    name,
-                    type: 'http',
-                    port: primaryPort,
-                    txt: {
-                        version: version || '1.0.0',
-                        ports: ports.join(','),
-                        path: '/'
-                    }
-                });
-                (0, logger_1.log)("mDNS", `HTTP service registered: ${name}.local on port(s) ${ports.join(', ')}`);
+        const { name, port, version } = this.config;
+        const ports = Array.isArray(port) ? port : [port];
+        const primaryPort = ports[0];
+        // Set up error handler to prevent crash on "already in use" errors
+        // Note: The error message will still be logged by Node.js, but the app won't crash
+        // The retry logic with suffixes (.2, .3, etc.) will continue to work
+        let handlerActive = true;
+        const globalErrorHandler = (error) => {
+            if (handlerActive && error.message.includes('already in use')) {
+                // Suppress crash - retry logic will handle it
+                return;
+            }
+        };
+        process.prependListener('uncaughtException', globalErrorHandler);
+        setTimeout(() => {
+            handlerActive = false;
+            process.removeListener('uncaughtException', globalErrorHandler);
+        }, 5000);
+        // Try to register with the original name, then try with suffixes .2, .3, .4, .5, .6
+        this.tryRegisterWithSuffix(name, primaryPort, ports, version, 0);
+    }
+    /**
+     * Recursively try to register with different suffixes
+     */
+    tryRegisterWithSuffix(baseName, primaryPort, ports, version, attempt) {
+        if (attempt > 6) {
+            // Exhausted all attempts
+            this.registrationError = `All names from "${baseName}" to "${baseName}.7" are already in use on the network`;
+            this.registrationStatus = 'failed';
+            (0, logger_1.err)("mDNS", this.registrationError);
+            (0, logger_1.err)("mDNS", "Please change the mdnsName in settings or stop other conflicting services");
+            return;
+        }
+        const tryName = attempt === 0 ? baseName : `${baseName}.${attempt + 1}`;
+        let service;
+        let conflictDetected = false;
+        let successTimeout = null;
+        // Create a wrapper to handle conflicts
+        const handleConflict = () => {
+            if (conflictDetected)
+                return;
+            conflictDetected = true;
+            // Clear the success timeout
+            if (successTimeout) {
+                clearTimeout(successTimeout);
+                successTimeout = null;
             }
-            catch (publishError) {
-                if (publishError.message && publishError.message.includes('already in use')) {
-                    (0, logger_1.err)("mDNS", `Service name "${name}" is already in use. This is usually harmless - continuing anyway.`);
-                    (0, logger_1.err)("mDNS", "The old service registration will expire in ~30 seconds.");
+            // Unpublish the conflicting service
+            if (service) {
+                try {
+                    service.stop();
                 }
-                else {
-                    (0, logger_1.err)("mDNS", `Service publish error: ${publishError.message}`);
+                catch (e) {
+                    // Ignore errors during stop
                 }
-                // Continue anyway - service will work once the old registration expires
             }
-            // Handle service errors - especially "already in use" errors
+            (0, logger_1.err)("mDNS", `Name "${tryName}" is already in use, trying next suffix...`);
+            // Try next suffix
+            setImmediate(() => {
+                this.tryRegisterWithSuffix(baseName, primaryPort, ports, version, attempt + 1);
+            });
+        };
+        try {
+            service = this.bonjour.publish({
+                name: tryName,
+                type: 'http',
+                port: primaryPort,
+                txt: {
+                    version: version || '1.0.0',
+                    ports: ports.join(','),
+                    path: '/'
+                }
+            });
+            // Set up error handler on the service
             if (service) {
                 service.on('error', (error) => {
                     if (error.message.includes('already in use')) {
-                        (0, logger_1.err)("mDNS", `Service name "${name}" is already in use. Another instance may be running.`);
-                        (0, logger_1.err)("mDNS", "To fix: 1) Stop other instances, or 2) Change the mdnsName in settings, or 3) Wait 30s for old service to expire");
+                        handleConflict();
                     }
-                    else {
+                    else if (!conflictDetected) {
+                        this.registrationError = error.message;
+                        this.registrationStatus = 'failed';
                         (0, logger_1.err)("mDNS", `Service error: ${error.message}`);
                     }
                 });
             }
-            // Publish the hostname A record (like ESP32 MDNS.begin())
-            this.publishHostname(name);
+            // Wait longer before declaring success - conflicts come from network
+            successTimeout = setTimeout(() => {
+                if (!conflictDetected) {
+                    // Success!
+                    this.registeredName = tryName;
+                    this.registrationStatus = 'success';
+                    this.registrationError = null;
+                    if (attempt > 0) {
+                        (0, logger_1.log)("mDNS", `⚠️  Original name "${baseName}" was taken, registered as "${tryName}.local" instead`);
+                    }
+                    else {
+                        (0, logger_1.log)("mDNS", `✓ HTTP service registered: ${tryName}.local on port(s) ${ports.join(', ')}`);
+                    }
+                    // Publish the hostname A record (like ESP32 MDNS.begin())
+                    this.publishHostname(tryName);
+                }
+            }, 2000); // Wait 2 seconds for network conflict responses
         }
-        catch (e) {
-            if (e.message.includes('already in use')) {
-                (0, logger_1.err)("mDNS", `Service name "${this.config.name}" is already in use on the network`);
-                (0, logger_1.err)("mDNS", "Possible causes: 1) Another instance is running, 2) Previous instance didn't clean up properly");
-                (0, logger_1.err)("mDNS", "Solutions: Stop other instances, or restart with a different service name in settings");
+        catch (publishError) {
+            if (publishError.message && publishError.message.includes('already in use')) {
+                // This name is taken, try the next one
+                (0, logger_1.err)("mDNS", `Name "${tryName}" is taken (sync error), trying next suffix...`);
+                setImmediate(() => {
+                    this.tryRegisterWithSuffix(baseName, primaryPort, ports, version, attempt + 1);
+                });
             }
             else {
-                (0, logger_1.err)("mDNS", `Failed to register service: ${e.message.split('\n')[0]}`);
+                // Different error, stop trying
+                this.registrationError = publishError.message;
+                this.registrationStatus = 'failed';
+                (0, logger_1.err)("mDNS", `Service publish error: ${publishError.message}`);
             }
         }
     }

package/server/proxy.js

@@ -16,9 +16,12 @@ const process_1 = require("process");
 exports.kEmptyProxy = {
     cloudServer: "masters.duotecno.eu",
     cloudPort: 5097,
+    configPort: 5099,
     masterAddress: "",
     masterPort: 5001,
+    masterConfigPort: 8080,
     uniqueId: "",
+    configUniqueId: "",
     debug: false,
     kind: "gw" // default running under the gateway or other process manager -> don't restart yourself
 };
@@ -34,24 +37,18 @@ function setProxyConfig(c) {
     if (c) {
         config.cloudServer = c.cloudServer || exports.kEmptyProxy.cloudServer;
         config.cloudPort = c.cloudPort || exports.kEmptyProxy.cloudPort;
+        config.configPort = c.configPort || exports.kEmptyProxy.configPort;
         config.masterAddress = c.masterAddress || exports.kEmptyProxy.masterAddress;
         config.masterPort = c.masterPort || exports.kEmptyProxy.masterPort;
+        config.masterConfigPort = c.masterConfigPort || exports.kEmptyProxy.masterConfigPort;
         config.uniqueId = c.uniqueId || exports.kEmptyProxy.uniqueId;
+        config.configUniqueId = c.configUniqueId || exports.kEmptyProxy.configUniqueId;
         config.debug = !!c.debug;
         config.kind = c.kind || exports.kEmptyProxy.kind;
     }
     return config;
 }
 exports.setProxyConfig = setProxyConfig;
-try {
-    const configPath = require.resolve('../config-proxy.json');
-    console.log(`[PROXY] Using config file at: ${configPath}`);
-    setProxyConfig(require(configPath));
-}
-catch (e) {
-    setProxyConfig();
-    log("[PROXY] No config-proxy.json found, using default values from homebridge or other.");
-}
 let connectionChecker = null;
 exports.gCloudConnections = [];
 const kDebug = config.debug || false; // enable debug mode from config
@@ -78,13 +75,14 @@ function error(str) {
 // Only auto-start if we have a config-proxy.json file (standalone mode)
 // When running under Platform/HomeBridge, let Platform control the startup
 try {
-    require.resolve('../config-proxy.json');
+    setProxyConfig(require("/../config-proxy.json"));
     // config-proxy.json exists, we're running standalone -> start the proxy
     log("[PROXY] Running in standalone mode (config-proxy.json found), starting proxy...");
     cleanStart(true);
 }
 catch (e) {
     // No config-proxy.json, we're probably running under Platform/HomeBridge
+    setProxyConfig();
     log("[PROXY] No config-proxy.json found, waiting for Platform to start proxy...");
 }
 function makeNewCloudConnection(master, masterPort, server, serverPort, uniqueId, count = 1) {
@@ -127,10 +125,28 @@ function cleanStart(restart = false) {
         connectionChecker = null;
     }
     if (restart) {
-        log(`[PROXY] → [CLOUD] Restarting proxy... for ${config.uniqueId}.`);
-        if (config.uniqueId) {
-            log(`[PROXY] Starting proxy with config: ${JSON.stringify(config, null, 2)}`);
+        log(`[PROXY] → [CLOUD] Restarting proxy...`);
+        let connectionsStarted = 0;
+        // Start connection for the master device if uniqueId is configured
+        if (config.uniqueId && config.masterAddress) {
+            log(`[PROXY] Starting proxy for master device: ${config.uniqueId}`);
             makeNewCloudConnection(config.masterAddress, config.masterPort, config.cloudServer, config.cloudPort, config.uniqueId);
+            connectionsStarted++;
+        }
+        else if (config.uniqueId) {
+            log(`[PROXY] → [CLOUD] Master uniqueId configured but no masterAddress, skipping master connection.`);
+        }
+        // Start TCP proxy for Config API if masterConfigPort is configured
+        // Use uniqueId:8080 pattern (or configUniqueId if explicitly set for backward compatibility)
+        if (config.uniqueId && config.masterAddress && config.masterConfigPort) {
+            const configId = config.configUniqueId || `${config.uniqueId}:${config.masterConfigPort}`;
+            log(`[PROXY] Starting TCP proxy for Config API: ${configId} -> ${config.masterAddress}:${config.masterConfigPort}`);
+            // All connections use the same cloud port for WebSocket multiplexing
+            makeNewCloudConnection(config.masterAddress, config.masterConfigPort, config.cloudServer, config.cloudPort, configId);
+            connectionsStarted++;
+        }
+        if (connectionsStarted > 0) {
+            log(`[PROXY] Started ${connectionsStarted} proxy connection(s) with config: ${JSON.stringify(config, null, 2)}`);
             // check every 16 second for a free connection
             connectionChecker = setInterval(() => {
                 const freeConnection = exports.gCloudConnections.find((ctx) => (!ctx.deviceSocket) && ctx.cloudSocket && (ctx.cloudSocket.readyState === 'open'));
@@ -144,7 +160,7 @@ function cleanStart(restart = false) {
             }, 16 * 1000);
         }
         else {
-            log(`[PROXY] → [CLOUD] Not restarting, no unique ID configured, not starting the proxy.`);
+            log(`[PROXY] → [CLOUD] Not restarting, no unique IDs configured, not starting the proxy.`);
         }
     }
     else {
@@ -161,6 +177,8 @@ class Context {
         this.server = server;
         this.serverPort = serverPort;
         this.uniqueId = uniqueId;
+        // Gateway connections have no master address (they handle HTTP, not TCP proxy)
+        this.isGateway = !master || master === "";
         this.deviceStatus = {
             connected: false,
             lastAttempt: null,
@@ -206,12 +224,21 @@ class Context {
                 // Handle connection response from the cloud server
             }
             else {
-                // There is real incomming data, it's a fresh connection, so: a new client wants to connect to the device
-                // 1) create a new (free) connection to the cloud server for the next client
-                // 2) connect to the device and send the initial data
-                log(`[PROXY] → [CLOUD] New client connection, creating new free connection for this proxy/device: ${config.uniqueId}.`);
-                makeNewCloudConnection(this.master, this.masterPort, this.server, this.serverPort, this.uniqueId);
-                this.makeDeviceConnection(this.master, this.masterPort, data);
+                // There is real incoming data, it's a fresh connection, so: a new client wants to connect
+                if (this.isGateway) {
+                    // Gateway connection - forward HTTP request to local HTTP gateway on port 5002
+                    log(`[PROXY] → [CLOUD] New client connection for gateway: ${this.uniqueId}.`);
+                    makeNewCloudConnection(this.master, this.masterPort, this.server, this.serverPort, this.uniqueId);
+                    this.makeDeviceConnection("localhost", 5002, data);
+                }
+                else {
+                    // Device connection - create TCP proxy to master device
+                    // 1) create a new (free) connection to the cloud server for the next client
+                    // 2) connect to the device and send the initial data
+                    log(`[PROXY] → [CLOUD] New client connection, creating new free connection for this proxy/device: ${this.uniqueId}.`);
+                    makeNewCloudConnection(this.master, this.masterPort, this.server, this.serverPort, this.uniqueId);
+                    this.makeDeviceConnection(this.master, this.masterPort, data);
+                }
             }
         }
         else if (this.deviceSocket.readyState === 'open') {

package/server/smartapp.js

@@ -322,16 +322,21 @@ class SmartApp extends webapp_1.WebApp {
     ///////////
     doProxy(context) {
         return __awaiter(this, void 0, void 0, function* () {
-            let config = this.config.proxy || proxy_1.kEmptyProxy;
+            let config = this.read("proxy") || proxy_1.kEmptyProxy;
             if (context.action === "save") {
                 // save the proxy config
                 config.cloudServer = context.getParam({ name: "cloudServer", type: "string" });
                 config.cloudPort = context.getParam({ name: "cloudPort", type: "integer" });
+                config.configPort = context.getParam({ name: "configPort", type: "integer" });
                 config.masterAddress = context.getParam({ name: "masterAddress", type: "string" });
                 config.masterPort = context.getParam({ name: "masterPort", type: "integer" });
+                config.masterConfigPort = context.getParam({ name: "masterConfigPort", type: "integer" });
                 config.uniqueId = context.getParam({ name: "uniqueId", type: "string" });
+                config.configUniqueId = context.getParam({ name: "configUniqueId", type: "string" });
                 this.write("proxy", config);
                 (0, proxy_1.setProxyConfig)(config);
+                // Automatically restart proxy with new config
+                (0, proxy_1.cleanStart)(true);
             }
             else if (context.action === "restart") {
                 (0, proxy_1.cleanStart)(true);
@@ -339,7 +344,13 @@ class SmartApp extends webapp_1.WebApp {
             else {
                 // just show the proxy config
             }
-            return this.ejs("proxy", context, { config, connections: proxy_1.gCloudConnections });
+            // Get mDNS status for display
+            const mdnsStatus = this.mdnsService ? {
+                registeredName: this.mdnsService.registeredName,
+                registrationError: this.mdnsService.registrationError,
+                registrationStatus: this.mdnsService.registrationStatus
+            } : null;
+            return this.ejs("proxy", context, { config, connections: proxy_1.gCloudConnections, mdnsStatus });
         });
     }
     //////////////
@@ -1359,7 +1370,7 @@ class SmartApp extends webapp_1.WebApp {
     //////////////////////////////
     doUnits(context) {
         return __awaiter(this, void 0, void 0, function* () {
-            // get masterAddress and Port
+            // get master Address and Port into "masterAddress" & "masterPort"
             context.getMaster("action", "node");
             const master = this.system.findMaster(context["masterAddress"], context["masterPort"]);
             if (context.action === "save") {
@@ -1375,6 +1386,15 @@ class SmartApp extends webapp_1.WebApp {
                 context.action = "edit";
                 return this.doRequest(context);
             }
+            else if (context.action === "register") {
+                // master=...&port=...&register=...&value=...
+                if (!master)
+                    return this.error(context, "master not found", true);
+                const register = context.getParam({ name: "register", type: "integer", default: 0 });
+                const value = context.getParam(kValue);
+                yield master.setRegisterValue(register, value);
+                return this.json({ register, value });
+            }
             else if (context.action === "set") {
                 if (!master)
                     return this.error(context, "master not found", true);

package/server/views/head.ejs

@@ -1,5 +1,6 @@
 <meta charset="UTF-8">
 <link type="text/css" rel="stylesheet" href="/files/min.css"  media="screen,projection"/>
+<title>Duotecno Gateway</title>
 
 <!--Let browser know website is optimized for mobile-->
 <meta name="viewport" content="width=device-width, initial-scale=1.0"/>

package/server/views/nav.ejs

@@ -49,15 +49,23 @@
 </ul>
 
 <% if (notReady) { %>
-  <h2>Not ready</h2>
-  <div>
-    <%= notReadyMessage %>
-  </div>
+  <form>
+    <div class="card-panel red">
+      <h2>Not ready</h2>
+      <div>
+        <%= notReadyMessage %>
+      </div>
+    </div>
+  </form>
 <% } %>
 
 <% if (message) { %>
-  <h2>Message</h2>
-  <div>
-    <%= message %>
-  </div>
+  <form>
+    <div class="card-panel green">
+      <h2>Message</h2>
+      <div>
+        <%= message %>
+      </div>
+    </div>
+  </form>
 <% } %>

package/server/views/proxy.ejs

@@ -16,53 +16,145 @@
           <button class="right btn waves-effect waves-light red" type="submit" name="action" value="restart">Restart</button>
         </h1>
 
-        <div class="row">
+        <h2 style="margin-top: 2rem; font-size: 1.5rem; font-weight: 500;">
+          <i class="material-icons left" style="vertical-align: middle;">cloud</i>
+          Cloud Server Settings
+        </h2>
+        
+        <div class="row" style="margin-top: 1rem;">
           <div class="input-field col s12">
-            <input placeholder="ws.duotecno.eu" id="cloudServer" name="cloudServer" type="text" 
+            <label for="cloudServer">Cloud Server Address</label>
+            <input placeholder="masters.duotecno.eu" id="cloudServer" name="cloudServer" type="text" 
                    value="<%= config.cloudServer %>">
-            <label for="name">CloudServer</label>
           </div>
         </div>
+
         <div class="row">
           <div class="input-field col s12">
-            <input placeholder="5099" id="cloudPort" name="cloudPort" type="number" 
+            <label for="cloudPort">Cloud Server Port</label>
+            <input placeholder="5097" id="cloudPort" name="cloudPort" type="number" 
                    value="<%= config.cloudPort %>">
-            <label for="name">CloudPort</label>
           </div>
         </div>
 
-        <div class="row">
+        <h2 style="margin-top: 3rem; font-size: 1.5rem; font-weight: 500;">
+          <i class="material-icons left" style="vertical-align: middle;">home</i>
+          Master Device
+        </h2>
+        <p class="grey-text" style="margin-bottom: 2rem;">
+          Configure your local master device with 2 ports.</small>
+        </p>
+
+        <div class="row" style="margin-top: 1rem;">
           <div class="input-field col s12">
-            <input placeholder="192.168.0.2" id="masterAddress" name="masterAddress" type="text" 
-                   value="<%= config.masterAddress %>">
-            <label for="name">MasterAddress</label>
+            <label for="uniqueId">Unique ID (without port)</label>
+            <input placeholder="john-doe.duotecno.be" id="uniqueId" name="uniqueId" type="text" 
+                   value="<%= config.uniqueId %>">
+            <span class="helper-text">
+              This ID is used for both connections:<br>
+              • Websocket: [uniqueId]:5001<br>
+              • Config API: [uniqueId]:8080<br>
+            </span>
           </div>
         </div>
 
         <div class="row">
           <div class="input-field col s12">
-            <input placeholder="5001" id="masterPort" name="masterPort" type="text" 
-                   value="<%= config.masterPort %>">
-            <label for="name">MasterPort</label>
+            <label for="masterAddress">IP Address</label>
+            <input placeholder="192.168.0.97" id="masterAddress" name="masterAddress" type="text" 
+                   value="<%= config.masterAddress %>">
           </div>
         </div>
 
         <div class="row">
-          <div class="input-field col s12">
-            <input placeholder="client:5002" id="uniqueId" name="uniqueId" type="text" 
-                   value="<%= config.uniqueId %>">
-            <label for="name">UniqueId</label>
+          <div class="col s6">
+            <p>
+              <label>
+                <input type="checkbox" class="filled-in" checked disabled />
+                <span><strong>Websocket</strong></span>
+              </label>
+            </p>
+            <div class="input-field">
+              <input placeholder="5001" id="masterPort" name="masterPort" type="number" 
+                     value="<%= config.masterPort || 5001 %>">
+            </div>
+          </div>
+          <div class="col s6">
+            <p>
+              <label>
+                <input type="checkbox" class="filled-in" checked disabled />
+                <span><strong>Config port</strong></span>
+              </label>
+            </p>
+            <div class="input-field">
+              <input placeholder="8080" id="masterConfigPort" name="masterConfigPort" type="number" 
+                     value="<%= config.masterConfigPort || 8080 %>">
+            </div>
           </div>
         </div>
 
+        <!-- Hidden fields for compatibility - these are no longer shown in UI -->
+        <input type="hidden" name="configPort" value="<%= config.configPort || config.cloudPort %>">
+        <input type="hidden" name="configUniqueId" value="<%= config.configUniqueId || '' %>">
+
       </form>
 
+      <!-- mDNS Status Section -->
+      <% if (mdnsStatus) { %>
+      <form>
+          <h1>mDNS Status</h1>
+          <% if (mdnsStatus.registrationStatus === 'success') { %>
+            <div class="card-panel green lighten-4">
+              <span class="green-text text-darken-4">
+                <i class="material-icons left">check_circle</i>
+                <strong>mDNS Service Registered Successfully</strong>
+              </span>
+              <p>Hostname: <strong><%= mdnsStatus.registeredName %>.local</strong></p>
+              <% if (mdnsStatus.registeredName && !mdnsStatus.registeredName.includes('.')) { %>
+                <p class="grey-text">The gateway is accessible on the network as <%= mdnsStatus.registeredName %>.local</p>
+              <% } else { %>
+                <p class="orange-text">
+                  <i class="material-icons tiny">warning</i>
+                  Note: Original name was taken, registered with suffix. Check Settings to change the mDNS name.
+                </p>
+              <% } %>
+            </div>
+          <% } else if (mdnsStatus.registrationStatus === 'failed') { %>
+            <div class="card-panel red lighten-4">
+              <span class="red-text text-darken-4">
+                <i class="material-icons left">error</i>
+                <strong>mDNS Registration Failed</strong>
+              </span>
+              <% if (mdnsStatus.registrationError) { %>
+                <p>Error: <%= mdnsStatus.registrationError %></p>
+              <% } %>
+              <p>The gateway is still running, but may not be discoverable via mDNS hostname.</p>
+              <p class="grey-text">Solutions:</p>
+              <ul class="grey-text">
+                <li>Change the mDNS name in <a href="/settings">Settings</a></li>
+                <li>Stop other devices/services using the same name</li>
+                <li>Access the gateway using IP address instead</li>
+              </ul>
+            </div>
+          <% } else { %>
+            <div class="card-panel blue lighten-4">
+              <span class="blue-text text-darken-4">
+                <i class="material-icons left">info</i>
+                mDNS registration is pending...
+              </span>
+            </div>
+          <% } %>
+      </form>
+      <% } %>
+
       <!-- Connection Status Section -->
       <form>
         <% if (connections && connections.length > 0) { %>
           <table class="striped highlight">
             <thead>
               <tr>
+                <th>Type</th>
+                <th>Unique ID</th>
                 <th>Cloud Connection</th>
                 <th>Device Connection</th>
                 <th>Last Attempt</th>
@@ -74,6 +166,16 @@
             <tbody>
               <% connections.forEach(function(conn) { %>
                 <tr>
+                  <td>
+                    <% if (conn.isGateway) { %>
+                      <span class="blue-text"><strong>Gateway</strong></span>
+                    <% } else { %>
+                      <span class="teal-text"><strong>Master</strong></span>
+                    <% } %>
+                  </td>
+                  <td>
+                    <small><%= conn.uniqueId %></small>
+                  </td>
                   <td>
                     <% if (conn.cloudSocket && conn.cloudSocket.readyState === 'open') { %>
                       <span class="green-text">✓ Connected</span><br>
@@ -83,12 +185,16 @@
                     <% } %>
                   </td>
                   <td>
-                    <% if (conn.deviceStatus.connected) { %>
+                    <% if (conn.isGateway) { %>
+                      <span class="grey-text">N/A (HTTP)</span>
+                    <% } else if (conn.deviceStatus.connected) { %>
                       <span class="green-text">✓ Connected</span><br>
                       <small><%= conn.master %>:<%= conn.masterPort %></small>
-                    <% } else { %>
+                    <% } else if (conn.master) { %>
                       <span class="red-text">✗ Disconnected</span><br>
                       <small><%= conn.master %>:<%= conn.masterPort %></small>
+                    <% } else { %>
+                      <span class="grey-text">Not configured</span>
                     <% } %>
                   </td>
                   <td>

package/server/views/style.ejs

@@ -6,7 +6,8 @@
   /* Main content area - grows to fill space */
   body > *:not(nav):not(.page-footer) { flex: 1 0 auto }
   
-  form { padding-left: 7px; padding-right: 9px; padding-bottom: 80px }
+  form { padding-left: 7px; padding-right: 9px; padding-bottom: 20px }
+  form:last-of-type { padding-bottom: 80px }
   
   nav, nav .nav-wrapper { height: 64px !important; line-height: 64px !important; flex-shrink: 0 }
   nav .brand-logo { left: 10px !important; -webkit-transform: none !important; transform: none !important }

package/server/webapp.js

@@ -346,6 +346,11 @@ class WebApp extends base_1.Base {
      */
     initMDNS(name, version) {
         try {
+            // Cleanup any existing mDNS service first (important for hot reload/restart)
+            if (this.mdnsService) {
+                (0, logger_1.log)("webapp", "Cleaning up existing mDNS service before reinitializing");
+                this.destroyMDNS();
+            }
             const ports = Array.isArray(this.port) ? this.port : [this.port];
             this.mdnsService = new mDNS_1.MDNSService({
                 name,
@@ -369,6 +374,8 @@ class WebApp extends base_1.Base {
             (0, logger_1.err)("webapp", "mDNS service not initialized, cannot register");
             return;
         }
+        // The mDNS service now handles conflicts internally with suffix retry
+        // No need for additional error handling here
         try {
             this.mdnsService.register();
         }