homebridge-openwrt-control 0.0.2 → 0.0.3-beta.0

package/README.md

@@ -28,9 +28,9 @@
 ## About The Plugin
 
 * Access Points:
-  * Control `ON/OFF` every SSID.
-  * Monitor with Sensors for every `SSIDs`.
-* Siri can be used to switch ON/OFF SSIDs, Policy, Ports.
+  * Control `ON/OFF` all exposed SSID.
+  * Contact sensor monitor for all `SSIDs`.
+* Siri can be used to switch ON/OFF SSIDs.
 * Home automations and shortcuts can be used for all functions.
 
 ## Configuration
@@ -52,11 +52,16 @@
 | `auth.enable` | If enabled, authorizatins credentials will be used for login. |
 | `auth.user` | Here set the authorization `Username`. |
 | `auth.passwd` | Here set the authorization `Password`. |
-| `accessPoint{}` | Volume object. |
-| `accessPoint.enable` | Here enable access point `SSIDs` control. |
-| `accessPoint.name` | Here set Your own volume/mute control name or leave empty. |
-| `accessPoint.namePrefix` | Here enable accessory name as a prefix for volume control name. |
-| `accessPoint.sensor` | Here enable access point `SSIDs` sensors. |
+| `apDevice{}` | Access Point. |
+| `apDevice.enable` | Here enable access point `SSIDs` control. |
+| `apDevice.name` | Here set Your own access point name or leave empty. |
+| `apDevice.namePrefix` | Here enable accessory name as a prefix for access point name. |
+| `apDevice.sensor` | Here enable access point `SSIDs` sensors. |
+| `swDevice{}` | Switch object. |
+| `swDevice.enable` | Here enable switch `Ports` control. |
+| `swDevice.name` | Here set Your own name or for switch leave empty. |
+| `swDevice.namePrefix` | Here enable accessory name as a prefix for switch name. |
+| `swDevice.sensor` | Here enable switch `Ports` sensors. |
 | `refreshInterval` | Here set the data refresh time in seconds. |
 | `log.deviceInfo` | If enabled, log device info will be displayed by every connections device to the network. |
 | `log.success` | If enabled, success log will be displayed in console. |

package/package.json

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

package/src/accesspoint.js

@@ -40,10 +40,11 @@ class AccessPoint extends EventEmitter {
             // update state
             const ssids = openWrtInfo.ssids;
             for (let i = 0; i < ssids.length; i++) {
-                const ssid = ssids[i];
-                const name = ssid.name;
-                const state = ssid.state;
-                const serviceName = this.namePrefix ? `${this.name} ${name}` : name;
+                const radio = ssids[i].device;
+                const frequency = ssids[i].frequency;
+                const ssid = ssids[i].name;
+                const state = ssids[i].disabled;
+                const serviceName = this.namePrefix ? `${this.name} ${ssid}` : ssid;
                 this.services?.[i]
                     ?.setCharacteristic(Characteristic.ConfiguredName, serviceName)
                     .updateCharacteristic(Characteristic.On, state);
@@ -53,8 +54,10 @@ class AccessPoint extends EventEmitter {
                     .updateCharacteristic(Characteristic.ContactSensorState, state);
 
                 if (this.logInfo) {
-                    this.emit('info', `Name: ${ssid.name}`);
-                    this.emit('info', `State: ${ssid.state}`);
+                    this.emit('info', `Radio: ${radio}`);
+                    this.emit('info', `Frequency: ${frequency}`);
+                    this.emit('info', `Name: ${ssid}`);
+                    this.emit('info', `State: ${state}`);
                     this.emit('info', `Mode: ${ssid.mode}`);
                 }
             }
@@ -175,33 +178,34 @@ class AccessPoint extends EventEmitter {
             this.services = [];
             this.sensorServices = [];
             for (const ssid of this.openWrtInfo.ssids) {
+                const radio = ssid.device; //radio name
+                const frequency = ssid.frequency; //frequency
                 const name = ssid.name;
                 if (this.logDebug) this.emit('debug', `prepare ssid: ${name} service`);
 
-                const serviceName = this.namePrefix ? `${accessoryName} ${name}` : name;
-                const service = accessory.addService(Service.Switch, serviceName, `service${name}`);
+                const serviceName = this.namePrefix ? `${accessoryName} ${name} ${frequency}` : `${name} ${frequency}`;
+                const service = accessory.addService(Service.Switch, serviceName, `service${name}${radio}`);
                 service.addOptionalCharacteristic(Characteristic.ConfiguredName);
                 service.setCharacteristic(Characteristic.ConfiguredName, serviceName);
                 service.getCharacteristic(Characteristic.On)
                     .onGet(async () => {
-                        const state = ssid.state;
-                        if (this.logInfo) this.emit('message', `SSID: ${name}, state: ${state ? 'Enabled' : 'Disabled'}`);
+                        const state = ssid.disabled;
+                        if (this.logInfo) this.emit('message', `SSID: ${name}, radio: ${radio}, state: ${state ? 'Enabled' : 'Disabled'}`);
                         return state;
                     })
                     .onSet(async (state) => {
                         try {
-                            state = state ? true : false;
-                            await this.openWrt.send('ssid', name, state);
-                            if (this.logInfo) this.emit('message', `SSID: ${name}, set State: ${state ? 'Enabled' : 'Disabled'}`);
+                            await this.openWrt.send('apDevice', radio, name, state);
+                            if (this.logInfo) this.emit('message', `SSID: ${name}, radio: ${radio}, set State: ${state ? 'Enabled' : 'Disabled'}`);
                         } catch (error) {
-                            this.emit('warn', `SSID: ${name}, set state error: ${error}`);
+                            this.emit('warn', `SSID: ${name}, radio: ${radio}, set state error: ${error}`);
                         }
                     });
                 this.services.push(service);
 
                 if (this.sensorsEnabled) {
                     if (this.logDebug) this.emit('debug', `prepare ssid: ${name} sensor service`);
-                    const sensorService = accessory.addService(Service.ContactSensor, serviceName, `sensorService${name}`);
+                    const sensorService = accessory.addService(Service.ContactSensor, serviceName, `sensorService${name}${radio}`);
                     sensorService.addOptionalCharacteristic(Characteristic.ConfiguredName);
                     sensorService.setCharacteristic(Characteristic.ConfiguredName, serviceName);
                     sensorService.getCharacteristic(Characteristic.ContactSensorState)

package/src/functions.js

@@ -42,16 +42,5 @@ class Functions {
             throw wrappedError;
         }
     }
-
-    async findIfaceBySsid(status, targetSsid) {
-        for (const radio of Object.values(status.radios)) {
-            for (const iface of Object.values(radio.interfaces)) {
-                if (iface.ssid === targetSsid) {
-                    return iface;
-                }
-            }
-        }
-        return null;
-    }
 }
 export default Functions

package/src/openwrt.js

@@ -92,54 +92,84 @@ class OpenWrt extends EventEmitter {
 
     async connect() {
         try {
-            const openWrtInfo = { state: false, info: '', systemInfo: {}, networkInfo: {}, wirelessStatus: {}, wirelessRadios: [], ssids: [] }
+            const openWrtInfo = { state: false, info: '', systemInfo: {}, networkInfo: {}, wirelessStatus: {}, wirelessRadios: [], wirelessSsids: [] };
+
+            /* ======================
+             * System information
+             * ====================== */
             const systemInfo = await this.ubusCall('system', 'board');
             if (this.logDebug) this.emit('debug', `System info data: ${JSON.stringify(systemInfo, null, 2)}`);
 
-            //const networkInfo = await this.ubusCall('network.device', 'status', '{ "name": "eth0" }');
-            //const networkInfo = await this.ubusCall('file', 'read', { path: '/sys/class/net/eth0/address' });
-            //if (this.logDebug) this.emit('debug', `Network info data: ${networkInfo}`);
-
-            //const wirelessStatus = await this.ubusCall('network.wireless', 'status');
+            /* ======================
+             * Wireless configuration (UCI)
+             * ====================== */
             const wirelessStatus = await this.ubusCall('uci', 'get', { config: 'wireless' });
             if (this.logDebug) this.emit('debug', `Wireless status data: ${JSON.stringify(wirelessStatus, null, 2)}`);
 
-            //const wirelessRadios = Object.values(wirelessStatus.radios).map(radio => ({
-            //name: radio.name,
-            //state: radio.up === true,
-            //interfaces: Object.values(radio.interfaces).map(i => ({
-            //name: i.ssid,
-            //state: i.up === true,
-            //mode: i.mode
-            //}))
-            //}));
-
-            //const ssids = wirelessRadios.flatMap(radio => radio.interfaces);
-            const ssids = Object.entries(wirelessStatus.values || {}).flatMap(([key, data]) => {
-                if (!key.startsWith('wifinet') && !key.startsWith('default_radio')) return [];
-                return [{
-                    ifname: data['.name'] || key,
-                    name: data.ssid || null,
-                    device: data.device || null,
-                    mode: data.mode || null,
-                    hidden: data.hidden === '1' || data.hidden === true,
-                    state: true
-                }];
-            });
+            /* ======================
+             * Build radio frequency map
+             * ====================== */
+            const radioFreqMap = Object.entries(wirelessStatus.values || {})
+                .filter(([, data]) => data['.type'] === 'wifi-device')
+                .reduce((map, [key, data]) => {
+                    let freq = null;
+                    if (data.channel) {
+                        const ch = parseInt(data.channel, 10);
+                        freq = ch <= 14 ? '2.4GHz' : '5GHz';
+                    }
+                    map[data['.name']] = freq;
+                    return map;
+                }, {});
+
+            /* ======================
+             * SSID list with state + radioName + frequency
+             * ====================== */
+            const ifaceEntries = Object.entries(wirelessStatus.values || {}).filter(([, data]) => data['.type'] === 'wifi-iface');
+            const ssids = await Promise.all(
+                ifaceEntries.map(async ([key, data]) => {
+                    const ifaceName = data['.name'] || key;
+                    const radioName = data.device || null;
+                    const frequency = radioFreqMap[radioName] || null;
+
+                    let state = false;
+
+                    try {
+                        const ifaceConfig = await this.ubusCall('uci', 'get', { config: 'wireless', section: ifaceName });
+                        const values = ifaceConfig?.values || {};
+                        state = values.disabled === '1';
+                    } catch (error) {
+                        if (this.logError) this.emit('error', `UCI get failed for ${ifaceName}: ${error.message}`);
+                    }
+
+                    return {
+                        ifname: ifaceName,
+                        device: radioName,
+                        frequency,               // 2.4GHz / 5GHz
+                        ssid: data.ssid || null,
+                        mode: data.mode || null,
+                        hidden: data.hidden === '1' || data.hidden === true,
+                        disabled: state
+                    };
+                })
+            );
+
             if (ssids.length === 0) {
                 openWrtInfo.info = 'SSIDs not found';
                 return openWrtInfo;
             }
 
+            /* ======================
+             * Final object
+             * ====================== */
             openWrtInfo.state = true;
-            openWrtInfo.info = `Connect Success`;
+            openWrtInfo.info = 'Connect Success';
             openWrtInfo.systemInfo = systemInfo;
-            //openWrtInfo.networkInfo = networkInfo;
             openWrtInfo.wirelessStatus = wirelessStatus;
-            //openWrtInfo.wirelessRadios = wirelessRadios;
-            openWrtInfo.ssids = ssids;
+            openWrtInfo.wirelessSsids = ssids;
 
-            // emit data
+            /* ======================
+             * Emit & return
+             * ====================== */
             this.emit('openWrtInfo', openWrtInfo);
 
             return openWrtInfo;
@@ -148,39 +178,43 @@ class OpenWrt extends EventEmitter {
         }
     }
 
-    async send(type, ssidName, state) {
+    async send(type, radio, ssid, state) {
         switch (type) {
-            case 'ssid':
+            case 'apDevice':
                 await this.handleWithLock(async () => {
-                    if (this.logDebug) this.emit('debug', `${state ? 'Enabling' : 'Disabling'} SSID ${ssidName}`);
-
-                    const status = await this.ubusCall('network.wireless', 'status');
-                    const iface = await this.functions.findIfaceBySsid(status, ssidName);
-                    if (!iface) throw new Error(`SSID ${ssidName} not found`);
-
-                    const section = iface.section;
-                    if (!section) throw new Error(`No UCI section for SSID ${ssidName}`);
-
-                    await this.ubusCall('uci', 'set',
-                        {
-                            config: 'wireless',
-                            section: section,
-                            values: {
-                                disabled: state ? '0' : '1'
-                            }
+                    if (this.logDebug) this.emit('debug', `${state ? 'Enabling' : 'Disabling'} SSID ${ssid} on ${radio}`);
+
+                    // Pobranie konfiguracji wireless z UCI
+                    const wirelessConfig = await this.ubusCall('uci', 'get', { config: 'wireless' });
+
+                    // Wybór wszystkich pasujących iface po ssid + radio
+                    const ifaceEntries = Object.entries(wirelessConfig.values || {}).filter(([, data]) => data['.type'] === 'wifi-iface' && data.ssid === ssid && data.device === radio);
+                    if (ifaceEntries.length === 0) {
+                        throw new Error(`SSID ${ssid} not found on radio ${radio}`);
+                    }
+
+                    for (const [, ifaceData] of ifaceEntries) {
+                        const section = ifaceData['.name'];
+
+                        if (!section) {
+                            if (this.logWarn) this.emit('warn', `Skipping SSID ${ssid} on ${radio} (missing section)`);
+                            continue;
                         }
-                    );
 
+                        await this.ubusCall('uci', 'set', { config: 'wireless', section, values: { disabled: state ? '0' : '1' } });
+                    }
+
+                    // Commit + reload
                     await this.ubusCall('uci', 'commit', { config: 'wireless' });
                     await this.ubusCall('network.wireless', 'reload', {});
-
-                    if (this.logDebug) this.emit('debug', `Send SSID ${ssidName} ${state ? 'enabled' : 'disabled'}`);
+                    if (this.logDebug) this.emit('debug', `Send SSID ${ssid} on ${radio} ${state ? 'enabled' : 'disabled'}`);
                 });
                 break;
-            case 'switch':
+            case 'swDevice':
                 break;
         }
     }
+
 }
 
 export default OpenWrt;