smart-home-engine 1.18.0 → 1.18.2

package/package.json

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

package/src/index.js

@@ -384,26 +384,6 @@ require('./web/server').setStatsProvider(() => {
 // Push current script:running state so the UI green dots survive a browser reload.
 setWelcomeProvider(() => Object.keys(scripts).map((f) => ({ type: 'script:running', path: makeLabel(f).slice(0, -1), running: true })));
 
-if (config.heartbeat?.enabled) {
-    const _hbInterval = typeof config.heartbeat.interval === 'number' ? config.heartbeat.interval : 50;
-    const _hbThreshold = typeof config.heartbeat.threshold === 'number' ? config.heartbeat.threshold : 300;
-    let _lastBeat = Date.now();
-    const _hbTimer = setInterval(() => {
-        const now = Date.now();
-        const lag = now - _lastBeat - _hbInterval;
-        _lastBeat = now;
-        if (lag > _hbThreshold) {
-            const label = _blockingScript ?? 'unknown';
-            if (lag > 2000) {
-                log.warn(`event loop blocked ${lag}ms — script: ${label}`);
-            } else {
-                log.warn(`event loop lag ${lag}ms — last active script: ${label}`);
-            }
-        }
-    }, _hbInterval);
-    _hbTimer.unref();
-}
-
 if (!config.url) {
     log.warn('no MQTT broker URL configured — set "url" in ' + path.join(require('os').homedir(), '.she', 'config.json'));
 }
@@ -1025,12 +1005,14 @@ function runScript(script, name, _origin) {
 
     const Sandbox = {
         setTimeout: (fn, delay, ...args) => {
-            const id = setTimeout(fn, delay, ...args);
+            const wrapped = args.length ? () => fn(...args) : fn;
+            const id = setTimeout(() => _dispatch(name, wrapped), delay);
             _myTimers.add(id);
             return id;
         },
         setInterval: (fn, delay, ...args) => {
-            const id = setInterval(fn, delay, ...args);
+            const wrapped = args.length ? () => fn(...args) : fn;
+            const id = setInterval(() => _dispatch(name, wrapped), delay);
             _myTimers.add(id);
             return id;
         },
@@ -1104,7 +1086,8 @@ function runScript(script, name, _origin) {
     // she.setTimeout / she.clearTimeout — tracked versions for use by stdlib and
     // sandbox modules that don't have direct access to the Sandbox context.
     she.setTimeout = (fn, delay, ...args) => {
-        const id = setTimeout(fn, delay, ...args);
+        const wrapped = args.length ? () => fn(...args) : fn;
+        const id = setTimeout(() => _dispatch(name, wrapped), delay);
         _myTimers.add(id);
         return id;
     };
@@ -1497,6 +1480,26 @@ function loadDir(dir) {
     }
 }
 function start() {
+    if (config.heartbeat?.enabled) {
+        const _hbInterval = typeof config.heartbeat.interval === 'number' ? config.heartbeat.interval : 50;
+        const _hbThreshold = typeof config.heartbeat.threshold === 'number' ? config.heartbeat.threshold : 300;
+        let _lastBeat = Date.now();
+        const _hbTimer = setInterval(() => {
+            const now = Date.now();
+            const lag = now - _lastBeat - _hbInterval;
+            _lastBeat = now;
+            if (lag > _hbThreshold) {
+                const label = _blockingScript ?? 'unknown';
+                if (lag > 2000) {
+                    log.warn(`event loop blocked ${lag}ms — script: ${label}`);
+                } else {
+                    log.warn(`event loop lag ${lag}ms — last active script: ${label}`);
+                }
+            }
+        }, _hbInterval);
+        _hbTimer.unref();
+    }
+
     if (config.file) {
         if (typeof config.file === 'string') {
             loadScript(config.file);