smart-home-engine 1.1.1 → 1.1.3

package/dist/web/assets/{tsMode-BcbP1HsB.js → tsMode-DR7Bz8RW.js}

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

package/dist/web/index.html

@@ -172,7 +172,7 @@
                 }
             })();
         </script>
-      <script type="module" crossorigin src="/assets/index-DttCbWJj.js"></script>
+      <script type="module" crossorigin src="/assets/index-S8U43ruI.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-DKIgEFlE.css">

package/package.json

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

package/src/lib/ssh-deploy.js

@@ -50,7 +50,8 @@ function scpArgs(sshConfig) {
 }
 
 function sshTarget(sshConfig) {
-    return `${sshConfig.user || 'she'}@${sshConfig.host}`;
+    const user = sshConfig.user || os.userInfo().username;
+    return `${user}@${sshConfig.host}`;
 }
 
 /**
@@ -159,4 +160,4 @@ async function generateKeypair(identityFile) {
     return fs.readFileSync(expandedPath + '.pub', 'utf8').trim();
 }
 
-module.exports = { runCommand, readRemoteFile, uploadFile, uploadContent, testConnection, generateKeypair };
+module.exports = { expandHome, runCommand, readRemoteFile, uploadFile, uploadContent, testConnection, generateKeypair };

package/src/web/broker-api.js

@@ -190,8 +190,7 @@ router.post('/config/restore', (req, res) => {
 router.post('/reload', async (req, res) => {
     try {
         const bc = getBrokerConfig(req);
-        if (bc.mode === 'remote' && bc.ssh && bc.ssh.host) {
-            const cmd = bc.reloadCmd || 'sudo systemctl reload mosquitto';
+        if (bc.ssh && bc.ssh.host) {
             const result = await sshDeploy.runCommand(bc.ssh, cmd);
             return res.json({ ok: true, ...result });
         }
@@ -210,8 +209,7 @@ router.post('/reload', async (req, res) => {
 router.post('/restart', async (req, res) => {
     try {
         const bc = getBrokerConfig(req);
-        if (bc.mode === 'remote' && bc.ssh && bc.ssh.host) {
-            const cmd = bc.restartCmd || 'sudo systemctl restart mosquitto';
+        if (bc.ssh && bc.ssh.host) {
             const result = await sshDeploy.runCommand(bc.ssh, cmd);
             return res.json({ ok: true, ...result });
         }
@@ -662,6 +660,20 @@ module.exports = { router };
 // Note: these routes are mounted on the same router but defined after module.exports
 // because they add to `router` (which is already exported by reference).
 
+/** GET /she/broker/ssh/pubkey — Read existing public key (if any) */
+router.get('/ssh/pubkey', (req, res) => {
+    try {
+        const bc = getBrokerConfig(req);
+        const identityFile = sshDeploy.expandHome((bc.ssh && bc.ssh.identityFile) || DEFAULT_SSH_KEY);
+        const pubPath = identityFile + '.pub';
+        if (!fs.existsSync(pubPath)) return res.json({ publicKey: null });
+        const publicKey = fs.readFileSync(pubPath, 'utf8').trim();
+        res.json({ publicKey });
+    } catch (err) {
+        handleError(res, err);
+    }
+});
+
 /** POST /she/broker/ssh/keygen — Generate SSH keypair */
 router.post('/ssh/keygen', async (req, res) => {
     try {
@@ -723,7 +735,7 @@ router.post('/wizard/bootstrap', async (req, res) => {
         const username = req.body.adminUsername || 'she-admin';
         const password = req.body.adminPassword || crypto.randomBytes(18).toString('base64url');
         const configDir = (req.body.configDir || bc.configDir || '/etc/mosquitto').replace(/\\/g, '/');
-        const isRemote = bc.mode === 'remote' && bc.ssh && bc.ssh.host;
+        const isRemote = !!(bc.ssh && bc.ssh.host);
 
         const dynSecPath = `${configDir}/dynamic-security.json`;
         const confFilePath = `${configDir}/mosquitto.conf`;