homebridge-smartsystem 7.0.4 → 7.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

@@ -7,7 +7,7 @@
     <body>
       <%- include('/views/nav', this); -%>
 
-      <form method="POST" action="/proxy">
+      <form method="POST" action="/proxy" style="padding-bottom: 0">
         <input type="hidden" name="daction" value="save">
         <h1>
           Proxy Config
@@ -16,46 +16,225 @@
           <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. Gateway port is auto-detected.<br>
+          <small>Access gateway via: http://[cloud server]/connect/[unique id]:gateway</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>
+                <th>Last Success</th>
+                <th>Retry Count</th>
+                <th>Last Error</th>
+              </tr>
+            </thead>
+            <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>
+                      <small><%= conn.server %>:<%= conn.serverPort %></small>
+                    <% } else { %>
+                      <span class="red-text">✗ Disconnected</span>
+                    <% } %>
+                  </td>
+                  <td>
+                    <% 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 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>
+                    <% if (conn.deviceStatus.lastAttempt) { %>
+                      <%= new Date(conn.deviceStatus.lastAttempt).toLocaleString() %>
+                    <% } else { %>
+                      <span class="grey-text">Never</span>
+                    <% } %>
+                  </td>
+                  <td>
+                    <% if (conn.deviceStatus.lastSuccess) { %>
+                      <%= new Date(conn.deviceStatus.lastSuccess).toLocaleString() %>
+                    <% } else { %>
+                      <span class="grey-text">Never</span>
+                    <% } %>
+                  </td>
+                  <td>
+                    <% if (conn.deviceStatus.retryCount > 0) { %>
+                      <span class="orange-text"><%= conn.deviceStatus.retryCount %></span>
+                    <% } else { %>
+                      <%= conn.deviceStatus.retryCount %>
+                    <% } %>
+                  </td>
+                  <td>
+                    <% if (conn.deviceStatus.lastError) { %>
+                      <span class="red-text"><%= conn.deviceStatus.lastError %></span>
+                    <% } else { %>
+                      <span class="grey-text">None</span>
+                    <% } %>
+                  </td>
+                </tr>
+              <% }); %>
+            </tbody>
+          </table>
+        <% } else { %>
+          <p class="red-text">No active connections</p>
+        <% } %>
+        </form>
+
       <%- include('/views/footer'); -%>
 
     </body>

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();
         }

package/.gitattributes

@@ -1,4 +0,0 @@
-*.css linguist-detectable=false
-*.map linguist-detectable=false
-*.js linguist-detectable=false
-*.ts linguist-detectable=true

package/MIXINS-GUIDE.md

@@ -1,210 +0,0 @@
-# TypeScript Mixins Pattern for SmartApp
-
-## Overview
-
-Your SmartApp is getting large because it handles multiple concerns:
-- Device management (WebSocket, power measurements)
-- Link management (Homebridge accessories)
-- Switch management (HTTP switches)
-- Power management (Smappee, P1, Shelly)
-- Proxy configuration
-- Settings management
-
-TypeScript doesn't support multiple inheritance, but **mixins** provide a similar capability.
-
-## Solution Options
-
-### **Option 1: Mixin Pattern** (Most Flexible)
-
-Create separate mixin functions that add functionality to your class:
-
-```typescript
-// server/mixins/DeviceMixin.ts
-type Constructor<T = {}> = new (...args: any[]) => T;
-
-export interface DeviceMixinBase {
-  devices: Array<Device>;
-  system: System;
-  power: Power;
-  // ... other required properties
-}
-
-export function DeviceMixin<TBase extends Constructor<DeviceMixinBase>>(Base: TBase) {
-  return class extends Base {
-    setupWebSocketServers() { /* ... */ }
-    sendDeviceList(ws: WebSocket) { /* ... */ }
-    getDeviceList() { /* ... */ }
-    // ... all device-related methods
-  };
-}
-
-// Usage in smartapp.ts
-import { DeviceMixin } from './mixins/DeviceMixin';
-import { LinkMixin } from './mixins/LinkMixin';
-import { SwitchMixin } from './mixins/SwitchMixin';
-
-// Apply mixins
-const SmartAppBase = SwitchMixin(LinkMixin(DeviceMixin(WebApp)));
-
-export class SmartApp extends SmartAppBase {
-  // Only SmartApp-specific logic here
-  constructor(system: System, power: Power, platform: Platform) {
-    super("smartapp");
-    // ...
-  }
-}
-```
-
-**Pros:**
-- True composition - each mixin is independent
-- Can be reused across different classes
-- TypeScript type-safe
-- Easy to test mixins individually
-
-**Cons:**
-- Requires some boilerplate
-- Mixing order matters
-- Can be confusing at first
-
----
-
-### **Option 2: Delegate Pattern** (Simpler)
-
-Create separate service/manager classes and delegate to them:
-
-```typescript
-// server/services/DeviceManager.ts
-export class DeviceManager {
-  constructor(
-    private devices: Array<Device>,
-    private system: System,
-    private power: Power
-  ) {}
-
-  setupWebSocketServers(servers: http.Server[]) { /* ... */ }
-  getDeviceList() { /* ... */ }
-  // ... all device methods
-}
-
-// server/services/LinkManager.ts
-export class LinkManager {
-  constructor(
-    private links: Array<Link>,
-    private system: System
-  ) {}
-
-  initLinks() { /* ... */ }
-  updateLink(inx: number, link: Link) { /* ... */ }
-  // ... all link methods
-}
-
-// In smartapp.ts
-export class SmartApp extends WebApp {
-  private deviceManager: DeviceManager;
-  private linkManager: LinkManager;
-
-  constructor(system: System, power: Power, platform: Platform) {
-    super("smartapp");
-    
-    this.deviceManager = new DeviceManager(this.devices, this.system, this.power);
-    this.linkManager = new LinkManager(this.links, this.system);
-  }
-
-  // Delegate to managers
-  setupWebSocketServers() {
-    this.deviceManager.setupWebSocketServers(this.servers);
-  }
-
-  initLinks() {
-    this.linkManager.initLinks();
-  }
-}
-```
-
-**Pros:**
-- Simple and intuitive
-- Easy to understand
-- Good separation of concerns
-- Easy to unit test
-
-**Cons:**
-- More delegation boilerplate
-- Not as "clean" as mixins
-- Managers need access to SmartApp state
-
----
-
-### **Option 3: Module Pattern** (Most Practical)
-
-Split into separate modules but keep in same class:
-
-```typescript
-// server/smartapp/devices.ts
-export class DeviceManagement {
-  static setupWebSocketServers(app: SmartApp) { /* ... */ }
-  static getDeviceList(app: SmartApp) { /* ... */ }
-  // ... all device methods as static functions
-}
-
-// server/smartapp/links.ts
-export class LinkManagement {
-  static initLinks(app: SmartApp) { /* ... */ }
-  static updateLink(app: SmartApp, inx: number, link: Link) { /* ... */ }
-}
-
-// In smartapp.ts
-import { DeviceManagement } from './smartapp/devices';
-import { LinkManagement } from './smartapp/links';
-
-export class SmartApp extends WebApp {
-  setupWebSocketServers() {
-    DeviceManagement.setupWebSocketServers(this);
-  }
-  
-  initLinks() {
-    LinkManagement.initLinks(this);
-  }
-}
-```
-
-**Pros:**
-- Simple to implement
-- Code is organized in separate files
-- No complex patterns needed
-- Easy to refactor incrementally
-
-**Cons:**
-- Still some methods in main class
-- Not true composition
-- Methods take `app` parameter
-
----
-
-## **Recommended Approach**
-
-For your situation, I'd recommend **Option 2 (Delegate Pattern)** or **Option 3 (Module Pattern)**.
-
-Here's why:
-1. **Easier to understand** - no complex mixin magic
-2. **Incremental refactoring** - move one feature at a time
-3. **Better testability** - each manager/module is isolated
-4. **Clearer dependencies** - you see what each part needs
-
-### Quick Win: Module Pattern
-
-Split your 1680-line smartapp.ts into:
-
-```
-server/
-  smartapp.ts (main class, ~300 lines)
-  smartapp/
-    devices.ts (WebSocket & power, ~300 lines)
-    links.ts (Homebridge links, ~200 lines)
-    switches.ts (HTTP switches, ~200 lines)
-    power.ts (Power bindings, ~150 lines)
-    proxy.ts (Proxy config, ~150 lines)
-    routes.ts (HTTP routing, ~200 lines)
-    units.ts (Unit management, ~150 lines)
-```
-
-Would you like me to help you refactor SmartApp using one of these patterns?