smart-home-engine 1.1.17 → 1.1.19

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

@@ -1,4 +1,4 @@
-import{m as O}from"./monaco-langs-BW2J83t5.js";import{t as I}from"./index-itohNXf2.js";/*!-----------------------------------------------------------------------------
+import{m as O}from"./monaco-langs-BW2J83t5.js";import{t as I}from"./index-sjamTHx3.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-itohNXf2.js"></script>
+      <script type="module" crossorigin src="/assets/index-sjamTHx3.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.17",
+    "version": "1.1.19",
     "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

@@ -191,10 +191,24 @@ function serialise(conf) {
         lines.push('');
     }
 
-    // Passthrough (comments, blanks, unmanaged keys)
-    for (const l of passthrough) lines.push(l);
+    // Passthrough (comments, blanks, unmanaged keys) — strip leading blank lines
+    // to avoid a double-blank at the managed/passthrough boundary.
+    const trimmedPassthrough = [...passthrough];
+    while (trimmedPassthrough.length > 0 && trimmedPassthrough[0].trim() === '') {
+        trimmedPassthrough.shift();
+    }
+    for (const l of trimmedPassthrough) lines.push(l);
 
-    return lines.join('\n');
+    // Collapse runs of more than one consecutive blank line into a single blank line.
+    const result = [];
+    let prevBlank = false;
+    for (const line of lines) {
+        const isBlank = line.trim() === '';
+        if (isBlank && prevBlank) continue;
+        result.push(line);
+        prevBlank = isBlank;
+    }
+    return result.join('\n');
 }
 
 /**

package/src/web/broker-api.js

@@ -801,6 +801,15 @@ router.post('/wizard/bootstrap', async (req, res) => {
 
         if (isRemote) {
             // mosquitto_ctrl must run on the broker host — invoke it via SSH.
+            // Delete any existing file first: mosquitto_ctrl init refuses to overwrite
+            // an existing file, which would leave the old credentials in place while
+            // config.json now holds new ones, causing "not authorised" on reconnect.
+            try {
+                await sshDeploy.runCommand(bc.ssh, `sudo rm -f "${dynSecPath}"`);
+                _log?.debug(`broker: removed existing ${dynSecPath} on remote (if any)`);
+            } catch (e) {
+                _log?.warn(`broker: could not remove existing ${dynSecPath} on remote: ${e.message}`);
+            }
             const ctrlCmd = `mosquitto_ctrl dynsec init "${dynSecPath}" "${username}" "${password}"`;
             _log?.debug(`broker: SSH mosquitto_ctrl on ${bc.ssh.host}: mosquitto_ctrl dynsec init "${dynSecPath}" "${username}" ***`);
             try {
@@ -831,6 +840,16 @@ router.post('/wizard/bootstrap', async (req, res) => {
                 _log?.warn(`broker: could not verify dynamic-security.json after init: ${e.message}`);
             }
 
+            // Fix ownership and permissions: mosquitto_ctrl creates the file owned by the
+            // SSH user (typically mode 600). Mosquitto runs as the 'mosquitto' system user
+            // and must be able to read it. Chown to mosquitto:mosquitto and set 644.
+            try {
+                await sshDeploy.runCommand(bc.ssh, `sudo chown mosquitto:mosquitto "${dynSecPath}" && sudo chmod 644 "${dynSecPath}"`);
+                _log?.debug(`broker: fixed ownership and permissions on remote ${dynSecPath}`);
+            } catch (e) {
+                _log?.warn(`broker: could not chown/chmod remote ${dynSecPath}: ${e.message} — mosquitto may fail with 'File is not readable'`);
+            }
+
             // Discover the full path to the .so on the remote host.
             let soPath = 'mosquitto_dynamic_security.so'; // fallback: rely on LD_LIBRARY_PATH
             try {
@@ -866,6 +885,13 @@ router.post('/wizard/bootstrap', async (req, res) => {
         } else {
             // Local mode: run mosquitto_ctrl on this host.
             fs.mkdirSync(configDir, { recursive: true });
+            // Delete any existing file first so mosquitto_ctrl always writes fresh credentials.
+            try {
+                fs.rmSync(dynSecPath, { force: true });
+                _log?.debug(`broker: removed existing ${dynSecPath} on local host (if any)`);
+            } catch (e) {
+                _log?.warn(`broker: could not remove existing ${dynSecPath}: ${e.message}`);
+            }
             _log?.debug(`broker: local mosquitto_ctrl dynsec init ${dynSecPath} ${username} ***`);
             try {
                 const r = await execFileAsync('mosquitto_ctrl', ['dynsec', 'init', dynSecPath, username, password], { timeout: 10000 });
@@ -892,6 +918,22 @@ router.post('/wizard/bootstrap', async (req, res) => {
             } catch (e) {
                 _log?.warn(`broker: could not verify dynamic-security.json after init: ${e.message}`);
             }
+
+            // Fix ownership and permissions: mosquitto_ctrl creates the file owned by the
+            // current user. Mosquitto runs as the 'mosquitto' system user and needs read access.
+            try {
+                await execFileAsync('sudo', ['chown', 'mosquitto:mosquitto', dynSecPath], { timeout: 5000 });
+                _log?.debug(`broker: fixed ownership on local ${dynSecPath}`);
+            } catch (e) {
+                _log?.warn(`broker: could not chown local ${dynSecPath}: ${e.message}`);
+            }
+            try {
+                fs.chmodSync(dynSecPath, 0o644);
+                _log?.debug(`broker: fixed permissions on local ${dynSecPath}`);
+            } catch (e) {
+                _log?.warn(`broker: could not chmod local ${dynSecPath}: ${e.message}`);
+            }
+
             let soPath = 'mosquitto_dynamic_security.so'; // fallback: rely on LD_LIBRARY_PATH
             try {
                 const r2 = await execFileAsync('find', ['/usr', '/lib', '-maxdepth', '8', '-name', 'mosquitto_dynamic_security.so'], { timeout: 8000 });