@xiaozhi-client/cli 1.10.9 → 2.0.0-beta.4

package/README.md

@@ -47,10 +47,10 @@ packages/cli/
 
 ## 外部依赖
 
-CLI 包通过 external 配置引用 backend 模块：
+CLI 包通过 external 配置引用 backend 模块和 workspace 包：
 
 - `@/WebServer` → `dist/backend/WebServer.js` (通过 WebServerLauncher)
-- `@/lib/config/manager` → `dist/backend/lib/config/manager.js`
+- `@xiaozhi-client/config` → `dist/config/index.js` (配置管理)
 
 ## 导入方式
 
@@ -62,11 +62,14 @@ import { DIContainer } from "./Container";
 import { CommandRegistry } from "./commands/index";
 ```
 
-### 外部依赖（使用路径别名）
+### 外部依赖（使用 workspace 包）
 
 ```typescript
-// 引用 backend 模块
-import { configManager } from "@/lib/config/manager";
+// 引用配置管理（从 workspace 包导入）
+import { configManager } from "@xiaozhi-client/config";
+
+// 引用 WebServer（使用路径别名，运行时解析为 backend 模块）
+import { WebServer } from "@/WebServer";
 ```
 
 ## 开发命令

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xiaozhi-client/cli",
-  "version": "1.10.9",
+  "version": "2.0.0-beta.4",
   "private": false,
   "repository": {
     "type": "git",
@@ -22,7 +22,7 @@
     "commander": "^14.0.0",
     "consola": "^3.4.2",
     "ora": "^8.2.0",
-    "@xiaozhi-client/config": "1.10.9"
+    "@xiaozhi-client/config": "2.0.0-beta.4"
   },
   "devDependencies": {
     "@types/node": "^24.3.0",

package/src/Container.ts

@@ -166,40 +166,6 @@ export class DIContainer implements IDIContainer {
       return new TemplateManagerModule.TemplateManagerImpl();
     });
 
-    // 注册命令层（稍后在命令层实现时添加）
-    // container.register('serviceCommand', () => {
-    //   const { ServiceCommand } = require('./commands/ServiceCommand.js');
-    //   const serviceManager = container.get('serviceManager');
-    //   const processManager = container.get('processManager');
-    //   return new ServiceCommand(serviceManager, processManager);
-    // });
-
-    // container.register('configCommand', () => {
-    //   const { ConfigCommand } = require('./commands/ConfigCommand.js');
-    //   const configManager = container.get('configManager');
-    //   const validation = container.get('validation');
-    //   return new ConfigCommand(configManager, validation);
-    // });
-
-    // container.register('projectCommand', () => {
-    //   const { ProjectCommand } = require('./commands/ProjectCommand.js');
-    //   const templateManager = container.get('templateManager');
-    //   const fileUtils = container.get('fileUtils');
-    //   return new ProjectCommand(templateManager, fileUtils);
-    // });
-
-    // container.register('mcpCommand', () => {
-    //   const { McpCommand } = require('./commands/McpCommand.js');
-    //   return new McpCommand();
-    // });
-
-    // container.register('infoCommand', () => {
-    //   const { InfoCommand } = require('./commands/InfoCommand.js');
-    //   const versionUtils = container.get('versionUtils');
-    //   const platformUtils = container.get('platformUtils');
-    //   return new InfoCommand(versionUtils, platformUtils);
-    // });
-
     return container;
   }
 }

package/src/commands/index.ts

@@ -23,6 +23,28 @@ export class CommandRegistry implements ICommandRegistry {
     this.handlerFactory = new CommandHandlerFactory(container);
   }
 
+  /**
+   * 包装命令处理函数，统一处理错误
+   * @param handler 命令处理函数
+   * @returns 包装后的处理函数
+   */
+  private wrapCommandHandler(
+    handler: (args: string[], options: Record<string, unknown>) => Promise<void>
+  ) {
+    return async (...args: unknown[]) => {
+      try {
+        // Commander.js 传递的最后一个参数是 Command 对象，包含选项值
+        const command = args[args.length - 1] as {
+          opts: () => Record<string, unknown>;
+        };
+        const options = command.opts();
+        await handler(args.slice(0, -1) as string[], options);
+      } catch (error) {
+        ErrorHandler.handle(error as Error);
+      }
+    };
+  }
+
   /**
    * 注册所有命令到 Commander 程序
    */
@@ -87,28 +109,19 @@ export class CommandRegistry implements ICommandRegistry {
         }
 
         // 设置子命令处理函数
-        cmd.action(async (...args) => {
-          try {
-            // Commander.js 传递的最后一个参数是 Command 对象，包含选项值
-            const command = args[args.length - 1];
-            const options = command.opts(); // 获取解析后的选项
-            await subcommand.execute(args.slice(0, -1), options);
-          } catch (error) {
-            ErrorHandler.handle(error as Error);
-          }
-        });
+        cmd.action(
+          this.wrapCommandHandler(async (args, options) => {
+            await subcommand.execute(args, options);
+          })
+        );
       }
 
       // 设置主命令的默认行为
-      commandGroup.action(async (...args) => {
-        try {
-          const command = args[args.length - 1];
-          const options = command.opts(); // 获取解析后的选项
-          await handler.execute(args.slice(0, -1), options);
-        } catch (error) {
-          ErrorHandler.handle(error as Error);
-        }
-      });
+      commandGroup.action(
+        this.wrapCommandHandler(async (args, options) => {
+          await handler.execute(args, options);
+        })
+      );
     } else {
       // 没有子命令，注册为普通命令
       let commandName = handler.name;
@@ -130,15 +143,11 @@ export class CommandRegistry implements ICommandRegistry {
       }
 
       // 设置主命令处理函数
-      command.action(async (...args) => {
-        try {
-          const command = args[args.length - 1];
-          const options = command.opts(); // 获取解析后的选项
-          await handler.execute(args.slice(0, -1), options);
-        } catch (error) {
-          ErrorHandler.handle(error as Error);
-        }
-      });
+      command.action(
+        this.wrapCommandHandler(async (args, options) => {
+          await handler.execute(args, options);
+        })
+      );
     }
   }
 
@@ -208,16 +217,11 @@ export class CommandRegistry implements ICommandRegistry {
       }
 
       // 设置命令处理函数
-      command.action(async (...args) => {
-        try {
-          // Commander.js 传递的最后一个参数是 Command 对象，包含选项值
-          const command = args[args.length - 1];
-          const options = command.opts(); // 获取解析后的选项
-          await subcommand.execute(args.slice(0, -1), options);
-        } catch (error) {
-          ErrorHandler.handle(error as Error);
-        }
-      });
+      command.action(
+        this.wrapCommandHandler(async (args, options) => {
+          await subcommand.execute(args, options);
+        })
+      );
     }
   }
 

package/src/global.d.ts

@@ -1,3 +1,11 @@
+/**
+ * CLI 全局类型声明
+ *
+ * 扩展 Node.js 全局类型，包含以下内容：
+ * - Express 相关类型
+ * - WebSocket 相关类型
+ * - 环境变量类型扩展
+ */
 /// <reference types="node" />
 /// <reference types="express" />
 /// <reference types="ws" />

package/src/services/DaemonManager.ts

@@ -154,7 +154,7 @@ export class DaemonManagerImpl implements IDaemonManager {
       const tail = spawn(command, args, { stdio: "inherit" });
 
       // 处理中断信号
-      process.on("SIGINT", () => {
+      process.once("SIGINT", () => {
         console.log("\n断开连接，服务继续在后台运行");
         tail.kill();
         process.exit(0);

package/src/services/ProcessManager.ts

@@ -153,33 +153,7 @@ export class ProcessManagerImpl implements IProcessManager {
    */
   async gracefulKillProcess(pid: number): Promise<void> {
     try {
-      // 尝试优雅停止
-      process.kill(pid, "SIGTERM");
-
-      // 等待进程停止
-      let attempts = 0;
-      const maxAttempts = 30; // 3秒超时
-
-      while (attempts < maxAttempts) {
-        await new Promise((resolve) => setTimeout(resolve, 100));
-
-        try {
-          process.kill(pid, 0);
-          attempts++;
-        } catch {
-          // 进程已停止
-          return;
-        }
-      }
-
-      // 如果还在运行，强制停止
-      try {
-        process.kill(pid, 0);
-        process.kill(pid, "SIGKILL");
-        await new Promise((resolve) => setTimeout(resolve, 500));
-      } catch {
-        // 进程已停止
-      }
+      await PlatformUtils.killProcess(pid, "SIGTERM");
     } catch (error) {
       throw new ProcessError(
         `无法停止进程: ${error instanceof Error ? error.message : String(error)}`,

package/src/services/ServiceManager.ts

@@ -278,8 +278,8 @@ export class ServiceManagerImpl implements IServiceManager {
         process.exit(0);
       };
 
-      process.on("SIGINT", cleanup);
-      process.on("SIGTERM", cleanup);
+      process.once("SIGINT", cleanup);
+      process.once("SIGTERM", cleanup);
 
       await server.start();
     }
@@ -338,8 +338,8 @@ export class ServiceManagerImpl implements IServiceManager {
       process.exit(0);
     };
 
-    process.on("SIGINT", cleanup);
-    process.on("SIGTERM", cleanup);
+    process.once("SIGINT", cleanup);
+    process.once("SIGTERM", cleanup);
 
     // 保存 PID 信息
     this.processManager.savePidInfo(process.pid, "foreground");

package/src/services/__tests__/ProcessManager.test.ts

@@ -139,43 +139,23 @@ describe("ProcessManagerImpl", () => {
   });
 
   describe("gracefulKillProcess", () => {
-    let originalKill: typeof process.kill;
-
-    beforeEach(() => {
-      originalKill = process.kill;
-      process.kill = vi.fn();
-    });
-
-    afterEach(() => {
-      process.kill = originalKill;
-    });
-
-    it("should gracefully kill process", async () => {
-      let killCallCount = 0;
-      (process.kill as any).mockImplementation((pid: number, signal: any) => {
-        killCallCount++;
-        if (killCallCount > 1) {
-          throw new Error("ESRCH"); // Process stopped
-        }
-      });
+    it("should delegate to PlatformUtils with SIGTERM signal", async () => {
+      mockPlatformUtils.killProcess.mockResolvedValue();
 
       await processManager.gracefulKillProcess(1234);
 
-      expect(process.kill).toHaveBeenCalledWith(1234, "SIGTERM");
+      expect(mockPlatformUtils.killProcess).toHaveBeenCalledWith(
+        1234,
+        "SIGTERM"
+      );
     });
 
-    it("should force kill if graceful kill fails", async () => {
-      (process.kill as any).mockImplementation((pid: number, signal: any) => {
-        if (signal === "SIGKILL") {
-          throw new Error("ESRCH"); // Process stopped
-        }
-        // Process still running for SIGTERM and signal 0
-      });
-
-      await processManager.gracefulKillProcess(1234);
+    it("should throw ProcessError when kill fails", async () => {
+      mockPlatformUtils.killProcess.mockRejectedValue(new Error("Kill failed"));
 
-      expect(process.kill).toHaveBeenCalledWith(1234, "SIGTERM");
-      expect(process.kill).toHaveBeenCalledWith(1234, "SIGKILL");
+      await expect(processManager.gracefulKillProcess(1234)).rejects.toThrow(
+        "无法停止进程"
+      );
     });
   });
 

package/src/services/__tests__/ServiceManager.test.ts

@@ -74,28 +74,6 @@ vi.mock("../../utils/PathUtils.js", () => ({
   },
 }));
 
-// Mock ConfigManager for WebServer
-vi.mock("@/lib/config/manager.js", () => {
-  const mockConfig = {
-    mcpEndpoint: "ws://localhost:3000",
-    mcpServers: {},
-    webServer: { port: 9999 },
-  };
-  const mockConfigManager = {
-    configExists: vi.fn().mockReturnValue(true),
-    getConfig: vi.fn().mockReturnValue(mockConfig),
-    loadConfig: vi.fn().mockResolvedValue(mockConfig),
-    getToolCallLogConfig: vi.fn().mockReturnValue({ enabled: false }),
-    getMcpServers: vi.fn().mockReturnValue({}),
-    getMcpEndpoint: vi.fn().mockReturnValue("ws://localhost:3000"),
-    getConfigDir: vi.fn().mockReturnValue("/mock/config"),
-  };
-  return {
-    configManager: mockConfigManager,
-    ConfigManager: vi.fn().mockImplementation(() => mockConfigManager),
-  };
-});
-
 // Mock fs
 vi.mock("node:fs", () => {
   const mockExistsSync = vi.fn().mockReturnValue(true);

package/src/types/backend.d.ts

@@ -1,26 +1,38 @@
 /**
  * Backend 模块类型声明
- * 使用 any 类型避免递归解析 backend 代码
+ *
+ * 这些声明用于 CLI 包中引用 Backend 模块的类型
+ * 避免递归解析 backend 代码，同时提供类型安全
  */
 
-declare module "@/lib/config/manager.js" {
-  export interface LocalMCPServerConfig {
-    command: string;
-    args: string[];
-    env?: Record<string, string>;
-  }
+/**
+ * WebServer 类型声明
+ * 对应 apps/backend/WebServer.ts
+ */
+declare module "@/WebServer.js" {
+	/**
+	 * WebServer - Web 服务器主控制器
+	 */
+	export class WebServer {
+		/**
+		 * 创建 WebServer 实例
+		 * @param port - 可选的端口号，不指定则使用配置文件中的端口
+		 */
+		constructor(port?: number);
 
-  export interface MCPServerConfig {
-    type?: string;
-    url?: string;
-    command?: string;
-    args?: string[];
-    headers?: Record<string, string>;
-  }
+		/**
+		 * 启动 Web 服务器
+		 */
+		start(): Promise<void>;
 
-  export const configManager: any;
-}
+		/**
+		 * 停止 Web 服务器
+		 */
+		stop(): Promise<void>;
 
-declare module "@/WebServer.js" {
-  export class WebServer {}
+		/**
+		 * 销毁 WebServer 实例，清理所有资源
+		 */
+		destroy(): void;
+	}
 }

package/tsup.config.ts

@@ -11,7 +11,7 @@ export default defineConfig({
     index: "src/index.ts",
   },
   format: ["esm"],
-  target: "node18",
+  target: "node20",
   outDir: "../../dist/cli",
   clean: true,
   sourcemap: true,