smart-home-engine 1.48.2 → 1.49.0

package/dist/web/assets/{tsMode-B1gyNry3.js → tsMode-DPnnht_o.js}

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

package/package.json

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

package/service/she-servicectl

@@ -45,7 +45,7 @@
 
 set -eu
 
-VERSION=13
+VERSION=14
 BROKER_ENV=/etc/mqtt-interfaces/broker.env
 UNIT_DIR=/etc/systemd/system
 
@@ -84,10 +84,25 @@ need_instance() {
     valid_instance "$1" || die "invalid instance name: $1"
 }
 
+# the command behind <adapter> belongs to an npm package of that name — what tells an adapter
+# apart from any other daemon that happens to keep its binary in /usr/local/bin
+npm_adapter_pkg() {
+    dir=$(adapter_dir "$1" 2>/dev/null) || return 1
+    [ "$(basename "$dir")" = "$1" ] && return 0
+    grep -Eq "\"name\"[[:space:]]*:[[:space:]]*\"(@[^\"/]*/)?$1\"" "$dir/package.json" 2>/dev/null
+}
+
 # a plain <adapter>.service of an npm-installed adapter (pre-core layout)
 legacy_unit() {
     [ -f "$UNIT_DIR/$1.service" ] || return 1
-    grep -Eq "(/node_modules/$1/|/usr/local/bin/$1( |$))" "$UNIT_DIR/$1.service" 2>/dev/null
+    # the unit naming the package directory is conclusive on its own
+    if grep -Eq "/node_modules/$1/" "$UNIT_DIR/$1.service" 2>/dev/null; then
+        return 0
+    fi
+    # ExecStart=/usr/local/bin/<name> alone is not: dnscrypt-proxy, dnsproxy and the like live
+    # there too. It counts only when that binary is an npm package called <adapter>.
+    grep -Eq "/usr/local/bin/$1( |$)" "$UNIT_DIR/$1.service" 2>/dev/null || return 1
+    npm_adapter_pkg "$1"
 }
 # the env file of a legacy unit: its EnvironmentFile= (leading - stripped), default /etc/default/<adapter>;
 # only /etc/default/<adapter> or something inside /etc/<adapter>/ is accepted

package/src/lib/services-host.js

@@ -26,7 +26,7 @@ const { execFile, spawn } = require('child_process');
 const sshDeploy = require('./ssh-deploy');
 
 const HELPER = '/usr/local/bin/she-servicectl';
-const HELPER_VERSION = 13; // must match VERSION in service/she-servicectl (test/unit/helper-version.test.js)
+const HELPER_VERSION = 14; // must match VERSION in service/she-servicectl (test/unit/helper-version.test.js)
 /** Default identity for services.hosts[].ssh — one key for all managed hosts (I5). */
 const DEFAULT_SERVICES_IDENTITY = '~/.she/ssh/services_id_ed25519';
 /** The helper as shipped with this she version (copied to remote hosts by the deploy route). */