smart-home-engine 0.22.0 → 0.23.0

package/dist/web/assets/{tsMode-B8CnSNxE.js → tsMode-Cvp4skWL.js}

@@ -1,4 +1,4 @@
-import{m as O}from"./monaco-langs-BW2J83t5.js";import{t as I}from"./index-BZSPXz4N.js";/*!-----------------------------------------------------------------------------
+import{m as O}from"./monaco-langs-BW2J83t5.js";import{t as I}from"./index-BWPgohd9.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-BZSPXz4N.js"></script>
+      <script type="module" crossorigin src="/assets/index-BWPgohd9.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.22.0",
+    "version": "0.23.0",
     "description": "Node.js based script runner for use in MQTT based Smart Home environments",
     "main": "src/index.js",
     "scripts": {

package/service/install.sh

@@ -32,8 +32,9 @@ else
     echo "user '$SHE_USER' already exists, skipping"
 fi
 
-# --- state directory (required by ReadWritePaths before first start) ------
-install -d -o "$SHE_USER" -g "$SHE_USER" -m 700 /home/she/.she
+# --- state directory ------------------------------------------------------
+install -d -o "$SHE_USER" -g "$SHE_USER" -m 750 /var/lib/she
+echo "created /var/lib/she"
 
 # --- sudoers rules -------------------------------------------------------
 NPM_BIN="$(command -v npm)"

package/service/smart-home-engine.service

@@ -11,9 +11,9 @@ Group=she
 Restart=on-failure
 RestartSec=5s
 
-ExecStart=/usr/local/bin/she
+ExecStart=/usr/local/bin/she --data-dir /var/lib/she
 
-ReadWritePaths=/home/she/.she
+ReadWritePaths=/var/lib/she
 
 StandardOutput=journal
 StandardError=journal

package/src/config.js

@@ -4,23 +4,29 @@ const fs = require('fs');
 const os = require('os');
 const path = require('path');
 
-// Default config file location (can be overridden with --config on the CLI)
-const configPath = path.join(os.homedir(), '.she', 'config', 'config.json');
+// Resolve data root: --data-dir is pre-parsed in index.js and written to SHE_DATA_DIR
+// so that this module and storage.js both see the same root when first required.
+const DATA_ROOT = process.env.SHE_DATA_DIR || path.join(os.homedir(), '.she');
 
 const config = require('yargs')
+    .option('data-dir', {
+        describe: 'root data directory for scripts, db, config, etc. (default: ~/.she)',
+        default: DATA_ROOT,
+        type: 'string',
+    })
     .option('dir', {
         alias: 'd',
         describe: 'directory to load user scripts from',
-        default: path.join(os.homedir(), '.she', 'scripts'),
+        default: path.join(DATA_ROOT, 'scripts'),
         type: 'string',
     })
     .option('db-path', {
         describe: 'path to sheDB data directory (empty string to disable)',
-        default: path.join(os.homedir(), '.she', 'db'),
+        default: path.join(DATA_ROOT, 'db'),
         type: 'string',
     })
     .option('matter-storage', {
-        describe: 'enable Matter controller; pass a directory path or true to use ~/.she/matter',
+        describe: 'enable Matter controller; pass a directory path or true to use <data-dir>/matter',
         type: 'string',
     })
     .option('port', {
@@ -36,7 +42,7 @@ const config = require('yargs')
             return {};
         }
     })
-    .default('config', configPath)
+    .default('config', path.join(DATA_ROOT, 'config', 'config.json'))
     .hide('config')
     // Sensible defaults for values not present in config.json
     .default({

package/src/index.js

@@ -25,7 +25,16 @@ if (process.argv.includes('--install')) {
     process.exit(0);
 }
 
-// Ensure ~/.she/ exists before anything else runs
+// 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 () {
+    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();
 
 const PinoPretty = require('pino-pretty');

package/src/lib/storage.js

@@ -4,7 +4,7 @@ const fs = require('fs');
 const os = require('os');
 const path = require('path');
 
-const STORAGE_ROOT = path.join(os.homedir(), '.she');
+const STORAGE_ROOT = process.env.SHE_DATA_DIR || path.join(os.homedir(), '.she');
 const CONFIG_ROOT = path.join(STORAGE_ROOT, 'config');
 const SCRIPTS_ROOT = path.join(STORAGE_ROOT, 'scripts');
 const DB_ROOT = path.join(STORAGE_ROOT, 'db');

package/src/web/server.js

@@ -107,6 +107,7 @@ function setStatsProvider(fn) {
 app.get('/she/status', (req, res) => {
     const s = _getStats ? _getStats() : { scripts: 0, topics: 0 };
     if (_latestNpmVersion) s.latestVersion = _latestNpmVersion;
+    s.dataDir = require('../lib/storage').STORAGE_ROOT;
     res.json(s);
 });