koishi-plugin-minecraft-adapter 1.0.0 → 1.0.2

package/lib/index.d.ts

@@ -27,10 +27,32 @@ export interface QueqiaoPlayer {
     health?: number;
     max_health?: number;
     experience_level?: number;
+    experience_progress?: number;
+    total_experience?: number;
+    walk_speed?: number;
     x?: number;
     y?: number;
     z?: number;
 }
+/**
+ * 鹊桥 V2 Death 对象
+ */
+export interface QueqiaoDeath {
+    key?: string;
+    args?: string;
+    text?: string;
+}
+/**
+ * 鹊桥 V2 Achievement 对象
+ */
+export interface QueqiaoAchievement {
+    display?: {
+        title?: string;
+        description?: string;
+        frame?: string;
+    };
+    text?: string;
+}
 /**
  * 鹊桥 V2 事件基础结构
  */
@@ -49,7 +71,7 @@ export interface PlayerChatEvent extends QueqiaoEventBase {
     post_type: 'message';
     event_name: 'PlayerChatEvent';
     message: string;
-    raw_message: string;
+    rawMessage?: string;
     message_id?: string;
     player: QueqiaoPlayer;
 }
@@ -60,7 +82,7 @@ export interface PlayerCommandEvent extends QueqiaoEventBase {
     post_type: 'message';
     event_name: 'PlayerCommandEvent';
     command: string;
-    raw_message: string;
+    rawMessage?: string;
     message_id?: string;
     player: QueqiaoPlayer;
 }
@@ -89,7 +111,7 @@ export interface PlayerDeathEvent extends QueqiaoEventBase {
     post_type: 'notice';
     event_name: 'PlayerDeathEvent';
     sub_type: 'player_death';
-    death_message?: string;
+    death?: QueqiaoDeath;
     player: QueqiaoPlayer;
 }
 /**
@@ -99,7 +121,7 @@ export interface PlayerAchievementEvent extends QueqiaoEventBase {
     post_type: 'notice';
     event_name: 'PlayerAchievementEvent';
     sub_type: 'player_achievement';
-    achievement?: string;
+    achievement?: QueqiaoAchievement;
     player: QueqiaoPlayer;
 }
 export type QueqiaoEvent = PlayerChatEvent | PlayerCommandEvent | PlayerJoinEvent | PlayerQuitEvent | PlayerDeathEvent | PlayerAchievementEvent;
@@ -156,6 +178,12 @@ export declare class MinecraftBot<C extends Context = Context> extends Bot<C, Mi
      */
     executeCommand(command: string): Promise<string>;
 }
+export interface ChatImageConfig {
+    /** 是否启用 ChatImage CICode 生成（出站方向），默认关闭 */
+    enabled?: boolean;
+    /** 图片在聊天栏中的默认显示名称 */
+    defaultImageName?: string;
+}
 export interface MinecraftAdapterConfig {
     bots: MinecraftBotConfig[];
     debug?: boolean;
@@ -165,8 +193,11 @@ export interface MinecraftAdapterConfig {
     maxReconnectAttempts?: number;
     /** 是否在消息前添加默认前缀 [鹊桥]，默认不添加（由服务端配置） */
     useMessagePrefix?: boolean;
+    /** ChatImage 集成配置 */
+    chatImage?: ChatImageConfig;
 }
 export declare class MinecraftAdapter<C extends Context = Context> extends Adapter<C, MinecraftBot<C>> {
+    static reusable: boolean;
     private rconConnections;
     private wsConnections;
     private reconnectAttempts;
@@ -178,15 +209,25 @@ export declare class MinecraftAdapter<C extends Context = Context> extends Adapt
     private reconnectInterval;
     private maxReconnectAttempts;
     private useMessagePrefix;
+    private chatImageEnabled;
+    private chatImageDefaultName;
     constructor(ctx: C, config: MinecraftAdapterConfig);
     /**
      * 生成唯一的请求 ID
      */
     private generateEcho;
+    private toTextComponent;
+    private extractRawText;
     /**
-     * 将消息转换为 Minecraft 文本组件格式
+     * 生成 ChatImage CICode: [[CICode,url=<url>,name=<name>]]
      */
-    private toTextComponent;
+    private buildCICode;
+    /**
+     * 解析出站消息中的 Koishi 元素标签 (<img src="..."/>, <image url="..."/>)
+     */
+    private parseOutboundMessage;
+    private extractAttr;
+    private decodeHtmlEntities;
     /**
      * 发送 WebSocket API 请求并等待响应
      */
@@ -198,14 +239,18 @@ export declare class MinecraftAdapter<C extends Context = Context> extends Adapt
     private getWebSocketCloseCode;
     private getWebSocketStateString;
     private connectWebSocket;
+    private sessionCounter;
     /**
      * 根据鹊桥 V2 事件创建 Koishi Session
      */
     private createSession;
     /**
      * 解析消息文本为 Koishi 元素数组
+     * 入站方向始终解析 CICode 和裸图片 URL（不受 chatImage.enabled 控制）
      */
     private parseMessageToElements;
+    private extractCICodeParam;
+    private addTextElements;
     /**
      * 发送私聊消息 (send_private_msg)
      */

package/lib/index.js

@@ -14,6 +14,7 @@ class MinecraftBot extends koishi_1.Bot {
     constructor(ctx, config) {
         super(ctx, config, 'minecraft');
         this.selfId = config.selfId;
+        this.platform = 'minecraft';
     }
     /**
      * 发送消息到频道或私聊
@@ -56,6 +57,7 @@ class MinecraftBot extends koishi_1.Bot {
 }
 exports.MinecraftBot = MinecraftBot;
 class MinecraftAdapter extends koishi_1.Adapter {
+    static reusable = true;
     rconConnections = new Map();
     wsConnections = new Map();
     reconnectAttempts = new Map();
@@ -67,6 +69,8 @@ class MinecraftAdapter extends koishi_1.Adapter {
     reconnectInterval;
     maxReconnectAttempts;
     useMessagePrefix;
+    chatImageEnabled;
+    chatImageDefaultName;
     constructor(ctx, config) {
         super(ctx);
         try {
@@ -76,6 +80,8 @@ class MinecraftAdapter extends koishi_1.Adapter {
             this.reconnectInterval = config.reconnectInterval ?? 5000;
             this.maxReconnectAttempts = config.maxReconnectAttempts ?? 10;
             this.useMessagePrefix = config.useMessagePrefix ?? false;
+            this.chatImageEnabled = config.chatImage?.enabled ?? false;
+            this.chatImageDefaultName = config.chatImage?.defaultImageName ?? '图片';
             if (this.debug) {
                 logger.info(`[DEBUG] MinecraftAdapter initialized with config:`, {
                     debug: this.debug,
@@ -97,7 +103,7 @@ class MinecraftAdapter extends koishi_1.Adapter {
                     bot.adapter = this;
                     this.bots.push(bot);
                     // 初始化 RCON 连接
-                    if (botConfig.rcon) {
+                    if (botConfig.rcon && botConfig.rcon.host && botConfig.rcon.port && botConfig.rcon.password) {
                         try {
                             if (this.debug) {
                                 logger.info(`[DEBUG] Connecting RCON for bot ${botConfig.selfId} to ${botConfig.rcon.host}:${botConfig.rcon.port}`);
@@ -121,7 +127,12 @@ class MinecraftAdapter extends koishi_1.Adapter {
                     }
                     else {
                         if (this.debug) {
-                            logger.info(`[DEBUG] No RCON config for bot ${botConfig.selfId}`);
+                            if (botConfig.rcon) {
+                                logger.info(`[DEBUG] RCON config incomplete for bot ${botConfig.selfId}, skipping (need host, port, password)`);
+                            }
+                            else {
+                                logger.info(`[DEBUG] No RCON config for bot ${botConfig.selfId}`);
+                            }
                         }
                     }
                     // 初始化 WebSocket 连接
@@ -150,53 +161,115 @@ class MinecraftAdapter extends koishi_1.Adapter {
     generateEcho() {
         return `koishi_${Date.now()}_${++this.requestCounter}`;
     }
-    /**
-     * 将消息转换为 Minecraft 文本组件格式
-     */
     toTextComponent(message) {
-        const extractText = (item) => {
-            if (item == null)
-                return '';
-            if (typeof item === 'string')
-                return item;
-            if (typeof item === 'number' || typeof item === 'boolean')
-                return String(item);
-            if (Array.isArray(item))
-                return item.map(extractText).join('');
-            if (typeof item === 'object') {
-                if (item.attrs && typeof item.attrs.content === 'string')
-                    return item.attrs.content;
-                if (typeof item.content === 'string')
-                    return item.content;
-                if (typeof item.text === 'string')
-                    return item.text;
-                if (item.children)
-                    return extractText(item.children);
+        const raw = this.extractRawText(message);
+        if (!raw)
+            return [{ text: '' }];
+        const segments = this.parseOutboundMessage(raw);
+        if (segments.length === 0)
+            return [{ text: '' }];
+        const fullText = segments.map(seg => {
+            if (seg.type === 'image') {
+                if (this.chatImageEnabled) {
+                    return this.buildCICode(seg.url, seg.name);
+                }
+                return seg.url;
+            }
+            return seg.text;
+        }).join('');
+        return [{ text: fullText }];
+    }
+    extractRawText(message) {
+        if (message == null)
+            return '';
+        if (typeof message === 'string')
+            return message;
+        if (typeof message === 'number' || typeof message === 'boolean')
+            return String(message);
+        if (Array.isArray(message))
+            return message.map(item => this.extractRawText(item)).join('');
+        if (typeof message === 'object') {
+            if (message.attrs && typeof message.attrs.content === 'string')
+                return message.attrs.content;
+            if (typeof message.content === 'string')
+                return message.content;
+            if (typeof message.text === 'string')
+                return message.text;
+            if (message.children)
+                return this.extractRawText(message.children);
+            try {
+                if (typeof message.toString === 'function' && message.toString !== Object.prototype.toString) {
+                    const s = message.toString();
+                    if (typeof s === 'string' && s !== '[object Object]')
+                        return s;
+                }
+            }
+            catch (e) {
+                // ignore
+            }
+            let acc = '';
+            for (const key in message) {
                 try {
-                    if (typeof item.toString === 'function' && item.toString !== Object.prototype.toString) {
-                        const s = item.toString();
-                        if (typeof s === 'string' && s !== '[object Object]')
-                            return s;
-                    }
+                    acc += this.extractRawText(message[key]);
                 }
                 catch (e) {
                     // ignore
                 }
-                let acc = '';
-                for (const key in item) {
-                    try {
-                        acc += extractText(item[key]);
-                    }
-                    catch (e) {
-                        // ignore
-                    }
-                }
-                return acc;
             }
-            return String(item);
-        };
-        const text = extractText(message);
-        return { text };
+            return acc;
+        }
+        return String(message);
+    }
+    /**
+     * 生成 ChatImage CICode: [[CICode,url=<url>,name=<name>]]
+     */
+    buildCICode(url, name) {
+        const displayName = name || this.chatImageDefaultName;
+        return `[[CICode,url=${url},name=${displayName}]]`;
+    }
+    /**
+     * 解析出站消息中的 Koishi 元素标签 (<img src="..."/>, <image url="..."/>)
+     */
+    parseOutboundMessage(content) {
+        const segments = [];
+        const imgTagRegex = /<(?:img|image)\s+([^>]*?)\/?>(?:<\/(?:img|image)>)?/gi;
+        let lastIndex = 0;
+        let match;
+        while ((match = imgTagRegex.exec(content)) !== null) {
+            if (match.index > lastIndex) {
+                segments.push({ type: 'text', text: content.slice(lastIndex, match.index) });
+            }
+            const attrs = match[1];
+            const rawUrl = this.extractAttr(attrs, 'src') || this.extractAttr(attrs, 'url');
+            if (rawUrl) {
+                const url = this.decodeHtmlEntities(rawUrl);
+                const name = this.extractAttr(attrs, 'alt') || this.extractAttr(attrs, 'name') || this.extractAttr(attrs, 'summary');
+                segments.push({ type: 'image', url, name: name || undefined });
+            }
+            lastIndex = match.index + match[0].length;
+        }
+        if (lastIndex < content.length) {
+            segments.push({ type: 'text', text: content.slice(lastIndex) });
+        }
+        return segments;
+    }
+    // 从 HTML 属性字符串中提取指定属性值: name="val" | name='val' | name=val
+    extractAttr(attrs, name) {
+        const regex = new RegExp(`${name}\\s*=\\s*(?:"([^"]*)"|'([^']*)'|(\\S+))`, 'i');
+        const match = regex.exec(attrs);
+        if (!match)
+            return null;
+        return match[1] ?? match[2] ?? match[3] ?? null;
+    }
+    decodeHtmlEntities(str) {
+        return str
+            .replace(/&amp;/g, '&')
+            .replace(/&lt;/g, '<')
+            .replace(/&gt;/g, '>')
+            .replace(/&quot;/g, '"')
+            .replace(/&#39;/g, "'")
+            .replace(/&#x([0-9a-fA-F]+);/g, (_, hex) => String.fromCharCode(parseInt(hex, 16)))
+            .replace(/&#(\d+);/g, (_, dec) => String.fromCharCode(parseInt(dec, 10)));
     }
     /**
      * 发送 WebSocket API 请求并等待响应
@@ -393,6 +466,7 @@ class MinecraftAdapter extends koishi_1.Adapter {
             }
         });
     }
+    sessionCounter = 0;
     /**
      * 根据鹊桥 V2 事件创建 Koishi Session
      */
@@ -401,10 +475,10 @@ class MinecraftAdapter extends koishi_1.Adapter {
             logger.info(`[DEBUG] Creating session for event: ${payload.event_name}, payload:`, payload);
         }
         const event = {
-            sn: Date.now(),
+            sn: ++this.sessionCounter,
             login: {
                 sn: bot.sn,
-                adapter: 'minecraft-adapter',
+                adapter: bot.adapterName,
                 user: bot.user || { id: bot.selfId, name: bot.selfId },
                 platform: 'minecraft',
                 selfId: bot.selfId,
@@ -551,11 +625,12 @@ class MinecraftAdapter extends koishi_1.Adapter {
                     id: deathEvent.server_name || 'minecraft',
                     name: deathEvent.server_name || 'Minecraft Server',
                 };
-                // 附加死亡消息
-                if (deathEvent.death_message) {
+                // 从 death 对象提取死亡消息
+                const deathText = deathEvent.death?.text || '';
+                if (deathText) {
                     event.message = {
                         id: Date.now().toString(),
-                        content: deathEvent.death_message,
+                        content: deathText,
                         timestamp: payload.timestamp * 1000,
                     };
                 }
@@ -578,11 +653,14 @@ class MinecraftAdapter extends koishi_1.Adapter {
                     id: achieveEvent.server_name || 'minecraft',
                     name: achieveEvent.server_name || 'Minecraft Server',
                 };
-                // 附加成就信息
-                if (achieveEvent.achievement) {
+                // 从 achievement 对象提取成就信息
+                const achievementText = achieveEvent.achievement?.display?.title
+                    || achieveEvent.achievement?.text
+                    || '';
+                if (achievementText) {
                     event.message = {
                         id: Date.now().toString(),
-                        content: achieveEvent.achievement,
+                        content: achievementText,
                         timestamp: payload.timestamp * 1000,
                     };
                 }
@@ -612,20 +690,68 @@ class MinecraftAdapter extends koishi_1.Adapter {
     }
     /**
      * 解析消息文本为 Koishi 元素数组
+     * 入站方向始终解析 CICode 和裸图片 URL（不受 chatImage.enabled 控制）
      */
     parseMessageToElements(messageText) {
         if (!messageText)
             return [];
+        const elements = [];
+        // CICode: [[CICode,url=<url>(,name=<name>)(,nsfw=<bool>)(,pre=<p>)(,suf=<s>)]]
+        // 裸图片 URL: https?://....(png|jpg|jpeg|gif|bmp|ico|jfif|webp)
+        const ciCodePattern = /\[\[CICode,([^\]]*)\]\]/g;
+        const imageUrlPattern = /https?:\/\/\S+\.(?:png|jpe?g|gif|bmp|ico|jfif|webp)(?:\?[^\s]*)?/gi;
+        const combinedPattern = new RegExp(`(${ciCodePattern.source})|(${imageUrlPattern.source})`, 'gi');
+        let lastIndex = 0;
+        let match;
+        while ((match = combinedPattern.exec(messageText)) !== null) {
+            if (match.index > lastIndex) {
+                const textBefore = messageText.slice(lastIndex, match.index);
+                this.addTextElements(elements, textBefore);
+            }
+            if (match[1]) {
+                const params = match[2];
+                const url = this.extractCICodeParam(params, 'url');
+                if (url) {
+                    const el = { type: 'img', attrs: { src: url } };
+                    const name = this.extractCICodeParam(params, 'name');
+                    if (name)
+                        el.attrs.alt = name;
+                    el.toString = function () { return `[${this.attrs.alt || '图片'}]`; };
+                    elements.push(el);
+                }
+            }
+            else {
+                const url = match[0];
+                const el = { type: 'img', attrs: { src: url } };
+                el.toString = function () { return `[图片]`; };
+                elements.push(el);
+            }
+            lastIndex = match.index + match[0].length;
+        }
+        if (lastIndex < messageText.length) {
+            const textAfter = messageText.slice(lastIndex);
+            this.addTextElements(elements, textAfter);
+        }
+        if (elements.length === 0) {
+            this.addTextElements(elements, messageText);
+        }
+        return elements;
+    }
+    // 提取 CICode 参数: "url=xxx,name=yyy" => { url: "xxx", name: "yyy" }
+    extractCICodeParam(params, key) {
+        const regex = new RegExp(`(?:^|,)${key}=([^,]*)`, 'i');
+        const match = regex.exec(params);
+        return match ? match[1] : null;
+    }
+    addTextElements(elements, text) {
         const tokens = this.tokenizeMode === 'none'
-            ? [messageText]
-            : messageText.split(/(\s+)/).filter((s) => s.length > 0);
-        return tokens.map((token) => {
+            ? [text]
+            : text.split(/(\s+)/).filter((s) => s.length > 0);
+        for (const token of tokens) {
             const el = { type: 'text', attrs: { content: token } };
-            el.toString = function () {
-                return this.attrs?.content ?? '';
-            };
-            return el;
-        });
+            el.toString = function () { return this.attrs?.content ?? ''; };
+            elements.push(el);
+        }
     }
     /**
      * 发送私聊消息 (send_private_msg)
@@ -768,7 +894,7 @@ class MinecraftAdapter extends koishi_1.Adapter {
                         data.subtitle = subtitleComponent;
                     if (player)
                         data.nickname = player;
-                    await this.sendApiRequest(ws, 'title', data);
+                    await this.sendApiRequest(ws, 'send_title', data);
                     return;
                 }
                 catch (error) {
@@ -789,7 +915,7 @@ class MinecraftAdapter extends koishi_1.Adapter {
                     const data = { message: messageComponent };
                     if (player)
                         data.nickname = player;
-                    await this.sendApiRequest(ws, 'action_bar', data);
+                    await this.sendApiRequest(ws, 'send_actionbar', data);
                     return;
                 }
                 catch (error) {
@@ -844,6 +970,10 @@ exports.MinecraftAdapter = MinecraftAdapter;
         reconnectInterval: koishi_1.Schema.number().description('重连间隔时间(ms)').default(5000),
         maxReconnectAttempts: koishi_1.Schema.number().description('最大重连尝试次数').default(10),
         useMessagePrefix: koishi_1.Schema.boolean().description('是否在消息前添加默认前缀（由服务端配置）').default(false),
+        chatImage: koishi_1.Schema.object({
+            enabled: koishi_1.Schema.boolean().description('启用 ChatImage CICode 图片发送（需客户端安装 ChatImage Mod）').default(false),
+            defaultImageName: koishi_1.Schema.string().description('图片在聊天栏中的默认显示名称').default('图片'),
+        }).description('ChatImage 图片显示集成配置'),
         bots: koishi_1.Schema.array(koishi_1.Schema.object({
             selfId: koishi_1.Schema.string().description('机器人 ID（唯一标识）').required(),
             serverName: koishi_1.Schema.string().description('服务器名称（需与鹊桥 config.yml 中的 server_name 一致）'),

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.0",
+  "version": "1.0.2",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [