homebridge-openwrt-control 0.0.2-beta.2 → 0.0.2-beta.20

package/config.schema.json

@@ -4,7 +4,7 @@
   "singular": true,
   "fixArrays": true,
   "strictValidation": true,
-  "headerDisplay": "This plugin works with OpenWrt Devices based on Dashboard API. Devices are exposed to HomeKit as separate accessories and each needs to be manually paired.",
+  "headerDisplay": "This plugin works with OpenWrt flashed devices. Devices are exposed to HomeKit as separate accessories and each needs to be manually paired.",
   "footerDisplay": "For documentation please see [GitHub repository](https://github.com/grzegorz914/homebridge-openwrt-control).",
   "schema": {
     "type": "object",
@@ -111,7 +111,7 @@
                   "placeholder": "Name",
                   "description": "Here set the Name to be displayed in Homebridge/HomeKit for this access point.",
                   "condition": {
-                    "functionBody": "return model.devices[arrayIndices[0]].accessPoint.enable === true;"
+                    "functionBody": "return model.devices[arrayIndices].accessPoint.enable === true;"
                   }
                 },
                 "namePrefix": {
@@ -119,13 +119,13 @@
                   "type": "boolean",
                   "description": "Here enable/disable the accessory name as a prefix for the access point name.",
                   "condition": {
-                    "functionBody": "return model.devices[arrayIndices[0]].accessPoint.enable === true;"
+                    "functionBody": "return model.devices[arrayIndices].accessPoint.enable === true;"
                   }
                 },
                 "sensor": {
-                  "title": "Enable",
+                  "title": "Sensor",
                   "type": "boolean",
-                  "description": "Here Enable/Disable sensor for every ssid.",
+                  "description": "Here Enable/Disable sensor for every SSID.",
                   "condition": {
                     "functionBody": "return model.devices[arrayIndices].accessPoint.enable === true;"
                   }

package/index.js

@@ -26,34 +26,34 @@ class OpenWrtPlatform {
     }
 
     api.on('didFinishLaunching', async () => {
-      for (const config of config.devices) {
-        const { name, host, port, displayType } = config;
-        if (!name || !host || !port || !displayType) {
-          log.warn(`Device: ${host || 'host missing'},  ${name || 'name missing'}, ${port || 'port missing'}${!displayType ? ', disply type disabled' : ''} in config, will not be published in the Home app`);
+      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`);
           continue;
         }
 
         //log config
         const logLevel = {
-          devInfo: config.log?.deviceInfo,
-          success: config.log?.success,
-          info: config.log?.info,
-          warn: config.log?.warn,
-          error: config.log?.error,
-          debug: config.log?.debug
+          devInfo: deviceConfig.log?.deviceInfo,
+          success: deviceConfig.log?.success,
+          info: deviceConfig.log?.info,
+          warn: deviceConfig.log?.warn,
+          error: deviceConfig.log?.error,
+          debug: deviceConfig.log?.debug
         };
 
         if (logLevel.debug) {
           log.info(`Device: ${host} ${name}, did finish launching.`);
           const safeConfig = {
-            ...config,
+            ...deviceConfig,
             auth: {
-              ...config.auth,
+              ...deviceConfig.auth,
               passwd: 'removed',
             },
             mqtt: {
               auth: {
-                ...config.mqtt?.auth,
+                ...deviceConfig.mqtt?.auth,
                 passwd: 'removed',
               }
             },
@@ -61,13 +61,13 @@ class OpenWrtPlatform {
           log.info(`Device: ${host} ${name}, Config: ${JSON.stringify(safeConfig, null, 2)}`);
         }
 
-        const refreshInterval = (config.refreshInterval ?? 5) * 1000;
-        if (config.accessPoint?.enable) this.devices.push('accessPoint');
-        if (config.switch?.enable) this.devices.push('switch');
+        const refreshInterval = (deviceConfig.refreshInterval ?? 5) * 1000;
+        if (deviceConfig.accessPoint?.enable) this.devices.push('accessPoint');
+        if (deviceConfig.switch?.enable) this.devices.push('switch');
 
         if (this.devices.length === 0) return;
 
-        const openWrt = new OpenWrt(config)
+        const openWrt = new OpenWrt(deviceConfig)
           .on('success', msg => logLevel.success && log.success(`Device: ${host}, ${msg}`))
           .on('info', msg => log.info(`Device: ${host}, ${msg}`))
           .on('debug', msg => log.info(`Device: ${host}, debug: ${msg}`))
@@ -90,8 +90,8 @@ class OpenWrtPlatform {
                   // create device instance
                   let type;
                   switch (device) {
-                    case 'accessPoint': type = new AccessPoint(api, config, openWrt, openWrtInfo); break;
-                    case 'switch': type = new Switch(api, config, openWrt, openWrtInfo); break;
+                    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;

package/package.json

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

package/src/functions.js

@@ -1,6 +1,4 @@
 import { promises as fsPromises } from 'fs';
-import { DiacriticsMap } from './constants.js';
-
 class Functions {
     constructor() {
     }
@@ -45,28 +43,6 @@ class Functions {
         }
     }
 
-    async sanitizeString(str) {
-        if (!str) return '';
-
-        // Replace diacritics using map
-        str = str.replace(/[^\u0000-\u007E]/g, ch => DiacriticsMap[ch] || ch);
-
-        // Replace separators between words with space
-        str = str.replace(/(\w)[.:;+\-\/]+(\w)/g, '$1 $2');
-
-        // Replace remaining standalone separators with space
-        str = str.replace(/[.:;+\-\/]/g, ' ');
-
-        // Remove remaining invalid characters (keep letters, digits, space, apostrophe)
-        str = str.replace(/[^A-Za-z0-9 ']/g, ' ');
-
-        // Collapse multiple spaces
-        str = str.replace(/\s+/g, ' ');
-
-        // Trim
-        return str.trim();
-    }
-
     async findIfaceBySsid(status, targetSsid) {
         for (const radio of Object.values(status.radios)) {
             for (const iface of Object.values(radio.interfaces)) {

package/src/openwrt.js

@@ -1,16 +1,14 @@
-import EventEmitter from "events";
-import axios from "axios";
+import EventEmitter from 'events';
+import axios from 'axios';
 import Functions from './functions.js';
-import ImpulseGenerator from "./impulsegenerator.js";
+import ImpulseGenerator from './impulsegenerator.js';
 
 class OpenWrt extends EventEmitter {
     constructor(config) {
         super();
 
-        this.name = config.name;
-        this.host = config.host;
-        this.user = config.user;
-        this.passwd = config.passwd;
+        this.user = config.auth?.user || 'root';
+        this.passwd = config.auth?.passwd;
         this.logError = config.log?.error;
         this.logDebug = config.log?.debug;
 
@@ -26,7 +24,7 @@ class OpenWrt extends EventEmitter {
 
         this.functions = new Functions();
         this.axiosInstance = axios.create({
-            baseURL: `${config.host}/ubus`,
+            baseURL: `http://${config.host}/ubus'`,
             timeout: 5000,
             headers: {
                 "Content-Type": "application/json"
@@ -34,11 +32,11 @@ class OpenWrt extends EventEmitter {
         });
 
         this.impulseGenerator = new ImpulseGenerator()
-            .on("connect", () => this.handleWithLock(async () => {
+            .on('connect', () => this.handleWithLock(async () => {
                 await this.connect();
             }))
-            .on("state", (state) => {
-                this.emit(state ? "success" : "warn", `Impulse generator ${state ? "started" : "stopped"}`);
+            .on('state', (state) => {
+                this.emit(state ? 'success' : 'warn', `Impulse generator ${state ? 'started' : 'stopped'}`);
             });
     }
 
@@ -49,8 +47,7 @@ class OpenWrt extends EventEmitter {
         try {
             await fn();
         } catch (error) {
-            this.emit("error", `Impulse generator error: ${error.message}`
-            );
+            this.emit('error', `Impulse generator error: ${error.message}`);
         } finally {
             this.lock = false;
         }
@@ -62,52 +59,54 @@ class OpenWrt extends EventEmitter {
             return this.sessionId;
         }
 
-        const response = await this.axiosInstance.post("", {
-            jsonrpc: "2.0",
+        this.emit('debug', `Login: ${this.user} ${this.passwd}`)
+        const response = await this.axiosInstance.post('', {
+            jsonrpc: '2.0',
             id: 1,
-            method: "call",
-            params: ["00000000000000000000000000000000", "session", "login", { username: this.user, password: this.passwd }]
+            method: 'call',
+            params: ['00000000000000000000000000000000', 'session', 'login', { username: this.user, password: this.passwd }]
         });
 
         const result = response.data?.result?.[1];
         if (!result?.ubus_rpc_session) {
-            throw new Error("ubus login failed");
+            throw new Error('ubus login failed');
         }
 
         this.sessionId = result.ubus_rpc_session;
         this.sessionExpiresAt = now + 240_000;
 
-        if (this.logDebug) this.emit("debug", `Ubus login OK`);
+        if (this.logDebug) this.emit('debug', `Ubus login OK`);
         return this.sessionId;
     }
 
     async ubusCall(service, method, params = {}) {
         const session = await this.login();
 
-        const response = await this.axiosInstance.post("", {
-            jsonrpc: "2.0",
+        const response = await this.axiosInstance.post('', {
+            jsonrpc: '2.0',
             id: 2,
-            method: "call",
+            method: 'call',
             params: [session, service, method, params]
         });
 
         if (response.data?.error) {
-            throw new Error(response.data.error.message || "ubus call error");
+            throw new Error(response.data.error.message || 'ubus call error');
         }
 
         return response.data.result[1];
     }
 
     async connect() {
+        const openWrtInfo = { state: false, systemInfo: {}, wirelessStatus: {}, wirelessRadios: [], ssids: [] }
+
         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 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 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 => ({
+            const wirelessRadios = Object.values(wirelessStatus.radios).map(radio => ({
                 name: radio.name,
                 state: radio.up === true,
                 interfaces: Object.values(radio.interfaces).map(i => ({
@@ -118,13 +117,13 @@ class OpenWrt extends EventEmitter {
             }));
 
             const ssids = wirelessRadios.flatMap(radio => radio.interfaces);
-            this.emit("systemInfo", systemInfo);
-            this.emit("wirelessStatus", wirelessStatus);
-            this.emit("wirelessRadios", wirelessRadios);
-            this.emit("ssids", ssids);
+            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.emit('success', `Connect success`);
                 this.firstRun = false;
             }
 
@@ -134,11 +133,11 @@ class OpenWrt extends EventEmitter {
             openWrtInfo.wirelessRadios = wirelessRadios;
             openWrtInfo.ssids = ssids;
 
-            if (this.logDebug) this.emit("debug", `OpenWrt Data: ${JSON.stringify(openWrtInfo, null, 2)}`);
+            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;
+            if (this.logError) this.emit('error', `Connect error: ${error.message}`);
+            return openWrtInfo;
         }
     }
 
@@ -146,29 +145,29 @@ class OpenWrt extends EventEmitter {
         switch (type) {
             case 'ssid':
                 await this.handleWithLock(async () => {
-                    if (this.logDebug) this.emit("debug", `${state ? "Enabling" : "Disabling"} SSID ${ssidName}`);
+                    if (this.logDebug) this.emit('debug', `${state ? 'Enabling' : 'Disabling'} SSID ${ssidName}`);
 
-                    const status = await this.ubusCall("network.wireless", "status");
+                    const status = await this.ubusCall('network.wireless', 'status');
                     const iface = await this.functions.findIfaceBySsid(status, ssidName);
                     if (!iface) throw new Error(`SSID ${ssidName} not found`);
 
                     const section = iface.section;
                     if (!section) throw new Error(`No UCI section for SSID ${ssidName}`);
 
-                    await this.ubusCall("uci", "set",
+                    await this.ubusCall('uci', 'set',
                         {
-                            config: "wireless",
+                            config: 'wireless',
                             section: section,
                             values: {
-                                disabled: state ? "0" : "1"
+                                disabled: state ? '0' : '1'
                             }
                         }
                     );
 
-                    await this.ubusCall("uci", "commit", { config: "wireless" });
-                    await this.ubusCall("network.wireless", "reload", {});
+                    await this.ubusCall('uci', 'commit', { config: 'wireless' });
+                    await this.ubusCall('network.wireless', 'reload', {});
 
-                    if (this.logDebug) this.emit("debug", `Send SSID ${ssidName} ${state ? "enabled" : "disabled"}`);
+                    if (this.logDebug) this.emit('debug', `Send SSID ${ssidName} ${state ? 'enabled' : 'disabled'}`);
                 });
                 break;
             case 'switch':