smart-home-engine 0.24.2 → 0.24.4

package/dist/web/assets/{tsMode-BfGVy5xb.js → tsMode-D21ZrR9G.js}

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

package/package.json

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

package/src/index.js

@@ -362,7 +362,7 @@ if (config.url) {
         } else {
             if (!state) {
                 log.error('invalid state', topic, payload);
-                process.exit();
+                return;
             }
             if (!state.ts) {
                 state.ts = new Date().getTime();
@@ -1329,12 +1329,21 @@ function loadDir(dir) {
                 return;
             }
 
-            // .shelib marker changes - warn only, manual restart required
+            // .shelib marker changes - unload or reload scripts in the affected directory
             if (basename === '.shelib') {
+                const affectedDir = path.dirname(filePath);
                 if (event === 'add') {
-                    log.warn(makeLabel(filePath), 'library marker added - .js files in this directory will no longer load as scripts after daemon restart');
+                    log.info(makeLabel(filePath), 'library marker added - unloading scripts in this directory');
+                    Object.keys(scripts).forEach((scriptFile) => {
+                        const absScript = path.resolve(scriptFile);
+                        const absDir = path.resolve(affectedDir);
+                        if (absScript.startsWith(absDir + path.sep) || path.dirname(absScript) === absDir) {
+                            unloadScript(scriptFile);
+                        }
+                    });
                 } else if (event === 'unlink') {
-                    log.warn(makeLabel(filePath), 'library marker removed - .js files in this directory will load as scripts after daemon restart');
+                    log.info(makeLabel(filePath), 'library marker removed - loading scripts in this directory');
+                    loadDirRecursive(affectedDir, path.resolve(dir));
                 }
                 return;
             }

package/src/sandbox/stdlib.js

@@ -140,10 +140,18 @@ module.exports = function (she) {
      * @returns {Promise<string|object>}
      */
     she.fetch = function Sandbox_fetch(url, options) {
-        return fetch(url, options).then((r) => {
+        const TIMEOUT_MS = 30_000;
+        let signal = options?.signal;
+        let timer;
+        if (!signal) {
+            const ac = new AbortController();
+            signal = ac.signal;
+            timer = setTimeout(() => ac.abort(new Error(`she.fetch timed out after ${TIMEOUT_MS / 1000}s`)), TIMEOUT_MS);
+        }
+        return fetch(url, { ...options, signal }).then((r) => {
             if (!r.ok) throw new Error(`HTTP ${r.status} ${r.statusText}`);
             const ct = r.headers.get('content-type') || '';
             return ct.includes('json') ? r.json() : r.text();
-        });
+        }).finally(() => clearTimeout(timer));
     };
 };

package/src/web/scripts-api.js

@@ -63,7 +63,7 @@ function walk(dir, base, parentIsLib) {
  * Nested tree of all files and subdirectories.
  * Each node: { type:'file'|'dir', name, path, lib, size?, mtime?, children? }
  */
-function buildTree(dir, base, parentIsLib) {
+function buildTree(dir, base, parentIsLib, parentIsDisabled = false) {
     let entries;
     try {
         entries = fs.readdirSync(dir, { withFileTypes: true });
@@ -81,13 +81,15 @@ function buildTree(dir, base, parentIsLib) {
         const abs = path.join(dir, entry.name);
         if (entry.isDirectory()) {
             const childIsLib = lib || hasShelibMarker(abs);
-            const disabled = hasShedisableMarker(abs);
-            const children = buildTree(abs, rel, childIsLib);
-            result.push({ type: 'dir', name: entry.name, path: rel, lib: childIsLib, disabled, children });
+            const selfDisabled = hasShedisableMarker(abs);
+            const effectiveDisabled = parentIsDisabled || selfDisabled;
+            const children = buildTree(abs, rel, childIsLib, effectiveDisabled);
+            result.push({ type: 'dir', name: entry.name, path: rel, lib: childIsLib, disabled: selfDisabled, children });
         } else {
             const stat = fs.statSync(abs);
             const isJs = entry.name.endsWith('.js');
-            const disabled = isJs ? hasShedisableMarker(abs) : false;
+            const selfDisabled = isJs ? hasShedisableMarker(abs) : false;
+            const disabled = parentIsDisabled || selfDisabled;
             result.push({ type: 'file', name: entry.name, path: rel, lib, size: stat.size, mtime: stat.mtimeMs, ...(isJs ? { disabled } : {}) });
         }
     }