smart-home-engine 0.27.0 → 0.27.2

package/dist/web/assets/{tsMode-CuEvjcPu.js → tsMode-C0zTO8Xc.js}

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

package/dist/web/index.html

@@ -155,7 +155,7 @@
                 }
             })();
         </script>
-      <script type="module" crossorigin src="/assets/index-DnqoSlvw.js"></script>
+      <script type="module" crossorigin src="/assets/index-sPBEVtGF.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-6dbanXAb.css">

package/package.json

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

package/src/index.js

@@ -241,6 +241,28 @@ function sunScheduleEvent(obj, shift) {
 let mqtt = null;
 let connected = false;
 
+// Deferred start — wait for retained MQTT state before running scripts
+let _started = false;
+let _startupTimeout = null;
+let _quietTimer = null;
+const _RETAIN_QUIET_MS = 300; // ms of silence after last retained msg → start
+const _STARTUP_TIMEOUT_MS = 10000; // ms to wait for broker before starting anyway
+
+function startOnce(reason) {
+    if (_started) return;
+    _started = true;
+    if (_startupTimeout) {
+        clearTimeout(_startupTimeout);
+        _startupTimeout = null;
+    }
+    if (_quietTimer) {
+        clearTimeout(_quietTimer);
+        _quietTimer = null;
+    }
+    if (reason) log.info(reason);
+    start();
+}
+
 // Wire up the MQTT API: pass the state store and a getter for the live MQTT client.
 // The getter always returns the current value of `mqtt` (null until connected).
 require('./web/mqtt-api').init(store, () => mqtt);
@@ -323,6 +345,12 @@ if (config.url) {
         log.debug('mqtt subscribe #');
         mqtt.subscribe('#');
         mqttEventCallbacks.filter((c) => c.event === 'connect').forEach((c) => c.callback());
+
+        // Arm the quiet-period timer (only needed on first connect, before scripts start)
+        if (!_started) {
+            if (_quietTimer) clearTimeout(_quietTimer);
+            _quietTimer = setTimeout(() => startOnce('mqtt: retained state ready, starting scripts'), _RETAIN_QUIET_MS);
+        }
     });
 
     mqtt.on('close', () => {
@@ -339,6 +367,13 @@ if (config.url) {
 
     mqtt.on('message', (topic, payload, msg) => {
         _mqttMsgCount++;
+
+        // Reset the quiet-period timer while the initial retained-message burst is in flight
+        if (!_started && msg.retain && _quietTimer) {
+            clearTimeout(_quietTimer);
+            _quietTimer = setTimeout(() => startOnce('mqtt: retained state ready, starting scripts'), _RETAIN_QUIET_MS);
+        }
+
         if (shedb.handleMqttMessage(topic, payload)) return;
 
         const state = require('./lib/parse-payload')(payload);
@@ -428,8 +463,18 @@ if (config.matterStorage) {
     log.warn('matter controller disabled — set matterStorage in config.json to enable');
 }
 
-// Start scripts immediately — MQTT retained state will populate the store asynchronously
-start();
+// If no broker is configured, start scripts immediately.
+// If a broker is configured, startOnce() fires from the quiet-period timer inside
+// mqtt.on('connect') once the retained-message burst settles, or from the
+// startup-timeout fallback if the broker is unreachable.
+if (config.url) {
+    _startupTimeout = setTimeout(() => {
+        log.warn('mqtt startup timeout — starting scripts without retained state');
+        startOnce();
+    }, _STARTUP_TIMEOUT_MS);
+} else {
+    start();
+}
 
 function stateChange(topic, state, oldState, msg) {
     subscriptions.forEach((subs) => {

package/src/web/server.js

@@ -2,7 +2,7 @@
 
 const express = require('express');
 const path = require('path');
-const { spawnSync, spawn } = require('child_process');
+const { spawn } = require('child_process');
 const semverCompare = require('semantic-compare');
 const pkg = require('../../package.json');
 const { router: configRouter } = require('./config-api');
@@ -96,8 +96,10 @@ app.post('/she/check-update', async (req, res) => {
 app.post('/she/update', (req, res) => {
     res.json({ ok: true });
     setTimeout(() => {
-        spawnSync('sudo', ['npm', 'install', '-g', 'smart-home-engine'], { stdio: 'inherit' });
-        _systemdRestart();
+        // Use async spawn so the HTTP server (and event loop) remain responsive
+        // while npm runs. spawnSync would block all HTTP polling from the UI.
+        const child = spawn('sudo', ['npm', 'install', '-g', 'smart-home-engine'], { stdio: 'inherit' });
+        child.on('close', () => _systemdRestart());
     }, 200);
 });