@pellebot/homebridge-fritz-platform-hb2 1.1.1 → 1.2.0

package/.release-notes-v1.2.0.md

@@ -0,0 +1,46 @@
+## Wizard Edit-Mode (Phase G) — Re-Runs überschreiben deine Einstellungen nicht mehr
+
+Der Setup-Wizard hat eine echte **Aktualisierungs-Routine** bekommen. Wenn du den Wizard ein zweites Mal aufrufst — zum Beispiel um ein neues Smart-Home-Gerät zu integrieren — werden deine bestehenden Anpassungen jetzt aus der `config.json` vorgeladen statt überschrieben.
+
+### Was das konkret fixt
+
+In v1.1.x sind beim Wizard-Re-Run folgende User-Anpassungen verloren gegangen:
+
+- **Tile-Namen** wie „PV Einspeisung Hausanschluss" wurden auf „Aktuelle Einspeisung" zurückgesetzt
+- **`accType`-Wahl** zwischen `energy-temperature` (°C-Tile) und `energy-light` (lx-Sensor) wurde immer auf `energy-temperature` zurückgesetzt
+- **Custom-Namen** für DECT-Geräte wurden durch den AVM-Auto-Discovery-Namen ersetzt
+- **Nur Router-Switches** waren korrekt vorausgefüllt
+
+Phase G dehnt diesen Hydration-Pattern auf alle Schritte aus.
+
+### Highlights
+
+- 🔁 **Schritt 1 (Verbindung):** Host/User/PW/SSL/TR064 wie bisher vorausgefüllt — jetzt über einen zentralen Loader
+- 🏷️ **Schritt 2 (Geräte):** für jedes AIN, das bereits in `config.json` steht, wird der bestehende `accType` und Custom-Name übernommen statt Auto-Detection-Default
+- ⚡ **Schritt 3 (Energy 250):** Tile-Namen aus existierender Config übernommen, °C/lx-Radio aus den vorhandenen Einträgen vorausgewählt
+- 🔘 **Schritt 4 (Router-Switches):** unverändert (war schon korrekt)
+- 📝 **Schritt 5 (Speichern):** **Neue Diff-Vorschau** zeigt vor dem Speichern, was sich gegenüber der aktuellen Config ändert — keine bösen Überraschungen mehr
+
+### Breaking Changes
+
+Keine. Bestehende Configs werden ohne Migration übernommen.
+
+### Migration für bestehende Nutzer
+
+Keine Action nötig. Wenn du den Wizard das nächste Mal öffnest, sind deine Einstellungen einfach da. Beim Speichern siehst du in der neuen Diff-Vorschau exakt, was sich ändern wird — falls die Liste leer ist, war alles schon korrekt.
+
+### Installation
+
+```bash
+sudo npm install -g @pellebot/homebridge-fritz-platform-hb2@1.2.0
+sudo hb-service restart
+```
+
+### Bekannte Limitationen
+
+- **Globaler statt per-Tile `energyAccType`:** Die Wizard-UI behandelt °C/lx als globale Einstellung für alle OBIS-Tiles. Mix-Setups (einige Tiles `energy-temperature`, andere `energy-light`) werden beim Wizard-Save auf eine einheitliche Wahl reduziert (light gewinnt). Wer einen Mix braucht: `config.json` direkt editieren, nicht den Wizard zum Speichern nutzen.
+- **Diff zeigt nur Änderungen gegenüber der gespeicherten Config**, nicht gegenüber dem letzten Wizard-Lauf. By design — aber bedeutet: wenn du den Wizard mehrmals öffnest und schließt ohne zu speichern, siehst du jedes Mal denselben Diff zur Live-Version.
+
+### Vollständiger Changelog
+
+Siehe [CHANGELOG.md](./CHANGELOG.md)

package/CHANGELOG.md

@@ -2,6 +2,35 @@
 
 > **Hinweis zum Format:** Releases ab `v1.0.0` werden unter dem npm-Paket `@pellebot/homebridge-fritz-platform-hb2` veröffentlicht. Die `6.1.0-hb2patch.x` Pre-Releases sind Vorstufen unter dem alten Paketnamen `@pellebot/homebridge-fritz-platform` (deprecated). Die `registerPlatform`-Kennung bleibt durchgängig `homebridge-fritz-platform`, sodass cached Accessories über den Rename hinweg matchen — kein Re-Pairing nötig.
 
+# v1.2.0 — 2026-05-14 (Wizard Edit-Mode / Phase G)
+
+**Setup-Wizard erhält Aktualisierungs-Routine.** Beim erneuten Aufruf des Wizards (z.B. um ein weiteres Gerät hinzuzufügen) werden die in `config.json` gespeicherten Einstellungen jetzt vorgeladen statt überschrieben. Damit ist der Hauptschmerz aus v1.1.x adressiert: manuell vergebene Tile-Namen, gewählter `accType` (z.B. `energy-light` statt `energy-temperature`) und Router-Switch-Zustände überleben einen Wizard-Re-Run unverändert.
+
+## Hintergrund
+
+Der Wizard in v1.1.x baute den `smarthome[]`-Array beim Speichern (Schritt 5) **immer aus dem In-Memory-State neu auf**. Dieser State wurde aber nur teilweise (Schritt 4 / Router-Switches) aus der bestehenden Config hydratisiert — Schritte 1–3 fielen jedes Mal auf Auto-Detection-Defaults zurück. Die sichtbare Folge: nach einem Wizard-Re-Run zeigte Apple Home wieder °C statt lx, und Tile-Namen wie „PV Einspeisung Hausanschluss" wurden auf „Aktuelle Einspeisung" zurückgesetzt.
+
+## Neuerungen
+
+- **`loadExistingConfig()`** — zentrale Lade-Funktion, die beim Wizard-Start einmal `homebridge.getPluginConfig()` aufruft und Master-Device + `smarthome[]` in `wizardState.existingConfig` ablegt. Single source of truth für alle Step-Hydrations.
+- **Schritt 1 (Verbindung):** Connection-Felder wie bisher vorausgefüllt, jetzt aber über `loadExistingConfig()` statt eines lokalen IIFE — konsistenter Pattern.
+- **Schritt 2 (Geräte):** Für jedes durch Discovery gefundene AIN wird geprüft, ob bereits ein `smarthome[]`-Eintrag existiert. Wenn ja: User-`accType` und Custom-Name übernehmen statt Auto-Detection-Default. `energy-light`-Einträge werden auf Wizard-State-Ebene zu `energy-temperature` normalisiert, damit Schritt 3 die AINs weiterhin erkennt (die °C/lx-Wahl lebt nun in `energyAccType`).
+- **Schritt 3 (Energy 250 / OBIS-Tiles):** Tile-Namen aus existierender Config gruppiert nach Sub-AIN übernehmen — fehlende Channels (`current_power`, `total_energy`) werden mit Defaults aufgefüllt. Der `energyAccType`-Radio (°C vs lx) wird global aus der Existing-Config vorausgewählt: wenn irgendein OBIS-Tile `energy-light` nutzt, ist der Light-Radio vorausgewählt.
+- **Schritt 4 (Router-Switches):** unverändert, war schon korrekt — fungierte als Pattern-Vorlage.
+- **Schritt 5 (Speichern):** Neue **Diff-Vorschau** zwischen alter und neuer Config: zeigt Tile-Umbenennungen, accType-Wechsel, neue/entfernte Geräte und geänderte Router-Switches als Liste. Wenn nichts sich ändert: „Keine Änderungen"-Hinweis. Macht klar was passieren wird, bevor man auf Speichern klickt.
+- **Bonus:** Summary-Counter in Schritt 5 zählen jetzt `energy-temperature` UND `energy-light` als „Energy-Tiles" (vorher wurde `energy-light` als „normales Gerät" gezählt).
+
+## Breaking Changes
+
+Keine. Bestehende Configs werden ohne Migration übernommen. First-Run-Verhalten (keine FritzPlatform-Sektion in `config.json`) ist unverändert: alle Defaults wie in v1.1.x.
+
+## Bekannte Limitationen
+
+- **Globaler vs. per-Tile-`energyAccType`:** Die Wizard-UI behandelt °C/lx als globale Einstellung für alle OBIS-Tiles. Wenn jemand manuell in der `config.json` gemischte Tiles erstellt hat (einige `energy-temperature`, einige `energy-light`), zeigt der Wizard nur den Wert „energy-light" an (sobald ein Tile light ist, gilt global light). Beim Speichern werden dann alle Tiles auf `energy-light` vereinheitlicht. Workaround für Mix-Setups: nicht den Wizard zum Speichern benutzen, sondern `config.json` direkt bearbeiten.
+- **Diff zeigt nur das was sich gegenüber der gespeicherten Config unterscheidet** — nicht das was sich gegenüber dem letzten Wizard-Lauf unterscheidet. Das ist by design, aber bedeutet: wenn man den Wizard mehrmals öffnet und schließt, ohne zu speichern, sieht man trotzdem nur den Diff zur letzten gespeicherten Version.
+
+---
+
 # v1.1.1 — 2026-05-14 (LightSensor variant for energy tiles)
 
 **Neuer accType `energy-light` als Alternative zu `energy-temperature`.** Beide nutzen dieselbe OBIS-Datenflow-Logik (Fritz!Smart Energy 250 sub-AINs), aber `energy-light` rendert die Werte als **LightSensor** (Einheit `lx`) statt **TemperatureSensor** (Einheit `°C`).

package/homebridge-ui/public/index.html

@@ -1,12 +1,16 @@
 <!--
   Custom UI for @pellebot/homebridge-fritz-platform-hb2
 
-  Phases A+B+C implemented:
+  Phases A–G implemented:
     A. Foundation (server.js, public/index.html, customUi flag)
     B. Connection test — Step 1 with form + /test-connection endpoint
     C. Device discovery — Step 2 with auto-detected accType per device
-
-  Future phases: Energy 250, Router-Switches, Save, Edit mode.
+    D. Energy 250 OBIS-Reader auto-setup — Step 3 (4 tiles per reader)
+    E. Router-Switches — Step 4 (master.options pre-hydrated from config)
+    F. Save + Apply — Step 5 (writes config.json, restarts Homebridge)
+    G. Edit-Mode — re-run preserves user edits (tile names, accType, energy
+       display type, router-switches) by hydrating wizardState from the
+       existing config.json. Step 5 shows a diff of pending changes.
 -->
 <style>
   .wizard-step-indicator {
@@ -320,6 +324,9 @@
 
       <div id="saveSummary" style="margin-top: 1rem;"></div>
 
+      <!-- Phase G: diff against existing config (empty on first run) -->
+      <div id="saveDiff" style="margin-top: 1rem;"></div>
+
       <details style="margin-top: 1rem;">
         <summary style="cursor: pointer;">Generierte Plugin-Config anzeigen (JSON-Vorschau)</summary>
         <pre id="savePreview" style="background: var(--bs-tertiary-bg, #f8f9fa); padding: 1rem; border-radius: 0.5rem; overflow-x: auto; max-height: 400px; font-size: 0.75rem; margin-top: 0.5rem;"></pre>
@@ -345,6 +352,7 @@
       energyTiles: {},            // { ain: [{ obisChannel, name }, ...] } after step 3
       energyAccType: 'energy-temperature', // 'energy-temperature' | 'energy-light' — chosen in step 3
       routerSwitches: {},         // { wifi_guest: bool, wps: bool, ... } after step 4
+      existingConfig: null,       // Phase G: { master, smarthome[] } from current config.json (null = first run)
     };
 
     // ============ DOM References ============
@@ -384,23 +392,59 @@
       });
     }
 
-    // ============ Step 1 — Connection Test ============
-    // Prefill from existing plugin config
-    (async () => {
+    // ============ Phase G — Edit-Mode (Existing-Config Hydration) ============
+    // Load the existing FritzPlatform config exactly once at wizard start so a
+    // re-run of the wizard doesn't blindly overwrite user customizations:
+    //   - Step 1: prefills connection fields (host/user/pw/ssl/tr064)
+    //   - Step 2: preserves user-chosen accType + custom names per AIN
+    //   - Step 3: preserves OBIS tile names + the °C-vs-lx display choice
+    //   - Step 4: hydrateRouterSwitches() already reads this directly
+    //   - Step 5: drives the diff preview against the new config
+    //
+    // Falls back to defaults / auto-detection on first install (no FritzPlatform
+    // entry in config.json yet).
+    async function loadExistingConfig() {
       try {
         const allConfig = await homebridge.getPluginConfig();
         const fritz = (allConfig || []).find((c) => c && c.platform === 'FritzPlatform');
-        const master = fritz && fritz.devices && fritz.devices.find((d) => d.master === true);
-        if (master) {
-          if (master.host) inputs.host.value = master.host;
-          if (master.port) inputs.port.value = master.port;
-          if (typeof master.ssl === 'boolean') inputs.ssl.checked = master.ssl;
-          if (typeof master.tr064 === 'boolean') inputs.tr064.checked = master.tr064;
-          if (master.username) inputs.username.value = master.username;
-          if (master.password) inputs.password.value = master.password;
-        }
+        if (!fritz) return null;
+        const master = (fritz.devices || []).find((d) => d && d.master === true) || null;
+        const smarthome = Array.isArray(fritz.smarthome) ? fritz.smarthome : [];
+        return { master, smarthome };
       } catch (err) {
-        // No config yet — keep placeholders.
+        return null;
+      }
+    }
+
+    // ============ Step 1 — Connection Test ============
+    // Prefill from existing plugin config. Also seeds wizardState.existingConfig
+    // and wizardState.energyAccType so later steps can hydrate from it.
+    (async () => {
+      wizardState.existingConfig = await loadExistingConfig();
+      const cfg = wizardState.existingConfig;
+      if (!cfg) return;
+
+      // Step 1 — connection fields
+      const master = cfg.master;
+      if (master) {
+        if (master.host) inputs.host.value = master.host;
+        if (master.port) inputs.port.value = master.port;
+        if (typeof master.ssl === 'boolean') inputs.ssl.checked = master.ssl;
+        if (typeof master.tr064 === 'boolean') inputs.tr064.checked = master.tr064;
+        if (master.username) inputs.username.value = master.username;
+        if (master.password) inputs.password.value = master.password;
+      }
+
+      // Seed energyAccType from existing OBIS entries so the Step 3 radio
+      // preselects the right display type (temperature vs light). If ANY
+      // existing tile uses energy-light, treat the whole reader as light —
+      // the wizard applies one global type to all OBIS tiles on save.
+      const obisEntries = cfg.smarthome.filter(
+        (e) => e && (e.accType === 'energy-temperature' || e.accType === 'energy-light')
+      );
+      if (obisEntries.length > 0) {
+        const anyLight = obisEntries.some((e) => e.accType === 'energy-light');
+        wizardState.energyAccType = anyLight ? 'energy-light' : 'energy-temperature';
       }
     })();
 
@@ -509,15 +553,41 @@
         { value: 'skip', label: '— ignorieren —' },
       ];
 
+      // Phase G: index existing smarthome entries by AIN for quick lookup.
+      // Multiple OBIS entries may share an AIN (one per obisChannel); we just
+      // need the first one to recover the accType + custom name.
+      const existingSh = (wizardState.existingConfig && wizardState.existingConfig.smarthome) || [];
+      const existingByAin = {};
+      for (const e of existingSh) {
+        if (e && e.ain && !existingByAin[e.ain]) existingByAin[e.ain] = e;
+      }
+
       const html = wizardState.discoveredDevices.map((d) => {
         // Default-Selection: include if accType detected (not 'unknown' / 'skip')
         const defaultInclude = d.accType !== 'unknown' && d.accType !== 'skip';
         if (!wizardState.deviceSelections[d.ain]) {
-          wizardState.deviceSelections[d.ain] = {
-            include: defaultInclude,
-            accType: d.accType,
-            name: d.name,
-          };
+          const existingEntry = existingByAin[d.ain];
+          if (existingEntry) {
+            // Phase G: AIN is already configured — preserve the user's chosen
+            // accType and name instead of overwriting with auto-detection.
+            // energy-light is normalized to energy-temperature at this layer
+            // so Step 3 picks the AIN up (energyAccType holds the display
+            // choice and is applied at save time).
+            const normalizedAccType = (existingEntry.accType === 'energy-light')
+              ? 'energy-temperature'
+              : existingEntry.accType;
+            wizardState.deviceSelections[d.ain] = {
+              include: true,
+              accType: normalizedAccType,
+              name: existingEntry.name || d.name,
+            };
+          } else {
+            wizardState.deviceSelections[d.ain] = {
+              include: defaultInclude,
+              accType: d.accType,
+              name: d.name,
+            };
+          }
         }
         const sel = wizardState.deviceSelections[d.ain];
 
@@ -727,13 +797,104 @@
       };
     }
 
+    /**
+     * Phase G: compute a human-readable list of changes the upcoming save will
+     * make against the currently persisted config.json. Empty/null on a first
+     * install (nothing to compare to).
+     *
+     * Key by (ain + obisChannel) for OBIS tiles (multiple per AIN), by ain
+     * only for everything else.
+     */
+    function renderConfigDiff(newConfig, existing) {
+      if (!existing) return ''; // first run — nothing to diff
+
+      const lines = [];
+
+      // -- Master device fields --
+      const oldMaster = existing.master || {};
+      const newMaster = (newConfig.devices && newConfig.devices[0]) || {};
+      if ((oldMaster.host || '') !== (newMaster.host || '')) {
+        lines.push(`Host: <code>${escapeHtml(oldMaster.host || '—')}</code> → <code>${escapeHtml(newMaster.host || '—')}</code>`);
+      }
+      if ((oldMaster.username || '') !== (newMaster.username || '')) {
+        lines.push(`Username: <code>${escapeHtml(oldMaster.username || '—')}</code> → <code>${escapeHtml(newMaster.username || '—')}</code>`);
+      }
+      if (!!oldMaster.ssl !== !!newMaster.ssl) {
+        lines.push(`SSL: ${oldMaster.ssl ? 'an' : 'aus'} → ${newMaster.ssl ? 'an' : 'aus'}`);
+      }
+      if ((oldMaster.port || 49000) !== (newMaster.port || 49000)) {
+        lines.push(`Port: <code>${oldMaster.port || 49000}</code> → <code>${newMaster.port || 49000}</code>`);
+      }
+
+      // -- Router-Switches (master.options) --
+      const oldOpts = (oldMaster.options) || {};
+      const newOpts = (newMaster.options) || {};
+      const allOptKeys = new Set([...Object.keys(oldOpts), ...Object.keys(newOpts)]);
+      for (const k of allOptKeys) {
+        const wasOn = !!oldOpts[k];
+        const isOn = !!newOpts[k];
+        if (wasOn && !isOn) lines.push(`Router-Switch <code>${escapeHtml(k)}</code> entfernt`);
+        else if (!wasOn && isOn) lines.push(`Router-Switch <code>${escapeHtml(k)}</code> hinzugefügt`);
+      }
+
+      // -- Smarthome entries (devices + OBIS tiles) --
+      const oldSh = existing.smarthome || [];
+      const newSh = newConfig.smarthome || [];
+      const keyOf = (e) => e.obisChannel ? `${e.ain}::${e.obisChannel}` : e.ain;
+      const oldByKey = {};
+      const newByKey = {};
+      for (const e of oldSh) if (e && e.ain) oldByKey[keyOf(e)] = e;
+      for (const e of newSh) if (e && e.ain) newByKey[keyOf(e)] = e;
+
+      for (const k of Object.keys(newByKey)) {
+        const n = newByKey[k];
+        const o = oldByKey[k];
+        if (!o) {
+          const chan = n.obisChannel ? ` <small>(${escapeHtml(n.obisChannel)})</small>` : '';
+          lines.push(`Neu: <code>${escapeHtml(n.ain)}</code>${chan} — <em>${escapeHtml(n.accType)}</em> "${escapeHtml(n.name || '')}"`);
+        } else {
+          if ((o.accType || '') !== (n.accType || '')) {
+            lines.push(`<code>${escapeHtml(n.ain)}</code>${n.obisChannel ? ` <small>(${escapeHtml(n.obisChannel)})</small>` : ''}: accType <em>${escapeHtml(o.accType || '—')}</em> → <em>${escapeHtml(n.accType || '—')}</em>`);
+          }
+          if ((o.name || '') !== (n.name || '')) {
+            lines.push(`<code>${escapeHtml(n.ain)}</code>${n.obisChannel ? ` <small>(${escapeHtml(n.obisChannel)})</small>` : ''}: Name "${escapeHtml(o.name || '—')}" → "${escapeHtml(n.name || '—')}"`);
+          }
+        }
+      }
+      for (const k of Object.keys(oldByKey)) {
+        if (newByKey[k]) continue;
+        const o = oldByKey[k];
+        const chan = o.obisChannel ? ` <small>(${escapeHtml(o.obisChannel)})</small>` : '';
+        lines.push(`Entfernt: <code>${escapeHtml(o.ain)}</code>${chan} — war <em>${escapeHtml(o.accType)}</em> "${escapeHtml(o.name || '')}"`);
+      }
+
+      if (lines.length === 0) {
+        return `
+          <div class="alert alert-secondary">
+            <strong>Keine Änderungen</strong> gegenüber der aktuellen <code>config.json</code>.
+            Du kannst trotzdem speichern (no-op) oder den Wizard verlassen.
+          </div>
+        `;
+      }
+
+      return `
+        <div class="alert alert-warning">
+          <div style="font-weight: 600; margin-bottom: 0.5rem;">📝 Änderungen gegenüber der aktuellen Konfiguration (${lines.length}):</div>
+          <ul style="margin: 0; padding-left: 1.25rem; font-size: 0.9rem;">
+            ${lines.map((l) => `<li>${l}</li>`).join('')}
+          </ul>
+        </div>
+      `;
+    }
+
     function renderSavePreview() {
       const config = buildPluginConfig();
       const summary = document.getElementById('saveSummary');
       const preview = document.getElementById('savePreview');
+      const diffEl = document.getElementById('saveDiff');
 
-      const nDevices = config.smarthome.filter((s) => s.accType !== 'energy-temperature').length;
-      const nEnergy = config.smarthome.filter((s) => s.accType === 'energy-temperature').length;
+      const nDevices = config.smarthome.filter((s) => s.accType !== 'energy-temperature' && s.accType !== 'energy-light').length;
+      const nEnergy = config.smarthome.filter((s) => s.accType === 'energy-temperature' || s.accType === 'energy-light').length;
       const nRouter = Object.keys((config.devices[0] && config.devices[0].options) || {}).length;
 
       // Mask password in preview for safety
@@ -755,6 +916,10 @@
       `;
 
       preview.textContent = JSON.stringify(maskedConfig, null, 2);
+
+      // Phase G: render diff against the config that was on disk when the
+      // wizard opened, so the user sees exactly what will change.
+      diffEl.innerHTML = renderConfigDiff(config, wizardState.existingConfig);
     }
 
     const saveBtn = document.getElementById('saveBtn');
@@ -911,13 +1076,50 @@
         '-2': { current_power: 'Aktuelle Einspeisung', total_energy: 'Gesamt Einspeisung' },
       };
 
+      // Phase G: index existing OBIS tiles by AIN so we can preserve the
+      // user's custom tile names instead of resetting to "Aktuelle Einspeisung"
+      // etc. on every wizard re-run. Existing config may store one OR two
+      // entries per sub-AIN (current_power, total_energy) — we keep whatever
+      // is there and only fill in the missing channel with the default name.
+      const existingObisByAin = {};
+      const existingShAll = (wizardState.existingConfig && wizardState.existingConfig.smarthome) || [];
+      for (const e of existingShAll) {
+        if (!e || !e.ain) continue;
+        if (e.accType !== 'energy-temperature' && e.accType !== 'energy-light') continue;
+        if (!existingObisByAin[e.ain]) existingObisByAin[e.ain] = [];
+        existingObisByAin[e.ain].push({
+          obisChannel: e.obisChannel || 'current_power',
+          name: e.name,
+        });
+      }
+
       // Initialize state for each OBIS AIN if not already there
       for (const baseAin of Object.keys(byBase)) {
         const group = byBase[baseAin];
         for (const dir of ['-1', '-2']) {
           const entry = dir === '-1' ? group.ain1 : group.ain2;
           if (!entry) continue;
-          if (!wizardState.energyTiles[entry.ain]) {
+          if (wizardState.energyTiles[entry.ain]) continue;
+
+          const existingTiles = existingObisByAin[entry.ain];
+          if (existingTiles && existingTiles.length > 0) {
+            // Phase G: rebuild from existing config, preserving names.
+            // Ensure both channels exist (wizard UI always renders 2 tiles
+            // per sub-AIN — current_power first, total_energy second).
+            const byChan = {};
+            for (const t of existingTiles) byChan[t.obisChannel] = t;
+            const tiles = [
+              {
+                obisChannel: 'current_power',
+                name: (byChan.current_power && byChan.current_power.name) || defaultNames[dir].current_power,
+              },
+              {
+                obisChannel: 'total_energy',
+                name: (byChan.total_energy && byChan.total_energy.name) || defaultNames[dir].total_energy,
+              },
+            ];
+            wizardState.energyTiles[entry.ain] = tiles;
+          } else {
             wizardState.energyTiles[entry.ain] = [
               { obisChannel: 'current_power', name: defaultNames[dir].current_power },
               { obisChannel: 'total_energy', name: defaultNames[dir].total_energy },

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pellebot/homebridge-fritz-platform-hb2",
   "displayName": "Homebridge FRITZ!Box Platform (HB2)",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "description": "Homebridge 2.0 plugin for AVM FRITZ!DECT devices (thermostats, lamps, sensors, OBIS smart-meter readers) and FRITZ!Box router switches (Guest WLAN, WPS). Node 22 / 24 ready.",
   "icon": "https://raw.githubusercontent.com/PelleBot/homebridge-fritz-platform-ng/main/branding/Icon.png",
   "type": "module",

package/src/accessories/smarthome/energy-meter/energy-meter.accessory.js

@@ -58,10 +58,7 @@ class Accessory {
         'Toggling not allowed for energy-meter (read-only sensor)',
         `${this.accessory.displayName} (${this.accessory.context.config.subtype})`
       );
-      setTimeout(
-        () => service.getCharacteristic(this.api.hap.Characteristic.On).updateValue(true),
-        1000
-      );
+      setTimeout(() => service.getCharacteristic(this.api.hap.Characteristic.On).updateValue(true), 1000);
     });
 
     // OutletInUse always true so the tile renders as active in HomeKit

package/src/accessories/smarthome/smarthome.config.js

@@ -1,7 +1,20 @@
 'use strict';
 
 const Config = (smarthomeConfig) => {
-  const validTypes = ['switch', 'contact', 'thermostat', 'lightbulb', 'temperature', 'window', 'blind', 'button', 'smoke', 'energy-meter', 'energy-temperature', 'energy-light'];
+  const validTypes = [
+    'switch',
+    'contact',
+    'thermostat',
+    'lightbulb',
+    'temperature',
+    'window',
+    'blind',
+    'button',
+    'smoke',
+    'energy-meter',
+    'energy-temperature',
+    'energy-light',
+  ];
   const validObisChannels = ['current_power', 'total_energy'];
   const validTypesGroup = ['switch', 'lightbulb', 'thermostat', 'switch-lightbulb'];
   const validButtons = [1, 4];

package/src/accessories/smarthome/smarthome.handler.js

@@ -687,9 +687,7 @@ class Handler {
         let service = accessory.getService(this.api.hap.Service.LightSensor);
 
         try {
-          let device = this.smarthomeList.devices.find((device) =>
-            device.ain.includes(accessory.context.config.ain)
-          );
+          let device = this.smarthomeList.devices.find((device) => device.ain.includes(accessory.context.config.ain));
           logger.debug(device, `${accessory.displayName} (${subtype})`);
 
           if (device) {
@@ -746,9 +744,7 @@ class Handler {
         let service = accessory.getService(this.api.hap.Service.TemperatureSensor);
 
         try {
-          let device = this.smarthomeList.devices.find((device) =>
-            device.ain.includes(accessory.context.config.ain)
-          );
+          let device = this.smarthomeList.devices.find((device) => device.ain.includes(accessory.context.config.ain));
           logger.debug(device, `${accessory.displayName} (${subtype})`);
 
           if (device) {
@@ -814,9 +810,7 @@ class Handler {
         let service = accessory.getService(this.api.hap.Service.Outlet);
 
         try {
-          let device = this.smarthomeList.devices.find((device) =>
-            device.ain.includes(accessory.context.config.ain)
-          );
+          let device = this.smarthomeList.devices.find((device) => device.ain.includes(accessory.context.config.ain));
           logger.debug(device, `${accessory.displayName} (${subtype})`);
 
           if (device) {
@@ -833,13 +827,9 @@ class Handler {
                 const currentPower = Math.abs(device.powermeter.power || 0);
                 const totalEnergy = device.powermeter.energy || 0;
 
-                service
-                  .getCharacteristic(this.api.hap.Characteristic.CurrentConsumption)
-                  .updateValue(currentPower);
+                service.getCharacteristic(this.api.hap.Characteristic.CurrentConsumption).updateValue(currentPower);
 
-                service
-                  .getCharacteristic(this.api.hap.Characteristic.TotalConsumption)
-                  .updateValue(totalEnergy);
+                service.getCharacteristic(this.api.hap.Characteristic.TotalConsumption).updateValue(totalEnergy);
 
                 service.getCharacteristic(this.api.hap.Characteristic.On).updateValue(true);
                 service.getCharacteristic(this.api.hap.Characteristic.OutletInUse).updateValue(true);

package/src/platform.js

@@ -76,7 +76,9 @@ function FritzPlatform(log, config, api) {
   HistoryService.prototype.addEntry = function () {};
   HistoryService.prototype.cleanPersist = function () {};
   HistoryService.prototype.setExtraPersistedData = function () {};
-  HistoryService.prototype.getExtraPersistedData = function () { return null; };
+  HistoryService.prototype.getExtraPersistedData = function () {
+    return null;
+  };
 
   this.api = api;
   this.log = log;
@@ -209,9 +211,9 @@ FritzPlatform.prototype = {
         else if (device.subtype === 'smarthome-window-switch')
           new SHWindowSwitchAccessory(this.api, accessory, this.accessories, this.meshMaster);
         else if (device.subtype === 'smarthome-lightbulb')
-            new SHLightbulbAccessory(this.api, accessory, this.accessories, this.meshMaster);
+          new SHLightbulbAccessory(this.api, accessory, this.accessories, this.meshMaster);
         else if (device.subtype === 'smarthome-smoke')
-            new SHSmokeAccessory(this.api, accessory, this.accessories, this.meshMaster, HistoryService);
+          new SHSmokeAccessory(this.api, accessory, this.accessories, this.meshMaster, HistoryService);
         else if (device.subtype === 'smarthome-switch-lightbulb' && device.energy)
           new SHOutletLightbulbAccessory(this.api, accessory, this.accessories, this.meshMaster, HistoryService);
         else if (device.subtype === 'smarthome-switch-lightbulb' && !device.energy)

package/src/types/custom.types.js

@@ -47,82 +47,105 @@ exports.registerWith = (hap) => {
 
   // ---- WiFi toggles ----
   declare('WifiTwo', 'WIFI 2.4GHZ', '0026e147-5d51-4f42-b157-6aca6050be8e', {
-    format: 'bool', perms: PR_PW_EV,
+    format: 'bool',
+    perms: PR_PW_EV,
   });
   declare('WifiFive', 'WIFI 5GHZ', 'a72aeeca-c6ce-45ce-b026-5d400aab5fc9', {
-    format: 'bool', perms: PR_PW_EV,
+    format: 'bool',
+    perms: PR_PW_EV,
   });
   declare('WifiGuest', 'WIFI Guest', 'a87bbf2b-885c-4713-8169-22abdbf0b2a1', {
-    format: 'bool', perms: PR_PW_EV,
+    format: 'bool',
+    perms: PR_PW_EV,
   });
   declare('WifiWPS', 'WIFI WPS', '991dd58c-7d8c-46b1-acd1-411d8f6902ac', {
-    format: 'bool', perms: PR_PW_EV,
+    format: 'bool',
+    perms: PR_PW_EV,
   });
 
   // ---- FritzBox device toggles ----
   declare('Reconnect', 'Reconnect', 'ce1cb310-d2d8-4cd1-9686-c6f2aba6ad15', {
-    format: 'bool', perms: PR_PW_EV,
+    format: 'bool',
+    perms: PR_PW_EV,
   });
   declare('DECT', 'DECT Station', '1718fc65-453b-403a-ab81-79a1c96ba195', {
-    format: 'bool', perms: PR_PW_EV,
+    format: 'bool',
+    perms: PR_PW_EV,
   });
   declare('AnsweringMachine', 'Answering Machine', 'd19ef9d5-3bc6-47ac-b6bb-7bdcf0df20b0', {
-    format: 'bool', perms: PR_PW_EV,
+    format: 'bool',
+    perms: PR_PW_EV,
   });
   declare('Deflection', 'Deflection', '658086c7-274c-4988-bd5e-3c720fa3054d', {
-    format: 'bool', perms: PR_PW_EV,
+    format: 'bool',
+    perms: PR_PW_EV,
   });
   declare('WakeUp', 'Wake Up', 'c60a4aa9-cefb-4c61-8185-ad2b3ba52842', {
-    format: 'bool', perms: PR_PW_EV,
+    format: 'bool',
+    perms: PR_PW_EV,
   });
 
   // ---- Device-control toggles ----
   declare('DeviceLED', 'LED', 'fd81f0dc-4324-457e-8164-289743873fb1', {
-    format: 'bool', perms: PR_PW_EV,
+    format: 'bool',
+    perms: PR_PW_EV,
   });
   declare('DeviceLock', 'Device Lock', '56af4239-46bc-4bae-b55b-dbc5be2d0897', {
-    format: 'bool', perms: PR_PW_EV,
+    format: 'bool',
+    perms: PR_PW_EV,
   });
   declare('RingLock', 'Ring Lock', 'cab7d43e-422c-4452-bc9a-11c89454332b', {
-    format: 'bool', perms: PR_PW_EV,
+    format: 'bool',
+    perms: PR_PW_EV,
   });
 
   // ---- Phone & alarm ----
   declare('PhoneBook', 'Refresh Phone Book', '8f9aeaa4-092f-4c3a-85f1-dfd064a07c3d', {
-    format: 'bool', perms: PR_PW_EV,
+    format: 'bool',
+    perms: PR_PW_EV,
   });
   declare('DialAlarm', 'Alarm', '8fe6e841-41e4-479f-b334-8af339ce5b30', {
-    format: 'bool', perms: PR_PW_EV,
+    format: 'bool',
+    perms: PR_PW_EV,
   });
 
   // ---- Network ----
   declare('DNSServer', 'DNS Server', 'c34f1eb0-92bb-44a8-b399-17f2599639f1', {
-    format: 'bool', perms: PR_PW_EV,
+    format: 'bool',
+    perms: PR_PW_EV,
   });
   declare('FallbackInternet', 'Internet Fallback', 'ef088934-4ec8-4174-b550-e8a8faaed88c', {
-    format: 'bool', perms: PR_PW_EV,
+    format: 'bool',
+    perms: PR_PW_EV,
   });
 
   // ---- Read-only display (callmonitor is out of scope but the router
   // accessory may still reference Caller/Called via Service.ContactSensor
   // optionals — registering here keeps router/router.accessory.js safe). ----
   declare('Caller', 'Last Caller', 'eb0b2d83-569b-44aa-989d-190a911b4397', {
-    format: 'string', perms: PR_EV,
+    format: 'string',
+    perms: PR_EV,
   });
   declare('Called', 'Last Called', 'cf42e4a1-ff61-4aa6-9cc5-55d3c09cfbbd', {
-    format: 'string', perms: PR_EV,
+    format: 'string',
+    perms: PR_EV,
   });
 
   // ---- Bandwidth / connection stats ----
   declare('Download', 'Download', '37574b8e-2d7c-47ee-8b5e-6bfc42f195d9', {
-    format: 'string', perms: PR_EV,
+    format: 'string',
+    perms: PR_EV,
   });
   declare('Upload', 'Upload', '9b2e94f7-a665-4575-9efd-1b37474d758b', {
-    format: 'string', perms: PR_EV,
+    format: 'string',
+    perms: PR_EV,
   });
   declare('Ping', 'Ping', 'ce18aaef-1026-4538-943b-026501599dc0', {
-    format: 'float', perms: PR_EV,
-    maxValue: 9999, minValue: 0, minStep: 0.1,
+    format: 'float',
+    perms: PR_EV,
+    maxValue: 9999,
+    minValue: 0,
+    minStep: 0.1,
   });
 
   // NOTE on Service.Switch: original file overrode the built-in HAP Switch

package/src/types/eve.types.js

@@ -49,58 +49,83 @@ exports.registerWith = (hap) => {
   // History-related (used by fakegato-history; our stub no-ops them but
   // accessory code may still reference these as registered types).
   declare('ResetTotal', 'Reset Total', 'E863F112-079E-48FF-8F27-9C2605A29F52', {
-    format: 'uint32', unit: 'seconds', perms: PR_EV_PW,
+    format: 'uint32',
+    unit: 'seconds',
+    perms: PR_EV_PW,
   });
   declare('HistoryStatus', 'History Status', 'E863F116-079E-48FF-8F27-9C2605A29F52', {
-    format: 'data', perms: PR_EV_PW,
+    format: 'data',
+    perms: PR_EV_PW,
   });
   declare('HistoryEntries', 'History Entries', 'E863F117-079E-48FF-8F27-9C2605A29F52', {
-    format: 'data', perms: PR_EV_PW,
+    format: 'data',
+    perms: PR_EV_PW,
   });
   declare('HistoryRequest', 'History Request', 'E863F11C-079E-48FF-8F27-9C2605A29F52', {
-    format: 'data', perms: PR_EV_PW,
+    format: 'data',
+    perms: PR_EV_PW,
   });
   declare('SetTime', 'Set Time', 'E863F121-079E-48FF-8F27-9C2605A29F52', {
-    format: 'data', perms: PR_EV_PW,
+    format: 'data',
+    perms: PR_EV_PW,
   });
 
   // Window / contact sensor (Eve-extended)
   declare('LastActivation', 'Last Activation', 'E863F11A-079E-48FF-8F27-9C2605A29F52', {
-    format: 'uint32', unit: 'seconds', perms: PR_EV,
+    format: 'uint32',
+    unit: 'seconds',
+    perms: PR_EV,
   });
   declare('TimesOpened', 'Times Opened', 'E863F129-079E-48FF-8F27-9C2605A29F52', {
-    format: 'uint32', perms: PR_EV,
+    format: 'uint32',
+    perms: PR_EV,
   });
   declare('OpenDuration', 'Open Duration', 'E863F118-079E-48FF-8F27-9C2605A29F52', {
-    format: 'uint32', unit: 'seconds', perms: PR_EV_PW,
+    format: 'uint32',
+    unit: 'seconds',
+    perms: PR_EV_PW,
   });
   declare('ClosedDuration', 'Closed Duration', 'E863F119-079E-48FF-8F27-9C2605A29F52', {
-    format: 'uint32', unit: 'seconds', perms: PR_EV_PW,
+    format: 'uint32',
+    unit: 'seconds',
+    perms: PR_EV_PW,
   });
 
   // Outlet / energy (Eve-extended)
   declare('CurrentConsumption', 'Current Consumption', 'E863F10D-079E-48FF-8F27-9C2605A29F52', {
-    format: 'float', unit: 'W', perms: PR_EV,
+    format: 'float',
+    unit: 'W',
+    perms: PR_EV,
   });
   declare('TotalConsumption', 'Total Consumption', 'E863F10C-079E-48FF-8F27-9C2605A29F52', {
-    format: 'float', unit: 'kWh', perms: PR_EV,
+    format: 'float',
+    unit: 'kWh',
+    perms: PR_EV,
   });
   declare('Volts', 'Volts', 'E863F10A-079E-48FF-8F27-9C2605A29F52', {
-    format: 'float', unit: 'V', perms: PR_EV,
+    format: 'float',
+    unit: 'V',
+    perms: PR_EV,
   });
   declare('Amperes', 'Amperes', 'E863F126-079E-48FF-8F27-9C2605A29F52', {
-    format: 'float', unit: 'A', perms: PR_EV,
+    format: 'float',
+    unit: 'A',
+    perms: PR_EV,
   });
 
   // Thermostat (Eve-extended)
   declare('ValvePosition', 'Valve Position', 'E863F12E-079E-48FF-8F27-9C2605A29F52', {
-    format: 'uint8', unit: 'percentage', perms: PR_EV,
+    format: 'uint8',
+    unit: 'percentage',
+    perms: PR_EV,
   });
   declare('ProgramCommand', 'Program Command', 'E863F12C-079E-48FF-8F27-9C2605A29F52', {
-    format: 'data', perms: ['pw'],
+    format: 'data',
+    perms: ['pw'],
   });
   declare('ProgramData', 'Program Data', 'E863F12F-079E-48FF-8F27-9C2605A29F52', {
-    format: 'data', perms: PR_EV,
+    format: 'data',
+    perms: PR_EV,
   });
 
   // NOTE: The original file overrode Service.Outlet, Service.Thermostat,