smart-home-engine 1.43.0 → 1.45.0

package/dist/web/assets/{tsMode-B4v7bdgd.js → tsMode-Do6TLbFL.js}

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

package/dist/web/index.html

@@ -172,10 +172,10 @@
                 }
             })();
         </script>
-      <script type="module" crossorigin src="/assets/index-Crx1MbU9.js"></script>
+      <script type="module" crossorigin src="/assets/index-IEG5HdGq.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-dFdInRyC.css">
+      <link rel="stylesheet" crossorigin href="/assets/index-C3PWzLWR.css">
     </head>
     <body>
         <div id="app"></div>

package/package.json

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

package/service/she-servicectl

@@ -31,7 +31,7 @@
 #   she-servicectl files  <adapter> <instance>                     JSON listing of /etc/<adapter>/ and /var/lib/<adapter>/<instance>/
 #   she-servicectl file   <adapter> <instance> read|write <path>  a file inside those two directories (write: content on stdin)
 #   she-servicectl asset  <adapter> <relpath>                      a file shipped in the adapter package (example, schema)
-#   she-servicectl node update [--lts]                             install/refresh tj/n (downloaded, no npm), then n stable (or n lts) — JSON with the version before and after
+#   she-servicectl node update [--lts|--latest|--stable]           install/refresh tj/n (downloaded, no npm), then n install <label> — JSON with the version before and after
 #   she-servicectl restart-all                                     restart every running instance on this host (after a node update, say)
 #   she-servicectl self-update                                     replace this script with the one on stdin (she ships it)
 #   she-servicectl remove-key                                      drop the public key on stdin from the calling user's authorized_keys
@@ -693,10 +693,13 @@ cmd_node() {
     action=$1
     shift
     [ "$action" = update ] || die "unknown node action: $action"
-    spec=stable
+    # the label is handed to n as it is: stable and lts both resolve to the newest
+    # long-term-support release (stable is n's older name for it), latest to the newest of all
+    spec=lts
     while [ $# -gt 0 ]; do
         case "$1" in
             --lts) spec=lts ;;
+            --latest) spec=latest ;;
             --stable) spec=stable ;;
             *) die "unknown option: $1" ;;
         esac

package/src/lib/node-releases.js

@@ -0,0 +1,65 @@
+'use strict';
+
+/**
+ * Which Node.js versions a host could be updated to — the two labels tj/n understands:
+ * `lts` (newest Long Term Support release) and `latest` (newest official release).
+ *
+ * she asks nodejs.org once for all hosts and caches the answer, so the Hosts tab can show
+ * what a click would install and hide the button when the host already runs it. Best-effort:
+ * every failure yields the last good answer, or nulls — nothing throws.
+ */
+
+const INDEX_URL = 'https://nodejs.org/dist/index.json';
+const TTL = 6 * 60 * 60 * 1000;
+
+let _fetch = (...args) => fetch(...args);
+
+/** Test hook: replace the fetch implementation. */
+function setFetch(fn) {
+    _fetch = fn;
+}
+
+/** @type {{lts: string|null, ltsName: string|null, latest: string|null, ts: number, ok: boolean}|null} */
+let _cache = null;
+/** @type {Promise<object>|null} */
+let _inflight = null;
+
+function clearCache() {
+    _cache = null;
+    _inflight = null;
+}
+
+/**
+ * @param {{force?: boolean, now?: number}} [opts]
+ * @returns {Promise<{lts: string|null, ltsName: string|null, latest: string|null, fetchedAt: number|null, stale: boolean}>}
+ */
+async function releases(opts = {}) {
+    const now = opts.now ?? Date.now();
+    if (_cache && !opts.force && now - _cache.ts < TTL) {
+        return { lts: _cache.lts, ltsName: _cache.ltsName, latest: _cache.latest, fetchedAt: _cache.ts, stale: !_cache.ok };
+    }
+    if (_inflight) return _inflight;
+
+    _inflight = (async () => {
+        try {
+            const res = await _fetch(INDEX_URL, { signal: AbortSignal.timeout(15000) });
+            if (!res.ok) throw new Error(String(res.status));
+            const list = await res.json();
+            if (!Array.isArray(list) || list.length === 0) throw new Error('unexpected index.json');
+            // index.json is ordered newest first; an LTS entry carries its codename in `lts`
+            const latest = typeof list[0].version === 'string' ? list[0].version : null;
+            const ltsEntry = list.find((e) => e && e.lts && typeof e.version === 'string') || null;
+            _cache = { lts: ltsEntry ? ltsEntry.version : null, ltsName: ltsEntry ? String(ltsEntry.lts) : null, latest, ts: now, ok: true };
+        } catch {
+            // keep whatever was known before, just mark it stale
+            _cache = _cache ? { ..._cache, ts: now, ok: false } : { lts: null, ltsName: null, latest: null, ts: now, ok: false };
+        } finally {
+            _inflight = null;
+        }
+        return { lts: _cache.lts, ltsName: _cache.ltsName, latest: _cache.latest, fetchedAt: _cache.ok ? _cache.ts : null, stale: !_cache.ok };
+    })();
+
+    return _inflight;
+}
+
+module.exports = { releases, setFetch, clearCache, INDEX_URL, TTL };

package/src/web/services-api.js

@@ -29,7 +29,8 @@
  *   GET    /she/services/ssh/pubkey                                  public key of the services identity (I5)
  *   POST   /she/services/ssh/keygen                                  generate it
  *   POST   /she/services/hosts/:host/test                            run `she-servicectl version` → ok / code
- *   POST   /she/services/hosts/:host/node/update                     { channel: stable|lts } update Node.js with tj/n (helper v13)
+ *   GET    /she/services/node/releases[?refresh=1]                   what a node update would install: the newest lts and latest release
+ *   POST   /she/services/hosts/:host/node/update                     { channel: stable|lts|latest } update Node.js with tj/n (helper v13)
  *   POST   /she/services/hosts/:host/instances/restart-all           restart every running instance (after a node update)
  *   POST   /she/services/hosts/:host/helper/deploy                   scp the helper to a remote host, install it, print the sudoers line
  *   POST   /she/services/hosts/:host/helper/remove                   { mode: key|all, force? } remove she from the host (I11), drop the host entry
@@ -56,6 +57,7 @@ const dns = require('dns');
 const { analyzeServices, wipeTopics, LOG_LEVELS } = require('../lib/services-inventory');
 const { shapeDevices, discoverTarget } = require('../lib/device-discovery');
 const npmRegistry = require('../lib/npm-registry');
+const nodeReleases = require('../lib/node-releases');
 const catalog = require('../lib/services-catalog');
 const os = require('os');
 const path = require('path');
@@ -1043,12 +1045,18 @@ function nodeHostError(res, err) {
     return hostError(res, err);
 }
 
-// POST /she/services/hosts/:host/node/update { channel?: 'stable' | 'lts' }
+// GET /she/services/node/releases[?refresh=1] — what the update buttons would install
+router.get('/node/releases', async (req, res) => {
+    res.json(await nodeReleases.releases({ force: req.query.refresh === '1' }));
+});
+
+// POST /she/services/hosts/:host/node/update { channel?: 'lts' | 'latest' }
 router.post('/hosts/:host/node/update', async (req, res) => {
     const entry = resolve(req, res);
     if (!entry) return;
-    const channel = (req.body && req.body.channel) || 'stable';
-    if (channel !== 'stable' && channel !== 'lts') return res.status(400).json({ error: "channel must be 'stable' or 'lts'" });
+    // n's own labels, passed through as they are: stable and lts both mean the newest LTS
+    const channel = (req.body && req.body.channel) || 'lts';
+    if (!['stable', 'lts', 'latest'].includes(channel)) return res.status(400).json({ error: "channel must be 'stable', 'lts' or 'latest'" });
     try {
         // downloading and unpacking a node build on a small host takes a while
         const { stdout } = await entry.driver.exec(['node', 'update', '--' + channel], { timeout: 900000 });