homebridge-openwrt-control 0.0.2-beta.41 → 0.0.2-beta.42

package/package.json

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

package/src/openwrt.js

@@ -85,8 +85,6 @@ class OpenWrt extends EventEmitter {
             params: [session, service, method, params]
         });
 
-        if (this.logDebug) this.emit('debug', `Response: ${JSON.stringify(response.data, null, 2)}`);
-
         if (response.data?.error) throw new Error(response.data.error.message || 'Ubus call error');
 
         return response.data.result[1];
@@ -99,28 +97,42 @@ class OpenWrt extends EventEmitter {
             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('network.device', 'status', '{ "name": "eth0" }');
+            const networkInfo = await this.ubusCall('uci', 'get', { config: 'network', section: 'lan', option: 'macaddr' });
             if (this.logDebug) this.emit('debug', `Network info data: ${JSON.stringify(networkInfo, null, 2)}`);
 
-            const wirelessStatus = await this.ubusCall('network.wireless', 'status');
+            //const wirelessStatus = await this.ubusCall('network.wireless', 'status');
+            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 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')) 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
+                }];
+            });
+
             openWrtInfo.state = true;
             openWrtInfo.systemInfo = systemInfo;
             openWrtInfo.networkInfo = networkInfo;
             openWrtInfo.wirelessStatus = wirelessStatus;
-            openWrtInfo.wirelessRadios = wirelessRadios;
+            //openWrtInfo.wirelessRadios = wirelessRadios;
             openWrtInfo.ssids = ssids;
 
             if (this.firstRun) {
@@ -132,7 +144,7 @@ class OpenWrt extends EventEmitter {
             this.emit('systemInfo', systemInfo);
             this.emit('networkInfo', networkInfo);
             this.emit('wirelessStatus', wirelessStatus);
-            this.emit('wirelessRadios', wirelessRadios);
+            //this.emit('wirelessRadios', wirelessRadios);
             this.emit('ssids', ssids);
 
             return openWrtInfo;