smart-home-engine 1.1.13 → 1.1.15

package/dist/web/assets/{tsMode-B_1LEKWd.js → tsMode-85y-_zmT.js}

@@ -1,4 +1,4 @@
-import{m as O}from"./monaco-langs-BW2J83t5.js";import{t as I}from"./index-CLoKW1Ib.js";/*!-----------------------------------------------------------------------------
+import{m as O}from"./monaco-langs-BW2J83t5.js";import{t as I}from"./index-DZuKCHly.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-CLoKW1Ib.js"></script>
+      <script type="module" crossorigin src="/assets/index-DZuKCHly.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-Cek-ldk8.css">

package/package.json

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

package/src/lib/dynsec.js

@@ -183,6 +183,31 @@ function getStatus() {
     return { connected: _connected, configured: _configured, dynsecReady: _dynsecReady };
 }
 
+/**
+ * Permanently stop the dynsec client (called when dynsec is deactivated).
+ * Ends the MQTT connection without reconnect, rejects all pending requests,
+ * and marks the client as unconfigured so it will not try to reconnect.
+ */
+function stop() {
+    _configured = false;
+    _connected = false;
+    _dynsecReady = false;
+    // Reject any in-flight / queued requests
+    if (_inflight && _inflightResolve) {
+        _inflightResolve = null;
+        _inflight = false;
+    }
+    while (_queue.length > 0) {
+        const { reject } = _queue.shift();
+        reject(new Error('dynsec stopped'));
+    }
+    if (_client) {
+        _client.end(true); // force=true — skip DISCONNECT, prevent auto-reconnect
+        _client = null;
+    }
+    if (_log) _log.info('dynsec: stopped');
+}
+
 // ── User management ────────────────────────────────────────────────────────────
 
 function createClient(username, password, options = {}) {
@@ -297,6 +322,7 @@ function setDefaultACLAccess(acls) {
 module.exports = {
     init,
     getStatus,
+    stop,
     // Users
     createClient,
     deleteClient,

package/src/web/broker-api.js

@@ -901,9 +901,10 @@ router.post('/wizard/bootstrap', async (req, res) => {
 
 /**
  * POST /she/broker/wizard/deactivate
- * Remove dynsec plugin lines from mosquitto.conf (remote or local).
- * The caller is responsible for also clearing broker.dynsec credentials from
- * config.json and restarting mosquitto afterwards.
+ * Remove dynsec plugin lines from mosquitto.conf (remote or local),
+ * stop the dynsec MQTT client immediately, and clear broker.dynsec credentials
+ * from config.json so she does not try to reconnect on next restart.
+ * Caller must still restart mosquitto to fully remove the plugin.
  */
 router.post('/wizard/deactivate', async (req, res) => {
     try {
@@ -923,6 +924,56 @@ router.post('/wizard/deactivate', async (req, res) => {
             const content = mosquittoConf.serialise(parsed);
             mosquittoConf.write(fp, content);
         }
+
+        // Stop the dynsec client immediately — prevents log flooding from
+        // repeated reconnect attempts against a broker that no longer has
+        // the dynamic-security plugin loaded.
+        dynsec.stop();
+
+        // Clear broker.dynsec credentials from config.json so the dynsec
+        // client is not re-initialised if she is restarted.
+        const configPath = req.app.locals.configPath;
+        if (configPath) {
+            try {
+                const cfg = JSON.parse(fs.readFileSync(configPath, 'utf8'));
+                if (cfg.broker && cfg.broker.dynsec) {
+                    delete cfg.broker.dynsec;
+                    fs.writeFileSync(configPath, JSON.stringify(cfg, null, 4) + '\n', 'utf8');
+                    _log?.info('broker: cleared broker.dynsec credentials from config.json');
+                }
+            } catch (e) {
+                _log?.warn(`broker: failed to clear dynsec credentials from config.json: ${e.message}`);
+            }
+        }
+
+        res.json({ ok: true });
+    } catch (err) {
+        handleError(res, err);
+    }
+});
+
+/**
+ * POST /she/broker/wizard/reinit
+ * Re-initialise the dynsec MQTT client with the credentials that were just
+ * saved to config.json by the wizard. Called immediately after saving
+ * credentials so the daemon picks them up without requiring a full she restart.
+ *
+ * Uses the startup config (URL, TLS, etc.) merged with the fresh broker
+ * section from config.json.
+ */
+router.post('/wizard/reinit', (req, res) => {
+    try {
+        const configPath = req.app.locals.configPath;
+        if (!configPath) return res.status(500).json({ error: 'no configPath in app.locals' });
+        const freshCfg = JSON.parse(fs.readFileSync(configPath, 'utf8'));
+        if (!freshCfg.broker?.dynsec?.adminUsername || !freshCfg.broker?.dynsec?.adminPassword) {
+            return res.status(400).json({ error: 'broker.dynsec credentials not set in config.json' });
+        }
+        // Merge startup config (URL, TLS, etc.) with fresh broker section from config.json
+        const reInitConfig = { ...sheConfig, broker: freshCfg.broker };
+        dynsec.stop(); // clean up any existing client first
+        dynsec.init(reInitConfig, _log);
+        _log?.info('broker: dynsec client re-initialised with updated credentials');
         res.json({ ok: true });
     } catch (err) {
         handleError(res, err);