homebridge-openwrt-control 0.0.2-beta.37 → 0.0.2-beta.38

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/package.json +1 -1
  2. package/src/openwrt.js +12 -26
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "displayName": "OpenWrt Control",
3
3
  "name": "homebridge-openwrt-control",
4
- "version": "0.0.2-beta.37",
4
+ "version": "0.0.2-beta.38",
5
5
  "description": "Homebridge plugin to control OpenWrt flashed devices.",
6
6
  "license": "MIT",
7
7
  "author": "grzegorz914",
package/src/openwrt.js CHANGED
@@ -98,36 +98,22 @@ class OpenWrt extends EventEmitter {
98
98
  if (this.logDebug) this.emit('debug', `System info data: ${JSON.stringify(systemInfo, null, 2)}`);
99
99
 
100
100
  const networkInfo = await this.ubusCall('network.device', 'status', { "name": "eth0" });
101
- //const networkInfo = await this.ubusCall('uci', 'get', { config: 'network.lan.macaddr' });
102
101
  if (this.logDebug) this.emit('debug', `Network info data: ${JSON.stringify(networkInfo, null, 2)}`);
103
102
 
104
- //const wirelessStatus = await this.ubusCall('network.wireless', 'status');
105
- const wirelessStatus = await this.ubusCall('uci', 'get', { config: 'wireless' });
103
+ const wirelessStatus = await this.ubusCall('network.wireless', 'status');
106
104
  if (this.logDebug) this.emit('debug', `Wireless status data: ${JSON.stringify(wirelessStatus, null, 2)}`);
107
105
 
108
- //const wirelessRadios = Object.values(wirelessStatus.radios).map(radio => ({
109
- //name: radio.name,
110
- //state: radio.up === true,
111
- //interfaces: Object.values(radio.interfaces).map(i => ({
112
- //name: i.ssid,
113
- //state: i.up === true,
114
- //mode: i.mode
115
- //}))
116
- //}));
117
-
118
- //const ssids = wirelessRadios.flatMap(radio => radio.interfaces);
119
- const ssids = Object.entries(wirelessStatus.values || {}).flatMap(([key, data]) => {
120
- if (!key.startsWith('wifinet')) return [];
121
- return [{
122
- ifname: data['.name'] || key,
123
- name: data.ssid || null,
124
- device: data.device || null,
125
- mode: data.mode || null,
126
- hidden: data.hidden === '1' || data.hidden === true,
127
- state: true
128
- }];
129
- });
130
-
106
+ const wirelessRadios = Object.values(wirelessStatus.radios).map(radio => ({
107
+ name: radio.name,
108
+ state: radio.up === true,
109
+ interfaces: Object.values(radio.interfaces).map(i => ({
110
+ name: i.ssid,
111
+ state: i.up === true,
112
+ mode: i.mode
113
+ }))
114
+ }));
115
+
116
+ const ssids = wirelessRadios.flatMap(radio => radio.interfaces);
131
117
  openWrtInfo.state = true;
132
118
  openWrtInfo.systemInfo = systemInfo;
133
119
  openWrtInfo.networkInfo = networkInfo;