homebridge-openwrt-control 0.4.0 → 0.4.1

package/CHANGELOG.md

@@ -9,6 +9,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - After update to v0.1.0 the plugin need to be reconfigured!
 
+## [0.4.1] - (25.09.2026)
+
+### Changes
+
+- fix: Home Assistant radio entities had the same name on routers with two radios of one band (two `Wi-Fi 5 GHz`), radios are now named by band and radio number (`5 GHz Radio 0`, `Restart 5 GHz Radio 0`, `Channel 5 GHz Radio 0`), SSIDs get the radio added when the same network is on two radios of one band (`Dom 5 GHz Radio 2`). Entity ids do not change
+- readme update
+
 ## [0.4.0] - (25.09.2026)
 
 ### Changes

package/README.md

@@ -154,12 +154,12 @@ With `mqtt.haDiscovery` the router appears in Home Assistant as one device with
 | Entity | Type | Description |
 | --- | --- | --- |
 | `WAN` | binary_sensor (connectivity) | WAN interface up, `Internet` on routers without a `wan` interface |
-| `Wi-Fi 2.4 GHz`, `Wi-Fi 5 GHz`... | switch | Radio on/off |
-| `<SSID> <band>` | switch | SSID on/off |
-| `Restart Wi-Fi <band>` | button (restart) | Radio restart |
+| `2.4 GHz Radio 0`, `5 GHz Radio 1`... | switch | Radio on/off, named by band and radio number |
+| `<SSID> <band>` | switch | SSID on/off, the radio is added (`Dom 5 GHz Radio 2`) when the same network is on two radios of one band |
+| `Restart <band> Radio <n>` | button (restart) | Radio restart |
 | `Reboot`, `Reload network`, `Reload Wi-Fi` | button | System reboot, network and wireless reload |
 | `Wi-Fi clients`, `<SSID> <band> clients` | sensor | Connected clients, total and per SSID |
-| `Channel <band>`, `TX power <band>` | sensor (diagnostic) | Current radio channel and TX power in dBm |
+| `Channel <band> Radio <n>`, `TX power <band> Radio <n>` | sensor (diagnostic) | Current radio channel and TX power in dBm |
 | `WAN IP`, `Firmware`, `Last boot`, `Load`, `Memory usage` | sensor (diagnostic) | System information |
 | `<SSID> <band> QR code` | image | QR code to join the network, only with `mqtt.haWifiQr` |
 

package/package.json

@@ -1,7 +1,7 @@
 {
     "displayName": "OpenWrt Control",
     "name": "homebridge-openwrt-control",
-    "version": "0.4.0",
+    "version": "0.4.1",
     "description": "Homebridge plugin to control OpenWrt flashed devices.",
     "license": "MIT",
     "author": "grzegorz914",

package/src/hadiscovery.js

@@ -164,25 +164,30 @@ class HaDiscovery {
         button('network_reload', { NetworkReload: true }, { name: 'Reload network', icon: 'mdi:lan-pending', entity_category: 'config' });
         button('wireless_reload', { WirelessReload: true }, { name: 'Reload Wi-Fi', icon: 'mdi:wifi-refresh', entity_category: 'config' });
 
-        // Radios
+        // Radios, named by band and radio number (5 GHz Radio 0), tri-band routers have two radios of one band
         for (const radio of info.wirelessRadios ?? []) {
             const id = radio.name;
             const key = this.key(id);
-            const label = BandLabel[radio.band] ?? id;
+            const label = this.radioLabel(radio);
             const radioInfo = ext.radios?.[id] ?? {};
-            toggle(`radio_${key}`, id, 'Radio', { name: `Wi-Fi ${label}`, icon: 'mdi:wifi', value_template: `{{ 'ON' if value_json.radios['${id}'].on else 'OFF' }}` });
-            button(`radio_${key}_restart`, { RadioRestart: { id } }, { name: `Restart Wi-Fi ${label}`, device_class: 'restart', entity_category: 'config' });
+            toggle(`radio_${key}`, id, 'Radio', { name: label, icon: 'mdi:wifi', value_template: `{{ 'ON' if value_json.radios['${id}'].on else 'OFF' }}` });
+            button(`radio_${key}_restart`, { RadioRestart: { id } }, { name: `Restart ${label}`, device_class: 'restart', entity_category: 'config' });
             if (this.has(`radio_${key}_channel`, radioInfo.channel != null)) sensor(`radio_${key}_channel`, { name: `Channel ${label}`, icon: 'mdi:access-point', entity_category: 'diagnostic', value_template: state(`.radios['${id}'].channel`) });
             if (this.has(`radio_${key}_txpower`, radioInfo.txpower != null)) sensor(`radio_${key}_txpower`, { name: `TX power ${label}`, icon: 'mdi:signal', unit_of_measurement: 'dBm', state_class: 'measurement', entity_category: 'diagnostic', value_template: state(`.radios['${id}'].txpower`) });
         }
 
         // SSIDs, the id is the UCI section so renaming the network keeps the entity
+        // SSIDs named by network and band (Dom 5 GHz), the radio is added when the same network is on two radios of one band
         const uci = info.wirelessInfo?.values ?? {};
+        const ssidBand = (ssid) => `${ssid.name} ${BandLabel[ssid.band] ?? ssid.radio ?? ''}`.trim();
+        const ssidLabels = (info.wirelessSsids ?? []).map(ssidBand);
         for (const ssid of info.wirelessSsids ?? []) {
             if (!ssid.section || !ssid.name) continue;
             const id = ssid.section;
             const key = this.key(id);
-            const label = `${ssid.name} ${BandLabel[ssid.band] ?? ssid.radio ?? ''}`.trim();
+            const radio = (info.wirelessRadios ?? []).find(r => r.name === ssid.radio);
+            const duplicate = ssidLabels.filter(label => label === ssidBand(ssid)).length > 1;
+            const label = duplicate && radio ? `${ssid.name} ${this.radioLabel(radio)}` : ssidBand(ssid);
             toggle(`ssid_${key}`, id, 'Ssid', { name: label, icon: 'mdi:wifi-lock', value_template: `{{ 'ON' if value_json.ssids['${id}'].on else 'OFF' }}` });
             if (clientsAvailable && (ssid.mode ?? 'ap') === 'ap') sensor(`ssid_${key}_clients`, { name: `${label} clients`, icon: 'mdi:account-multiple', state_class: 'measurement', value_template: state(`.ssids['${id}'].clients`) });
 
@@ -248,6 +253,14 @@ class HaDiscovery {
         return qr.createSvgTag({ cellSize: 8, margin: 4, scalable: true });
     }
 
+    // 5 GHz Radio 0, the number from the radio name (radio0), other names as they are
+    radioLabel(radio) {
+        const number = String(radio.name).match(/^radio(\d+)$/)?.[1];
+        const band = BandLabel[radio.band];
+        const name = number !== undefined ? `Radio ${number}` : radio.name;
+        return band ? `${band} ${name}` : name;
+    }
+
     // Object id part of a radio or UCI section name
     key(id) {
         return String(id).replace(/[^a-zA-Z0-9_-]/g, '_');