@decentnetwork/beagle 0.1.24 → 0.1.25

package/dist/desktop/app.js

@@ -1,4 +1,4 @@
-window.__DK_UI_VERSION="0.1.23";
+window.__DK_UI_VERSION="0.1.24";
 const ICON_PATHS = {
   // ---- tab bar (the four must feel like one set) ----
   users: '<path d="M16 21v-2a4 4 0 0 0-4-4H6a4 4 0 0 0-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M22 21v-2a4 4 0 0 0-3-3.87"/><path d="M16 3.13a4 4 0 0 1 0 7.75"/>',
@@ -4214,6 +4214,16 @@ const STR = {
     linksCard: "Links",
     linkPlaceholder: "username or profile URL",
     save: "save",
+    updTitle: "Update available",
+    updLater: "Later",
+    updNow: "Update now",
+    updRestart: "Restart",
+    updBusy: "Updating\u2026 (about a minute)",
+    updDone: "Updated \u2014 restart to apply.",
+    updRestarting: "Restarting\u2026 this page reloads when it\u2019s back. (If beagle was started by hand in a terminal, run it again.)",
+    updNpx: "Running via npx \u2014 restarting picks up the latest version automatically.",
+    updDev: "Running from a source checkout \u2014 update with:",
+    updLanNote: "agentnet (lan) updates separately; the daemon restart is manual:",
     pubOpen: "View public profile",
     pubNone: "No public profile \u2014 this user has not registered a beagles.eth name.",
     ensNoEthWallet: "no Ethereum wallet extension found (MetaMask\u2026)",
@@ -4360,6 +4370,16 @@ const STR = {
     linksCard: "\u793E\u4EA4\u8D26\u53F7",
     linkPlaceholder: "\u7528\u6237\u540D\u6216\u4E3B\u9875\u94FE\u63A5",
     save: "\u4FDD\u5B58",
+    updTitle: "\u53D1\u73B0\u65B0\u7248\u672C",
+    updLater: "\u7A0D\u540E",
+    updNow: "\u7ACB\u5373\u66F4\u65B0",
+    updRestart: "\u91CD\u542F",
+    updBusy: "\u66F4\u65B0\u4E2D\u2026(\u7EA6\u4E00\u5206\u949F)",
+    updDone: "\u66F4\u65B0\u5B8C\u6210\u2014\u2014\u91CD\u542F\u540E\u751F\u6548\u3002",
+    updRestarting: "\u6B63\u5728\u91CD\u542F\u2026\u5B8C\u6210\u540E\u672C\u9875\u4F1A\u81EA\u52A8\u5237\u65B0\u3002(\u5982\u679C beagle \u662F\u5728\u7EC8\u7AEF\u91CC\u624B\u52A8\u542F\u52A8\u7684,\u8BF7\u91CD\u65B0\u8FD0\u884C\u4E00\u6B21\u3002)",
+    updNpx: "\u4F60\u662F\u7528 npx \u8FD0\u884C\u7684\u2014\u2014\u91CD\u542F\u5373\u81EA\u52A8\u83B7\u53D6\u6700\u65B0\u7248\u3002",
+    updDev: "\u5F53\u524D\u4ECE\u6E90\u7801\u76EE\u5F55\u8FD0\u884C,\u8BF7\u624B\u52A8\u66F4\u65B0:",
+    updLanNote: "agentnet(lan)\u9700\u5355\u72EC\u5347\u7EA7,daemon \u91CD\u542F\u9700\u624B\u52A8\u6267\u884C:",
     pubOpen: "\u67E5\u770B\u516C\u5F00\u8D44\u6599",
     pubNone: "\u6682\u65E0\u516C\u5F00\u8D44\u6599\u2014\u2014\u5BF9\u65B9\u8FD8\u6CA1\u6709\u6CE8\u518C beagles.eth \u540D\u5B57\u3002",
     ensNoEthWallet: "\u672A\u68C0\u6D4B\u5230\u4EE5\u592A\u574A\u94B1\u5305\u63D2\u4EF6(MetaMask \u7B49)",
@@ -4409,12 +4429,82 @@ function RailBtn({ icon, label, active, soon, onClick }) {
     gap: 3
   } }, /* @__PURE__ */ React.createElement(Icon, { name: icon, size: 20, stroke: active ? 2.1 : 1.8, color: active ? "var(--accent)" : "var(--dim)" }), /* @__PURE__ */ React.createElement("span", { style: { fontSize: 9, fontWeight: 600, letterSpacing: 0.2, color: active ? "var(--accent)" : "var(--faint)" } }, label), soon && /* @__PURE__ */ React.createElement("span", { style: { position: "absolute", top: 5, right: 6, width: 6, height: 6, borderRadius: 999, background: "var(--warn)" } }));
 }
+function DkUpdateModal({ T, info, onClose }) {
+  const [phase, setPhase] = React.useState("idle");
+  const [err, setErr] = React.useState(null);
+  const behind = (info.updates || []).filter((u) => u.behind);
+  const appBehind = behind.some((u) => u.pkg !== "@decentnetwork/lan");
+  const lanBehind = behind.find((u) => u.pkg === "@decentnetwork/lan");
+  const short = (pkg) => pkg.replace("@decentnetwork/", "");
+  const doUpdate = () => {
+    setPhase("running");
+    setErr(null);
+    fetch("/api/update-run", { method: "POST" }).then((r) => r.json()).then((d) => {
+      if (d.ok)
+        setPhase("done");
+      else {
+        setPhase("error");
+        setErr(d.error || "update failed");
+      }
+    }).catch((e) => {
+      setPhase("error");
+      setErr(String(e && e.message || e));
+    });
+  };
+  const doRestart = () => {
+    setPhase("restarting");
+    fetch("/api/update-restart", { method: "POST" }).catch(() => {
+    });
+    const poll = setInterval(() => {
+      fetch("/api/update-check").then((r) => {
+        if (r.ok) {
+          clearInterval(poll);
+          window.location.reload();
+        }
+      }).catch(() => {
+      });
+    }, 1500);
+  };
+  const btn = (label, onClick, tone) => /* @__PURE__ */ React.createElement("button", { onClick, style: {
+    padding: "7px 14px",
+    borderRadius: 9,
+    cursor: "pointer",
+    fontFamily: "var(--ui)",
+    fontSize: 12.5,
+    border: tone ? "none" : "1px solid var(--line)",
+    background: tone ? "var(--accent)" : "transparent",
+    color: tone ? "#fff" : "var(--text)"
+  } }, label);
+  return /* @__PURE__ */ React.createElement("div", { style: { position: "fixed", inset: 0, zIndex: 95, background: "color-mix(in oklab, #000, transparent 38%)", display: "flex", alignItems: "center", justifyContent: "center", padding: 24 } }, /* @__PURE__ */ React.createElement("div", { style: { width: 430, maxWidth: "94vw", background: "var(--panel)", border: "1px solid var(--line)", borderRadius: 16, padding: "20px 22px", display: "flex", flexDirection: "column", gap: 14 } }, /* @__PURE__ */ React.createElement("span", { style: { fontFamily: "var(--mono)", fontSize: 13.5, fontWeight: 700, color: "var(--text)" } }, T.updTitle || "Update available"), /* @__PURE__ */ React.createElement("div", { style: { display: "flex", flexDirection: "column", gap: 6 } }, behind.map((u) => /* @__PURE__ */ React.createElement("div", { key: u.pkg, style: { display: "flex", alignItems: "center", gap: 10, fontFamily: "var(--mono)", fontSize: 12.5 } }, /* @__PURE__ */ React.createElement("span", { style: { width: 70, color: "var(--faint)" } }, short(u.pkg)), /* @__PURE__ */ React.createElement("span", { style: { color: "var(--dim)" } }, u.current), /* @__PURE__ */ React.createElement("span", { style: { color: "var(--faint)" } }, "\u2192"), /* @__PURE__ */ React.createElement("span", { style: { color: "var(--accent)", fontWeight: 700 } }, u.latest)))), phase === "idle" && appBehind && info.mode === "dev" && /* @__PURE__ */ React.createElement("div", { style: { fontFamily: "var(--ui)", fontSize: 12, color: "var(--dim)", lineHeight: 1.5 } }, T.updDev || "Running from a source checkout \u2014 update with:", /* @__PURE__ */ React.createElement("br", null), /* @__PURE__ */ React.createElement("code", { style: { fontFamily: "var(--mono)", fontSize: 11.5, color: "var(--text)" } }, "git pull && npm run build")), phase === "idle" && appBehind && info.mode === "npx" && /* @__PURE__ */ React.createElement("div", { style: { fontFamily: "var(--ui)", fontSize: 12, color: "var(--dim)", lineHeight: 1.5 } }, T.updNpx || "Running via npx \u2014 restarting picks up the latest version automatically."), lanBehind && /* @__PURE__ */ React.createElement("div", { style: { fontFamily: "var(--ui)", fontSize: 12, color: "var(--dim)", lineHeight: 1.5 } }, T.updLanNote || "agentnet (lan) updates separately; the daemon restart is manual:", /* @__PURE__ */ React.createElement("br", null), /* @__PURE__ */ React.createElement("code", { style: { fontFamily: "var(--mono)", fontSize: 11.5, color: "var(--text)", userSelect: "all" } }, "npm i -g @decentnetwork/lan@latest && sudo agentnet down && sudo agentnet up --real-tun")), phase === "running" && /* @__PURE__ */ React.createElement("div", { style: { fontFamily: "var(--ui)", fontSize: 12.5, color: "var(--dim)" } }, T.updBusy || "Updating\u2026 (about a minute)"), phase === "done" && /* @__PURE__ */ React.createElement("div", { style: { fontFamily: "var(--ui)", fontSize: 12.5, color: "var(--online)" } }, T.updDone || "Updated \u2014 restart to apply."), phase === "restarting" && /* @__PURE__ */ React.createElement("div", { style: { fontFamily: "var(--ui)", fontSize: 12.5, color: "var(--dim)" } }, T.updRestarting || "Restarting\u2026 this page reloads when it\u2019s back. (If beagle was started by hand in a terminal, run it again.)"), phase === "error" && /* @__PURE__ */ React.createElement("div", { style: { fontFamily: "var(--ui)", fontSize: 12, color: "var(--danger)", wordBreak: "break-word" } }, err), /* @__PURE__ */ React.createElement("div", { style: { display: "flex", justifyContent: "flex-end", gap: 8 } }, (phase === "idle" || phase === "error") && btn(T.updLater || "Later", onClose), phase === "idle" && appBehind && info.mode === "global" && btn(T.updNow || "Update now", doUpdate, true), phase === "idle" && appBehind && info.mode === "npx" && btn(T.updRestart || "Restart", doRestart, true), phase === "done" && btn(T.updRestart || "Restart", doRestart, true))));
+}
 function DkApp() {
   const [t, setTweak] = useTweaks(DK_DEFAULTS);
   const [tab, setTab] = React.useState(t.startTab || "chat");
   const [activeId, setActiveId] = React.useState(null);
   const data = useDaemonData();
   const me = data.me;
+  const [upd, setUpd] = React.useState(null);
+  React.useEffect(() => {
+    let dead = false;
+    const check = () => fetch("/api/update-check").then((r) => r.json()).then((d) => {
+      if (dead || !d.ok)
+        return;
+      const behind = (d.updates || []).filter((u) => u.behind);
+      if (!behind.length)
+        return;
+      const key = behind.map((u) => u.pkg + "@" + u.latest).join(",");
+      if (localStorage.getItem("dk-upd-dismissed") === key)
+        return;
+      setUpd({ ...d, key });
+    }).catch(() => {
+    });
+    check();
+    const timer = setInterval(check, 6 * 3600 * 1e3);
+    return () => {
+      dead = true;
+      clearInterval(timer);
+    };
+  }, []);
   const [backend, setBackend] = React.useState(null);
   const refreshBackend = React.useCallback(() => {
     dkGet("/api/backend").then((b) => {
@@ -4631,6 +4721,16 @@ function DkApp() {
     color: "#fff",
     fontSize: 12,
     fontWeight: 600
-  } }, n.label)))), /* @__PURE__ */ React.createElement(IncomingCallModal, { T, ctl: callCtl, peers }), /* @__PURE__ */ React.createElement(CallOverlay, { T, ctl: callCtl, peers }), /* @__PURE__ */ React.createElement(RtcFileInbox, { T, peers, ctl: rtcFileCtl }));
+  } }, n.label)))), /* @__PURE__ */ React.createElement(IncomingCallModal, { T, ctl: callCtl, peers }), /* @__PURE__ */ React.createElement(CallOverlay, { T, ctl: callCtl, peers }), /* @__PURE__ */ React.createElement(RtcFileInbox, { T, peers, ctl: rtcFileCtl }), upd && /* @__PURE__ */ React.createElement(
+    DkUpdateModal,
+    {
+      T,
+      info: upd,
+      onClose: () => {
+        localStorage.setItem("dk-upd-dismissed", upd.key);
+        setUpd(null);
+      }
+    }
+  ));
 }
 ReactDOM.createRoot(document.getElementById("root")).render(/* @__PURE__ */ React.createElement(DkApp, null));

package/dist/server.js

@@ -187,6 +187,93 @@ async function ensPublicByUserid(maxWaitMs = 300) {
     }
     return map;
 }
+// ── self-update ─────────────────────────────────────────────────────────────
+// npm registry is consulted at most once per TTL (and only while a UI is
+// open); the UI pops a confirm dialog when something is behind. "Update"
+// reinstalls the global package in place and restarts this process —
+// pm2/launchd/systemd bring it back; a bare terminal run exits with a hint.
+const UPDATE_TTL_MS = 6 * 3600_000;
+const BEAGLE_PKG = "@decentnetwork/beagle";
+let updateCache = null;
+const BEAGLE_ROOT = join(dirname(fileURLToPath(import.meta.url)), "..");
+function beagleVersion() {
+    try {
+        return JSON.parse(readFileSync(join(BEAGLE_ROOT, "package.json"), "utf-8")).version ?? "";
+    }
+    catch {
+        return "";
+    }
+}
+/** How this copy of beagle got onto disk — decides what "update" can do.
+ *  npx cache paths contain _npx AND node_modules, so test _npx first. */
+function installMode() {
+    if (BEAGLE_ROOT.includes("_npx"))
+        return "npx";
+    if (BEAGLE_ROOT.includes(join("node_modules", "@decentnetwork", "beagle")))
+        return "global";
+    return "dev";
+}
+async function npmLatest(pkg) {
+    const ctl = new AbortController();
+    const t = setTimeout(() => ctl.abort(), 8000);
+    try {
+        const r = await fetch(`https://registry.npmjs.org/${pkg.replace("/", "%2F")}/latest`, { signal: ctl.signal });
+        if (!r.ok)
+            return null;
+        return (await r.json()).version ?? null;
+    }
+    catch {
+        return null;
+    }
+    finally {
+        clearTimeout(t);
+    }
+}
+function verLt(a, b) {
+    const pa = a.split(".").map((x) => parseInt(x, 10));
+    const pb = b.split(".").map((x) => parseInt(x, 10));
+    if (pa.some(Number.isNaN) || pb.some(Number.isNaN))
+        return false;
+    for (let i = 0; i < 3; i++) {
+        const d = (pb[i] ?? 0) - (pa[i] ?? 0);
+        if (d !== 0)
+            return d > 0;
+    }
+    return false;
+}
+/** Run `npm i -g @decentnetwork/beagle@latest`. npm is found on PATH, else via
+ *  npm-cli.js next to the running node (covers pm2/cron environments whose
+ *  PATH lacks the nvm shims). */
+async function npmSelfUpdate() {
+    const { spawn } = await import("node:child_process");
+    const args = ["i", "-g", `${BEAGLE_PKG}@latest`];
+    const npmCli = join(dirname(process.execPath), "..", "lib", "node_modules", "npm", "bin", "npm-cli.js");
+    const attempts = [
+        { cmd: "npm", args },
+        ...(existsSync(npmCli) ? [{ cmd: process.execPath, args: [npmCli, ...args] }] : []),
+    ];
+    for (const a of attempts) {
+        const r = await new Promise((resolveRun) => {
+            const ch = spawn(a.cmd, a.args, { shell: process.platform === "win32" });
+            let out = "";
+            const timer = setTimeout(() => ch.kill("SIGKILL"), 5 * 60_000);
+            ch.stdout?.on("data", (c) => (out += c));
+            ch.stderr?.on("data", (c) => (out += c));
+            ch.on("error", (e) => { clearTimeout(timer); resolveRun({ code: null, out, spawnErr: e.message }); });
+            ch.on("close", (code) => { clearTimeout(timer); resolveRun({ code, out }); });
+        });
+        if (r.spawnErr)
+            continue; // npm not found this way — try the next resolver
+        const tail = r.out.slice(-2000);
+        if (r.code === 0)
+            return { ok: true, log: tail };
+        const hint = /EACCES|permission denied/i.test(r.out)
+            ? " — no write access to the global npm dir; run `sudo npm i -g @decentnetwork/beagle@latest` manually"
+            : "";
+        return { ok: false, error: `npm exited ${r.code}${hint}`, log: tail };
+    }
+    return { ok: false, error: "npm not found — update manually: npm i -g @decentnetwork/beagle@latest" };
+}
 /** True only when the request came from the local machine. Used to gate the
  *  "Sign in with Decent" routes so binding the UI to a LAN IP can't expose
  *  identity signing to other hosts. The popup always runs in the local user's
@@ -1125,6 +1212,71 @@ export function startBeagleServer(opts) {
             // One bootstrap call for the desktop UI: composes the design's DK_*
             // shapes (me / peers / requests / exits) from diag + friends-list +
             // ipam + routes, so the client data layer is a single poll.
+            // ── self-update: check (cached), run (localhost), restart (localhost) ──
+            if (req.method === "GET" && url === "/api/update-check") {
+                const force = new URL(req.url || "", "http://localhost").searchParams.get("force") === "1";
+                if (!force && updateCache && Date.now() - updateCache.at < UPDATE_TTL_MS) {
+                    sendJson(res, 200, updateCache.body);
+                    return;
+                }
+                const [beagleLatest, peerLatest, lanLatest] = await Promise.all([
+                    npmLatest(BEAGLE_PKG),
+                    npmLatest("@decentnetwork/peer"),
+                    npmLatest("@decentnetwork/lan"),
+                ]);
+                const curLan = opts.meExtra?.lanVer ?? "";
+                const row = (pkg, current, latest) => ({
+                    pkg,
+                    current,
+                    latest,
+                    behind: !!(current && latest && verLt(current, latest)),
+                });
+                const body = {
+                    ok: true,
+                    checkedAt: Date.now(),
+                    mode: installMode(),
+                    updates: [
+                        row(BEAGLE_PKG, beagleVersion(), beagleLatest),
+                        // peer ships inside beagle: reinstalling beagle refreshes it too.
+                        row("@decentnetwork/peer", opts.meExtra?.peerVer ?? "", peerLatest),
+                        ...(curLan && curLan !== "(none)" ? [row("@decentnetwork/lan", curLan, lanLatest)] : []),
+                    ],
+                };
+                updateCache = { at: Date.now(), body };
+                sendJson(res, 200, body);
+                return;
+            }
+            if (req.method === "POST" && url === "/api/update-run") {
+                if (!isLocalRequest(req)) {
+                    sendJson(res, 403, { ok: false, error: "update runs only from this machine (localhost)" });
+                    return;
+                }
+                const mode = installMode();
+                if (mode === "dev") {
+                    sendJson(res, 400, { ok: false, error: "running from a source checkout — update with: git pull && npm run build" });
+                    return;
+                }
+                if (mode === "npx") {
+                    // npx with @latest re-resolves on every launch: restarting IS the update.
+                    sendJson(res, 200, { ok: true, npx: true });
+                    return;
+                }
+                const r = await npmSelfUpdate();
+                updateCache = null; // next check reflects the new install
+                sendJson(res, r.ok ? 200 : 502, r);
+                return;
+            }
+            if (req.method === "POST" && url === "/api/update-restart") {
+                if (!isLocalRequest(req)) {
+                    sendJson(res, 403, { ok: false, error: "restart only from this machine (localhost)" });
+                    return;
+                }
+                sendJson(res, 200, { ok: true });
+                // Let the response flush, then exit 0: pm2/launchd/systemd restart the
+                // process; a bare `beagle` in a terminal just exits (the UI says so).
+                setTimeout(() => process.exit(0), 400);
+                return;
+            }
             // Public profile card for any userid (friend or directory row): what
             // they published on their beagles.eth record. Read-only, no signing.
             if (req.method === "GET" && url === "/api/ens-profile") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decentnetwork/beagle",
-  "version": "0.1.24",
+  "version": "0.1.25",
   "description": "Beagle — P2P chat, file transfer and calls for regular users, on the Decent Network. No admin privilege required.",
   "type": "module",
   "main": "./dist/index.js",