herdr-remote 0.2.1 → 0.2.2

package/dist/tui.mjs

@@ -557,7 +557,19 @@ var require_en = __commonJS({
       "hint.restartRequired": "Restart the services to apply these changes.",
       "hint.unsavedChanges": "Unsaved changes \u2014 press s to save.",
       "hint.save": "s save",
-      "hint.editing": "\u21B5 confirm \xB7 esc cancel"
+      "hint.editing": "\u21B5 confirm \xB7 esc cancel",
+      "update.title": "Updates",
+      "update.check": "Check for updates",
+      "update.checking": "Checking npm\u2026",
+      "update.upToDate": "Up to date ({version})",
+      "update.available": "Update available: {version} \u2014 press Enter to install",
+      "update.updating": "Installing {version}\u2026",
+      "update.done": "Updated to {version}",
+      "update.restartHint": "Update installed. Restart herdr-remote to use it.",
+      "update.errorNetwork": "Could not reach the npm registry",
+      "update.errorFailed": "The update failed. Try: npm install -g herdr-remote@latest",
+      "update.cannot.source": "Running from a source checkout \u2014 update with git, not npm",
+      "update.cannot.linked": "Running from a linked working copy \u2014 npm link manages this one"
     };
   }
 });
@@ -765,7 +777,19 @@ var require_zh = __commonJS({
       "hint.restartRequired": "\u9700\u8981\u91CD\u542F\u670D\u52A1\u624D\u80FD\u751F\u6548\u3002",
       "hint.unsavedChanges": "\u6709\u672A\u4FDD\u5B58\u7684\u4FEE\u6539 \u2014 \u6309 s \u4FDD\u5B58\u3002",
       "hint.save": "s \u4FDD\u5B58",
-      "hint.editing": "\u21B5 \u786E\u8BA4 \xB7 esc \u53D6\u6D88"
+      "hint.editing": "\u21B5 \u786E\u8BA4 \xB7 esc \u53D6\u6D88",
+      "update.title": "\u66F4\u65B0",
+      "update.check": "\u68C0\u67E5\u66F4\u65B0",
+      "update.checking": "\u6B63\u5728\u67E5\u8BE2 npm\u2026",
+      "update.upToDate": "\u5DF2\u662F\u6700\u65B0\uFF08{version}\uFF09",
+      "update.available": "\u6709\u65B0\u7248\u672C {version} \u2014\u2014 \u6309 Enter \u5B89\u88C5",
+      "update.updating": "\u6B63\u5728\u5B89\u88C5 {version}\u2026",
+      "update.done": "\u5DF2\u66F4\u65B0\u5230 {version}",
+      "update.restartHint": "\u66F4\u65B0\u5DF2\u5B89\u88C5\uFF0C\u91CD\u542F herdr-remote \u540E\u751F\u6548\u3002",
+      "update.errorNetwork": "\u65E0\u6CD5\u8FDE\u63A5 npm registry",
+      "update.errorFailed": "\u66F4\u65B0\u5931\u8D25\uFF0C\u53EF\u624B\u52A8\u6267\u884C\uFF1Anpm install -g herdr-remote@latest",
+      "update.cannot.source": "\u5F53\u524D\u4ECE\u6E90\u7801\u76EE\u5F55\u8FD0\u884C \u2014\u2014 \u8BF7\u7528 git \u66F4\u65B0\uFF0C\u800C\u4E0D\u662F npm",
+      "update.cannot.linked": "\u5F53\u524D\u662F npm link \u7684\u5DE5\u4F5C\u526F\u672C \u2014\u2014 \u7531 npm link \u7BA1\u7406"
     };
   }
 });
@@ -2272,6 +2296,116 @@ var require_herdr_plugin = __commonJS({
   }
 });
 
+// src/updater.js
+var require_updater = __commonJS({
+  "src/updater.js"(exports, module) {
+    "use strict";
+    var fs = __require("node:fs");
+    var path = __require("node:path");
+    var { spawn } = __require("node:child_process");
+    var { PACKAGE_ROOT } = require_config();
+    var PACKAGE_NAME = "herdr-remote";
+    var REGISTRY_URL = `https://registry.npmjs.org/${PACKAGE_NAME}/latest`;
+    function currentVersion() {
+      try {
+        return __require(path.join(PACKAGE_ROOT, "package.json")).version;
+      } catch {
+        return "0.0.0";
+      }
+    }
+    function installKind2() {
+      const root = PACKAGE_ROOT;
+      if (!root.split(path.sep).includes("node_modules")) return "source";
+      try {
+        if (fs.lstatSync(root).isSymbolicLink()) return "linked";
+      } catch {
+      }
+      return "npm";
+    }
+    function canSelfUpdate2() {
+      return installKind2() === "npm";
+    }
+    function compareVersions(a, b) {
+      const parse = (value) => String(value).split("-")[0].split(".").map((part) => Number.parseInt(part, 10) || 0);
+      const left = parse(a);
+      const right = parse(b);
+      for (let index = 0; index < Math.max(left.length, right.length); index += 1) {
+        const diff = (left[index] || 0) - (right[index] || 0);
+        if (diff > 0) return 1;
+        if (diff < 0) return -1;
+      }
+      return 0;
+    }
+    async function checkForUpdate2({ timeoutMs = 8e3, fetchImpl = globalThis.fetch } = {}) {
+      const current = currentVersion();
+      const controller = new AbortController();
+      const timer = setTimeout(() => controller.abort(), timeoutMs);
+      try {
+        const response = await fetchImpl(REGISTRY_URL, {
+          signal: controller.signal,
+          headers: { Accept: "application/vnd.npm.install-v1+json" }
+        });
+        if (!response.ok) {
+          return { ok: false, current, errorKey: "update.errorNetwork" };
+        }
+        const body = await response.json();
+        const latest = typeof body?.version === "string" ? body.version : null;
+        if (!latest) return { ok: false, current, errorKey: "update.errorNetwork" };
+        return {
+          ok: true,
+          current,
+          latest,
+          updateAvailable: compareVersions(latest, current) > 0
+        };
+      } catch {
+        return { ok: false, current, errorKey: "update.errorNetwork" };
+      } finally {
+        clearTimeout(timer);
+      }
+    }
+    function performUpdate2({
+      spawnImpl = spawn,
+      timeoutMs = 18e4,
+      // Seam for tests: the suite runs from a checkout, where the guard below is
+      // correctly the only reachable outcome.
+      installKindImpl = installKind2
+    } = {}) {
+      return new Promise((resolve) => {
+        const kind = installKindImpl();
+        if (kind !== "npm") {
+          resolve({ ok: false, errorKey: `update.cannot.${kind}` });
+          return;
+        }
+        const child = spawnImpl("npm", ["install", "-g", `${PACKAGE_NAME}@latest`], {
+          encoding: "utf8",
+          timeout: timeoutMs
+        });
+        let output = "";
+        const collect = (chunk) => {
+          output += String(chunk);
+        };
+        child.stdout?.on("data", collect);
+        child.stderr?.on("data", collect);
+        child.on("error", (error) => {
+          resolve({ ok: false, errorKey: "update.errorFailed", output: error.message });
+        });
+        child.on("close", (code) => {
+          resolve({ ok: code === 0, output: output.trim().slice(-2e3) });
+        });
+      });
+    }
+    module.exports = {
+      PACKAGE_NAME,
+      canSelfUpdate: canSelfUpdate2,
+      checkForUpdate: checkForUpdate2,
+      compareVersions,
+      currentVersion,
+      installKind: installKind2,
+      performUpdate: performUpdate2
+    };
+  }
+});
+
 // tui/src/index.tsx
 import { render } from "ink";
 
@@ -2580,6 +2714,7 @@ var import_service = __toESM(require_service());
 var import_lifecycle = __toESM(require_lifecycle());
 var keepalive = __toESM(require_keepalive());
 var herdrPlugin = __toESM(require_herdr_plugin());
+var import_updater = __toESM(require_updater());
 function detectLocale(options = {}) {
   return (0, import_i18n.detectLocale)(options);
 }
@@ -3462,12 +3597,65 @@ import { jsx as jsx10, jsxs as jsxs9 } from "react/jsx-runtime";
 function About({ ctx }) {
   const { t, draft } = ctx;
   const [selected, setSelected] = useState8("auto");
+  const [update, setUpdate] = useState8({ phase: "idle" });
   const detected = detectLocale({ preference: "auto" });
-  const options = [
+  const languageOptions = [
     { id: "auto", label: t("about.languageAuto", { detected }) },
     { id: "zh", label: t("about.languageZh") },
     { id: "en", label: t("about.languageEn") }
   ];
+  const updatable = (0, import_updater.canSelfUpdate)();
+  const updateLabel = (() => {
+    switch (update.phase) {
+      case "checking":
+        return t("update.checking");
+      case "current":
+        return t("update.upToDate", { version: update.latest });
+      case "available":
+        return t("update.available", { version: update.latest });
+      case "updating":
+        return t("update.updating", { version: update.latest });
+      case "done":
+        return t("update.done", { version: update.latest });
+      case "error":
+        return t(update.messageKey);
+      default:
+        return t("update.check");
+    }
+  })();
+  const options = [...languageOptions, { id: "update", label: updateLabel }];
+  const runCheck = async () => {
+    setUpdate({ phase: "checking" });
+    const result = await (0, import_updater.checkForUpdate)();
+    if (!result.ok) {
+      setUpdate({ phase: "error", messageKey: result.errorKey ?? "update.errorNetwork" });
+      return;
+    }
+    setUpdate(result.updateAvailable ? { phase: "available", latest: result.latest } : { phase: "current", latest: result.latest });
+  };
+  const runUpdate = async (latest) => {
+    setUpdate({ phase: "updating", latest });
+    const result = await (0, import_updater.performUpdate)();
+    if (!result.ok) {
+      setUpdate({ phase: "error", messageKey: result.errorKey ?? "update.errorFailed" });
+      ctx.notify(t("update.errorFailed"), "error");
+      return;
+    }
+    setUpdate({ phase: "done", latest });
+    ctx.notify(t("update.restartHint"), "success");
+  };
+  const activateUpdate = () => {
+    if (update.phase === "checking" || update.phase === "updating") return;
+    if (update.phase === "available") {
+      if (!updatable) {
+        setUpdate({ phase: "error", messageKey: `update.cannot.${(0, import_updater.installKind)()}` });
+        return;
+      }
+      void runUpdate(update.latest);
+      return;
+    }
+    void runCheck();
+  };
   const choose = (language) => {
     const result = (0, import_settings_model.setField)(draft, "language", language);
     if (result.errorKey) {
@@ -3483,15 +3671,22 @@ function About({ ctx }) {
       ctx.notify(t("error.saveFailed", { message: error.message }), "error");
     }
   };
+  const activate = (id) => {
+    if (id === "update") {
+      activateUpdate();
+      return;
+    }
+    choose(id);
+  };
   useInput7((_input, key) => {
     const index = options.findIndex((option) => option.id === selected);
     if (key.upArrow) setSelected(options[(index - 1 + options.length) % options.length].id);
     else if (key.downArrow) setSelected(options[(index + 1) % options.length].id);
-    else if (key.return) choose(selected);
+    else if (key.return) activate(selected);
   }, { isActive: ctx.editingId === null });
   return /* @__PURE__ */ jsxs9(Panel, { title: t("about.title"), children: [
     /* @__PURE__ */ jsx10(Text9, { color: theme.muted, children: t("about.language") }),
-    /* @__PURE__ */ jsx10(Box9, { flexDirection: "column", marginTop: 1, marginBottom: 1, children: options.map((option) => /* @__PURE__ */ jsx10(
+    /* @__PURE__ */ jsx10(Box9, { flexDirection: "column", marginTop: 1, marginBottom: 1, children: languageOptions.map((option) => /* @__PURE__ */ jsx10(
       Selectable,
       {
         selected: selected === option.id,
@@ -3504,7 +3699,20 @@ function About({ ctx }) {
       },
       option.id
     )) }),
-    /* @__PURE__ */ jsx10(Row, { label: t("about.version"), children: /* @__PURE__ */ jsx10(Text9, { color: theme.muted, children: "0.2.1" }) }),
+    /* @__PURE__ */ jsx10(Text9, { color: theme.muted, children: t("update.title") }),
+    /* @__PURE__ */ jsx10(Box9, { flexDirection: "column", marginTop: 1, marginBottom: 1, children: /* @__PURE__ */ jsx10(
+      Selectable,
+      {
+        selected: selected === "update",
+        onSelect: () => {
+          setSelected("update");
+          activateUpdate();
+        },
+        onHover: () => setSelected("update"),
+        children: updateLabel
+      }
+    ) }),
+    /* @__PURE__ */ jsx10(Row, { label: t("about.version"), children: /* @__PURE__ */ jsx10(Text9, { color: theme.muted, children: "0.2.2" }) }),
     /* @__PURE__ */ jsx10(Row, { label: t("about.configPath"), children: /* @__PURE__ */ jsx10(Text9, { color: theme.muted, children: (0, import_config.configPath)() }) }),
     /* @__PURE__ */ jsx10(Row, { label: t("about.statePath"), children: /* @__PURE__ */ jsx10(Text9, { color: theme.muted, children: (0, import_config.stateDir)() }) }),
     /* @__PURE__ */ jsx10(Box9, { marginTop: 1, children: /* @__PURE__ */ jsx10(Text9, { color: theme.muted, children: t("about.docs") }) }),

package/herdr-plugin.toml

@@ -1,6 +1,6 @@
 id = "herdr.remote.web"
 name = "Herdr Remote Web"
-version = "0.2.0"
+version = "0.2.2"
 min_herdr_version = "0.8.2"
 description = "Mobile-first remote access to the native Herdr TUI through a local or self-hosted relay"
 platforms = ["linux", "macos"]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "herdr-remote",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "Remote browser access to your Herdr terminal workspaces: Herdr plugin, host connector, and bilingual configuration TUI",
   "license": "MIT",
   "repository": {

package/src/i18n/en.js

@@ -218,4 +218,16 @@ module.exports = {
   'hint.unsavedChanges': 'Unsaved changes — press s to save.',
   'hint.save': 's save',
   'hint.editing': '↵ confirm · esc cancel',
+  'update.title': 'Updates',
+  'update.check': 'Check for updates',
+  'update.checking': 'Checking npm…',
+  'update.upToDate': 'Up to date ({version})',
+  'update.available': 'Update available: {version} — press Enter to install',
+  'update.updating': 'Installing {version}…',
+  'update.done': 'Updated to {version}',
+  'update.restartHint': 'Update installed. Restart herdr-remote to use it.',
+  'update.errorNetwork': 'Could not reach the npm registry',
+  'update.errorFailed': 'The update failed. Try: npm install -g herdr-remote@latest',
+  'update.cannot.source': 'Running from a source checkout — update with git, not npm',
+  'update.cannot.linked': 'Running from a linked working copy — npm link manages this one',
 };

package/src/i18n/zh.js

@@ -217,4 +217,16 @@ module.exports = {
   'hint.unsavedChanges': '有未保存的修改 — 按 s 保存。',
   'hint.save': 's 保存',
   'hint.editing': '↵ 确认 · esc 取消',
+  'update.title': '更新',
+  'update.check': '检查更新',
+  'update.checking': '正在查询 npm…',
+  'update.upToDate': '已是最新（{version}）',
+  'update.available': '有新版本 {version} —— 按 Enter 安装',
+  'update.updating': '正在安装 {version}…',
+  'update.done': '已更新到 {version}',
+  'update.restartHint': '更新已安装，重启 herdr-remote 后生效。',
+  'update.errorNetwork': '无法连接 npm registry',
+  'update.errorFailed': '更新失败，可手动执行：npm install -g herdr-remote@latest',
+  'update.cannot.source': '当前从源码目录运行 —— 请用 git 更新，而不是 npm',
+  'update.cannot.linked': '当前是 npm link 的工作副本 —— 由 npm link 管理',
 };

package/src/updater.js

@@ -0,0 +1,148 @@
+'use strict';
+
+// Self-update for the npm-installed CLI.
+//
+// The update path is only meaningful for a package installed from npm. A source
+// checkout is managed by git and a linked development copy by the developer, so
+// this refuses to touch either: silently running `npm install -g` over a
+// checkout would replace the tree someone is working in.
+
+const fs = require('node:fs');
+const path = require('node:path');
+const { spawn } = require('node:child_process');
+const { PACKAGE_ROOT } = require('./config');
+
+const PACKAGE_NAME = 'herdr-remote';
+const REGISTRY_URL = `https://registry.npmjs.org/${PACKAGE_NAME}/latest`;
+
+function currentVersion() {
+  try {
+    return require(path.join(PACKAGE_ROOT, 'package.json')).version;
+  } catch {
+    return '0.0.0';
+  }
+}
+
+/**
+ * How this copy got here.
+ *
+ * - `npm`      installed from the registry; updating is `npm install -g`.
+ * - `linked`   `npm link`ed into a global tree from a working copy.
+ * - `source`   run straight out of a checkout.
+ *
+ * The distinction is drawn from the path rather than from npm, which would
+ * mean shelling out on every render.
+ */
+function installKind() {
+  const root = PACKAGE_ROOT;
+  // A real install always lives inside a node_modules tree.
+  if (!root.split(path.sep).includes('node_modules')) return 'source';
+  try {
+    // `npm link` leaves a symlink where a published install has a directory.
+    if (fs.lstatSync(root).isSymbolicLink()) return 'linked';
+  } catch {
+    // Unreadable: treat as a normal install and let npm report the problem.
+  }
+  return 'npm';
+}
+
+function canSelfUpdate() {
+  return installKind() === 'npm';
+}
+
+/** Compare two `MAJOR.MINOR.PATCH` strings. Returns 1, -1 or 0. */
+function compareVersions(a, b) {
+  const parse = (value) => String(value)
+    .split('-')[0]
+    .split('.')
+    .map((part) => Number.parseInt(part, 10) || 0);
+  const left = parse(a);
+  const right = parse(b);
+  for (let index = 0; index < Math.max(left.length, right.length); index += 1) {
+    const diff = (left[index] || 0) - (right[index] || 0);
+    if (diff > 0) return 1;
+    if (diff < 0) return -1;
+  }
+  return 0;
+}
+
+/**
+ * Ask the registry what the current release is.
+ *
+ * Never throws: an update check is a convenience, and a machine that is offline
+ * or behind a proxy should still get a working settings screen.
+ */
+async function checkForUpdate({ timeoutMs = 8000, fetchImpl = globalThis.fetch } = {}) {
+  const current = currentVersion();
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), timeoutMs);
+  try {
+    const response = await fetchImpl(REGISTRY_URL, {
+      signal: controller.signal,
+      headers: { Accept: 'application/vnd.npm.install-v1+json' },
+    });
+    if (!response.ok) {
+      return { ok: false, current, errorKey: 'update.errorNetwork' };
+    }
+    const body = await response.json();
+    const latest = typeof body?.version === 'string' ? body.version : null;
+    if (!latest) return { ok: false, current, errorKey: 'update.errorNetwork' };
+    return {
+      ok: true,
+      current,
+      latest,
+      updateAvailable: compareVersions(latest, current) > 0,
+    };
+  } catch {
+    return { ok: false, current, errorKey: 'update.errorNetwork' };
+  } finally {
+    clearTimeout(timer);
+  }
+}
+
+/**
+ * Install the newest release over this one.
+ *
+ * Resolves with `{ ok, output }` rather than rejecting, so the caller can show
+ * npm's own message; npm's diagnostics are more useful than anything that could
+ * be invented here.
+ */
+function performUpdate({
+  spawnImpl = spawn,
+  timeoutMs = 180_000,
+  // Seam for tests: the suite runs from a checkout, where the guard below is
+  // correctly the only reachable outcome.
+  installKindImpl = installKind,
+} = {}) {
+  return new Promise((resolve) => {
+    const kind = installKindImpl();
+    if (kind !== 'npm') {
+      resolve({ ok: false, errorKey: `update.cannot.${kind}` });
+      return;
+    }
+    const child = spawnImpl('npm', ['install', '-g', `${PACKAGE_NAME}@latest`], {
+      encoding: 'utf8',
+      timeout: timeoutMs,
+    });
+    let output = '';
+    const collect = (chunk) => { output += String(chunk); };
+    child.stdout?.on('data', collect);
+    child.stderr?.on('data', collect);
+    child.on('error', (error) => {
+      resolve({ ok: false, errorKey: 'update.errorFailed', output: error.message });
+    });
+    child.on('close', (code) => {
+      resolve({ ok: code === 0, output: output.trim().slice(-2000) });
+    });
+  });
+}
+
+module.exports = {
+  PACKAGE_NAME,
+  canSelfUpdate,
+  checkForUpdate,
+  compareVersions,
+  currentVersion,
+  installKind,
+  performUpdate,
+};