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

package/config.schema.json

@@ -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;"
                   }
@@ -375,7 +375,7 @@
                     "devices[].accessPoint.enable",
                     "devices[].accessPoint.name",
                     "devices[].accessPoint.namePrefix",
-                    "devices[].accessPoint.sensors"
+                    "devices[].accessPoint.sensor"
                   ]
                 },
                 {

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,10 +90,10 @@ 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 zone: ${zoneControl}`);
+                      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.1",
+    "version": "0.0.2-beta.10",
     "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,37 +1,23 @@
 import EventEmitter from "events";
-import axios from "axios";
-import Functions from './functions.js';
+import { exec } from "child_process";
+import Functions from "./functions.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;
 
-        //external integration
-        this.restFulEnabled = config.restFul?.enable || false;
-        this.mqttEnabled = config.mqtt?.enable || false;
-
         this.firstRun = true;
         this.lock = false;
 
-        this.sessionId = null;
-        this.sessionExpiresAt = 0;
-
         this.functions = new Functions();
-        this.axiosInstance = axios.create({
-            baseURL: `${config.host}/ubus`,
-            timeout: 5000,
-            headers: {
-                "Content-Type": "application/json"
-            }
-        });
 
         this.impulseGenerator = new ImpulseGenerator()
             .on("connect", () => this.handleWithLock(async () => {
@@ -45,69 +31,48 @@ class OpenWrt extends EventEmitter {
     async handleWithLock(fn) {
         if (this.lock) return;
         this.lock = true;
-
         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;
         }
     }
 
-    async login() {
-        const now = Date.now();
-        if (this.sessionId && now < this.sessionExpiresAt) {
-            return this.sessionId;
-        }
-
-        const response = await this.axiosInstance.post("", {
-            jsonrpc: "2.0",
-            id: 1,
-            method: "call",
-            params: ["00000000000000000000000000000000", "session", "login", { username: this.user, password: this.passwd }]
+    // --- Helper do wywołań SSH z wyłączeniem StrictHostKeyChecking ---
+    async sshCall(command) {
+        return new Promise((resolve, reject) => {
+            const sshCmd = `ssh -o StrictHostKeyChecking=no ${this.user}@${this.host} '${command.replace(/'/g, `'\\''`)}'`;
+            exec(sshCmd, (error, stdout, stderr) => {
+                if (error) return reject(new Error(stderr || error.message));
+                try {
+                    const json = JSON.parse(stdout);
+                    resolve(json);
+                } catch (parseError) {
+                    reject(new Error(`Invalid JSON from SSH: ${parseError.message}`));
+                }
+            });
         });
-
-        const result = response.data?.result?.[1];
-        if (!result?.ubus_rpc_session) {
-            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`);
-        return this.sessionId;
     }
 
+    // --- ubus call przez SSH ---
     async ubusCall(service, method, params = {}) {
-        const session = await this.login();
-
-        const response = await this.axiosInstance.post("", {
-            jsonrpc: "2.0",
-            id: 2,
-            method: "call",
-            params: [session, service, method, params]
-        });
-
-        if (response.data?.error) {
-            throw new Error(response.data.error.message || "ubus call error");
-        }
-
-        return response.data.result[1];
+        const cmd = `ubus call ${service} ${method} '${JSON.stringify(params)}'`;
+        return await this.sshCall(cmd);
     }
 
+    // --- Pobranie info i statusu ---
     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)}`);
+            if (this.logDebug) this.emit("debug", `[${this.host}] System info: ${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)}`);
+            if (this.logDebug) this.emit("debug", `[${this.host}] Wireless status: ${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,6 +83,7 @@ class OpenWrt extends EventEmitter {
             }));
 
             const ssids = wirelessRadios.flatMap(radio => radio.interfaces);
+
             this.emit("systemInfo", systemInfo);
             this.emit("wirelessStatus", wirelessStatus);
             this.emit("wirelessRadios", wirelessRadios);
@@ -134,19 +100,20 @@ 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", `[${this.host}] 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", `[${this.host}] Connect error: ${error.message}`);
+            return openWrtInfo;
         }
     }
 
+    // --- Włączanie / wyłączanie SSID ---
     async send(type, ssidName, state) {
         switch (type) {
-            case 'ssid':
+            case "ssid":
                 await this.handleWithLock(async () => {
-                    if (this.logDebug) this.emit("debug", `${state ? "Enabling" : "Disabling"} SSID ${ssidName}`);
+                    if (this.logDebug) this.emit("debug", `[${this.host}] ${state ? "Enabling" : "Disabling"} SSID ${ssidName}`);
 
                     const status = await this.ubusCall("network.wireless", "status");
                     const iface = await this.functions.findIfaceBySsid(status, ssidName);
@@ -155,23 +122,18 @@ class OpenWrt extends EventEmitter {
                     const section = iface.section;
                     if (!section) throw new Error(`No UCI section for SSID ${ssidName}`);
 
-                    await this.ubusCall("uci", "set",
-                        {
-                            config: "wireless",
-                            section: section,
-                            values: {
-                                disabled: state ? "0" : "1"
-                            }
-                        }
-                    );
-
+                    await this.ubusCall("uci", "set", {
+                        config: "wireless",
+                        section: section,
+                        values: { disabled: state ? "0" : "1" }
+                    });
                     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", `[${this.host}] SSID ${ssidName} ${state ? "enabled" : "disabled"}`);
                 });
                 break;
-            case 'switch':
+            case "switch":
                 break;
         }
     }
@@ -179,3 +141,4 @@ class OpenWrt extends EventEmitter {
 
 export default OpenWrt;
 
+