homebridge-openwrt-control 0.0.2-beta.47 → 0.0.2-beta.48

package/index.js

@@ -67,7 +67,6 @@ class OpenWrtPlatform {
             .on('start', async () => {
               try {
 
-                const refreshInterval = (deviceConfig.refreshInterval ?? 5) * 1000;
                 const openWrt = new OpenWrt(deviceConfig)
                   .on('success', msg => logLevel.success && log.success(`Device: ${host}, ${msg}`))
                   .on('info', msg => log.info(`Device: ${host} ${name}, ${msg}`))
@@ -82,6 +81,7 @@ class OpenWrtPlatform {
                 }
 
                 // start openwrt impulse generator
+                const refreshInterval = (deviceConfig.refreshInterval ?? 5) * 1000;
                 await openWrt.impulseGenerator.state(true, [{ name: 'connect', sampling: refreshInterval }], false);
 
                 const configuredDevices = [];
@@ -96,10 +96,10 @@ class OpenWrtPlatform {
 
                   if (!DeviceClass) {
                     if (logLevel.warn) log.warn(`Device: ${host} ${name}, class not found for: ${device}`);
-                    return;
+                    continue;
                   }
 
-                  const type = new DeviceClass(api, deviceConfig, openWrt, openWrtInfo)
+                  const type = new DeviceClass(api, deviceConfig)
                     .on('devInfo', msg => logLevel.devInfo && log.info(msg))
                     .on('success', msg => logLevel.success && log.success(`Device: ${host} ${name}, ${msg}`))
                     .on('info', msg => log.info(`Device: ${host} ${name}, ${msg}`))
@@ -107,15 +107,15 @@ class OpenWrtPlatform {
                     .on('warn', msg => log.warn(`Device: ${host} ${name}, ${msg}`))
                     .on('error', msg => log.error(`Device: ${host} ${name}, ${msg}`));
 
-                  const accessory = await type.start();
+                  const accessory = await type.start(openWrt, openWrtInfo);
                   if (accessory) {
                     api.publishExternalAccessories(PluginName, [accessory]);
                     if (logLevel.success) log.success(`Device: ${host} ${name}, Published as external accessory.`);
                   }
-
-                  // stop accessory impulse generator
-                  await impulseGenerator.state(false);
                 }
+
+                // stop accessory impulse generator
+                await impulseGenerator.state(false);
               } catch (error) {
                 if (logLevel.error) log.error(`Device: ${host} ${name}, Start impulse generator error: ${error.message ?? error}, trying again.`);
               }

package/package.json

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

package/src/accesspoint.js

@@ -25,9 +25,7 @@ class AccessPoint extends EventEmitter {
         this.mqttConnected = false;
 
         //openwrt
-        this.openWrt = openWrt;
-        this.openWrtInfo = openWrtInfo;
-        this.ssids = openWrtInfo.ssids;
+
     };
 
     async externalIntegrations() {
@@ -185,7 +183,11 @@ class AccessPoint extends EventEmitter {
     };
 
     //start
-    async start() {
+    async start(openWrt, openWrtInfo) {
+        this.openWrt = openWrt;
+        this.openWrtInfo = openWrtInfo;
+        this.ssids = openWrtInfo.ssids;
+
         try {
             //start external integrations
             if (this.restFul.enable || this.mqtt.enable) await this.externalIntegrations();