smart-home-engine 1.1.16 → 1.1.17

package/dist/web/assets/{tsMode-B79Y_ksb.js → tsMode-CMynGIyH.js}

@@ -1,4 +1,4 @@
-import{m as O}from"./monaco-langs-BW2J83t5.js";import{t as I}from"./index-Dz9x2Vob.js";/*!-----------------------------------------------------------------------------
+import{m as O}from"./monaco-langs-BW2J83t5.js";import{t as I}from"./index-itohNXf2.js";/*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Version: 0.52.2(404545bded1df6ffa41ea0af4e8ddb219018c6c1)
  * Released under the MIT license

package/dist/web/index.html

@@ -172,7 +172,7 @@
                 }
             })();
         </script>
-      <script type="module" crossorigin src="/assets/index-Dz9x2Vob.js"></script>
+      <script type="module" crossorigin src="/assets/index-itohNXf2.js"></script>
       <link rel="modulepreload" crossorigin href="/assets/monaco-langs-BW2J83t5.js">
       <link rel="stylesheet" crossorigin href="/assets/monaco-langs-DyX1CsEw.css">
       <link rel="stylesheet" crossorigin href="/assets/index-b3gdLMp3.css">

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "smart-home-engine",
-    "version": "1.1.16",
+    "version": "1.1.17",
     "description": "Node.js based script runner for use in MQTT based Smart Home environments",
     "main": "src/index.js",
     "scripts": {

package/src/lib/mosquitto-conf.js

@@ -26,7 +26,10 @@ const { promisify } = require('util');
 const execFileAsync = promisify(execFile);
 
 // Keys that she manages — all others are treated as passthrough
-const MANAGED_SINGLE_KEYS = new Set(['allow_anonymous', 'persistence', 'persistence_location', 'log_dest', 'log_type', 'plugin', 'plugin_opt_dynsec_config_file']);
+// NOTE: 'plugin_opt_dynsec_config_file' is kept here only for migration —
+// when read from an old conf it is normalised to 'plugin_opt_config_file' on
+// the same line that recognises it (see parseText below).
+const MANAGED_SINGLE_KEYS = new Set(['allow_anonymous', 'persistence', 'persistence_location', 'log_dest', 'log_type', 'plugin', 'plugin_opt_config_file', 'plugin_opt_dynsec_config_file']);
 
 /**
  * Parse mosquitto.conf text into a structured object.
@@ -70,10 +73,12 @@ function parseText(raw) {
         } else if (currentListener && isListenerSubkey(key)) {
             applyListenerKey(currentListener, key, value);
         } else if (MANAGED_SINGLE_KEYS.has(key)) {
-            if (managed[key] !== undefined) {
-                managed[key] = [].concat(managed[key]).concat(value);
+            // Normalise the old (incorrect) key name written by earlier she versions
+            const managedKey = key === 'plugin_opt_dynsec_config_file' ? 'plugin_opt_config_file' : key;
+            if (managed[managedKey] !== undefined) {
+                managed[managedKey] = [].concat(managed[managedKey]).concat(value);
             } else {
-                managed[key] = value;
+                managed[managedKey] = value;
             }
             currentListener = null;
         } else {
@@ -155,7 +160,7 @@ function serialise(conf) {
     // Managed single-key entries first
     const { managed = {}, listeners = [], passthrough = [] } = conf;
 
-    const keyOrder = ['allow_anonymous', 'persistence', 'persistence_location', 'log_dest', 'log_type', 'plugin', 'plugin_opt_dynsec_config_file'];
+    const keyOrder = ['allow_anonymous', 'persistence', 'persistence_location', 'log_dest', 'log_type', 'plugin', 'plugin_opt_config_file'];
     for (const key of keyOrder) {
         if (managed[key] === undefined) continue;
         const val = managed[key];

package/src/web/broker-api.js

@@ -855,7 +855,7 @@ router.post('/wizard/bootstrap', async (req, res) => {
             const parsed = mosquittoConf.parseText(remoteConfRaw);
             if (!parsed.managed.plugin || !String(parsed.managed.plugin).includes('mosquitto_dynamic_security')) {
                 parsed.managed.plugin = soPath;
-                parsed.managed.plugin_opt_dynsec_config_file = dynSecPath;
+                parsed.managed.plugin_opt_config_file = dynSecPath;
                 const content = mosquittoConf.serialise(parsed);
                 _log?.debug(`broker: uploading updated conf to ${bc.ssh.host}:${confFilePath}`);
                 await sshDeploy.uploadContent(bc.ssh, content, confFilePath);
@@ -908,7 +908,7 @@ router.post('/wizard/bootstrap', async (req, res) => {
             const parsed = mosquittoConf.parse(confFilePath);
             if (!parsed.managed.plugin || !String(parsed.managed.plugin).includes('mosquitto_dynamic_security')) {
                 parsed.managed.plugin = soPath;
-                parsed.managed.plugin_opt_dynsec_config_file = dynSecPath;
+                parsed.managed.plugin_opt_config_file = dynSecPath;
                 const content = mosquittoConf.serialise(parsed);
                 _log?.debug(`broker: writing updated local conf to ${confFilePath}`);
                 mosquittoConf.write(confFilePath, content);
@@ -946,12 +946,16 @@ router.post('/wizard/deactivate', async (req, res) => {
             const raw = await sshDeploy.readRemoteFile(bc.ssh, fp);
             const parsed = mosquittoConf.parseText(raw);
             delete parsed.managed.plugin;
+            delete parsed.managed.plugin_opt_config_file;
+            // Also remove old key name in case conf was written by an earlier she version
             delete parsed.managed.plugin_opt_dynsec_config_file;
             const content = mosquittoConf.serialise(parsed);
             await sshDeploy.uploadContent(bc.ssh, content, fp);
         } else {
             const parsed = mosquittoConf.parse(fp);
             delete parsed.managed.plugin;
+            delete parsed.managed.plugin_opt_config_file;
+            // Also remove old key name in case conf was written by an earlier she version
             delete parsed.managed.plugin_opt_dynsec_config_file;
             const content = mosquittoConf.serialise(parsed);
             mosquittoConf.write(fp, content);