dsh-workbuddy-connect 0.3.0 → 0.3.1

package/lib/bin.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { S as workbuddyOwnAuthPath, a as readHostHeartbeat, c as WORKBUDDY_CONNECT_VERSION, l as WorkBuddyUpstreamClient, m as FALLBACK_WORKBUDDY_MODELS, o as workbuddyHostHeartbeatPath, r as isHeartbeatProcessAlive, v as WorkBuddyCredentialStore } from "./host-heartbeat-CM7AW7vZ.js";
+import { S as workbuddyOwnAuthPath, a as readHostHeartbeat, c as WORKBUDDY_CONNECT_VERSION, l as WorkBuddyUpstreamClient, m as FALLBACK_WORKBUDDY_MODELS, o as workbuddyHostHeartbeatPath, r as isHeartbeatProcessAlive, v as WorkBuddyCredentialStore } from "./host-heartbeat-9FtwMcIF.js";
 import { realpathSync } from "node:fs";
 import { fileURLToPath } from "node:url";
 //#region src/bin.ts

package/lib/{host-heartbeat-CM7AW7vZ.js → host-heartbeat-9FtwMcIF.js}

@@ -142,10 +142,21 @@ function parseOwnDocument(text) {
 	const document = parsed;
 	if (document["version"] !== OWN_FORMAT_VERSION) return void 0;
 	if (typeof document["credential"] !== "object" || document["credential"] === null) return void 0;
-	const credential = parseWorkBuddyAuth(JSON.stringify({ auth: document["credential"] }));
-	if (credential === void 0) return void 0;
+	const stored = document["credential"];
+	const accessToken = typeof stored["accessToken"] === "string" ? stored["accessToken"] : "";
+	if (accessToken === "") return void 0;
+	const refreshExpiresAtMs = typeof stored["refreshExpiresAtMs"] === "number" ? stored["refreshExpiresAtMs"] : void 0;
+	const enterpriseId = optionalString(stored["enterpriseId"]);
+	const nickname = optionalString(stored["nickname"]);
 	return {
-		...credential,
+		accessToken,
+		refreshToken: typeof stored["refreshToken"] === "string" ? stored["refreshToken"] : "",
+		expiresAtMs: typeof stored["expiresAtMs"] === "number" ? stored["expiresAtMs"] : 0,
+		...refreshExpiresAtMs === void 0 ? {} : { refreshExpiresAtMs },
+		domain: optionalString(stored["domain"]) ?? "",
+		uid: optionalString(stored["uid"]) ?? "",
+		...enterpriseId === void 0 ? {} : { enterpriseId },
+		...nickname === void 0 ? {} : { nickname },
 		source: "dsh"
 	};
 }
@@ -1041,7 +1052,7 @@ var WorkBuddyUpstreamClient = class {
 };
 //#endregion
 //#region src/version.ts
-const WORKBUDDY_CONNECT_VERSION = "0.3.0";
+const WORKBUDDY_CONNECT_VERSION = "0.3.1";
 //#endregion
 //#region src/host-heartbeat.ts
 /**

package/lib/index.js

@@ -1,4 +1,4 @@
-import { S as workbuddyOwnAuthPath, _ as WORKBUDDY_AUTH_FILE_ENV, a as readHostHeartbeat, b as defaultDesktopAuthPath, d as normalizeCredits, f as prepareChatBody, g as WORKBUDDY_AUTH_FILENAME, h as WorkBuddyCatalog, i as processStartTimeMs, l as WorkBuddyUpstreamClient, m as FALLBACK_WORKBUDDY_MODELS, n as clearHostHeartbeat, o as workbuddyHostHeartbeatPath, p as regionOf, r as isHeartbeatProcessAlive, s as writeHostHeartbeat, t as WORKBUDDY_HOST_HEARTBEAT_FILENAME, u as classifyUpstreamError, v as WorkBuddyCredentialStore, x as parseWorkBuddyAuth, y as defaultDesktopAuthCandidates } from "./host-heartbeat-CM7AW7vZ.js";
+import { S as workbuddyOwnAuthPath, _ as WORKBUDDY_AUTH_FILE_ENV, a as readHostHeartbeat, b as defaultDesktopAuthPath, d as normalizeCredits, f as prepareChatBody, g as WORKBUDDY_AUTH_FILENAME, h as WorkBuddyCatalog, i as processStartTimeMs, l as WorkBuddyUpstreamClient, m as FALLBACK_WORKBUDDY_MODELS, n as clearHostHeartbeat, o as workbuddyHostHeartbeatPath, p as regionOf, r as isHeartbeatProcessAlive, s as writeHostHeartbeat, t as WORKBUDDY_HOST_HEARTBEAT_FILENAME, u as classifyUpstreamError, v as WorkBuddyCredentialStore, x as parseWorkBuddyAuth, y as defaultDesktopAuthCandidates } from "./host-heartbeat-9FtwMcIF.js";
 import z from "@deepseek-ai/schemastery";
 import { createProvider } from "@earendil-works/pi-ai";
 import { openAICompletionsApi } from "@earendil-works/pi-ai/api/openai-completions.lazy";
@@ -253,25 +253,15 @@ var WorkBuddyPiAiAdapter = class extends PiAiAdapter {
 	}
 };
 //#endregion
-//#region src/shim.ts
+//#region src/loopback.ts
 /**
-* Loopback OpenAI-compatible endpoint. The pi-ai provider points here; the
-* shim applies the WorkBuddy wire quirks (forced streaming, string
-* `tool_choice`, CLI-shaped headers) and forwards to the real upstream.
-* It binds 127.0.0.1 only and never serves another interface.
-*
-* Inbound hardening: the loopback bind alone is not a trust boundary (any
-* local process or a DNS-rebinding page can reach 127.0.0.1), so every
-* request must carry a loopback Host header, browser-sent Origins must be
-* loopback, chat POSTs must be application/json, and the Authorization
-* header must carry the shim's per-process shared secret. The plugin's
-* own client satisfies all four by construction; local attackers cannot
-* read the secret out of the plugin process's memory.
+* Shared loopback gates for the plugin's local HTTP surfaces: the loopback
+* shim and the same-origin web-status route. Both are only ever meant to be
+* addressed through the machine's loopback interface.
 *
-* @module dsh-workbuddy-connect/shim
+* @module dsh-workbuddy-connect/loopback
 */
-const REQUEST_BODY_LIMIT = 67108864;
-/** Loopback hostnames the shim's own in-process client uses. */
+/** Loopback hostnames a local plugin surface may be addressed by. */
 const LOOPBACK_HOSTS = /* @__PURE__ */ new Set([
 	"127.0.0.1",
 	"localhost",
@@ -285,7 +275,7 @@ function hostnameOfHost(host) {
 		return end === -1 ? hostname : hostname.slice(0, end + 1);
 	}
 	const colon = hostname.lastIndexOf(":");
-	if (colon !== -1 && /^\d+$/.test(hostname.slice(colon + 1))) hostname = hostname.slice(0, colon);
+	if (colon !== -1 && !hostname.slice(0, colon).includes(":") && /^\d+$/.test(hostname.slice(colon + 1))) hostname = hostname.slice(0, colon);
 	return hostname;
 }
 /**
@@ -310,6 +300,25 @@ function originIsLoopback(origin) {
 		return false;
 	}
 }
+//#endregion
+//#region src/shim.ts
+/**
+* Loopback OpenAI-compatible endpoint. The pi-ai provider points here; the
+* shim applies the WorkBuddy wire quirks (forced streaming, string
+* `tool_choice`, CLI-shaped headers) and forwards to the real upstream.
+* It binds 127.0.0.1 only and never serves another interface.
+*
+* Inbound hardening: the loopback bind alone is not a trust boundary (any
+* local process or a DNS-rebinding page can reach 127.0.0.1), so every
+* request must carry a loopback Host header, browser-sent Origins must be
+* loopback, chat POSTs must be application/json, and the Authorization
+* header must carry the shim's per-process shared secret. The plugin's
+* own client satisfies all four by construction; local attackers cannot
+* read the secret out of the plugin process's memory.
+*
+* @module dsh-workbuddy-connect/shim
+*/
+const REQUEST_BODY_LIMIT = 67108864;
 /** Chat-completion POSTs must carry a JSON body type (simple-request CSRF drops here). */
 function isJsonContentType(req) {
 	const type = req.headers["content-type"];
@@ -500,16 +509,14 @@ function json(res, status, body) {
 	});
 	res.end(payload);
 }
-/** Loopback browser origins only; other devices are refused until trusted origins exist. */
-function loopbackOrigin(req) {
-	const origin = req.headers.origin;
-	if (origin === void 0) return true;
-	try {
-		const { hostname } = new URL(origin);
-		return hostname === "localhost" || hostname === "127.0.0.1" || hostname === "[::1]" || hostname === "::1";
-	} catch {
-		return false;
-	}
+/**
+* The request must be addressed to the loopback interface, and a
+* browser-attached Origin must be loopback too. The Host check drops
+* DNS-rebinding pages (their Host is the attacker's domain, not loopback);
+* the card's same-origin fetches carry no Origin and pass on Host alone.
+*/
+function loopbackRequest(req) {
+	return hostIsLoopback(req.headers.host) && originIsLoopback(req.headers.origin);
 }
 /**
 * Assemble the card's status document. Sign-in state is read-only; credit is
@@ -557,27 +564,31 @@ async function workBuddyWebStatus(deps) {
 	}
 	return statusWithModels;
 }
+/** The status route's request handler, extracted so tests can mount it on a bare server. */
+function workBuddyStatusHandler(deps) {
+	return async (req, res) => {
+		if (req.method !== "GET") {
+			json(res, 405, { error: "method not allowed" });
+			return;
+		}
+		if (!loopbackRequest(req)) {
+			json(res, 403, { error: "request-not-trusted" });
+			return;
+		}
+		try {
+			json(res, 200, await workBuddyWebStatus(deps));
+		} catch (error) {
+			json(res, 500, { error: safeMessage(error) });
+		}
+	};
+}
 /** Mount the GET status route on an optional webServer context. */
 function registerWorkBuddyStatusRoute(ctx, deps) {
 	ctx.effect(() => {
 		const dispose = ctx.webServer.register({
 			kind: "exact",
 			path: WORKBUDDY_STATUS_PATH,
-			handler: async (req, res) => {
-				if (req.method !== "GET") {
-					json(res, 405, { error: "method not allowed" });
-					return;
-				}
-				if (!loopbackOrigin(req)) {
-					json(res, 403, { error: "origin-not-trusted" });
-					return;
-				}
-				try {
-					json(res, 200, await workBuddyWebStatus(deps));
-				} catch (error) {
-					json(res, 500, { error: safeMessage(error) });
-				}
-			}
+			handler: workBuddyStatusHandler(deps)
 		});
 		return () => {
 			dispose();

package/package.json

@@ -2,7 +2,7 @@
   "name": "dsh-workbuddy-connect",
   "displayName": "DSH WorkBuddy Connect",
   "description": "将 WorkBuddy 桌面 App 包含的模型自动接入 DeepSeek Harness — bring WorkBuddy desktop app models into DeepSeek Harness with zero configuration.",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "author": "corrinehu",
   "keywords": [
     "dsh-plugin",