homebridge-openwrt-control 0.0.2-beta.49 → 0.0.2-beta.50

package/index.js

@@ -67,7 +67,7 @@ class OpenWrtPlatform {
             .on('start', async () => {
               try {
 
-                const openWrt = new OpenWrt(deviceConfig)
+                let openWrt = new OpenWrt(deviceConfig)
                   .on('success', msg => logLevel.success && log.success(`Device: ${host}, ${msg}`))
                   .on('info', msg => log.info(`Device: ${host} ${name}, ${msg}`))
                   .on('debug', msg => log.info(`Device: ${host} ${name}, debug: ${msg}`))

package/package.json

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

package/src/accesspoint.js

@@ -13,8 +13,9 @@ class AccessPoint extends EventEmitter {
 
         //config
         this.host = config.host;
-        this.name = config.accessPoint.name || openWrtInfo.systemInfo.hostname;
-        this.accessPoint = config.accessPoint;
+        this.name = config.accessPoint?.name || openWrtInfo.systemInfo.hostname;
+        this.namePrefix = config.accessPoint?.namePrefix || false;
+        this.sensorsEnabled = config.accessPoint?.sensor || false
         this.logInfo = config.log?.info || false;
         this.logDebug = config.log?.debug || false;
 
@@ -47,7 +48,7 @@ class AccessPoint extends EventEmitter {
                     const ssid = ssids[i];
                     const name = ssid.name;
                     const state = ssid.state;
-                    const serviceName = this.accessPoint.namePrefix ? `${this.name} ${name}` : name;
+                    const serviceName = this.namePrefix ? `${this.name} ${name}` : name;
                     this.services?.[i]
                         ?.setCharacteristic(Characteristic.ConfiguredName, serviceName)
                         .updateCharacteristic(Characteristic.On, state);
@@ -185,7 +186,7 @@ class AccessPoint extends EventEmitter {
                 const name = ssid.name;
                 if (this.logDebug) this.emit('debug', `prepare ssid: ${name} service`);
 
-                const serviceName = this.accessPoint.namePrefix ? `${accessoryName} ${name}` : name;
+                const serviceName = this.namePrefix ? `${accessoryName} ${name}` : name;
                 const service = accessory.addService(Service.Switch, serviceName, `service${name}`);
                 service.addOptionalCharacteristic(Characteristic.ConfiguredName);
                 service.setCharacteristic(Characteristic.ConfiguredName, serviceName);
@@ -206,7 +207,7 @@ class AccessPoint extends EventEmitter {
                     });
                 this.services.push(service);
 
-                if (this.accessPoint.sensor) {
+                if (this.sensorsEnabled) {
                     if (this.logDebug) this.emit('debug', `prepare ssid: ${name} sensor service`);
                     const sensorService = accessory.addService(Service.ContactSensor, serviceName, `sensorService${name}`);
                     sensorService.addOptionalCharacteristic(Characteristic.ConfiguredName);

package/src/switch.js

@@ -14,7 +14,8 @@ class Switch extends EventEmitter {
         //config
         this.host = config.host;
         this.name = config.accessPoint.name || openWrtInfo.systemInfo.hostname;
-        this.accessPoint = config.accessPoint;
+        this.namePrefix = config.accessPoint?.namePrefix || false;
+        this.sensorsEnabled = config.accessPoint?.sensor || false
         this.logInfo = config.log?.info || false;
         this.logDebug = config.log?.debug || false;
 
@@ -28,6 +29,43 @@ class Switch extends EventEmitter {
         this.openWrt = openWrt;
         this.openWrtInfo = openWrtInfo;
         this.ssids = openWrtInfo.ssids;
+
+        //openwrt client
+        this.openWrt.on('systemInfo', (info) => {
+            this.informationService?.updateCharacteristic(Characteristic.FirmwareRevision, info.release?.version);
+        })
+            .on('networkInfo', async (info) => {
+            })
+            .on('ports', async (ports) => {
+                this.ports = ports;
+
+                // sensors
+                for (let i = 0; i < ports.length; i++) {
+                    const port = ports[i];
+                    const name = port.name;
+                    const state = port.state;
+                    const serviceName = this.namePrefix ? `${this.name} ${name}` : name;
+                    this.services?.[i]
+                        ?.setCharacteristic(Characteristic.ConfiguredName, serviceName)
+                        .updateCharacteristic(Characteristic.On, state);
+
+                    this.sensorServices?.[i]
+                        ?.setCharacteristic(Characteristic.ConfiguredName, serviceName)
+                        .updateCharacteristic(Characteristic.ContactSensorState, !state);
+
+                    if (this.logInfo) {
+                        this.emit('info', `Name: ${ports.name}`);
+                        this.emit('info', `State: ${ports.state}`);
+                        this.emit('info', `Mode: ${ports.mode}`);
+                    }
+                }
+            })
+            .on('restFul', (path, data) => {
+                if (this.restFulConnected) this.restFul1.update(path, data);
+            })
+            .on('mqtt', (topic, message) => {
+                if (this.mqttConnected) this.mqtt1.emit('publish', topic, message);
+            });
     };
 
     async externalIntegrations() {
@@ -144,7 +182,7 @@ class Switch extends EventEmitter {
                 const name = port.name;
                 if (this.logDebug) this.emit('debug', `prepare port: ${name} service`);
 
-                const serviceName = this.accessPoint.namePrefix ? `${accessoryName} ${name}` : name;
+                const serviceName = this.namePrefix ? `${accessoryName} ${name}` : name;
                 const service = accessory.addService(Service.Switch, serviceName, `service${name}`);
                 service.addOptionalCharacteristic(Characteristic.ConfiguredName);
                 service.setCharacteristic(Characteristic.ConfiguredName, serviceName);
@@ -165,7 +203,7 @@ class Switch extends EventEmitter {
                     });
                 this.services.push(service);
 
-                if (this.accessPoint.sensor) {
+                if (this.sensorsEnabled) {
                     if (this.logDebug) this.emit('debug', `prepare port: ${name} sensor service`);
 
                     const sensorService = accessory.addService(Service.ContactSensor, serviceName, `sensorService${name}`);
@@ -201,47 +239,6 @@ class Switch extends EventEmitter {
             this.emit('devInfo', `Ports: ${this.ports.length}`);
             this.emit('devInfo', `----------------------------------`);
 
-            //openwrt client
-            this.openWrt.on('systemInfo', (info) => {
-                this.informationService?.updateCharacteristic(Characteristic.FirmwareRevision, info.release?.version);
-            })
-                .on('networkInfo', async (info) => {
-                })
-                .on('wirelessStatus', async (status) => {
-                })
-                .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.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, serviceName)
-                            .updateCharacteristic(Characteristic.ContactSensorState, !state);
-
-                        if (this.logInfo) {
-                            this.emit('info', `Name: ${ports.name}`);
-                            this.emit('info', `State: ${ports.state}`);
-                            this.emit('info', `Mode: ${ports.mode}`);
-                        }
-                    }
-                })
-                .on('restFul', (path, data) => {
-                    if (this.restFulConnected) this.restFul1.update(path, data);
-                })
-                .on('mqtt', (topic, message) => {
-                    if (this.mqttConnected) this.mqtt1.emit('publish', topic, message);
-                });
-
             //prepare accessory
             const accessory = await this.prepareAccessory();
             return accessory;