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

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;"
                   }

package/index.js

@@ -26,8 +26,8 @@ class OpenWrtPlatform {
     }
 
     api.on('didFinishLaunching', async () => {
-      for (const config of config.devices) {
-        const { name, host, port, displayType } = config;
+      for (const deviceConfig of config.devices) {
+        const { name, host, port, displayType } =deviceConfig;
         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`);
           continue;
@@ -35,25 +35,25 @@ class OpenWrtPlatform {
 
         //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.4",
     "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)) {