koishi-plugin-minecraft-adapter 0.4.2 → 0.4.4

package/lib/index.d.ts

@@ -32,6 +32,7 @@ declare class MinecraftService extends Service implements MinecraftServiceAPI {
     private wsReconnectTimer?;
     private wsCurrentInterval?;
     private debugEnabled;
+    private internalBot?;
     constructor(ctx: Context, config: MinecraftService.Config);
     private registerWebhook;
     start(): void;

package/lib/index.js

@@ -26,6 +26,8 @@ class MinecraftService extends koishi_1.Service {
     wsCurrentInterval;
     // Debug
     debugEnabled = false;
+    // 内置简易 Bot（用于在无正式 Adapter 时注入会话）
+    internalBot;
     constructor(ctx, config) {
         super(ctx, 'minecraft', true);
         this.ctx = ctx;
@@ -34,6 +36,10 @@ class MinecraftService extends koishi_1.Service {
         if (config.webhook?.enabled) {
             this.registerWebhook();
         }
+        // 创建一个内部 Bot，便于把聊天注入 Koishi 标准消息事件
+        if (config.adapterCompat?.injectMessage) {
+            this.internalBot = new MinecraftBot(ctx, { selfId: config.websocket?.serverName || 'minecraft' }, this);
+        }
         // 注册 Koishi 指令，便于 ChatLuna 通过自然语言“触发命令”
         if (config.commands?.enabled !== false) {
             const authority = config.commands?.authority ?? 2;
@@ -302,13 +308,14 @@ class MinecraftService extends koishi_1.Service {
                         channelId: `mc:${userId}`,
                         guildId: 'minecraft',
                         content,
+                        bot: this.internalBot,
                     };
                     this.dlog('inject.message', { session: { ...session, content: truncate(session.content, 200) } });
                     this.ctx.emit('message', session);
                 }
             }
             catch (e) {
-                logger.warn('WS 消息解析失败: ' + e?.message);
+                logger.warn('WS 处理失败: ' + e?.message);
             }
         });
         ws.on('close', () => {
@@ -577,13 +584,27 @@ function mapQueqiaoEvent(type, data) {
         case 'advancement_earned':
             return { type: 'advancement', payload: { player: data.player || data.name, advancement: data.advancement || data.key, raw: data } };
     }
-    // 回退：QueQiao 的标准消息
-    if (data && data.post_type === 'message') {
+    // 回退：QueQiao 标准格式
+    if (data?.post_type === 'message') {
         if (data.sub_type === 'chat' || data.event_name?.toLowerCase()?.includes('chatevent')) {
             const playerName = data.player?.nickname || data.player?.name || data.player?.display_name || data.name;
             return { type: 'chat', payload: { player: playerName, message: data.message || data.text, raw: data } };
         }
     }
+    if (data?.post_type === 'notice') {
+        if (data.sub_type === 'join' || data.event_name?.toLowerCase()?.includes('loggedinevent')) {
+            const playerName = data.player?.nickname || data.player?.name || data.player?.display_name || data.name;
+            return { type: 'join', payload: { player: playerName, raw: data } };
+        }
+        if (data.sub_type === 'quit' || data.event_name?.toLowerCase()?.includes('loggedoutevent')) {
+            const playerName = data.player?.nickname || data.player?.name || data.player?.display_name || data.name;
+            return { type: 'leave', payload: { player: playerName, raw: data } };
+        }
+        if (data.sub_type === 'achievement' || data.event_name?.toLowerCase()?.includes('advancement')) {
+            const playerName = data.player?.nickname || data.player?.name || data.player?.display_name || data.name;
+            return { type: 'advancement', payload: { player: playerName, advancement: data.advancement?.name || data.advancement?.key, raw: data } };
+        }
+    }
     return { type, payload: data };
 }
 function buildWsOutboundPayload(config, api, data) {
@@ -604,3 +625,24 @@ function truncate(str, len = 1000) {
         return str;
     return str.length > len ? str.slice(0, len) + '…' : str;
 }
+// 极简 Bot：用于让 session.bot 存在，避免 Koishi Processor 报错
+class MinecraftBot extends koishi_1.Bot {
+    config;
+    svc;
+    constructor(ctx, config, svc) {
+        super(ctx, {
+            platform: 'minecraft',
+            selfId: config.selfId,
+        }, {});
+        this.config = config;
+        this.svc = svc;
+    }
+    async sendMessage(channelId, content) {
+        await this.svc.wsBroadcast(content);
+        return [];
+    }
+    async sendPrivateMessage(userId, content) {
+        await this.svc.wsTell(userId, content);
+        return [];
+    }
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-minecraft-adapter",
   "description": "Minecraft RCON & webhook integration for Koishi",
-  "version": "0.4.2",
+  "version": "0.4.4",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [