homebridge-openwrt-control 0.0.2-beta.0 → 0.0.2-beta.1

package/package.json

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

package/src/apdevice.js

@@ -198,7 +198,7 @@ class AccessPointDevice extends EventEmitter {
             this.emit('devInfo', `Firmware: ${this.openWrtInfo.systemInfo.release?.description}`);
             this.emit('devInfo', `----------------------------------`);
 
-            //denon client
+            //openwrt client
             this.openWrt.on('systemInfo', (info) => {
                 this.informationService?.updateCharacteristic(Characteristic.FirmwareRevision, info.release?.description);
             })

package/src/openwrt.js

@@ -11,7 +11,8 @@ class OpenWrt extends EventEmitter {
         this.host = config.host;
         this.user = config.user;
         this.passwd = config.passwd;
-        this.logDebug = config.logDebug;
+        this.logError = config.log?.error;
+        this.logDebug = config.log?.debug;
 
         //external integration
         this.restFulEnabled = config.restFul?.enable || false;
@@ -98,40 +99,47 @@ class OpenWrt extends EventEmitter {
     }
 
     async connect() {
-        const openWrtInfo = { state: false, systemInfo: {}, wirelessStatus: {}, wirelessRadios: [], ssids: [] }
-        const systemInfo = await this.ubusCall("system", "board");
-        const wirelessStatus = await this.ubusCall("network.wireless", "status");
-        if (this.logDebug) this.emit("debug", `Status data: ${JSON.stringify(wirelessStatus, null, 2)}`);
-
-        const wirelessRadios = Object.values(status.radios).map(radio => ({
-            name: radio.name,
-            state: radio.up === true,
-            interfaces: Object.values(radio.interfaces).map(i => ({
-                name: i.ssid,
-                state: i.up === true,
-                mode: i.mode
-            }))
-        }));
+        try {
+            const openWrtInfo = { state: false, systemInfo: {}, wirelessStatus: {}, wirelessRadios: [], ssids: [] }
+            const systemInfo = await this.ubusCall("system", "board");
+            if (this.logDebug) this.emit("debug", `System info data: ${JSON.stringify(systemInfo, null, 2)}`);
+
+            const wirelessStatus = await this.ubusCall("network.wireless", "status");
+            if (this.logDebug) this.emit("debug", `Wireless status data: ${JSON.stringify(wirelessStatus, null, 2)}`);
+
+            const wirelessRadios = Object.values(status.radios).map(radio => ({
+                name: radio.name,
+                state: radio.up === true,
+                interfaces: Object.values(radio.interfaces).map(i => ({
+                    name: i.ssid,
+                    state: i.up === true,
+                    mode: i.mode
+                }))
+            }));
+
+            const ssids = wirelessRadios.flatMap(radio => radio.interfaces);
+            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;
+            }
 
-        const ssids = openWrtInfo.wirelessRadios.flatMap(radio => radio.interfaces);
-        this.emit("systemInfo", systemInfo);
-        this.emit("wirelessStatus", wirelessStatus);
-        this.emit("wirelessRadios", wirelessRadios);
-        this.emit("ssids", ssids);
+            openWrtInfo.state = true;
+            openWrtInfo.systemInfo = systemInfo;
+            openWrtInfo.wirelessStatus = wirelessStatus;
+            openWrtInfo.wirelessRadios = wirelessRadios;
+            openWrtInfo.ssids = ssids;
 
-        if (this.firstRun) {
-            this.emit("success", `Connect success`);
-            this.firstRun = false;
+            if (this.logDebug) this.emit("debug", `OpenWrt Data: ${JSON.stringify(openWrtInfo, null, 2)}`);
+            return openWrtInfo;
+        } catch (error) {
+            if (this.logError) this.emit("error", `Connect error: ${error.message}`);
+            return null;
         }
-
-        openWrtInfo.state = true;
-        openWrtInfo.systemInfo = systemInfo;
-        openWrtInfo.wirelessStatus = wirelessStatus;
-        openWrtInfo.wirelessRadios = wirelessRadios;
-        openWrtInfo.ssids = ssids;
-
-        if (this.logDebug) this.emit("debug", `OpenWrt Data: ${JSON.stringify(openWrtInfo, null, 2)}`);
-        return openWrtInfo;
     }
 
     async send(type, ssidName, state) {
@@ -160,7 +168,7 @@ class OpenWrt extends EventEmitter {
                     await this.ubusCall("uci", "commit", { config: "wireless" });
                     await this.ubusCall("network.wireless", "reload", {});
 
-                    this.emit("success", `SSID ${ssidName} ${state ? "enabled" : "disabled"}`);
+                    if (this.logDebug) this.emit("debug", `Send SSID ${ssidName} ${state ? "enabled" : "disabled"}`);
                 });
                 break;
             case 'switch':

package/src/swdevice.js

@@ -195,12 +195,12 @@ class SwitchDevice 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
+            //openwrt client
             this.openWrt.on('systemInfo', (info) => {
-                this.informationService?.updateCharacteristic(Characteristic.FirmwareRevision, info.release?.version);
+                this.informationService?.updateCharacteristic(Characteristic.FirmwareRevision, info.release?.description);
             })
                 .on('switchStatus', async (status) => {
                 })