koishi-plugin-minecraft-adapter 1.0.8 → 1.0.9

package/lib/index.js

@@ -9,29 +9,52 @@ const rcon_client_1 = require("rcon-client");
 const ws_1 = __importDefault(require("ws"));
 const logger = new koishi_1.Logger('minecraft');
 /**
- * 将嵌套格式的服务器配置扁平化
+ * 将嵌套格式的服务器配置扁平化。
+ * 每种嵌套对象（websocket / rcon / chatImage）独立处理，
+ * 确保任何混合格式（如扁平 url + 嵌套 rcon）都能正确转换。
  */
 function flattenServerConfig(server) {
-    if (server.websocket && typeof server.websocket === 'object') {
-        // 嵌套格式的 rcon 对象：只要存在且有 host/port/password 任一字段，即视为启用
-        const hasRcon = server.rcon && typeof server.rcon === 'object'
-            && (server.rcon.host || server.rcon.port || server.rcon.password);
-        return {
-            selfId: server.selfId,
-            serverName: server.serverName,
-            url: server.websocket.url,
-            accessToken: server.websocket.accessToken,
-            extraHeaders: server.websocket.extraHeaders,
-            enableRcon: hasRcon ? true : (server.rcon?.enabled ?? false),
-            rconHost: server.rcon?.host,
-            rconPort: server.rcon?.port,
-            rconPassword: server.rcon?.password,
-            rconTimeout: server.rcon?.timeout,
-            enableChatImage: server.chatImage?.enabled ?? !!(server.chatImage && (server.chatImage.defaultImageName)),
-            chatImageDefaultName: server.chatImage?.defaultImageName,
-        };
+    const result = { ...server };
+    // ── websocket 嵌套 → 扁平 ──
+    if (result.websocket && typeof result.websocket === 'object') {
+        const ws = result.websocket;
+        if (ws.url !== undefined)
+            result.url = ws.url;
+        if (ws.accessToken !== undefined)
+            result.accessToken = ws.accessToken;
+        if (ws.extraHeaders !== undefined)
+            result.extraHeaders = ws.extraHeaders;
+        delete result.websocket;
+    }
+    // ── rcon 嵌套 → 扁平 ──
+    if (result.rcon && typeof result.rcon === 'object') {
+        const rcon = result.rcon;
+        const hasRconConfig = rcon.host || rcon.port || rcon.password;
+        if (hasRconConfig || rcon.enabled) {
+            result.enableRcon = true;
+        }
+        // 仅在嵌套值实际存在时覆盖，避免用 undefined 覆盖已有值或阻止 Schema 默认值
+        if (rcon.host !== undefined)
+            result.rconHost = rcon.host;
+        if (rcon.port !== undefined)
+            result.rconPort = rcon.port;
+        if (rcon.password !== undefined)
+            result.rconPassword = rcon.password;
+        if (rcon.timeout !== undefined)
+            result.rconTimeout = rcon.timeout;
+        delete result.rcon;
+    }
+    // ── chatImage 嵌套 → 扁平 ──
+    if (result.chatImage && typeof result.chatImage === 'object') {
+        const ci = result.chatImage;
+        if (ci.enabled !== undefined || ci.defaultImageName) {
+            result.enableChatImage = ci.enabled ?? !!ci.defaultImageName;
+        }
+        if (ci.defaultImageName !== undefined)
+            result.chatImageDefaultName = ci.defaultImageName;
+        delete result.chatImage;
     }
-    return server;
+    return result;
 }
 /**
  * 向后兼容：
@@ -120,8 +143,7 @@ class MinecraftAdapter extends koishi_1.Adapter {
     constructor(ctx, rawConfig) {
         super(ctx);
         try {
-            const resolvedConfig = MinecraftAdapter.Config(rawConfig);
-            const config = migrateConfig(resolvedConfig);
+            const config = migrateConfig(rawConfig);
             this.debug = config.debug ?? false;
             this.detailedLogging = config.detailedLogging ?? false;
             this.tokenizeMode = config.tokenizeMode ?? 'split';
@@ -395,9 +417,17 @@ class MinecraftAdapter extends koishi_1.Adapter {
     async connectRcon(bot) {
         const config = bot.config;
         const selfId = bot.selfId;
-        const rconHost = config.rconHost || '127.0.0.1';
-        const rconPort = config.rconPort || 25575;
-        const rconTimeout = config.rconTimeout || 5000;
+        // rconHost 未配置时，从 WebSocket URL 中提取主机地址作为回退
+        let rconHost = config.rconHost;
+        if (!rconHost && config.url) {
+            try {
+                rconHost = new URL(config.url).hostname;
+            }
+            catch { }
+        }
+        rconHost = rconHost || '127.0.0.1';
+        const rconPort = config.rconPort ?? 25575;
+        const rconTimeout = config.rconTimeout ?? 5000;
         if (this.debug) {
             logger.info(`[DEBUG] RCON config for server ${selfId}:`, {
                 rconHost: config.rconHost,
@@ -405,9 +435,8 @@ class MinecraftAdapter extends koishi_1.Adapter {
                 rconPassword: config.rconPassword ? '***' : undefined,
                 rconTimeout: config.rconTimeout,
                 enableRcon: config.enableRcon,
-                configKeys: Object.keys(config),
+                resolved: `${rconHost}:${rconPort}`,
             });
-            logger.info(`[DEBUG] Connecting RCON for server ${selfId} to ${rconHost}:${rconPort}`);
         }
         try {
             const rcon = await this.createRconWithTimeout(rconHost, rconPort, config.rconPassword || '', rconTimeout);
@@ -1193,34 +1222,20 @@ MinecraftBot.MessageEncoder = MinecraftMessageEncoder;
 // ============================================================================
 // Koishi Schema 配置
 // ============================================================================
-const serverSchema = koishi_1.Schema.intersect([
-    koishi_1.Schema.object({
-        selfId: koishi_1.Schema.string().description('机器人 ID（唯一标识）').required(),
-        serverName: koishi_1.Schema.string().description('服务器名称（需与鹊桥 config.yml 中的 server_name 一致）'),
-        url: koishi_1.Schema.string().description('WebSocket 地址（如 ws://127.0.0.1:8080）').required(),
-        accessToken: koishi_1.Schema.string().description('访问令牌（需与鹊桥 config.yml 中的 access_token 一致）'),
-        extraHeaders: koishi_1.Schema.dict(koishi_1.Schema.string()).description('额外请求头'),
-        enableRcon: koishi_1.Schema.boolean().description('启用 RCON 远程命令执行').default(false),
-        enableChatImage: koishi_1.Schema.boolean().description('启用 ChatImage CICode 图片发送（需客户端安装 ChatImage Mod）').default(false),
-    }),
-    koishi_1.Schema.union([
-        koishi_1.Schema.object({
-            enableRcon: koishi_1.Schema.const(true).required(),
-            rconHost: koishi_1.Schema.string().description('RCON 主机地址').default('127.0.0.1'),
-            rconPort: koishi_1.Schema.number().description('RCON 端口').default(25575),
-            rconPassword: koishi_1.Schema.string().description('RCON 密码（留空表示无密码）'),
-            rconTimeout: koishi_1.Schema.number().description('RCON 超时时间(ms)').default(5000),
-        }),
-        koishi_1.Schema.object({}),
-    ]),
-    koishi_1.Schema.union([
-        koishi_1.Schema.object({
-            enableChatImage: koishi_1.Schema.const(true).required(),
-            chatImageDefaultName: koishi_1.Schema.string().description('图片在聊天栏中的默认显示名称').default('图片'),
-        }),
-        koishi_1.Schema.object({}),
-    ]),
-]);
+const serverSchema = koishi_1.Schema.object({
+    selfId: koishi_1.Schema.string().description('机器人 ID（唯一标识）').required(),
+    serverName: koishi_1.Schema.string().description('服务器名称（需与鹊桥 config.yml 中的 server_name 一致）'),
+    url: koishi_1.Schema.string().description('WebSocket 地址（如 ws://127.0.0.1:8080）').required(),
+    accessToken: koishi_1.Schema.string().description('访问令牌（需与鹊桥 config.yml 中的 access_token 一致）'),
+    extraHeaders: koishi_1.Schema.dict(koishi_1.Schema.string()).description('额外请求头'),
+    enableRcon: koishi_1.Schema.boolean().description('启用 RCON 远程命令执行').default(false),
+    rconHost: koishi_1.Schema.string().description('RCON 主机地址（留空则自动取 WebSocket 地址中的主机）'),
+    rconPort: koishi_1.Schema.number().description('RCON 端口').default(25575),
+    rconPassword: koishi_1.Schema.string().description('RCON 密码（留空表示无密码）'),
+    rconTimeout: koishi_1.Schema.number().description('RCON 超时时间(ms)').default(5000),
+    enableChatImage: koishi_1.Schema.boolean().description('启用 ChatImage CICode 图片发送（需客户端安装 ChatImage Mod）').default(false),
+    chatImageDefaultName: koishi_1.Schema.string().description('图片在聊天栏中的默认显示名称').default('图片'),
+});
 (function (MinecraftAdapter) {
     MinecraftAdapter.Config = koishi_1.Schema.object({
         debug: koishi_1.Schema.boolean().description('启用调试模式，输出详细日志').default(false),

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-minecraft-adapter",
   "description": "Minecraft adapter for Koishi based on QueQiao V2 protocol",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [