smart-home-engine 1.1.6 → 1.1.9

package/dist/web/assets/{tsMode-CY_XZkxX.js → tsMode-Cnr_wxoV.js}

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

package/package.json

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

package/src/index.js

@@ -146,6 +146,7 @@ const scheduler = modules['node-schedule'];
 const StateStore = require('./lib/state-store');
 const sandboxModules = [];
 const store = new StateStore();
+if (typeof config.port !== 'undefined') require('./web/broker-api').setStore(store);
 const scripts = {};
 const scriptOrigins = new Map(); // file → 'builtin' | 'user'
 const subscriptions = [];
@@ -361,6 +362,7 @@ if (config.url) {
         log.info('mqtt connected ' + config.url);
         log.debug('mqtt subscribe #');
         mqtt.subscribe('#');
+        mqtt.subscribe('$SYS/#');
         mqttEventCallbacks.filter((c) => c.event === 'connect').forEach((c) => c.callback());
 
         if (!_started) {

package/src/lib/dynsec.js

@@ -46,9 +46,13 @@ function _drain() {
     const timer = setTimeout(() => {
         _inflight = false;
         _inflightResolve = null;
-        if (_log) _log.debug(`dynsec: timeout waiting for response to "${command}" (${_timeout}ms)`);
+        if (_log) _log.warn(`dynsec: timeout waiting for response to "${command}" (${_timeout}ms) — is the dynsec plugin loaded and the admin user configured?`);
         reject(new Error(`dynsec timeout waiting for response to "${command}"`));
-        _drain();
+        // Fail-fast: reject all remaining queued commands since the broker is not responding
+        while (_queue.length > 0) {
+            const queued = _queue.shift();
+            queued.reject(new Error(`dynsec: aborting "${queued.command}" — previous command timed out`));
+        }
     }, _timeout);
 
     _inflightResolve = (responses) => {
@@ -122,11 +126,15 @@ function init(config, log) {
     _client = mqtt.connect(config.url, opts);
 
     _client.on('connect', () => {
-        _connected = true;
-        _log.info('dynsec: connected as', dynsecCfg.adminUsername);
+        _log.info('dynsec: MQTT connect event, subscribing to response topic');
         _client.subscribe(RESPONSE_TOPIC, (err) => {
-            if (err) _log.error('dynsec: failed to subscribe to response topic:', err.message);
-            else _drain(); // flush any requests queued before connection
+            if (err) {
+                _log.error('dynsec: failed to subscribe to response topic:', err.message);
+            } else {
+                _connected = true;
+                _log.info('dynsec: ready — subscribed as', dynsecCfg.adminUsername);
+                _drain(); // flush any requests queued before connection
+            }
         });
     });
 

package/src/web/broker-api.js

@@ -16,6 +16,7 @@
 const express = require('express');
 const path = require('path');
 const fs = require('fs');
+const crypto = require('crypto');
 const dynsec = require('../lib/dynsec');
 const mosquittoConf = require('../lib/mosquitto-conf');
 const ca = require('../lib/ca');
@@ -28,12 +29,18 @@ const DEFAULT_SSH_KEY = path.join(sheConfig['data-dir'], 'ssh', 'broker_id_ed255
 const router = express.Router();
 
 let _log = null;
+let _store = null;
 
 /** Must be called once from index.js so broker-api can emit debug-level log lines. */
 function setLogger(log) {
     _log = log;
 }
 
+/** Must be called once from index.js to give broker-api access to the MQTT state store. */
+function setStore(store) {
+    _store = store;
+}
+
 // ── Helpers ────────────────────────────────────────────────────────────────────
 
 /** Get broker config from live config.json */
@@ -71,13 +78,14 @@ function handleError(res, err) {
  */
 router.get('/status', (req, res) => {
     const ds = dynsec.getStatus();
-    const mqttState = req.app.locals.mqttState || {};
 
-    const sysPrefixes = ['$SYS/broker/version', '$SYS/broker/clients/', '$SYS/broker/uptime'];
     const sys = {};
-    for (const [topic, entry] of Object.entries(mqttState)) {
-        if (sysPrefixes.some((p) => topic.startsWith(p))) {
-            sys[topic] = entry;
+    if (_store) {
+        const sysPrefixes = ['$SYS/broker/version', '$SYS/broker/uptime', '$SYS/broker/clients/', '$SYS/broker/messages/'];
+        for (const [topic, entry] of _store.mqttEntries()) {
+            if (sysPrefixes.some((p) => topic.startsWith(p))) {
+                sys[topic] = entry;
+            }
         }
     }
 
@@ -89,14 +97,22 @@ router.get('/status', (req, res) => {
 /**
  * GET /she/broker/config
  * Returns parsed config structure + raw text + checksum.
+ * In remote mode, reads mosquitto.conf from the broker host via SSH.
  */
-router.get('/config', (req, res) => {
+router.get('/config', async (req, res) => {
     try {
         const bc = getBrokerConfig(req);
         const fp = confPath(bc);
+        const backups = mosquittoConf.listBackups(fp).map((b) => path.basename(b));
+        if (bc.ssh && bc.ssh.host) {
+            _log?.debug(`broker: reading remote config from ${bc.ssh.host}:${fp}`);
+            const raw = await sshDeploy.readRemoteFile(bc.ssh, fp);
+            const parsed = mosquittoConf.parseText(raw);
+            const cs = crypto.createHash('sha256').update(raw).digest('hex');
+            return res.json({ ...parsed, checksum: cs, backups });
+        }
         const parsed = mosquittoConf.parse(fp);
         const cs = mosquittoConf.checksum(fp);
-        const backups = mosquittoConf.listBackups(fp).map((b) => path.basename(b));
         res.json({ ...parsed, checksum: cs, backups });
     } catch (err) {
         handleError(res, err);
@@ -107,17 +123,25 @@ router.get('/config', (req, res) => {
  * PUT /she/broker/config
  * Write structured config (body: { listeners, managed, passthrough, checksum? }).
  * body.checksum is the client's last-known checksum for external-modify detection.
+ * In remote mode, the file is also deployed to the broker host via SCP.
  */
-router.put('/config', (req, res) => {
+router.put('/config', async (req, res) => {
     try {
         const bc = getBrokerConfig(req);
         const fp = confPath(bc);
         const { listeners, managed, passthrough, checksum: clientChecksum } = req.body;
         const content = mosquittoConf.serialise({ listeners, managed, passthrough });
-        const result = mosquittoConf.write(fp, content, clientChecksum ?? null);
+        const remote = bc.ssh && bc.ssh.host;
+        _log?.info(`broker: writing config to ${remote ? `remote ${bc.ssh.host}:${fp}` : `local ${fp}`}`);
+        // In remote mode skip local conflict check — remote is the source of truth
+        const result = mosquittoConf.write(fp, content, remote ? null : (clientChecksum ?? null));
         if (!result.ok) {
             return res.status(409).json({ error: 'external_modify', message: 'mosquitto.conf was modified externally since last read' });
         }
+        if (remote) {
+            _log?.debug(`broker: uploading config to ${bc.ssh.host}:${fp}`);
+            await sshDeploy.uploadContent(bc.ssh, content, fp);
+        }
         _lastWriteChecksum.set(fp, mosquittoConf.checksum(fp));
         res.json({ ok: true, backupPath: result.backupPath ? path.basename(result.backupPath) : null });
     } catch (err) {
@@ -128,8 +152,9 @@ router.put('/config', (req, res) => {
 /**
  * PUT /she/broker/config/raw
  * Write raw mosquitto.conf text directly (used by the Advanced editor).
+ * In remote mode, the file is also deployed to the broker host via SCP.
  */
-router.put('/config/raw', (req, res) => {
+router.put('/config/raw', async (req, res) => {
     try {
         const bc = getBrokerConfig(req);
         const fp = confPath(bc);
@@ -137,10 +162,17 @@ router.put('/config/raw', (req, res) => {
         if (typeof content !== 'string') {
             return res.status(400).json({ error: 'content must be a string' });
         }
-        const result = mosquittoConf.write(fp, content, clientChecksum ?? null);
+        const remote = bc.ssh && bc.ssh.host;
+        _log?.info(`broker: writing raw config to ${remote ? `remote ${bc.ssh.host}:${fp}` : `local ${fp}`}`);
+        // In remote mode skip local conflict check — remote is the source of truth
+        const result = mosquittoConf.write(fp, content, remote ? null : (clientChecksum ?? null));
         if (!result.ok) {
             return res.status(409).json({ error: 'external_modify', message: 'mosquitto.conf was modified externally since last read' });
         }
+        if (remote) {
+            _log?.debug(`broker: uploading raw config to ${bc.ssh.host}:${fp}`);
+            await sshDeploy.uploadContent(bc.ssh, content, fp);
+        }
         _lastWriteChecksum.set(fp, mosquittoConf.checksum(fp));
         res.json({ ok: true, backupPath: result.backupPath ? path.basename(result.backupPath) : null });
     } catch (err) {
@@ -673,7 +705,7 @@ router.delete('/ca/trusted/:fingerprint', async (req, res) => {
     }
 });
 
-module.exports = { router, setLogger };
+module.exports = { router, setLogger, setStore };
 
 // ── SSH routes ─────────────────────────────────────────────────────────────────
 // Note: these routes are mounted on the same router but defined after module.exports