homebridge-openwrt-control 0.0.2-beta.31 → 0.0.2-beta.33

package/index.js

@@ -1,8 +1,8 @@
 import { join } from 'path';
 import { mkdirSync, existsSync, writeFileSync } from 'fs';
 import OpenWrt from './src/openwrt.js';
-import AccessPoint from './src/apdevice.js';
-import Switch from './src/swdevice.js';
+import AccessPoint from './src/accesspoint.js';
+import Switch from './src/switch.js';
 import ImpulseGenerator from './src/impulsegenerator.js';
 import { PluginName, PlatformName } from './src/constants.js';
 
@@ -28,7 +28,7 @@ class OpenWrtPlatform {
       for (const deviceConfig of config.devices) {
         const { name, host, displayType } = deviceConfig;
         if (!name || !host || !displayType) {
-          log.warn(`Device: ${host || 'host missing'},  ${name || 'name missing'}, ${!displayType ? ', disply type disabled' : ''} in config, will not be published in the Home app`);
+          log.warn(`Device: ${host || 'host missing'},  ${name || 'name missing'}, ${!displayType ? ', display type disabled' : ''} in config, will not be published in the Home app`);
           continue;
         }
 
@@ -64,43 +64,35 @@ class OpenWrtPlatform {
         const refreshInterval = (deviceConfig.refreshInterval ?? 5) * 1000;
         if (deviceConfig.accessPoint?.enable) configuredDevices.push('accessPoint');
         if (deviceConfig.switch?.enable) configuredDevices.push('switch');
-        if (configuredDevices.length === 0) return;
-
-        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}`))
-          .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) {
-          if (logLevel.warn) log.warn(`Device: ${host} ${name}, no data received`);
-          return;
-        }
-
-        // start openwrt impulse generator
-        await openWrt.impulseGenerator.state(true, [{ name: 'connect', sampling: refreshInterval }], false);
+        if (configuredDevices.length === 0) continue;
+
+        try {
+          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}`))
+            .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) {
+            if (logLevel.warn) log.warn(`Device: ${host} ${name}, no data received`);
+            continue;
+          }
 
-        for (const device of configuredDevices) {
-          try {
+          // start openwrt impulse generator
+          await openWrt.impulseGenerator.state(true, [{ name: 'connect', sampling: refreshInterval }], false);
 
-            // create impulse generator
+          // create impulse generator for every device
+          for (const device of configuredDevices) {
             const impulseGenerator = new ImpulseGenerator()
               .on('start', async () => {
                 try {
 
-                  // create device instance
-                  let type;
-                  switch (device) {
-                    case 'accessPoint': type = new AccessPoint(api, deviceConfig, openWrt, openWrtInfo); break;
-                    case 'switch': type = new Switch(api, deviceConfig, openWrt, openWrtInfo); break;
-                    default:
-                      if (logLevel.warn) log.warn(`Device: ${host} ${name}, unknown device: ${device}`);
-                      return;
-                  }
-
-                  type
+                  // create device clases
+                  const DeviceClasses = { accessPoint: AccessPoint, switch: Switch };
+                  const DeviceClass = DeviceClasses[device];
+                  const type = new DeviceClass(api, deviceConfig, openWrt, openWrtInfo)
                     .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}`))
@@ -126,9 +118,9 @@ 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}`);
           }
+        } 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.31",
+    "version": "0.0.2-beta.33",
     "description": "Homebridge plugin to control OpenWrt flashed devices.",
     "license": "MIT",
     "author": "grzegorz914",

package/src/openwrt.js

@@ -67,9 +67,7 @@ class OpenWrt extends EventEmitter {
         });
 
         const result = response.data?.result?.[1];
-        if (!result?.ubus_rpc_session) {
-            throw new Error('ubus login failed');
-        }
+        if (!result?.ubus_rpc_session) throw new Error('Ubus login failed');
 
         this.sessionId = result.ubus_rpc_session;
         this.sessionExpiresAt = now + 240_000;
@@ -80,7 +78,6 @@ class OpenWrt extends EventEmitter {
 
     async ubusCall(service, method, params = {}) {
         const session = await this.login();
-
         const response = await this.axiosInstance.post('', {
             jsonrpc: '2.0',
             id: 2,
@@ -88,9 +85,7 @@ class OpenWrt extends EventEmitter {
             params: [session, service, method, params]
         });
 
-        if (response.data?.error) {
-            throw new Error(response.data.error.message || 'ubus call error');
-        }
+        if (response.data?.error) throw new Error(response.data.error.message || 'Ubus call error');
 
         return response.data.result[1];
     }
@@ -118,7 +113,7 @@ class OpenWrt extends EventEmitter {
 
             //const ssids = wirelessRadios.flatMap(radio => radio.interfaces);
             const ssids = Object.entries(wirelessStatus.values || {}).flatMap(([key, data]) => {
-                if (!key.startsWith('wifinet')) return []; // pomijamy wszystko inne
+                if (!key.startsWith('wifinet')) return [];
                 return [{
                     ifname: data['.name'] || key,
                     name: data.ssid || null,
@@ -128,15 +123,6 @@ class OpenWrt extends EventEmitter {
                     state: true
                 }];
             });
-            this.emit('systemInfo', systemInfo);
-            this.emit('wirelessStatus', wirelessStatus);
-            //this.emit('wirelessRadios', wirelessRadios);
-            this.emit('ssids', ssids);
-
-            if (this.firstRun) {
-                this.emit('success', `Connect success`);
-                this.firstRun = false;
-            }
 
             openWrtInfo.state = true;
             openWrtInfo.systemInfo = systemInfo;
@@ -144,6 +130,17 @@ class OpenWrt extends EventEmitter {
             //openWrtInfo.wirelessRadios = wirelessRadios;
             openWrtInfo.ssids = ssids;
 
+            if (this.firstRun) {
+                this.emit('success', `Connect success`);
+                this.firstRun = false;
+            }
+
+            // emit data
+            this.emit('systemInfo', systemInfo);
+            this.emit('wirelessStatus', wirelessStatus);
+            //this.emit('wirelessRadios', wirelessRadios);
+            this.emit('ssids', ssids);
+
             return openWrtInfo;
         } catch (error) {
             if (this.logError) this.emit('error', `Connect error: ${error.message}`);