homebridge-openwrt-control 0.0.2-beta.51 → 0.0.2-beta.53

package/index.js

@@ -61,13 +61,12 @@ class OpenWrtPlatform {
         }
 
         try {
-
           // create impulse generator for every device
           const impulseGenerator = new ImpulseGenerator()
             .on('start', async () => {
               try {
 
-                let openWrt = new OpenWrt(deviceConfig)
+                const 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}`))
@@ -126,7 +125,6 @@ class OpenWrtPlatform {
 
           // start accessory impulse generator
           await impulseGenerator.state(true, [{ name: 'start', sampling: 120000 }]);
-
         } catch (error) {
           if (logLevel.error) log.error(`Device: ${host} ${name}, Did finish launching error: ${error.message ?? error}`);
         }

package/package.json

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

package/src/accesspoint.js

@@ -1,4 +1,5 @@
 import EventEmitter from 'events';
+import DeviceUpdate from './deviceupdate.js';
 let Accessory, Characteristic, Service, Categories, AccessoryUUID;
 
 class AccessPoint extends EventEmitter {
@@ -12,6 +13,7 @@ class AccessPoint extends EventEmitter {
         AccessoryUUID = api.hap.uuid;
 
         //config
+        this.config = config;
         this.host = config.host;
         this.name = config.accessPoint?.name || openWrtInfo.systemInfo.hostname;
         this.namePrefix = config.accessPoint?.namePrefix || false;
@@ -31,46 +33,39 @@ class AccessPoint extends EventEmitter {
         this.ssids = openWrtInfo.ssids;
 
         //openwrt client
-        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('ssids', async (ssids) => {
-                this.ssids = ssids;
-
-                // sensors
-                for (let i = 0; i < ssids.length; i++) {
-                    const ssid = ssids[i];
-                    const name = ssid.name;
-                    const state = ssid.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: ${ssid.name}`);
-                        this.emit('info', `State: ${ssid.state}`);
-                        this.emit('info', `Mode: ${ssid.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);
-            });
 
+                openWrt.on('openWrtInfo', (openWrtInfo) => {
+                    this.informationService?.updateCharacteristic(Characteristic.FirmwareRevision, openWrtInfo.systemInfo.release?.version);
+                    const ssids = openWrtInfo.ssids;
+                    this.ssids = ssids;
+
+                    // sensors
+                    for (let i = 0; i < ssids.length; i++) {
+                        const ssid = ssids[i];
+                        const name = ssid.name;
+                        const state = ssid.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: ${ssid.name}`);
+                            this.emit('info', `State: ${ssid.state}`);
+                            this.emit('info', `Mode: ${ssid.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() {
@@ -242,6 +237,8 @@ class AccessPoint extends EventEmitter {
             this.emit('devInfo', `SSIDs: ${this.ssids.length}`);
             this.emit('devInfo', `----------------------------------`);
 
+
+
             //prepare accessory
             const accessory = await this.prepareAccessory();
             return accessory;

package/src/deviceupdate.js

@@ -0,0 +1,34 @@
+import EventEmitter from 'events';
+
+class AccessPoint extends EventEmitter {
+    constructor(config, openWrt) {
+        super();
+
+        //config
+        this.logInfo = config.log?.info || false;
+        this.logDebug = config.log?.debug || false;
+
+        //external integration
+        this.restFul = config.restFul || {};
+        this.mqtt = config.mqtt || {};
+
+        //openwrt client
+        //openwrt
+        this.client = openWrt;
+        openWrt.on('openWrtInfo', async (openWrtInfo) => {
+            await this.updateState(openWrtInfo);
+        });
+    };
+
+    async updateState(openWrtInfo) {
+        try {
+            const ssids = openWrtInfo.ssids;
+            this.emit('ssids', ssids);
+
+            return true;
+        } catch (error) {
+            throw new Error(`Chaeck state error: ${error.message}`);
+        };
+    }
+};
+export default AccessPoint;

package/src/openwrt.js

@@ -141,11 +141,7 @@ class OpenWrt extends EventEmitter {
             }
 
             // emit data
-            this.emit('systemInfo', systemInfo);
-            //this.emit('networkInfo', networkInfo);
-            this.emit('wirelessStatus', wirelessStatus);
-            //this.emit('wirelessRadios', wirelessRadios);
-            this.emit('ssids', ssids);
+            this.emit('openWrtInfo', openWrtInfo);
 
             return openWrtInfo;
         } catch (error) {

package/src/switch.js

@@ -26,12 +26,12 @@ class Switch extends EventEmitter {
         this.mqttConnected = false;
 
         //openwrt
-        this.openWrt = openWrt;
+        this.client = openWrt;
         this.openWrtInfo = openWrtInfo;
         this.ssids = openWrtInfo.ssids;
 
         //openwrt client
-        this.openWrt.on('systemInfo', (info) => {
+        openWrt.on('systemInfo', (info) => {
             this.informationService?.updateCharacteristic(Characteristic.FirmwareRevision, info.release?.version);
         })
             .on('networkInfo', async (info) => {
@@ -142,7 +142,7 @@ class Switch extends EventEmitter {
             switch (key) {
                 case 'Power':
                     const powerState = value ? 'ON' : 'OFF';
-                    set = await this.openWrt.send('Power', powerState);
+                    set = await this.client.send('Power', powerState);
                     break;
                 default:
                     this.emit('warn', `${integration}, received key: ${key}, value: ${value}`);