npm - smart-home-engine - Versions diffs - 1.1.11 → 1.1.13 - Mend

smart-home-engine 1.1.11 → 1.1.13

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

package/dist/web/assets/{index-DiZlYUuT.js → index-CLoKW1Ib.js} +69 -67
package/dist/web/assets/{index-iTrR9H4f.css → index-Cek-ldk8.css} +1 -1
package/dist/web/assets/{tsMode-CqAPIE7p.js → tsMode-B_1LEKWd.js} +1 -1
package/dist/web/index.html +2 -2
package/package.json +1 -1
package/src/lib/dynsec.js +12 -2
package/src/web/broker-api.js +57 -2

package/dist/web/assets/{tsMode-CqAPIE7p.js → tsMode-B_1LEKWd.js} RENAMED Viewed

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

package/dist/web/index.html CHANGED Viewed

@@ -172,10 +172,10 @@
                 }
             })();
         </script>
-      <script type="module" crossorigin src="/assets/index-DiZlYUuT.js"></script>
+      <script type="module" crossorigin src="/assets/index-CLoKW1Ib.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-iTrR9H4f.css">
+      <link rel="stylesheet" crossorigin href="/assets/index-Cek-ldk8.css">
     </head>
     <body>
         <div id="app"></div>

package/package.json CHANGED Viewed

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

package/src/lib/dynsec.js CHANGED Viewed

@@ -25,6 +25,7 @@ const RESPONSE_TOPIC = '$CONTROL/dynamic-security/v1/response';
 let _client = null;
 let _connected = false;
 let _configured = false;
+let _dynsecReady = false;
 let _timeout = 5000;
 let _log = null;
@@ -134,6 +135,14 @@ function init(config, log) {
                 _connected = true;
                 _log.info('dynsec: ready — subscribed as', dynsecCfg.adminUsername);
                 _drain(); // flush any requests queued before connection
+                // Probe whether the plugin is actually loaded and responding
+                _request('getDefaultACLAccess').then(() => {
+                    _dynsecReady = true;
+                    _log.info('dynsec: plugin confirmed active');
+                }).catch((err) => {
+                    _dynsecReady = false;
+                    _log.warn('dynsec: plugin probe failed — is the dynamic-security plugin loaded in mosquitto.conf?', err.message);
+                });
             }
         });
     });
@@ -141,6 +150,7 @@ function init(config, log) {
     _client.on('close', () => {
         if (_connected) {
             _connected = false;
+            _dynsecReady = false;
             _log.warn('dynsec: disconnected');
         }
     });
@@ -168,9 +178,9 @@ function init(config, log) {
     });
 }
-/** @returns {{ connected: boolean, configured: boolean }} */
+/** @returns {{ connected: boolean, configured: boolean, dynsecReady: boolean }} */
 function getStatus() {
-    return { connected: _connected, configured: _configured };
+    return { connected: _connected, configured: _configured, dynsecReady: _dynsecReady };
 }
 // ── User management ────────────────────────────────────────────────────────────

package/src/web/broker-api.js CHANGED Viewed

@@ -813,6 +813,18 @@ router.post('/wizard/bootstrap', async (req, res) => {
                 });
             }
+            // Discover the full path to the .so on the remote host.
+            let soPath = 'mosquitto_dynamic_security.so'; // fallback: rely on LD_LIBRARY_PATH
+            try {
+                const found = await sshDeploy.runCommand(bc.ssh, "find /usr /lib -maxdepth 8 -name 'mosquitto_dynamic_security.so' 2>/dev/null | head -1");
+                if (found.stdout) {
+                    soPath = found.stdout;
+                    _log?.debug(`broker: discovered .so on remote at ${soPath}`);
+                }
+            } catch (e) {
+                _log?.debug(`broker: remote .so discovery failed (${e.message}), using bare filename`);
+            }
             // Read the remote mosquitto.conf, parse, and add the plugin line if missing.
             let remoteConfRaw = '';
             try {
@@ -824,7 +836,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 = 'mosquitto_dynamic_security.so';
+                parsed.managed.plugin = soPath;
                 parsed.managed.plugin_opt_dynsec_config_file = dynSecPath;
                 const content = mosquittoConf.serialise(parsed);
                 _log?.debug(`broker: uploading updated conf to ${bc.ssh.host}:${confFilePath}`);
@@ -847,10 +859,23 @@ router.post('/wizard/bootstrap', async (req, res) => {
                 });
             }
+            // Discover the full path to the .so on this host.
+            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 });
+                const lines = r2.stdout.trim().split('\n').filter(Boolean);
+                if (lines.length > 0) {
+                    soPath = lines[0];
+                    _log?.debug(`broker: discovered .so at ${soPath}`);
+                }
+            } catch (e) {
+                _log?.debug(`broker: local .so discovery failed (${e.message}), using bare filename`);
+            }
             // Ensure plugin line exists in local mosquitto.conf
             const parsed = mosquittoConf.parse(confFilePath);
             if (!parsed.managed.plugin || !String(parsed.managed.plugin).includes('mosquitto_dynamic_security')) {
-                parsed.managed.plugin = 'mosquitto_dynamic_security.so';
+                parsed.managed.plugin = soPath;
                 parsed.managed.plugin_opt_dynsec_config_file = dynSecPath;
                 const content = mosquittoConf.serialise(parsed);
                 _log?.debug(`broker: writing updated local conf to ${confFilePath}`);
@@ -873,3 +898,33 @@ router.post('/wizard/bootstrap', async (req, res) => {
         handleError(res, err);
     }
 });
+/**
+ * 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.
+ */
+router.post('/wizard/deactivate', async (req, res) => {
+    try {
+        const bc = getBrokerConfig(req);
+        const fp = confPath(bc);
+        if (bc.ssh && bc.ssh.host) {
+            const raw = await sshDeploy.readRemoteFile(bc.ssh, fp);
+            const parsed = mosquittoConf.parseText(raw);
+            delete parsed.managed.plugin;
+            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_dynsec_config_file;
+            const content = mosquittoConf.serialise(parsed);
+            mosquittoConf.write(fp, content);
+        }
+        res.json({ ok: true });
+    } catch (err) {
+        handleError(res, err);
+    }
+});