@genkaku/dsh-worker-plugin 0.1.14 → 0.1.16

package/lib/client.js

@@ -38,10 +38,8 @@ var genkaku_mark_default = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAK4AAA
 // src/client/index.tsx
 var import_jsx_runtime = require("react/jsx-runtime");
 var PANEL_ID = "genkaku-worker";
-var ORIGIN = "http://127.0.0.1:47821";
-var STATUS_URL = `${ORIGIN}/genkaku/status`;
-var OLLAMA_URL = `${ORIGIN}/genkaku/ollama`;
-var DASHBOARD_URL = `${ORIGIN}/genkaku`;
+var CANDIDATE_PORTS = [47821, 47822, 47823, 47824, 47825, 47826];
+var originOf = (port) => `http://127.0.0.1:${port}`;
 var inject = ["slots"];
 var ZH = typeof navigator !== "undefined" && /^zh/i.test(navigator.language);
 var t = (en, zh) => ZH ? zh : en;
@@ -162,24 +160,49 @@ function Page() {
   const [pullModel, setPullModel] = (0, import_react.useState)("");
   const [pull, setPull] = (0, import_react.useState)(null);
   const seeded = (0, import_react.useRef)(false);
-  const loadStatus = (0, import_react.useCallback)(async () => {
+  const [origin, setOrigin] = (0, import_react.useState)(originOf(CANDIDATE_PORTS[0]));
+  const originRef = (0, import_react.useRef)(origin);
+  originRef.current = origin;
+  const probe = (0, import_react.useCallback)(async (base) => {
     try {
-      const res = await fetch(STATUS_URL, { cache: "no-store" });
-      if (!res.ok) throw new Error(`status ${res.status}`);
-      const next = await res.json();
-      setStatus(next);
-      setError(null);
-      if (!seeded.current) {
-        seeded.current = true;
-        setDraft(seedDraft(next));
-      }
-    } catch (e) {
-      setError(e instanceof Error ? e.message : String(e));
+      const res = await fetch(`${base}/genkaku/status`, { cache: "no-store", signal: AbortSignal.timeout(2500) });
+      if (!res.ok) return null;
+      const doc = await res.json();
+      return doc.role === "user" ? null : doc;
+    } catch {
+      return null;
     }
   }, []);
+  const loadStatus = (0, import_react.useCallback)(async () => {
+    let base = originRef.current;
+    let next = await probe(base);
+    if (next == null) {
+      for (const port of CANDIDATE_PORTS) {
+        const candidate = originOf(port);
+        if (candidate === base) continue;
+        const doc = await probe(candidate);
+        if (doc != null) {
+          base = candidate;
+          next = doc;
+          break;
+        }
+      }
+    }
+    if (next == null) {
+      setError(t("Worker status unreachable on 47821\u201347826.", "47821\u201347826 \u4E0A\u90FD\u627E\u4E0D\u5230 worker \u72C0\u614B\u670D\u52D9\u3002"));
+      return;
+    }
+    if (base !== originRef.current) setOrigin(base);
+    setStatus(next);
+    setError(null);
+    if (!seeded.current) {
+      seeded.current = true;
+      setDraft(seedDraft(next));
+    }
+  }, [probe]);
   const loadOllama = (0, import_react.useCallback)(async () => {
     try {
-      const res = await fetch(OLLAMA_URL, { cache: "no-store" });
+      const res = await fetch(`${originRef.current}/genkaku/ollama`, { cache: "no-store" });
       if (!res.ok) throw new Error(`ollama ${res.status}`);
       setOllama(await res.json());
     } catch {
@@ -200,7 +223,7 @@ function Page() {
     };
   }, [loadStatus, loadOllama]);
   const post = (0, import_react.useCallback)(async (path, body) => {
-    const res = await fetch(`${ORIGIN}${path}`, {
+    const res = await fetch(`${originRef.current}${path}`, {
       method: "POST",
       headers: { "content-type": "application/json" },
       body: JSON.stringify(body)
@@ -229,7 +252,7 @@ function Page() {
     setNotice(null);
     setPull({ status: t("starting", "\u958B\u59CB\u4E0B\u8F09") });
     try {
-      const res = await fetch(`${ORIGIN}/genkaku/ollama/pull`, {
+      const res = await fetch(`${originRef.current}/genkaku/ollama/pull`, {
         method: "POST",
         headers: { "content-type": "application/json" },
         body: JSON.stringify({ model })
@@ -402,7 +425,7 @@ function Page() {
           import_dsh_client_ui_primitives.Switch,
           {
             checked: status.publishAddress === true,
-            disabled: busy === "publish",
+            disabled: busy === "publish" || status.publishForced === true || status.reachable !== true && status.publishAddress !== true,
             label: t("Publish this worker on-chain", "\u5C07\u6B64 worker \u767C\u4F48\u5230\u93C8\u4E0A\u76EE\u9304"),
             onChange: (next) => {
               void setPublish(next);
@@ -411,9 +434,12 @@ function Page() {
         )
       ] }),
       /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { style: { ...dim, fontSize: 12, marginTop: 2 }, children: status.reachable !== true ? t(
-        "This machine has no public address, so listing it would create an entry nobody can dial. Peers on the same network can still connect.",
-        "\u9019\u53F0\u6A5F\u5668\u6C92\u6709\u516C\u7DB2\u4F4D\u5740\uFF0C\u767C\u4F48\u53EA\u6703\u7522\u751F\u4E00\u689D\u6C92\u4EBA\u9023\u5F97\u4E0A\u7684\u7D00\u9304\u3002\u540C\u7DB2\u6BB5\u7684 peer \u4ECD\u53EF\u9023\u7DDA\u3002"
-      ) : status.publishAddress === true ? t(
+        "This machine has no public address, so this switch is off until it gets one: listing it would create an entry nobody can dial. Peers on the same network can still connect.",
+        "\u9019\u53F0\u6A5F\u5668\u6C92\u6709\u516C\u7DB2\u4F4D\u5740\uFF0C\u56E0\u6B64\u958B\u95DC\u76EE\u524D\u7121\u6CD5\u958B\u555F\uFF1A\u767C\u4F48\u53EA\u6703\u7522\u751F\u4E00\u689D\u6C92\u4EBA\u9023\u5F97\u4E0A\u7684\u7D00\u9304\u3002\u540C\u7DB2\u6BB5\u7684 peer \u4ECD\u53EF\u9023\u7DDA\u3002"
+      ) : status.publishForced === true ? t(
+        "Forced on by this profile (publishAddress), so it cannot be turned off here.",
+        "\u6B64 profile \u5DF2\u5F37\u5236\u958B\u555F\uFF08publishAddress\uFF09\uFF0C\u7121\u6CD5\u5728\u6B64\u95DC\u9589\u3002"
+      ) : status.published === true ? t(
         "Listed. Your public IP is written to the chain and stays readable forever, even after you turn this off.",
         "\u5DF2\u5217\u51FA\u3002\u4F60\u7684\u516C\u7DB2 IP \u6703\u5BEB\u9032\u93C8\u4E0A\uFF0C\u5373\u4F7F\u65E5\u5F8C\u95DC\u9589\uFF0C\u4ECD\u7136\u6C38\u4E45\u53EF\u8B80\u3002"
       ) : t(
@@ -523,6 +549,23 @@ function Page() {
         /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { style: dim, children: t("Wallet", "\u9322\u5305") }),
         /* @__PURE__ */ (0, import_jsx_runtime.jsx)("code", { children: status.wallet ?? "\u2014" })
       ] }),
+      /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { style: row, children: [
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { style: dim, children: t("Connection", "\u9023\u7DDA\u65B9\u5F0F") }),
+        /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", { children: [
+          /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { style: dot(status.transport === "direct") }),
+          status.transport === "direct" ? t("libp2p direct", "libp2p \u76F4\u9023") : status.transport === "relay" ? t("seed VM relay", "seed VM \u4E2D\u7E7C") : t("LAN only", "\u50C5\u9650\u540C\u7DB2\u6BB5")
+        ] })
+      ] }),
+      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { style: { ...dim, fontSize: 12, marginTop: 2 }, children: status.transport === "direct" ? t(
+        "Clients reach this worker directly over libp2p.",
+        "\u4F7F\u7528\u8005\u900F\u904E libp2p \u76F4\u63A5\u9023\u5230\u9019\u53F0 worker\u3002"
+      ) : status.transport === "relay" ? t(
+        "Direct dialing is not possible from the internet, so traffic is forwarded through the GenKaKu seed VM. Clients try a direct connection first, then fall back to the relay.",
+        "\u9019\u53F0\u6A5F\u5668\u7121\u6CD5\u88AB\u516C\u7DB2\u76F4\u9023\uFF0C\u56E0\u6B64\u6D41\u91CF\u6703\u7D93\u7531 GenKaKu seed VM \u8F49\u9001\u3002\u4F7F\u7528\u8005\u6703\u5148\u5617\u8A66\u76F4\u9023\uFF0C\u5931\u6557\u5F8C\u624D\u8D70\u4E2D\u7E7C\u3002"
+      ) : t(
+        "Only peers on the same network can connect. A relay appears once the seed VM is reachable.",
+        "\u76EE\u524D\u53EA\u6709\u540C\u7DB2\u6BB5\u7684 peer \u80FD\u9023\u7DDA\u3002\u9023\u4E0A seed VM \u5F8C\u6703\u81EA\u52D5\u53D6\u5F97\u4E2D\u7E7C\u4F4D\u5740\u3002"
+      ) }),
       /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { style: row, children: [
         /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { style: dim, children: t("Active sessions", "\u9032\u884C\u4E2D session") }),
         /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { children: status.activeSessions ?? 0 })
@@ -531,7 +574,7 @@ function Page() {
         /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { style: dim, children: t("Addresses", "\u4F4D\u5740\u6578") }),
         /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { children: (status.peerAddrs ?? []).length })
       ] }),
-      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { style: { ...row, justifyContent: "flex-start" }, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("a", { href: DASHBOARD_URL, target: "_blank", rel: "noreferrer", style: { fontSize: 12 }, children: t("Open the full dashboard", "\u958B\u555F\u5B8C\u6574\u63A7\u5236\u53F0") }) })
+      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { style: { ...row, justifyContent: "flex-start" }, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("a", { href: `${origin}/genkaku`, target: "_blank", rel: "noreferrer", style: { fontSize: 12 }, children: t("Open the full dashboard", "\u958B\u555F\u5B8C\u6574\u63A7\u5236\u53F0") }) })
     ] })
   ] });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@genkaku/dsh-worker-plugin",
-  "version": "0.1.14",
+  "version": "0.1.16",
   "description": "Share this machine's Ollama models on the GenKaKu network",
   "license": "MIT",
   "type": "module",
@@ -38,8 +38,8 @@
     }
   },
   "dependencies": {
-    "@genkaku/protocol": "0.1.10",
-    "@genkaku/dsh-runtime": "0.1.13"
+    "@genkaku/dsh-runtime": "0.1.15",
+    "@genkaku/protocol": "0.1.11"
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.1.0"
@@ -68,6 +68,9 @@
     "usdc",
     "base"
   ],
+  "engines": {
+    "node": ">=22"
+  },
   "scripts": {
     "build": "tsc -p tsconfig.json && node ../../scripts/build-client.mjs . @genkaku/dsh-worker-plugin",
     "typecheck": "tsc -p tsconfig.json --noEmit"