smart-home-engine 1.48.1 → 1.48.3

package/dist/web/assets/{tsMode-Bw4L07QT.js → tsMode-Daa0DLzL.js}

@@ -1,4 +1,4 @@
-import{m as O}from"./monaco-langs-DKJI_o9J.js";import{t as I}from"./index-DvjjOawt.js";/*!-----------------------------------------------------------------------------
+import{m as O}from"./monaco-langs-DKJI_o9J.js";import{t as I}from"./index-BMdhxdQq.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-DvjjOawt.js"></script>
+      <script type="module" crossorigin src="/assets/index-BMdhxdQq.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.1",
+    "version": "1.48.3",
     "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/npm-registry.js

@@ -39,10 +39,10 @@ async function latestVersion(name, opts = {}) {
     if (!validName(name)) return null;
     const now = opts.now ?? Date.now();
     const hit = _cache.get(name);
-    if (hit && !opts.force) {
-        if (hit.promise) return hit.promise;
-        if (now - hit.ts < TTL) return hit.version;
-    }
+    // a forced lookup ignores the cached answer, but not a forced one already on its way:
+    // the same adapter installed on five hosts is one request, not five
+    if (hit && hit.promise && (!opts.force || hit.forced)) return hit.promise;
+    if (hit && !opts.force && now - hit.ts < TTL) return hit.version;
     const promise = (async () => {
         try {
             const res = await _fetch(`${REGISTRY}/${name}/latest`, { signal: AbortSignal.timeout(10000) });
@@ -53,7 +53,7 @@ async function latestVersion(name, opts = {}) {
             return hit ? hit.version : null; // keep the last good answer
         }
     })();
-    _cache.set(name, { version: hit ? hit.version : null, ts: now, promise });
+    _cache.set(name, { version: hit ? hit.version : null, ts: now, promise, forced: Boolean(opts.force) });
     const version = await promise;
     _cache.set(name, { version, ts: now });
     return version;
@@ -63,10 +63,12 @@ async function latestVersion(name, opts = {}) {
  * Newer version available? null when unknown.
  * @param {string} name
  * @param {string|null} installed
+ * @param {{force?: boolean, now?: number}} [opts] `force` asks the registry again instead of
+ *   answering from the 24 h cache — what the refresh button on a listing wants.
  * @returns {Promise<{latest: string|null, updateAvailable: boolean|null}>}
  */
-async function updateInfo(name, installed) {
-    const latest = await latestVersion(name);
+async function updateInfo(name, installed, opts = {}) {
+    const latest = await latestVersion(name, opts);
     if (!latest || !installed) return { latest, updateAvailable: null };
     let updateAvailable = null;
     try {

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). */

package/src/web/services-api.js

@@ -132,17 +132,18 @@ function publish(topic, payload) {
     });
 }
 
-// GET /she/services/instances
+// GET /she/services/instances[?refresh=1]
 router.get('/instances', async (req, res) => {
     if (!_store) return res.json({ enabled: false, instances: [], coreCount: 0, legacyCount: 0 });
     const cfg = getServicesConfig(req);
     const result = analyzeServices(_store.mqttEntries());
-    // update badge: one registry lookup per adapter (cached 24 h)
+    // update badge: one registry lookup per adapter (cached 24 h, asked again on a refresh)
     const adapters = [...new Set(result.instances.filter((i) => i.adapter).map((i) => i.adapter))];
-    const latest = new Map(await Promise.all(adapters.map(async (a) => [a, await npmRegistry.latestVersion(a)])));
+    const latest = new Map(await Promise.all(adapters.map(async (a) => [a, await npmRegistry.latestVersion(a, { force: req.query.refresh === '1' })])));
     const instances = await Promise.all(
         result.instances.map(async (i) => {
             if (!i.adapter) return { ...i, latestVersion: null, updateAvailable: null };
+            // unforced on purpose: the lookup above just put the fresh answer in the cache
             const { updateAvailable } = await npmRegistry.updateInfo(i.adapter, i.version);
             return { ...i, latestVersion: latest.get(i.adapter) ?? null, updateAvailable };
         }),
@@ -556,7 +557,7 @@ router.get('/hosts', async (req, res) => {
     if (!fresh && _hostsCache && _hostsCache.key === key && Date.now() - _hostsCache.ts < HOSTS_TTL) {
         return res.json({ hosts: await _hostsCache.promise, cached: true });
     }
-    const promise = listHosts(req);
+    const promise = listHosts(req, { force: fresh });
     _hostsCache = { key, ts: Date.now(), promise };
     res.json({ hosts: await promise, cached: false });
 });
@@ -574,7 +575,12 @@ function withCpuShare(hostName, instances, now = Date.now()) {
     });
 }
 
-async function listHosts(req) {
+/**
+ * @param {object} req
+ * @param {{force?: boolean}} [opts] `force`: ask npm again for the latest versions instead of
+ *   taking the 24 h cached answer — a refresh on the listing means "is any of this outdated now?"
+ */
+async function listHosts(req, opts = {}) {
     return Promise.all(
         hostEntries(req).map(async ({ cfg, driver }) => {
             const base = {
@@ -588,11 +594,11 @@ async function listHosts(req) {
                 const { stdout } = await driver.exec(['list']);
                 const list = parseList(stdout);
                 if (!cfg.hostname && list.hostname) saveHostname(req, cfg.name, list.hostname);
-                // update badge per installed adapter: one registry lookup each (cached 24 h)
+                // update badge per installed adapter: one registry lookup each (cached 24 h, asked again on a refresh)
                 const adapters = await Promise.all(
                     (list.adapters || []).map(async (a) => {
                         try {
-                            const { latest, updateAvailable } = await npmRegistry.updateInfo(a.name, a.version);
+                            const { latest, updateAvailable } = await npmRegistry.updateInfo(a.name, a.version, { force: opts.force });
                             return { ...a, latestVersion: latest || null, updateAvailable };
                         } catch {
                             return { ...a, latestVersion: null, updateAvailable: null };