homebridge-openwrt-control 0.0.2-beta.25 → 0.0.2-beta.27

package/index.js

@@ -69,10 +69,10 @@ class OpenWrtPlatform {
 
         const openWrt = new OpenWrt(deviceConfig)
           .on('success', msg => logLevel.success && log.success(`Device: ${host}, ${msg}`))
-          .on('info', msg => log.info(`Device: ${host}, ${msg}`))
-          .on('debug', msg => log.info(`Device: ${host}, debug: ${msg}`))
-          .on('warn', msg => log.warn(`Device: ${host}, ${msg}`))
-          .on('error', msg => log.error(`Device: ${host}, ${msg}`))
+          .on('info', msg => log.info(`Device: ${host} ${name}, ${msg}`))
+          .on('debug', msg => log.info(`Device: ${host} ${name}, debug: ${msg}`))
+          .on('warn', msg => log.warn(`Device: ${host} ${name}, ${msg}`))
+          .on('error', msg => log.error(`Device: ${host} ${name}, ${msg}`))
 
         const openWrtInfo = await openWrt.connect();
         if (!openWrtInfo.state) {

package/package.json

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

package/src/apdevice.js

@@ -1,7 +1,7 @@
 import EventEmitter from 'events';
 let Accessory, Characteristic, Service, Categories, AccessoryUUID;
 
-class AccessPointDevice extends EventEmitter {
+class AccessPoint extends EventEmitter {
     constructor(api, config, openWrt, openWrtInfo) {
         super();
 
@@ -12,6 +12,7 @@ class AccessPointDevice extends EventEmitter {
         AccessoryUUID = api.hap.uuid;
 
         //config
+        this.host = config.host;
         this.name = config.accessPoint.name || openWrtInfo.systemInfo.hostname;
         this.accessPoint = config.accessPoint;
         this.logInfo = config.log?.info || false;
@@ -121,22 +122,22 @@ class AccessPointDevice extends EventEmitter {
             //prepare accessory
             if (this.logDebug) this.emit('debug', `prepare accessory`);
             const accessoryName = this.name;
-            const accessoryUUID = AccessoryUUID.generate(this.openWrtInfo.systemInfo.hostname);
+            const accessoryUUID = AccessoryUUID.generate(`${this.host}${this.openWrtInfo.systemInfo.hostname}`);
             const accessoryCategory = Categories.AIRPORT;
             const accessory = new Accessory(accessoryName, accessoryUUID, accessoryCategory);
 
             //prepare information service
             if (this.logDebug) this.emit('debug', `prepare information service`);
             accessory.getService(Service.AccessoryInformation)
-                .setCharacteristic(Characteristic.Manufacturer, 'OpenWrt')
+                .setCharacteristic(Characteristic.Manufacturer, this.openWrtInfo.systemInfo.release.distribution || 'OpenWrt')
                 .setCharacteristic(Characteristic.Model, this.openWrtInfo.systemInfo.model)
                 .setCharacteristic(Characteristic.SerialNumber, this.openWrtInfo.systemInfo.system)
-                .setCharacteristic(Characteristic.FirmwareRevision, this.openWrtInfo.systemInfo.release?.description)
+                .setCharacteristic(Characteristic.FirmwareRevision, this.openWrtInfo.systemInfo.release?.version)
                 .setCharacteristic(Characteristic.ConfiguredName, accessoryName);
 
             if (this.logDebug) this.emit('debug', `prepare service`);
 
-            //device
+            //services
             this.services = [];
             for (const ssid of this.ssids) {
                 const name = ssid.name;
@@ -192,39 +193,42 @@ class AccessPointDevice extends EventEmitter {
             if (this.restFul.enable || this.mqtt.enable) await this.externalIntegrations();
 
             this.emit('devInfo', `-------- Access Point ${this.name} --------`);
-            this.emit('devInfo', `Name: ${this.openWrtInfo.systemInfo.hostname}`);
-            this.emit('devInfo', `Model: ${this.openWrtInfo.systemInfo.model}`);
+            this.emit('devInfo', `Model: ${this.openWrtInfo.systemInfo.model || this.openWrtInfo.systemInfo.board_name}`);
             this.emit('devInfo', `System: ${this.openWrtInfo.systemInfo.system}`);
+            this.emit('devInfo', `Kernel: ${this.openWrtInfo.systemInfo.kernel}`);
             this.emit('devInfo', `Firmware: ${this.openWrtInfo.systemInfo.release?.description}`);
+            this.emit('devInfo', `Target: ${this.openWrtInfo.systemInfo.release?.target}`);
+            this.emit('devInfo', `SSIDs: ${this.ssids.length}`);
             this.emit('devInfo', `----------------------------------`);
 
             //openwrt client
             this.openWrt.on('systemInfo', (info) => {
-                this.informationService?.updateCharacteristic(Characteristic.FirmwareRevision, info.release?.description);
+                this.informationService?.updateCharacteristic(Characteristic.FirmwareRevision, info.release?.version);
             })
                 .on('wirelessStatus', async (status) => {
                 })
                 .on('wirelessRadios', async (radios) => {
                 })
                 .on('ssids', async (ssids) => {
+                    this.ssids = ssids;
+
                     // sensors
                     for (let i = 0; i < ssids.length; i++) {
                         const ssid = ssids[i];
-
-                        const name = ssid[i].name;
-                        const state = ssid[i].state;
+                        const name = ssid.name;
+                        const state = ssid.state;
                         const serviceName = this.accessPoint.namePrefix ? `${this.name} ${name}` : name;
                         this.services?.[i]
                             ?.setCharacteristic(Characteristic.ConfiguredName, serviceName)
                             .updateCharacteristic(Characteristic.On, state);
 
                         this.sensorServices?.[i]
-                            ?.setCharacteristic(Characteristic.ConfiguredName, name)
-                            .updateCharacteristic(Characteristic.ContactSensorState, state ? 0 : 1);
+                            ?.setCharacteristic(Characteristic.ConfiguredName, serviceName)
+                            .updateCharacteristic(Characteristic.ContactSensorState, !state);
 
                         if (this.logInfo) {
-                            this.emit('info', `SSID name: ${ssid.name}`);
-                            this.emit('info', `Name: ${ssid.state}`);
+                            this.emit('info', `Name: ${ssid.name}`);
+                            this.emit('info', `State: ${ssid.state}`);
                             this.emit('info', `Mode: ${ssid.mode}`);
                         }
                     }
@@ -244,4 +248,4 @@ class AccessPointDevice extends EventEmitter {
         }
     }
 };
-export default AccessPointDevice;
+export default AccessPoint;

package/src/openwrt.js

@@ -102,23 +102,35 @@ 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 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 []; // pomijamy wszystko inne
+                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
+                }];
+            });
             this.emit('systemInfo', systemInfo);
             this.emit('wirelessStatus', wirelessStatus);
-            this.emit('wirelessRadios', wirelessRadios);
+            //this.emit('wirelessRadios', wirelessRadios);
             this.emit('ssids', ssids);
 
             if (this.firstRun) {
@@ -129,10 +141,9 @@ class OpenWrt extends EventEmitter {
             openWrtInfo.state = true;
             openWrtInfo.systemInfo = systemInfo;
             openWrtInfo.wirelessStatus = wirelessStatus;
-            openWrtInfo.wirelessRadios = wirelessRadios;
+            //openWrtInfo.wirelessRadios = wirelessRadios;
             openWrtInfo.ssids = ssids;
 
-            if (this.logDebug) this.emit('debug', `OpenWrt Data: ${JSON.stringify(openWrtInfo, null, 2)}`);
             return openWrtInfo;
         } catch (error) {
             if (this.logError) this.emit('error', `Connect error: ${error.message}`);
@@ -175,5 +186,4 @@ class OpenWrt extends EventEmitter {
     }
 }
 
-export default OpenWrt;
-
+export default OpenWrt;

package/src/swdevice.js

@@ -1,7 +1,7 @@
 import EventEmitter from 'events';
 let Accessory, Characteristic, Service, Categories, AccessoryUUID;
 
-class SwitchDevice extends EventEmitter {
+class Switch extends EventEmitter {
     constructor(api, config, openWrt, openWrtInfo) {
         super();
 
@@ -12,8 +12,9 @@ class SwitchDevice extends EventEmitter {
         AccessoryUUID = api.hap.uuid;
 
         //config
-        this.name = config.switch.name || openWrtInfo.systemInfo.hostname;
-        this.switch = config.switch;
+        this.host = config.host;
+        this.name = config.accessPoint.name || openWrtInfo.systemInfo.hostname;
+        this.accessPoint = config.accessPoint;
         this.logInfo = config.log?.info || false;
         this.logDebug = config.log?.debug || false;
 
@@ -121,29 +122,29 @@ class SwitchDevice extends EventEmitter {
             //prepare accessory
             if (this.logDebug) this.emit('debug', `prepare accessory`);
             const accessoryName = this.name;
-            const accessoryUUID = AccessoryUUID.generate(this.openWrtInfo.systemInfo.hostname);
-            const accessoryCategory = Categories.ROUTER;
+            const accessoryUUID = AccessoryUUID.generate(`${this.host}${this.openWrtInfo.systemInfo.hostname}`);
+            const accessoryCategory = Categories.AIRPORT;
             const accessory = new Accessory(accessoryName, accessoryUUID, accessoryCategory);
 
             //prepare information service
             if (this.logDebug) this.emit('debug', `prepare information service`);
             accessory.getService(Service.AccessoryInformation)
-                .setCharacteristic(Characteristic.Manufacturer, 'OpenWrt')
+                .setCharacteristic(Characteristic.Manufacturer, this.openWrtInfo.systemInfo.release.distribution || 'OpenWrt')
                 .setCharacteristic(Characteristic.Model, this.openWrtInfo.systemInfo.model)
                 .setCharacteristic(Characteristic.SerialNumber, this.openWrtInfo.systemInfo.system)
-                .setCharacteristic(Characteristic.FirmwareRevision, this.openWrtInfo.systemInfo.release?.description)
+                .setCharacteristic(Characteristic.FirmwareRevision, this.openWrtInfo.systemInfo.release?.version)
                 .setCharacteristic(Characteristic.ConfiguredName, accessoryName);
 
             if (this.logDebug) this.emit('debug', `prepare service`);
 
-            //device
+            //services
             this.services = [];
             for (const port of this.ports) {
                 const name = port.name;
                 if (this.logDebug) this.emit('debug', `prepare port: ${name} service`);
 
-                const serviceName = this.accessPoint.namePrefix ? `${accessoryName} ${ssidName}` : ssidName;
-                const service = accessory.addService(Service.Switch, serviceName, `service${ssidName}`);
+                const serviceName = this.accessPoint.namePrefix ? `${accessoryName} ${name}` : name;
+                const service = accessory.addService(Service.Switch, serviceName, `service${name}`);
                 service.addOptionalCharacteristic(Characteristic.ConfiguredName);
                 service.setCharacteristic(Characteristic.ConfiguredName, serviceName);
                 service.getCharacteristic(Characteristic.On)
@@ -191,39 +192,44 @@ class SwitchDevice extends EventEmitter {
             //start external integrations
             if (this.restFul.enable || this.mqtt.enable) await this.externalIntegrations();
 
-            this.emit('devInfo', `-------- Switch ${this.name} --------`);
-            this.emit('devInfo', `Name: ${this.openWrtInfo.systemInfo.hostname}`);
-            this.emit('devInfo', `Model: ${this.openWrtInfo.systemInfo.model}`);
+            this.emit('devInfo', `-------- Access Point ${this.name} --------`);
+            this.emit('devInfo', `Model: ${this.openWrtInfo.systemInfo.model || this.openWrtInfo.systemInfo.board_name}`);
             this.emit('devInfo', `System: ${this.openWrtInfo.systemInfo.system}`);
+            this.emit('devInfo', `Kernel: ${this.openWrtInfo.systemInfo.kernel}`);
             this.emit('devInfo', `Firmware: ${this.openWrtInfo.systemInfo.release?.description}`);
+            this.emit('devInfo', `Target: ${this.openWrtInfo.systemInfo.release?.target}`);
+            this.emit('devInfo', `Ports: ${this.ports.length}`);
             this.emit('devInfo', `----------------------------------`);
 
             //openwrt client
             this.openWrt.on('systemInfo', (info) => {
-                this.informationService?.updateCharacteristic(Characteristic.FirmwareRevision, info.release?.description);
+                this.informationService?.updateCharacteristic(Characteristic.FirmwareRevision, info.release?.version);
             })
-                .on('switchStatus', async (status) => {
+                .on('wirelessStatus', async (status) => {
                 })
-                .on('switchPorts', async (ports) => {
+                .on('wirelessRadios', async (radios) => {
+                })
+                .on('ports', async (ports) => {
+                    this.ports = ports;
+
                     // sensors
                     for (let i = 0; i < ports.length; i++) {
                         const port = ports[i];
-
-                        const name = port[i].name;
-                        const state = port[i].state;
+                        const name = port.name;
+                        const state = port.state;
                         const serviceName = this.accessPoint.namePrefix ? `${this.name} ${name}` : name;
                         this.services?.[i]
                             ?.setCharacteristic(Characteristic.ConfiguredName, serviceName)
                             .updateCharacteristic(Characteristic.On, state);
 
                         this.sensorServices?.[i]
-                            ?.setCharacteristic(Characteristic.ConfiguredName, name)
-                            .updateCharacteristic(Characteristic.ContactSensorState, state ? 0 : 1);
+                            ?.setCharacteristic(Characteristic.ConfiguredName, serviceName)
+                            .updateCharacteristic(Characteristic.ContactSensorState, !state);
 
                         if (this.logInfo) {
-                            this.emit('info', `Port name: ${port.name}`);
-                            this.emit('info', `Name: ${port.state}`);
-                            this.emit('info', `Mode: ${port.mode}`);
+                            this.emit('info', `Name: ${ports.name}`);
+                            this.emit('info', `State: ${ports.state}`);
+                            this.emit('info', `Mode: ${ports.mode}`);
                         }
                     }
                 })
@@ -242,4 +248,4 @@ class SwitchDevice extends EventEmitter {
         }
     }
 };
-export default SwitchDevice;
+export default Switch;