homebridge-openwrt-control 0.0.1-beta.4 → 0.0.2-beta.0

package/CHANGELOG.md

@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Warning
 
-## [0.0.1] - (16.1.2025)
+## [0.0.1] - (16.01.2026)
+
+## Changes
 
 - initial release (WLAN control)

package/package.json

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

package/src/apdevice.js

@@ -12,7 +12,7 @@ class AccessPointDevice extends EventEmitter {
         AccessoryUUID = api.hap.uuid;
 
         //config
-        this.name = config.name;
+        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,7 +121,7 @@ class AccessPointDevice extends EventEmitter {
             //prepare accessory
             if (this.logDebug) this.emit('debug', `prepare accessory`);
             const accessoryName = this.name;
-            const accessoryUUID = AccessoryUUID.generate(this.deviceUuid);
+            const accessoryUUID = AccessoryUUID.generate(this.openWrtInfo.systemInfo.hostname);
             const accessoryCategory = Categories.AIRPORT;
             const accessory = new Accessory(accessoryName, accessoryUUID, accessoryCategory);
 
@@ -129,9 +129,9 @@ class AccessPointDevice extends EventEmitter {
             if (this.logDebug) this.emit('debug', `prepare information service`);
             accessory.getService(Service.AccessoryInformation)
                 .setCharacteristic(Characteristic.Manufacturer, 'OpenWrt')
-                .setCharacteristic(Characteristic.Model, accessoryName)
-                .setCharacteristic(Characteristic.SerialNumber, this.networkId)
-                .setCharacteristic(Characteristic.FirmwareRevision, this.organizationId)
+                .setCharacteristic(Characteristic.Model, this.openWrtInfo.systemInfo.model)
+                .setCharacteristic(Characteristic.SerialNumber, this.openWrtInfo.systemInfo.system)
+                .setCharacteristic(Characteristic.FirmwareRevision, this.openWrtInfo.systemInfo.release?.description)
                 .setCharacteristic(Characteristic.ConfiguredName, accessoryName);
 
             if (this.logDebug) this.emit('debug', `prepare service`);
@@ -139,37 +139,37 @@ class AccessPointDevice extends EventEmitter {
             //device
             this.services = [];
             for (const ssid of this.ssids) {
-                const ssidName = ssid.name;
-                if (this.logDebug) this.emit('debug', `prepare ssid: ${ssidName} service`);
+                const name = ssid.name;
+                if (this.logDebug) this.emit('debug', `prepare ssid: ${name} service`);
 
-                const serviceName = this.accessPoint.namePrefix ? `${this.name} ${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)
                     .onGet(async () => {
                         const state = ssid.state;
-                        if (this.logInfo) this.emit('message', `SSID: ${ssidName}, state: ${state ? 'Enabled' : 'Disabled'}`);
+                        if (this.logInfo) this.emit('message', `SSID: ${name}, state: ${state ? 'Enabled' : 'Disabled'}`);
                         return state;
                     })
                     .onSet(async (state) => {
                         try {
                             state = state ? true : false;
-                            await this.openWrt.send('ssid', ssidName, state);
-                            if (this.logInfo) this.emit('message', `SSID: ${ssidName}, set State: ${state ? 'Enabled' : 'Disabled'}`);
+                            await this.openWrt.send('ssid', name, state);
+                            if (this.logInfo) this.emit('message', `SSID: ${name}, set State: ${state ? 'Enabled' : 'Disabled'}`);
                         } catch (error) {
-                            this.emit('warn', `SSID: ${ssidName}, set state error: ${error}`);
+                            this.emit('warn', `SSID: ${name}, set state error: ${error}`);
                         }
                     });
                 this.services.push(service);
 
                 if (this.accessPoint.sensor) {
-                    if (this.logDebug) this.emit('debug', `prepare ssid: ${ssidName} sensor service`);
+                    if (this.logDebug) this.emit('debug', `prepare ssid: ${name} sensor service`);
 
                     this.sensorServices = [];
-                    const sensorService = accessory.addService(Service.ContactSensor, ssidName, `sensorService${ssidName}`);
+                    const sensorService = accessory.addService(Service.ContactSensor, serviceName, `sensorService${name}`);
                     sensorService.addOptionalCharacteristic(Characteristic.ConfiguredName);
-                    sensorService.setCharacteristic(Characteristic.ConfiguredName, ssidName);
+                    sensorService.setCharacteristic(Characteristic.ConfiguredName, serviceName);
                     sensorService.getCharacteristic(Characteristic.ContactSensorState)
                         .onGet(async () => {
                             const state = ssid.state;
@@ -195,12 +195,12 @@ class AccessPointDevice extends EventEmitter {
             this.emit('devInfo', `Name: ${this.openWrtInfo.systemInfo.hostname}`);
             this.emit('devInfo', `Model: ${this.openWrtInfo.systemInfo.model}`);
             this.emit('devInfo', `System: ${this.openWrtInfo.systemInfo.system}`);
-            this.emit('devInfo', `Release: ${this.openWrtInfo.systemInfo.release?.description}`);
+            this.emit('devInfo', `Firmware: ${this.openWrtInfo.systemInfo.release?.description}`);
             this.emit('devInfo', `----------------------------------`);
 
             //denon client
             this.openWrt.on('systemInfo', (info) => {
-                this.informationService?.updateCharacteristic(Characteristic.FirmwareRevision, info.release?.version);
+                this.informationService?.updateCharacteristic(Characteristic.FirmwareRevision, info.release?.description);
             })
                 .on('wirelessStatus', async (status) => {
                 })

package/src/swdevice.js

@@ -12,7 +12,7 @@ class SwitchDevice extends EventEmitter {
         AccessoryUUID = api.hap.uuid;
 
         //config
-        this.name = config.name;
+        this.name = config.switch.name || openWrtInfo.systemInfo.hostname;
         this.switch = config.switch;
         this.logInfo = config.log?.info || false;
         this.logDebug = config.log?.debug || false;
@@ -121,58 +121,58 @@ class SwitchDevice extends EventEmitter {
             //prepare accessory
             if (this.logDebug) this.emit('debug', `prepare accessory`);
             const accessoryName = this.name;
-            const accessoryUUID = AccessoryUUID.generate(this.deviceUuid);
-            const accessoryCategory = Categories.AIRPORT;
+            const accessoryUUID = AccessoryUUID.generate(this.openWrtInfo.systemInfo.hostname);
+            const accessoryCategory = Categories.ROUTER;
             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.Model, accessoryName)
-                .setCharacteristic(Characteristic.SerialNumber, this.networkId)
-                .setCharacteristic(Characteristic.FirmwareRevision, this.organizationId)
+                .setCharacteristic(Characteristic.Model, this.openWrtInfo.systemInfo.model)
+                .setCharacteristic(Characteristic.SerialNumber, this.openWrtInfo.systemInfo.system)
+                .setCharacteristic(Characteristic.FirmwareRevision, this.openWrtInfo.systemInfo.release?.description)
                 .setCharacteristic(Characteristic.ConfiguredName, accessoryName);
 
             if (this.logDebug) this.emit('debug', `prepare service`);
 
             //device
             this.services = [];
-            for (const ssid of this.ssids) {
-                const ssidName = ssid.name;
-                if (this.logDebug) this.emit('debug', `prepare ssid: ${ssidName} service`);
+            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 ? `${this.name} ${ssidName}` : ssidName;
+                const serviceName = this.accessPoint.namePrefix ? `${accessoryName} ${ssidName}` : ssidName;
                 const service = accessory.addService(Service.Switch, serviceName, `service${ssidName}`);
                 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: ${ssidName}, state: ${state ? 'Enabled' : 'Disabled'}`);
+                        const state = port.state;
+                        if (this.logInfo) this.emit('message', `Port: ${name}, state: ${state ? 'Enabled' : 'Disabled'}`);
                         return state;
                     })
                     .onSet(async (state) => {
                         try {
                             state = state ? true : false;
-                            await this.openWrt.send('ssid', ssidName, state);
-                            if (this.logInfo) this.emit('message', `SSID: ${ssidName}, set State: ${state ? 'Enabled' : 'Disabled'}`);
+                            await this.openWrt.send('port', name, state);
+                            if (this.logInfo) this.emit('message', `Port: ${name}, set State: ${state ? 'Enabled' : 'Disabled'}`);
                         } catch (error) {
-                            this.emit('warn', `SSID: ${ssidName}, set state error: ${error}`);
+                            this.emit('warn', `Port: ${name}, set state error: ${error}`);
                         }
                     });
                 this.services.push(service);
 
                 if (this.accessPoint.sensor) {
-                    if (this.logDebug) this.emit('debug', `prepare ssid: ${ssidName} sensor service`);
+                    if (this.logDebug) this.emit('debug', `prepare port: ${name} sensor service`);
 
                     this.sensorServices = [];
-                    const sensorService = accessory.addService(Service.ContactSensor, ssidName, `sensorService${ssidName}`);
+                    const sensorService = accessory.addService(Service.ContactSensor, serviceName, `sensorService${name}`);
                     sensorService.addOptionalCharacteristic(Characteristic.ConfiguredName);
-                    sensorService.setCharacteristic(Characteristic.ConfiguredName, ssidName);
+                    sensorService.setCharacteristic(Characteristic.ConfiguredName, serviceName);
                     sensorService.getCharacteristic(Characteristic.ContactSensorState)
                         .onGet(async () => {
-                            const state = ssid.state;
+                            const state = port.state;
                             return state;
                         });
                     this.sensorServices.push(sensorService);
@@ -202,17 +202,15 @@ class SwitchDevice extends EventEmitter {
             this.openWrt.on('systemInfo', (info) => {
                 this.informationService?.updateCharacteristic(Characteristic.FirmwareRevision, info.release?.version);
             })
-                .on('wirelessStatus', async (status) => {
+                .on('switchStatus', async (status) => {
                 })
-                .on('wirelessRadios', async (radios) => {
-                })
-                .on('ssids', async (ssids) => {
+                .on('switchPorts', async (ports) => {
                     // sensors
-                    for (let i = 0; i < ssids.length; i++) {
-                        const ssid = ssids[i];
+                    for (let i = 0; i < ports.length; i++) {
+                        const port = ports[i];
 
-                        const name = ssid[i].name;
-                        const state = ssid[i].state;
+                        const name = port[i].name;
+                        const state = port[i].state;
                         const serviceName = this.accessPoint.namePrefix ? `${this.name} ${name}` : name;
                         this.services?.[i]
                             ?.setCharacteristic(Characteristic.ConfiguredName, serviceName)
@@ -223,9 +221,9 @@ class SwitchDevice extends EventEmitter {
                             .updateCharacteristic(Characteristic.ContactSensorState, state ? 0 : 1);
 
                         if (this.logInfo) {
-                            this.emit('info', `SSID name: ${ssid.name}`);
-                            this.emit('info', `Name: ${ssid.state}`);
-                            this.emit('info', `Mode: ${ssid.mode}`);
+                            this.emit('info', `Port name: ${port.name}`);
+                            this.emit('info', `Name: ${port.state}`);
+                            this.emit('info', `Mode: ${port.mode}`);
                         }
                     }
                 })