homebridge-openwrt-control 0.3.5 → 0.3.6-beta.0

package/package.json

@@ -1,7 +1,7 @@
 {
     "displayName": "OpenWrt Control",
     "name": "homebridge-openwrt-control",
-    "version": "0.3.5",
+    "version": "0.3.6-beta.0",
     "description": "Homebridge plugin to control OpenWrt flashed devices.",
     "license": "MIT",
     "author": "grzegorz914",
@@ -30,12 +30,12 @@
         "LICENSE"
     ],
     "engines": {
-        "homebridge": "^1.8.0 || ^2.0.0 || ^2.0.0-beta.80 || ^2.0.0-alpha.63",
-        "node": "^20 || ^22 || ^24 || ^25"
+        "homebridge": "^1.8.0 || ^2.0.0",
+        "node": "^20 || ^22 || ^24 || ^25 || ^26"
     },
     "dependencies": {
         "mqtt": "^5.15.1",
-        "axios": "^1.15.0",
+        "axios": "^1.16.0",
         "express": "^5.2.1"
     },
     "keywords": [

package/src/openwrt.js

@@ -1,14 +1,13 @@
 import EventEmitter from 'events';
 import axios from 'axios';
-import Functions from './functions.js';
 import ImpulseGenerator from './impulsegenerator.js';
-import { AclPath, AclData } from './constants.js';
 
 class OpenWrt extends EventEmitter {
     constructor(config) {
         super();
         this.user = config.auth?.user || 'root';
         this.passwd = config.auth?.passwd;
+        this.logWarn = config.log?.warn;
         this.logError = config.log?.error;
         this.logDebug = config.log?.debug;
 
@@ -16,8 +15,6 @@ class OpenWrt extends EventEmitter {
         this.sessionId = null;
         this.sessionExpiresAt = 0;
 
-        this.functions = new Functions();
-
         const baseUrl = `http://${config.host}/ubus`;
         this.axiosInstance = axios.create({
             baseURL: baseUrl,

package/src/restful.js

@@ -72,7 +72,7 @@ class RestFul extends EventEmitter {
     }
 
     update(path, data) {
-        if (this.restFulData.hasOwnProperty(path)) {
+        if (Object.hasOwn(this.restFulData, path)) {
             this.restFulData[path] = data;
         } else {
             if (this.logWarn) this.emit('warn', `Unknown RESTFul update path: ${path}, data: ${JSON.stringify(data)}`);

package/src/router.js

@@ -27,6 +27,7 @@ class Router extends EventEmitter {
         this.buttons = (config.buttons ?? []).filter(b => (b.displayType ?? 0) > 0);
         this.logDeviceInfo = config.log?.deviceInfo || false;
         this.logInfo = config.log?.info || false;
+        this.logWarn = config.log?.warn || false;
         this.logDebug = config.log?.debug || false;
 
         // external integrations
@@ -184,6 +185,7 @@ class Router extends EventEmitter {
         if (this.restFul.enable) {
             this.restFul1 = new RestFul({
                 port: this.restFul.port || 3000,
+                logWarn: this.logWarn,
                 logDebug: this.logDebug
             })
                 .on('connected', msg => {
@@ -206,6 +208,7 @@ class Router extends EventEmitter {
                 prefix: this.mqtt.prefix ? `${this.openWrtInfo.systemInfo.model}/${this.mqtt.prefix}/${this.name}` : `${this.openWrtInfo.systemInfo.model}/${this.name}`,
                 user: this.mqtt.auth?.user,
                 passwd: this.mqtt.auth?.passwd,
+                logWarn: this.logWarn,
                 logDebug: this.logDebug
             })
                 .on('connected', msg => {
@@ -228,11 +231,11 @@ class Router extends EventEmitter {
 
         switch (key) {
             case 'SystemReboot':
-                return this.openWrt.send('externalIntegration', null, null, null, 0);
+                return this.openWrt.send('externalIntegration', null, null, null, null, 0);
             case 'NetworkReload':
-                return this.openWrt.send('externalIntegration', null, null, null, 1);
+                return this.openWrt.send('externalIntegration', null, null, null, null, 1);
             case 'WirelessReload':
-                return this.openWrt.send('externalIntegration', null, null, null, 2);
+                return this.openWrt.send('externalIntegration', null, null, null, null, 2);
             default:
                 this.emit('warn', `${integration} unknown key ${key}`);
                 return false;
@@ -245,7 +248,7 @@ class Router extends EventEmitter {
         const radioId = `radio:${name}:${band}`;
         const convertedBand = band === '2g' ? '2.4GHz' : band === '5g' ? '5GHz' : '';
 
-        const getCurrent = () => this.openWrtInfo.wirelessSsids.find(r => r.name === name && r.band === band);
+        const getCurrent = () => this.openWrtInfo.wirelessRadios.find(r => r.name === name && r.band === band);
 
         // control
         if (this.wirelessRadioControl.displayType > 0) {
@@ -301,11 +304,11 @@ class Router extends EventEmitter {
             service.getCharacteristic(Characteristic.ConfiguredName)
                 .onGet(async () => {
                     const current = getCurrent();
-                    return current.name;
+                    return current?.name ?? name;
                 })
                 .onSet(async (value) => {
                     const current = getCurrent();
-                    if (current.name === value) return;
+                    if (!current || current.name === value) return;
 
                     await this.openWrt.send('ssid', radio, name, value, !current.disabled, null, false); //{type, radioName, ssidName, newSsidName, state, command, restart}
                 });
@@ -394,7 +397,7 @@ class Router extends EventEmitter {
                     if (!state) return;
 
                     button.state = true;
-                    await this.openWrt.send('button', null, null, null, button.command, false); //{type, radioName, ssidName, newSsidName, state, command, restart}
+                    await this.openWrt.send('button', null, null, null, null, button.command, false); //{type, radioName, ssidName, newSsidName, state, command, restart}
                     setTimeout(() => {
                         button.state = false;
                         buttonService.updateCharacteristic(Characteristic.On, false);