smart-home-engine 0.23.3 → 0.23.5

package/dist/web/assets/{tsMode-DnW9KumD.js → tsMode-BwwXBsvx.js}

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

package/package.json

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

package/src/index.js

@@ -27,12 +27,12 @@ if (process.argv.includes('--install')) {
 
 // Resolve --data-dir early so that storage.js and config.js both see the correct
 // data root when they are first require()'d below.
-;(function () {
+(function () {
     const idx = process.argv.indexOf('--data-dir');
     if (idx !== -1 && process.argv[idx + 1] && !process.argv[idx + 1].startsWith('-')) {
         process.env.SHE_DATA_DIR = process.argv[idx + 1];
     }
-}());
+})();
 
 // Ensure the data directory exists before anything else runs
 require('./lib/storage').ensureRoot();
@@ -73,6 +73,21 @@ const log = {
 const config = require('./config.js');
 const pkg = require('../package.json');
 
+/**
+ * Build a short log label for a script file.
+ * Uses the path relative to the configured script dir(s) when possible,
+ * falling back to the bare filename for files outside the script dir.
+ */
+function makeLabel(filePath) {
+    const normalized = filePath.replace(/\\/g, '/');
+    const dirs = config.dir ? (Array.isArray(config.dir) ? config.dir : [config.dir]) : [];
+    for (const d of dirs) {
+        const rel = path.relative(d, normalized).replace(/\\/g, '/');
+        if (!rel.startsWith('..')) return rel + ':';
+    }
+    return path.basename(normalized) + ':';
+}
+
 log.setLevel(['debug', 'info', 'warn', 'error'].indexOf(config.verbosity) === -1 ? 'info' : config.verbosity);
 log.info('she ' + pkg.version + ' starting');
 log.debug('loaded config: ', config);
@@ -296,9 +311,9 @@ if (config.url) {
     const _mqttOpts = { will: { topic: config.name + '/connected', payload: '0', retain: true } };
     if (config.mqttUsername) _mqttOpts.username = config.mqttUsername;
     if (config.mqttPassword) _mqttOpts.password = config.mqttPassword;
-    if (config.mqttCa)   _mqttOpts.ca   = config.mqttCa;
+    if (config.mqttCa) _mqttOpts.ca = config.mqttCa;
     if (config.mqttCert) _mqttOpts.cert = config.mqttCert;
-    if (config.mqttKey)  _mqttOpts.key  = config.mqttKey;
+    if (config.mqttKey) _mqttOpts.key = config.mqttKey;
     mqtt = modules.mqtt.connect(config.url, _mqttOpts);
     mqtt.publish(config.name + '/connected', '2', { retain: true });
 
@@ -497,18 +512,19 @@ function setVariable(name, val) {
 }
 
 function createScript(source, name) {
-    log.debug(name, 'compiling');
+    const compileLabel = makeLabel(name);
+    log.debug(compileLabel, 'compiling');
     try {
         return new vm.Script(source, { filename: name });
     } catch (err) {
-        log.error(name, err.name + ':', err.message);
+        log.error(compileLabel, err.name + ':', err.message);
         return false;
     }
 }
 
 function runScript(script, name, origin) {
     const scriptDir = path.dirname(path.resolve(name));
-    const logLabel = (origin || 'user') + '::' + path.basename(name) + ':';
+    const logLabel = makeLabel(name);
 
     // Initialise per-script resource tracking
     if (!scriptJobs.has(name)) scriptJobs.set(name, []);
@@ -980,7 +996,7 @@ function runScript(script, name, origin) {
         md(she, { scriptDomain, scriptName, scriptFile: name });
     });
 
-    log.debug(name, 'contextifying sandbox');
+    log.debug(logLabel, 'contextifying sandbox');
     const context = vm.createContext(Sandbox);
 
     scriptDomain.on('error', (e) => {
@@ -1009,7 +1025,7 @@ function runScript(script, name, origin) {
 function loadScript(file, origin) {
     origin = origin || 'user';
     file = file.replace(/\\/g, '/');
-    const loadLabel = (origin || 'user') + '::' + path.basename(file) + ':';
+    const loadLabel = makeLabel(file);
     if (scripts[file]) {
         log.error(loadLabel, 'already loaded?!');
         return;
@@ -1037,7 +1053,7 @@ function loadScript(file, origin) {
 function unloadScript(file) {
     file = file.replace(/\\/g, '/');
     const origin = scriptOrigins.get(file) || 'user';
-    const unloadLabel = (origin || 'user') + '::' + path.basename(file) + ':';
+    const unloadLabel = makeLabel(file);
     log.info(unloadLabel, 'unloading');
     scriptOrigins.delete(file);
 
@@ -1046,12 +1062,18 @@ function unloadScript(file) {
 
     // Remove MQTT subscriptions belonging to this script
     for (let i = subscriptions.length - 1; i >= 0; i--) {
-        if (subscriptions[i]._script === file) { subscriptions.splice(i, 1); removedCallbacks++; }
+        if (subscriptions[i]._script === file) {
+            subscriptions.splice(i, 1);
+            removedCallbacks++;
+        }
     }
 
     // Remove MQTT event callbacks (connect/disconnect) belonging to this script
     for (let i = mqttEventCallbacks.length - 1; i >= 0; i--) {
-        if (mqttEventCallbacks[i]._script === file) { mqttEventCallbacks.splice(i, 1); removedCallbacks++; }
+        if (mqttEventCallbacks[i]._script === file) {
+            mqttEventCallbacks.splice(i, 1);
+            removedCallbacks++;
+        }
     }
 
     // Remove HTTP routes registered by this script via she.api
@@ -1158,7 +1180,7 @@ function loadSandbox(callback) {
                 sandboxWatcher.on('ready', () => log.debug('watch', dir, 'initialized'));
                 sandboxWatcher.on('all', (event, filePath) => {
                     sandboxWatcher.close();
-                    log.info(filePath, 'sandbox change detected. exiting.');
+                    log.info(makeLabel(filePath), 'sandbox change detected. exiting.');
                     process.exit(0);
                 });
             }
@@ -1290,9 +1312,9 @@ function loadDir(dir) {
             // .shelib marker changes - warn only, manual restart required
             if (basename === '.shelib') {
                 if (event === 'add') {
-                    log.warn(filePath, 'library marker added - .js files in this directory will no longer load as scripts after daemon restart');
+                    log.warn(makeLabel(filePath), 'library marker added - .js files in this directory will no longer load as scripts after daemon restart');
                 } else if (event === 'unlink') {
-                    log.warn(filePath, 'library marker removed - .js files in this directory will load as scripts after daemon restart');
+                    log.warn(makeLabel(filePath), 'library marker removed - .js files in this directory will load as scripts after daemon restart');
                 }
                 return;
             }
@@ -1312,32 +1334,33 @@ function loadDir(dir) {
                 return;
             }
 
+            const fileLabel = makeLabel(filePath);
             if (event === 'change' && filePath.endsWith('.js')) {
                 if (isLibFile(filePath, dir)) {
-                    log.warn(filePath, 'is a library file - scripts that require() it will see the old version until they or the daemon are restarted');
+                    log.warn(fileLabel, 'is a library file - scripts that require() it will see the old version until they or the daemon are restarted');
                     return;
                 }
                 if (isDisabledPath(filePath) || isInDisabledDir(filePath, dir)) {
-                    log.debug(filePath, 'is disabled - ignoring change');
+                    log.debug(fileLabel, 'is disabled - ignoring change');
                     return;
                 }
-                log.info(filePath, 'change detected. hot-reloading.');
+                log.info(fileLabel, 'change detected. hot-reloading.');
                 unloadScript(filePath);
                 loadScript(filePath);
             } else if (event === 'add' && filePath.endsWith('.js')) {
                 if (isLibFile(filePath, dir)) {
-                    log.debug(filePath, 'is a library file - not loading as script');
+                    log.debug(fileLabel, 'is a library file - not loading as script');
                     return;
                 }
                 if (isDisabledPath(filePath) || isInDisabledDir(filePath, dir)) {
-                    log.debug(filePath, 'is disabled - not loading as script');
+                    log.debug(fileLabel, 'is disabled - not loading as script');
                     return;
                 }
-                log.info(filePath, 'added. loading.');
+                log.info(fileLabel, 'added. loading.');
                 loadScript(filePath);
             } else if (event === 'unlink' && filePath.endsWith('.js')) {
                 if (scripts[filePath]) {
-                    log.info(filePath, 'removed. unloading.');
+                    log.info(fileLabel, 'removed. unloading.');
                     unloadScript(filePath);
                 }
             }

package/src/web/scripts-api.js

@@ -46,6 +46,7 @@ function walk(dir, base, parentIsLib) {
     for (const entry of entries) {
         if (entry.name === '.shelib') continue;
         if (entry.name.startsWith('.shedisable-')) continue;
+        if (entry.isDirectory() && entry.name.startsWith('.')) continue;
         const rel = base ? `${base}/${entry.name}` : entry.name;
         if (entry.isDirectory()) {
             results.push(...walk(path.join(dir, entry.name), rel, lib));
@@ -75,6 +76,7 @@ function buildTree(dir, base, parentIsLib) {
     for (const entry of entries) {
         if (entry.name === '.shelib') continue;
         if (entry.name.startsWith('.shedisable-')) continue;
+        if (entry.isDirectory() && entry.name.startsWith('.')) continue;
         const rel = base ? `${base}/${entry.name}` : entry.name;
         const abs = path.join(dir, entry.name);
         if (entry.isDirectory()) {