xiaozhi-client 2.3.1-beta.2 → 2.3.1-beta.4

package/README.md

@@ -1,8 +1,11 @@
-<br />
 <div align="center">
-  <img style="height: 60px;" src="https://raw.githubusercontent.com/shenjingnan/xiaozhi-client/main/docs/public/images/logo.png" alt="xiaozhi-client logo" />
+  <br />
+  <br />
+  <img src="logo.svg" alt="Xiaozhi Client" width="400" height="100" />
+  <br />
+  <br />
+  <br />
 </div>
-<br />
 
 <div align="center">
 <a href="https://www.npmjs.com/package/xiaozhi-client" target="_blank"><img src="https://img.shields.io/npm/v/xiaozhi-client" alt="npm version" /></a>

package/dist/backend/WebServer.js

@@ -2,7 +2,7 @@ import { createRequire } from 'node:module';
 globalThis.require = createRequire(import.meta.url);
 
 import { a as __toESM, i as __reExport, n as __exportAll, r as __name, t as __commonJSMin } from "./chunk-Dn3sj6vE.js";
-import { a as MCPConnection, c as configManager, n as isModelScopeURL, o as TypeFieldNormalizer, r as normalizeServiceConfig, s as ensureToolJSONSchema$1 } from "./config-CQI3gsre.js";
+import { a as MCPConnection, c as configManager, n as isModelScopeURL, o as TypeFieldNormalizer, r as normalizeServiceConfig, s as ensureToolJSONSchema$1 } from "./config-CtLjYTic.js";
 import { logger } from "./Logger.js";
 import { createServer } from "node:http";
 import { serve } from "@hono/node-server";
@@ -166,7 +166,7 @@ var Endpoint = class Endpoint {
 	* ```
 	*/
 	static async create(config) {
-		const { InternalMCPManagerAdapter } = await import("./internal-mcp-manager-CE7FUsCF.js");
+		const { InternalMCPManagerAdapter } = await import("./internal-mcp-manager-B_XaJQHT.js");
 		const internalMCPManager = new InternalMCPManagerAdapter({
 			mcpServers: config.mcpServers,
 			reconnectDelay: config.reconnectDelay
@@ -11652,7 +11652,7 @@ var UpdateApiHandler = class extends BaseHandler {
 * 如果构建时能读取到 package.json，则为真实版本号
 * 否则为占位符，运行时从 package.json 读取
 */
-const VERSION = "2.3.1-beta.2";
+const VERSION = "2.3.1-beta.4";
 const APP_NAME = "xiaozhi-client";
 /**
 * 版本工具类
@@ -11667,7 +11667,7 @@ var VersionUtils = class VersionUtils {
 	* 如果是占位符，则运行时从 package.json 读取
 	*/
 	static getVersion() {
-		if ("2.3.1-beta.2" === "__VERSION__") return VersionUtils.getRuntimeVersion();
+		if ("2.3.1-beta.4" === "__VERSION__") return VersionUtils.getRuntimeVersion();
 		return VERSION;
 	}
 	/**
@@ -11675,7 +11675,7 @@ var VersionUtils = class VersionUtils {
 	*/
 	static getVersionInfo() {
 		if (VersionUtils.cachedVersionInfo) return VersionUtils.cachedVersionInfo;
-		if ("2.3.1-beta.2" === "__VERSION__") {
+		if ("2.3.1-beta.4" === "__VERSION__") {
 			VersionUtils.cachedVersionInfo = VersionUtils.getRuntimeVersionInfo();
 			return VersionUtils.cachedVersionInfo;
 		}

package/dist/backend/WebServerLauncher.js

@@ -11,7 +11,7 @@ import { r as __name } from "./chunk-Dn3sj6vE.js";
 */
 async function importModules() {
 	const webServerModule = await import("./WebServer.js");
-	const configModule = await import("./config-CQI3gsre.js").then((n) => n.t);
+	const configModule = await import("./config-CtLjYTic.js").then((n) => n.t);
 	const loggerModule = await import("./Logger.js");
 	return {
 		WebServer: webServerModule.WebServer,

package/dist/backend/{config-CQI3gsre.js → config-CtLjYTic.js}

@@ -5,7 +5,6 @@ import { n as __exportAll, r as __name } from "./chunk-Dn3sj6vE.js";
 import { copyFileSync, existsSync, mkdirSync, readFileSync, readdirSync, statSync, writeFileSync } from "node:fs";
 import path, { dirname, isAbsolute, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
-import * as commentJson from "comment-json";
 import dayjs from "dayjs";
 import { Client } from "@modelcontextprotocol/sdk/client/index.js";
 import { SSEClientTransport } from "@modelcontextprotocol/sdk/client/sse.js";
@@ -14,40 +13,6 @@ import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/
 import { EventSource } from "eventsource";
 import { EventEmitter } from "node:events";
 
-//#region ../config/json5-adapter.ts
-/**
-* JSON5 注释保留适配器
-* 使用 comment-json 实现 JSON5/JSONC 注释保留功能
-*
-* 注意：为了使用 comment-json 保留注释，JSON5 配置文件的键需要带引号。
-* 这与 JSON5 标准语法允许不带引号的键略有不同，但能实现注释保留功能。
-*/
-/**
-* 创建 JSON5 写入器适配器
-* @param content 原始 JSON5 内容字符串
-* @returns Json5WriterAdapter 实例
-*/
-function createJson5Writer(content) {
-	const parsedData = commentJson.parse(content);
-	return {
-		write(data) {
-			if (parsedData && typeof parsedData === "object" && data) Object.assign(parsedData, data);
-		},
-		toSource() {
-			return commentJson.stringify(parsedData, null, 2);
-		}
-	};
-}
-/**
-* 解析 JSON5 内容(带注释保留)
-* @param content JSON5 内容字符串
-* @returns 解析后的对象
-*/
-function parseJson5(content) {
-	return commentJson.parse(content);
-}
-
-//#endregion
 //#region ../config/resolver.ts
 /**
 * 配置解析器
@@ -86,17 +51,13 @@ var ConfigResolver = class ConfigResolver {
 	/**
 	* 在指定目录中查找配置文件
 	*
-	* 按优先级查找：xiaozhi.config.json5 > xiaozhi.config.jsonc > xiaozhi.config.json
+	* 查找配置文件：xiaozhi.config.json
 	*
 	* @param dir - 要搜索的目录
 	* @returns 找到的配置文件路径，如果不存在则返回 null
 	*/
 	static findConfigInDir(dir) {
-		for (const fileName of [
-			"xiaozhi.config.json5",
-			"xiaozhi.config.jsonc",
-			"xiaozhi.config.json"
-		]) {
+		for (const fileName of ["xiaozhi.config.json"]) {
 			const filePath = path.join(dir, fileName);
 			if (existsSync(filePath)) return filePath;
 		}
@@ -120,7 +81,7 @@ var ConfigResolver = class ConfigResolver {
 * 配置管理器
 *
 * 核心配置管理模块，负责：
-* - 配置文件的读取和解析（支持 JSON、JSON5、JSONC 格式）
+* - 配置文件的读取和解析（支持 JSON 格式）
 * - 配置验证和类型检查
 * - 配置更新和持久化
 * - 配置变更事件通知
@@ -168,7 +129,6 @@ var ConfigManager = class ConfigManager {
 	defaultConfigPath;
 	config = null;
 	currentConfigPath = null;
-	json5Writer = null;
 	statsUpdateLocks = /* @__PURE__ */ new Map();
 	statsUpdateLockTimeouts = /* @__PURE__ */ new Map();
 	STATS_UPDATE_TIMEOUT = 5e3;
@@ -197,7 +157,7 @@ var ConfigManager = class ConfigManager {
 	}
 	/**
 	* 获取配置文件路径（动态计算）
-	* 支持多种配置文件格式：json5 > jsonc > json
+	* 支持配置文件格式：json
 	*
 	* 查找优先级：
 	* 1. 环境变量 XIAOZHI_CONFIG_DIR 指定的目录
@@ -212,14 +172,6 @@ var ConfigManager = class ConfigManager {
 		return resolve(process.env.XIAOZHI_CONFIG_DIR || process.cwd(), "xiaozhi.config.json");
 	}
 	/**
-	* 获取配置文件格式
-	*/
-	getConfigFileFormat(filePath) {
-		if (filePath.endsWith(".json5")) return "json5";
-		if (filePath.endsWith(".jsonc")) return "jsonc";
-		return "json";
-	}
-	/**
 	* 获取配置管理器单例实例
 	*/
 	static getInstance() {
@@ -239,16 +191,14 @@ var ConfigManager = class ConfigManager {
 	}
 	/**
 	* 初始化配置文件
-	* 从 config.default.json 复制到 config.json
-	* @param format 配置文件格式，默认为 json
+	* 将默认模板配置复制到 xiaozhi.config.json
 	*/
-	initConfig(format = "json") {
+	initConfig() {
 		if (!existsSync(this.defaultConfigPath)) throw new Error(`默认配置模板文件不存在: ${this.defaultConfigPath}`);
 		if (this.configExists()) throw new Error("配置文件已存在，无需重复初始化");
-		const configPath = resolve(process.env.XIAOZHI_CONFIG_DIR || process.cwd(), `xiaozhi.config.${format}`);
+		const configPath = resolve(process.env.XIAOZHI_CONFIG_DIR || process.cwd(), "xiaozhi.config.json");
 		copyFileSync(this.defaultConfigPath, configPath);
 		this.config = null;
-		this.json5Writer = null;
 	}
 	/**
 	* 加载配置文件
@@ -265,21 +215,8 @@ var ConfigManager = class ConfigManager {
 		try {
 			const configPath = this.getConfigFilePath();
 			this.currentConfigPath = configPath;
-			const configFileFormat = this.getConfigFileFormat(configPath);
 			const configData = readFileSync(configPath, "utf8").replace(/^\uFEFF/, "");
-			let config;
-			switch (configFileFormat) {
-				case "json5":
-					config = parseJson5(configData);
-					this.json5Writer = createJson5Writer(configData);
-					break;
-				case "jsonc":
-					config = commentJson.parse(configData);
-					break;
-				default:
-					config = JSON.parse(configData);
-					break;
-			}
+			const config = JSON.parse(configData);
 			this.validateConfig(config);
 			return config;
 		} catch (error) {
@@ -542,35 +479,7 @@ var ConfigManager = class ConfigManager {
 				configPath = this.getConfigFilePath();
 				this.currentConfigPath = configPath;
 			}
-			const configFileFormat = this.getConfigFileFormat(configPath);
-			let configContent;
-			switch (configFileFormat) {
-				case "json5":
-					try {
-						if (this.json5Writer) {
-							this.json5Writer.write(config);
-							configContent = this.json5Writer.toSource();
-						} else {
-							console.warn("没有 JSON5 适配器实例，使用 comment-json 序列化");
-							configContent = commentJson.stringify(config, null, 2);
-						}
-					} catch (json5Error) {
-						console.warn("使用 JSON5 适配器保存失败，回退到 comment-json 序列化:", json5Error);
-						configContent = commentJson.stringify(config, null, 2);
-					}
-					break;
-				case "jsonc":
-					try {
-						configContent = commentJson.stringify(config, null, 2);
-					} catch (commentJsonError) {
-						console.warn("使用 comment-json 保存失败，回退到标准 JSON 格式:", commentJsonError);
-						configContent = JSON.stringify(config, null, 2);
-					}
-					break;
-				default:
-					configContent = JSON.stringify(config, null, 2);
-					break;
-			}
+			const configContent = `${JSON.stringify(config, null, 2)}\n`;
 			writeFileSync(configPath, configContent, "utf8");
 			this.config = config;
 			console.log("配置保存成功");
@@ -589,7 +498,6 @@ var ConfigManager = class ConfigManager {
 	reloadConfig() {
 		this.config = null;
 		this.currentConfigPath = null;
-		this.json5Writer = null;
 	}
 	/**
 	* 获取配置文件路径
@@ -2348,4 +2256,4 @@ var config_exports = /* @__PURE__ */ __exportAll({
 
 //#endregion
 export { MCPConnection as a, configManager as c, MCPManager as i, isModelScopeURL as n, TypeFieldNormalizer as o, normalizeServiceConfig as r, ensureToolJSONSchema as s, config_exports as t };
-//# sourceMappingURL=config-CQI3gsre.js.map
+//# sourceMappingURL=config-CtLjYTic.js.map