@dyyz1993/create-agent 2.0.0 → 2.1.0

package/templates/general/src/bun/index.ts

@@ -3,23 +3,24 @@ import { RPCServer } from "@dyyz1993/rpc-core";
 import { ElectrobunTransport } from "../gateway/ipc-transport";
 import { registerAllHandlers } from "../shared/register-all-handlers";
 import { createLogger, configureLogDir } from "../shared/lib/logger";
+import { config } from "../server-config";
 
 configureLogDir("logs");
 const log = createLogger("server");
 
 async function getMainViewUrl(): Promise<string> {
-  const channel = await Updater.localInfo.channel();
-  const DEV_SERVER_URL = "http://localhost:5173";
-  if (channel === "dev") {
-    try {
-      await fetch(DEV_SERVER_URL, { method: "HEAD" });
-      log.info(`HMR enabled: Using Vite dev server at ${DEV_SERVER_URL}`);
-      return DEV_SERVER_URL;
-    } catch {
-      log.info("Vite dev server not running.");
-    }
-  }
-  return "views://mainview/index.html";
+	const channel = await Updater.localInfo.channel();
+	const DEV_SERVER_URL = "http://localhost:5173";
+	if (channel === "dev") {
+		try {
+			await fetch(DEV_SERVER_URL, { method: "HEAD" });
+			log.info(`HMR enabled: Using Vite dev server at ${DEV_SERVER_URL}`);
+			return DEV_SERVER_URL;
+		} catch {
+			log.info("Vite dev server not running.");
+		}
+	}
+	return "views://mainview/index.html";
 }
 
 const url = await getMainViewUrl();
@@ -27,46 +28,95 @@ const url = await getMainViewUrl();
 const transport = new ElectrobunTransport();
 const server = new RPCServer(transport);
 
-// --- 注册 RPC handlers（自动导入 handlers barrel） ---
 registerAllHandlers(server, { platform: "desktop" });
 
-// --- 创建窗口 ---
-
 const mainWindow = new BrowserWindow({
-  title: "Pi Agent",
-  url,
-  frame: {
-    width: 1200,
-    height: 800,
-    x: 200,
-    y: 200,
-  },
-  rpc: BrowserView.defineRPC({
-    maxRequestTime: 60000,
-    handlers: {
-      requests: {},
-      messages: {
-        // @ts-expect-error Electrobun's messages schema doesn't support custom keys at compile time
-        "rpc-message": (data: unknown) => {
-          try {
-            const message = typeof data === "string" ? JSON.parse(data) : data;
-            transport.handleMessage(message);
-          } catch (error) {
-            log.error("Failed to parse RPC message", { error });
-          }
-        },
-      },
-    },
-  }),
+	title: "Pi Agent",
+	url,
+	frame: {
+		width: 1200,
+		height: 800,
+		x: 200,
+		y: 200,
+	},
+	rpc: BrowserView.defineRPC({
+		maxRequestTime: 60000,
+		handlers: {
+			requests: {},
+			messages: {
+				// @ts-expect-error Electrobun's messages schema doesn't support custom keys at compile time
+				"rpc-message": (data: unknown) => {
+					try {
+						const message = typeof data === "string" ? JSON.parse(data) : data;
+						transport.handleMessage(message);
+					} catch (error) {
+						log.error("Failed to parse RPC message", { error });
+					}
+				},
+			},
+		},
+	}),
 });
 
 transport.setBrowserView(mainWindow.webview);
 
 log.info("Pi Agent desktop app started!");
 
+if (config.enableWebService) {
+	try {
+		const { createWebServer, getLocalIP } = await import("../shared/lib/web-server");
+
+		const webServer = await createWebServer({
+			port: config.port,
+			authToken: config.authToken,
+			maxUploadSize: config.maxUploadSize,
+			corsOrigin: "*",
+		});
+
+		const localIp = getLocalIP();
+		log.info(`[Hybrid] Web service started: http://${localIp}:${webServer.port}`);
+		log.info(`[Hybrid] WebSocket endpoint: ws://${localIp}:${webServer.port}/ws`);
+		log.info(
+			`[Hybrid] Share URL: http://${localIp}:${webServer.port}?token=${webServer.authToken}`
+		);
+
+		server.emitEvent("hybrid.ready", {
+			url: `http://${localIp}:${webServer.port}`,
+			wsUrl: `ws://${localIp}:${webServer.port}/ws`,
+			token: webServer.authToken,
+		});
+	} catch (err) {
+		log.error("[Hybrid] Failed to start web service", {
+			error: err instanceof Error ? err.message : String(err),
+		});
+	}
+}
+
 ApplicationMenu.setApplicationMenu([
-  { label: "Pi Agent", submenu: [{ role: "about" }, { type: "separator" }, { role: "hide" }, { role: "hideOthers" }, { role: "showAll" }, { type: "separator" }, { role: "quit" }] },
-  { label: "Edit", submenu: [{ role: "undo" }, { role: "redo" }, { type: "separator" }, { role: "cut" }, { role: "copy" }, { role: "paste" }, { role: "selectAll" }] },
-  { label: "View", submenu: [{ role: "toggleFullScreen" }] },
-  { label: "Window", submenu: [{ role: "minimize" }, { role: "zoom" }] },
+	{
+		label: "Pi Agent",
+		submenu: [
+			{ role: "about" },
+			{ type: "separator" },
+			{ role: "hide" },
+			{ role: "hideOthers" },
+			{ role: "showAll" },
+			{ type: "separator" },
+			{ role: "quit" },
+		],
+	},
+	{
+		label: "Edit",
+		submenu: [
+			{ role: "undo" },
+			{ role: "redo" },
+			{ type: "separator" },
+			{ role: "cut" },
+			{ role: "copy" },
+			{ role: "paste" },
+			{ role: "selectAll" },
+		],
+	},
+	{ label: "View", submenu: [{ role: "toggleFullScreen" }] },
+	{ label: "Window", submenu: [{ role: "minimize" }, { role: "zoom" }] },
 ]);

package/templates/general/src/bun/three.d.ts

@@ -0,0 +1 @@
+declare module "three";

package/templates/general/src/gateway/http-routes.ts

@@ -1 +1 @@
-export { createHttpHandler, type HttpRouteDeps } from "@shared/http-routes";
+export { createHttpHandler, type HttpRouteDeps } from "../shared/http-routes";

package/templates/general/src/gateway/ws-handler.ts

@@ -13,74 +13,102 @@ import { createLogger } from "../shared/lib/logger";
 const log = createLogger("gateway");
 
 function safeEqual(a: string, b: string): boolean {
-  const bufA = Buffer.from(a);
-  const bufB = Buffer.from(b);
-  if (bufA.length !== bufB.length) return false;
-  return timingSafeEqual(bufA, bufB);
+	const bufA = Buffer.from(a);
+	const bufB = Buffer.from(b);
+	if (bufA.length !== bufB.length) return false;
+	return timingSafeEqual(bufA, bufB);
 }
 
 export interface WsHandlerDeps {
-  config: { readonly port: number; readonly authToken: string; readonly maxUploadSize: number };
+	config: { readonly port: number; readonly authToken: string; readonly maxUploadSize: number };
 }
 
 export function createWsHandler(httpServer: Server, deps: WsHandlerDeps): WebSocketServer {
-  const { config: cfg } = deps;
-  const wss = new WebSocketServer({ server: httpServer, path: "/ws" });
+	const { config: cfg } = deps;
+	const wss = new WebSocketServer({ server: httpServer, path: "/ws" });
 
-  wss.on("connection", (ws: WebSocket, req) => {
-    // Token 验证
-    const url = req.url ? new URL(req.url, "http://localhost") : null;
-    const token = url?.searchParams.get("token");
-    if (!safeEqual(token || "", cfg.authToken)) {
-      log.warn("Connection rejected: invalid token");
-      ws.close(4001, "Unauthorized");
-      return;
-    }
+	wss.on("connection", (ws: WebSocket, req) => {
+		// Token 验证（header 优先，query fallback）
+		const url = req.url ? new URL(req.url, "http://localhost") : null;
+		const headerToken = (req.headers["sec-websocket-protocol"] as string) || undefined;
+		const queryToken = url?.searchParams.get("token");
+		const token = headerToken || queryToken;
+		if (!safeEqual(token || "", cfg.authToken)) {
+			log.warn("Connection rejected: invalid token", {
+				providedPrefix: token ? `${token.substring(0, 4)}***` : "(none)",
+			});
+			ws.close(4001, "Unauthorized");
+			return;
+		}
 
-    log.info("Client connected", { total: wss.clients.size });
+		log.info("Client connected", { total: wss.clients.size });
 
-    const wsTransport = {
-      send: async (message: unknown): Promise<void> => {
-        if (ws.readyState === WebSocket.OPEN) {
-          ws.send(JSON.stringify(message));
-        }
-      },
-      onMessage: (handler: (message: unknown) => void): (() => void) => {
-        const listener = (data: Buffer) => {
-          try {
-            const msg = JSON.parse(data.toString());
-            handler(msg);
-          } catch (err) {
-            log.error("Failed to parse message", { error: err instanceof Error ? err.message : String(err) });
-          }
-        };
-        ws.on("message", listener);
-        return () => ws.off("message", listener);
-      },
-      onError: (): (() => void) => {
-        return () => {};
-      },
-      onDisconnect: (): (() => void) => {
-        return () => {};
-      },
-      isConnected: (): boolean => ws.readyState === WebSocket.OPEN,
-      close: (): void => {},
-    };
+		const PING_INTERVAL = 30000;
+		let pongReceived = true;
+		const pingTimer = setInterval(() => {
+			if (ws.readyState !== WebSocket.OPEN) {
+				clearInterval(pingTimer);
+				return;
+			}
+			if (!pongReceived) {
+				log.warn("Client heartbeat timeout, closing connection");
+				clearInterval(pingTimer);
+				ws.terminate();
+				return;
+			}
+			pongReceived = false;
+			ws.ping();
+		}, PING_INTERVAL);
 
-    const rpcServer = new RPCServer(wsTransport as Transport);
+		ws.on("pong", () => {
+			pongReceived = true;
+		});
 
-    // 自动导入并注册所有 handlers
-    registerAllHandlers(rpcServer, { platform: "web" });
+		const wsTransport = {
+			send: async (message: unknown): Promise<void> => {
+				if (ws.readyState === WebSocket.OPEN) {
+					ws.send(JSON.stringify(message));
+				}
+			},
+			onMessage: (handler: (message: unknown) => void): (() => void) => {
+				const listener = (data: Buffer) => {
+					try {
+						const msg = JSON.parse(data.toString());
+						handler(msg);
+					} catch (err) {
+						log.error("Failed to parse message", {
+							error: err instanceof Error ? err.message : String(err),
+						});
+					}
+				};
+				ws.on("message", listener);
+				return () => ws.off("message", listener);
+			},
+			onError: (): (() => void) => {
+				return () => {};
+			},
+			onDisconnect: (): (() => void) => {
+				return () => {};
+			},
+			isConnected: (): boolean => ws.readyState === WebSocket.OPEN,
+			close: (): void => {},
+		};
 
-    ws.on("close", () => {
-      log.info("Client disconnected", { total: wss.clients.size });
-      rpcServer.close();
-    });
+		const rpcServer = new RPCServer(wsTransport as Transport);
 
-    ws.on("error", (err: Error) => {
-      log.error("Client error", { error: err.message });
-    });
-  });
+		// 自动导入并注册所有 handlers
+		registerAllHandlers(rpcServer, { platform: "web" });
 
-  return wss;
+		ws.on("close", () => {
+			if (pingTimer) clearInterval(pingTimer);
+			log.info("Client disconnected", { total: wss.clients.size });
+			rpcServer.close();
+		});
+
+		ws.on("error", (err: Error) => {
+			log.error("Client error", { error: err.message });
+		});
+	});
+
+	return wss;
 }

package/templates/general/src/mainview/__tests__/i18n/i18n.test.ts

@@ -44,5 +44,6 @@ describe("i18n configuration", () => {
     const i18n = await import("../../lib/i18n");
     await i18n.default.changeLanguage("zh");
     expect(i18n.default.t("app.title")).toBe("Pi Agent");
+    expect(i18n.default.t("sidebar.explorer")).toBe("资源管理器");
   });
 });

package/templates/general/src/mainview/__tests__/theme-variables.test.ts

@@ -0,0 +1,36 @@
+import { describe, it, expect } from "vitest";
+import { readFileSync } from "fs";
+import { resolve, dirname } from "path";
+
+function extractVarNames(css: string, selector: string): string[] {
+  const regex = new RegExp(`${selector.replace(".", "\\.")}\\s*\\{([^}]+)\\}`, "s");
+  const match = css.match(regex);
+  if (!match) return [];
+  const vars = match[1].match(/--[\w-]+/g);
+  return vars ? [...new Set(vars)].sort() : [];
+}
+
+describe("CSS Variables", () => {
+  const cssPath = resolve(dirname(import.meta.url.replace("file://", "")), "../index.css");
+  const css = readFileSync(cssPath, "utf-8");
+
+  it("should have matching variables in :root and .dark", () => {
+    const rootVars = extractVarNames(css, ":root");
+    const darkVars = extractVarNames(css, ".dark");
+
+    expect(rootVars.length).toBeGreaterThan(0);
+    expect(darkVars.length).toBeGreaterThan(0);
+    expect(rootVars).toEqual(darkVars);
+  });
+
+  it("should have all required variable categories", () => {
+    const allVars = css.match(/--[\w-]+/g) || [];
+    const uniqueVars = [...new Set(allVars)];
+
+    const requiredPrefixes = ["bg-", "text-", "border-", "accent-"];
+    for (const prefix of requiredPrefixes) {
+      const hasPrefix = uniqueVars.some((v) => v.includes(prefix));
+      expect(hasPrefix, `Missing CSS variables with prefix: ${prefix}`).toBe(true);
+    }
+  });
+});

package/templates/general/src/mainview/components/common/LanguageSwitcher.tsx

@@ -5,6 +5,7 @@ export function LanguageSwitcher() {
 
   return (
     <button
+      data-testid="language-switcher"
       onClick={() => setLocale(locale === "en" ? "zh" : "en")}
       className="px-1.5 py-0.5 rounded text-xs hover:bg-[var(--color-bg-hover)] transition-colors text-[var(--color-text-secondary)]"
       title={locale === "en" ? "切换到中文" : "Switch to English"}

package/templates/general/src/mainview/components/common/ThemeToggle.tsx

@@ -6,6 +6,7 @@ export function ThemeToggle() {
 
   return (
     <button
+      data-testid="theme-toggle"
       onClick={toggleTheme}
       className="p-1.5 rounded-md hover:bg-[var(--color-bg-hover)] transition-colors"
       title={theme === "dark" ? "Switch to light mode" : "Switch to dark mode"}