xiaozhi-client 2.3.0 → 2.3.1-beta.1

package/dist/backend/Logger.js

@@ -1,6 +1,6 @@
 import { createRequire } from 'node:module';
-const require = createRequire(import.meta.url);
-var __require = require;
+globalThis.require = createRequire(import.meta.url);
+
 var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __export = (target, all) => {

package/dist/backend/WebServer.js

@@ -1,6 +1,6 @@
 import { createRequire } from 'node:module';
-const require = createRequire(import.meta.url);
-var __require = require;
+globalThis.require = createRequire(import.meta.url);
+
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -58071,7 +58071,7 @@ var UpdateApiHandler = class extends BaseHandler {
 import fs3 from "fs";
 import path6 from "path";
 import { fileURLToPath as fileURLToPath4 } from "url";
-var VERSION2 = "2.3.0";
+var VERSION2 = "2.3.1-beta.1";
 var APP_NAME = "xiaozhi-client";
 var VersionUtils = class _VersionUtils {
   static {

package/dist/backend/WebServerLauncher.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { createRequire } from 'node:module';
-const require = createRequire(import.meta.url);
-var __require = require;
+globalThis.require = createRequire(import.meta.url);
+
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -59788,7 +59788,7 @@ var VERSION2, APP_NAME, VersionUtils;
 var init_version2 = __esm({
   "../utils/version.ts"() {
     "use strict";
-    VERSION2 = "2.3.0";
+    VERSION2 = "2.3.1-beta.1";
     APP_NAME = "xiaozhi-client";
     VersionUtils = class _VersionUtils {
       static {

package/dist/cli/index.js

@@ -1,4 +1,7 @@
 #!/usr/bin/env node
+import { createRequire } from 'node:module';
+globalThis.require = createRequire(import.meta.url);
+
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
@@ -2663,9 +2666,16 @@ var init_PathUtils = __esm({
       }
       /**
        * 获取项目根目录路径
+       *
+       * 兼容开发和构建两种环境：
+       * - 开发环境：脚本位于 src/cli/ 下，需向上 3 级
+       * - 构建环境：脚本位于 dist/cli/ 下，需向上 2 级
        */
       static getProjectRoot() {
         const scriptDir = _PathUtils.getScriptDir();
+        if (scriptDir.endsWith("/dist/cli") || scriptDir.endsWith("\\dist\\cli")) {
+          return path5.join(scriptDir, "..", "..");
+        }
         return path5.join(scriptDir, "..", "..", "..");
       }
       /**
@@ -2749,11 +2759,11 @@ var init_PathUtils = __esm({
       }
       /**
        * 获取 Web 服务器启动器路径
-       * 返回项目根目录 dist 下的 WebServerLauncher.js（向后兼容包装脚本）
+       * 返回项目根目录 dist/backend 下的 WebServerLauncher.js
        */
       static getWebServerLauncherPath() {
         const projectRoot = _PathUtils.getProjectRoot();
-        return path5.join(projectRoot, "dist", "WebServerLauncher.js");
+        return path5.join(projectRoot, "dist", "backend", "WebServerLauncher.js");
       }
       /**
        * 创建安全的文件路径
@@ -3754,56 +3764,40 @@ var init_ServiceManager = __esm({
         }
       }
       /**
-       * 启动普通模式
+       * 启动普通模式（始终以守护进程方式运行）
        */
-      async startNormalMode(options) {
-        if (options.daemon) {
-          await this.startWebServerInDaemon();
-        } else {
-          await this.startWebServerInForeground();
-        }
+      async startNormalMode(_options) {
+        await this.startWebServerInDaemon();
       }
       /**
-       * 启动 MCP Server 模式
+       * 启动 MCP Server 模式（始终以守护进程方式运行）
        */
       async startMcpServerMode(options) {
         const port = options.port || 3e3;
         const { spawn: spawn2 } = await import("child_process");
-        if (options.daemon) {
-          const scriptPath = PathUtils.getExecutablePath("cli");
-          const child = spawn2(
-            "node",
-            [scriptPath, "start", "--server", port.toString()],
-            {
-              detached: true,
-              stdio: ["ignore", "ignore", "ignore"],
-              // 完全忽略所有 stdio，避免阻塞
-              env: {
-                ...process.env,
-                XIAOZHI_CONFIG_DIR: PathUtils.getConfigDir(),
-                XIAOZHI_DAEMON: "true",
-                MCP_SERVER_MODE: "true"
-              }
+        const scriptPath = PathUtils.getExecutablePath("cli");
+        const child = spawn2(
+          "node",
+          [scriptPath, "start", "--server", port.toString()],
+          {
+            detached: true,
+            stdio: ["ignore", "ignore", "ignore"],
+            // 完全忽略所有 stdio，避免阻塞
+            env: {
+              ...process.env,
+              XIAOZHI_CONFIG_DIR: PathUtils.getConfigDir(),
+              XIAOZHI_DAEMON: "true",
+              MCP_SERVER_MODE: "true"
             }
-          );
-          this.processManager.savePidInfo(child.pid || 0, "daemon");
-          child.unref();
-          consola2.success(
-            `MCP Server \u5DF2\u5728\u540E\u53F0\u542F\u52A8 (PID: ${child.pid}, Port: ${port})`
-          );
-          consola2.info("\u4F7F\u7528 'xiaozhi status' \u67E5\u770B\u72B6\u6001");
-          process.exit(0);
-        } else {
-          const { WebServer } = await import("../backend/WebServer.js");
-          const server = new WebServer(port);
-          const cleanup = /* @__PURE__ */ __name(async () => {
-            await server.stop();
-            process.exit(0);
-          }, "cleanup");
-          process.once("SIGINT", cleanup);
-          process.once("SIGTERM", cleanup);
-          await server.start();
-        }
+          }
+        );
+        this.processManager.savePidInfo(child.pid || 0, "daemon");
+        child.unref();
+        consola2.success(
+          `MCP Server \u5DF2\u5728\u540E\u53F0\u542F\u52A8 (PID: ${child.pid}, Port: ${port})`
+        );
+        consola2.info("\u4F7F\u7528 'xiaozhi status' \u67E5\u770B\u72B6\u6001");
+        process.exit(0);
       }
       /**
        * 后台模式启动 WebServer
@@ -3826,29 +3820,18 @@ var init_ServiceManager = __esm({
             XIAOZHI_DAEMON: "true"
           }
         });
-        this.processManager.savePidInfo(child.pid || 0, "daemon");
+        if (!child.pid) {
+          throw new ServiceError(
+            "\u65E0\u6CD5\u521B\u5EFA\u5B88\u62A4\u8FDB\u7A0B\uFF08node \u542F\u52A8\u5931\u8D25\uFF09\uFF0C\u8BF7\u68C0\u67E5 Node.js \u5B89\u88C5\u662F\u5426\u6B63\u5E38"
+          );
+        }
+        this.processManager.savePidInfo(child.pid, "daemon");
         child.unref();
         consola2.success(`\u540E\u53F0\u670D\u52A1\u5DF2\u542F\u52A8 (PID: ${child.pid})`);
         consola2.info("\u4F7F\u7528 'xiaozhi status' \u67E5\u770B\u72B6\u6001");
         consola2.info("\u4F7F\u7528 'xiaozhi attach' \u67E5\u770B\u65E5\u5FD7");
         process.exit(0);
       }
-      /**
-       * 前台模式启动 WebServer
-       */
-      async startWebServerInForeground() {
-        const { WebServer } = await import("../backend/WebServer.js");
-        const server = new WebServer();
-        const cleanup = /* @__PURE__ */ __name(async () => {
-          await server.stop();
-          this.processManager.cleanupPidFile();
-          process.exit(0);
-        }, "cleanup");
-        process.once("SIGINT", cleanup);
-        process.once("SIGTERM", cleanup);
-        this.processManager.savePidInfo(process.pid, "foreground");
-        await server.start();
-      }
     };
   }
 });
@@ -5630,7 +5613,7 @@ init_config();
 import fs from "fs";
 import path3 from "path";
 import { fileURLToPath as fileURLToPath3 } from "url";
-var VERSION = "2.3.0";
+var VERSION = "2.3.1-beta.1";
 var APP_NAME = "xiaozhi-client";
 var VersionUtils = class _VersionUtils {
   static {