smart-home-engine 1.51.0 → 1.51.2

package/dist/web/assets/{tsMode-DYoVxMI5.js → tsMode-4A8DZYIU.js}

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

package/dist/web/index.html

@@ -175,7 +175,7 @@
                 }
             })();
         </script>
-      <script type="module" crossorigin src="/assets/index-d3XMhJaq.js"></script>
+      <script type="module" crossorigin src="/assets/index-CSKTxEh5.js"></script>
       <link rel="modulepreload" crossorigin href="/assets/monaco-langs-DKJI_o9J.js">
       <link rel="stylesheet" crossorigin href="/assets/monaco-langs-DyX1CsEw.css">
       <link rel="stylesheet" crossorigin href="/assets/index-DPDW78ru.css">

package/package.json

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

package/service/she-servicectl

@@ -719,7 +719,7 @@ fetch_n() {
 }
 
 cmd_node() {
-    [ $# -ge 1 ] || die "usage: node update [--lts|--stable]"
+    [ $# -ge 1 ] || die "usage: node update [--lts|--stable|--latest|--version X.Y.Z]"
     action=$1
     shift
     [ "$action" = update ] || die "unknown node action: $action"

package/src/index.js

@@ -259,6 +259,7 @@ const { domain, vm, fs, path, suncalc } = modules;
 const scheduler = modules['node-schedule'];
 
 const StateStore = require('./lib/state-store');
+const { trackTimeout } = require('./lib/script-timers');
 const sandboxModules = [];
 const store = new StateStore();
 if (typeof config.port !== 'undefined') require('./web/broker-api').setStore(store);
@@ -1061,8 +1062,7 @@ function runScript(script, name, _origin) {
                     scheduler.scheduleJob(pattern, () => {
                         // Track the random-delay timer so it is cancelled on unload
                         // if the job fires in the same tick as the script is reloaded.
-                        const id = setTimeout(() => _dispatch(name, scriptDomain.bind(callback)), (parseFloat(options.random) || 0) * 1000 * Math.random());
-                        _myTimers.add(id);
+                        trackTimeout(_myTimers, () => _dispatch(name, scriptDomain.bind(callback)), (parseFloat(options.random) || 0) * 1000 * Math.random());
                     }),
                 );
             } else {
@@ -1211,9 +1211,7 @@ function runScript(script, name, _origin) {
     const Sandbox = {
         setTimeout: (fn, delay, ...args) => {
             const wrapped = args.length ? () => fn(...args) : fn;
-            const id = setTimeout(() => _dispatch(name, wrapped), delay);
-            _myTimers.add(id);
-            return id;
+            return trackTimeout(_myTimers, () => _dispatch(name, wrapped), delay);
         },
         setInterval: (fn, delay, ...args) => {
             const wrapped = args.length ? () => fn(...args) : fn;
@@ -1296,9 +1294,7 @@ function runScript(script, name, _origin) {
     // sandbox modules that don't have direct access to the Sandbox context.
     she.setTimeout = (fn, delay, ...args) => {
         const wrapped = args.length ? () => fn(...args) : fn;
-        const id = setTimeout(() => _dispatch(name, wrapped), delay);
-        _myTimers.add(id);
-        return id;
+        return trackTimeout(_myTimers, () => _dispatch(name, wrapped), delay);
     };
     she.clearTimeout = (id) => {
         _myTimers.delete(id);

package/src/lib/script-timers.js

@@ -0,0 +1,26 @@
+'use strict';
+/**
+ * One-shot timers a script started, tracked in the script's set so that unloading the script can
+ * clear the ones still pending (roadmap B9).
+ *
+ * The id leaves the set when the timer fires. Before, only an explicit clearTimeout removed it, so
+ * every timeout that ran normally stayed in the set for the life of the daemon — with its callback
+ * and everything the callback captured. A script that starts a "switch off after N minutes" timer
+ * per event leaked hundreds of them an hour, and the heap ran full after about twelve days.
+ *
+ * @param {Set} timers the script's timer set
+ * @param {Function} fn called when the timer fires
+ * @param {number} delay ms
+ * @param {Function} [setTimeoutFn] for tests
+ * @returns the timer id (what clearTimeout takes)
+ */
+function trackTimeout(timers, fn, delay, setTimeoutFn = setTimeout) {
+    const id = setTimeoutFn(() => {
+        timers.delete(id);
+        fn();
+    }, delay);
+    timers.add(id);
+    return id;
+}
+
+module.exports = { trackTimeout };