koishi-plugin-mai-bridge 0.1.2 → 0.1.3

package/README.md

@@ -68,7 +68,7 @@ groupMessageTriggerCount: 1
 - `apiKey` 可以留空。插件会生成并复用运行期密钥。
 - `dockerNetwork` 按你的 Koishi Docker 网络填写。Koishi 需要能通过 `apiHost` 访问 `maimai-ko`。
 - `webuiPublicUrl` 可填写反代或宿主机映射后的 WebUI 地址，用于 Koishi 控制台显示入口。
-- `groupMessageTriggerCount` 控制群聊累计多少条消息后才转发给 maibot。设为 `3` 时，同一群前两条只记录上下文，第 3 条才拉起思考；私聊不受影响。
+- `groupMessageTriggerCount` 控制群聊累计多少条消息后批量转发并强制触发 maibot 思考。设为 `3` 时，同一群前两条先缓存，第 3 条会连同前两条一起转发；私聊不受影响。
 
 ## 消息模式
 

package/out/bridge/convert.d.ts

@@ -4,6 +4,7 @@ import type { KoishiRoute, MaimApiMessage } from '../types';
 export interface SessionToMaimOptions {
     resolveImage?: (source: string) => Awaitable<string | undefined>;
     replyContext?: ReplyContext;
+    forceMention?: boolean;
 }
 export interface ReplyContext {
     targetMessageId: string;

package/out/bridge/convert.js

@@ -181,6 +181,8 @@ async function sessionToMaimMessage(session, route, apiKey, options = {}) {
     const messageId = String(session.messageId || session.id || `koishi-${Date.now()}`);
     const senderInfo = buildSenderInfo(session);
     const atBot = isAtBot(session);
+    const forceMention = !!options.forceMention;
+    const mentioned = atBot || forceMention;
     const replyContext = options.replyContext;
     return {
         message_info: {
@@ -202,8 +204,9 @@ async function sessionToMaimMessage(session, route, apiKey, options = {}) {
                 koishi_reply_to_message_id: replyContext?.targetMessageId,
                 koishi_reply_context_count: replyContext?.contextCount,
                 koishi_is_direct: !!session.isDirect,
-                at_bot: atBot,
-                is_mentioned: atBot,
+                koishi_group_trigger_forced: forceMention,
+                at_bot: mentioned,
+                is_mentioned: mentioned,
             },
             format_info: {
                 content_format: ['text', 'image'],

package/out/bridge/group-trigger.d.ts

@@ -5,10 +5,16 @@ export interface GroupTriggerResult {
     count: number;
     threshold: number;
     key?: string;
+    entries: GroupTriggerEntry[];
+    forceMention?: boolean;
+}
+export interface GroupTriggerEntry {
+    session: Session;
+    route: KoishiRoute;
 }
 export declare class GroupMessageTrigger {
     private threshold;
-    private counters;
+    private pending;
     constructor(threshold: number);
     test(session: Session, route: KoishiRoute): GroupTriggerResult;
     clear(): void;

package/out/bridge/group-trigger.js

@@ -3,26 +3,27 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.GroupMessageTrigger = void 0;
 class GroupMessageTrigger {
     threshold;
-    counters = new Map();
+    pending = new Map();
     constructor(threshold) {
         this.threshold = threshold;
     }
     test(session, route) {
         const threshold = Math.max(1, Math.floor(this.threshold || 1));
+        const entry = { session, route };
         if (threshold <= 1 || session.isDirect || !route.channelId) {
-            return { shouldForward: true, count: 1, threshold };
+            return { shouldForward: true, count: 1, threshold, entries: [entry] };
         }
         const key = this.createKey(route);
-        const count = (this.counters.get(key) || 0) + 1;
-        if (count >= threshold) {
-            this.counters.delete(key);
-            return { shouldForward: true, count, threshold, key };
+        const entries = [...this.pending.get(key) || [], entry];
+        if (entries.length >= threshold) {
+            this.pending.delete(key);
+            return { shouldForward: true, count: entries.length, threshold, key, entries, forceMention: true };
         }
-        this.counters.set(key, count);
-        return { shouldForward: false, count, threshold, key };
+        this.pending.set(key, entries);
+        return { shouldForward: false, count: entries.length, threshold, key, entries: [] };
     }
     clear() {
-        this.counters.clear();
+        this.pending.clear();
     }
     createKey(route) {
         return [

package/out/config.js

@@ -43,7 +43,7 @@ exports.Config = koishi_1.Schema.intersect([
             koishi_1.Schema.const('command').description('命令：仅命中指令前缀时转发。'),
         ]).default('coexist').description('消息转发模式。'),
         commandPrefix: koishi_1.Schema.string().default('mai.ko').description('command 模式下触发 mai.ko 的文本前缀。'),
-        groupMessageTriggerCount: koishi_1.Schema.number().min(1).default(1).description('同一群聊累计达到多少条消息后才转发给 mai.ko 触发思考；1 表示每条群消息都转发。私聊不受影响。'),
+        groupMessageTriggerCount: koishi_1.Schema.number().min(1).default(1).description('同一群聊累计达到多少条消息后批量转发并强制触发 mai.ko 思考；1 表示每条群消息都转发。私聊不受影响。'),
         imageDownloadEnabled: koishi_1.Schema.boolean().default(true).description('转发图片消息前由 Koishi 下载图片并转为 mai.ko 可识别的 base64 图片段。'),
         imageDownloadTimeout: koishi_1.Schema.number().min(1000).default(10000).description('下载单张入站图片的超时时间，单位毫秒。'),
         imageDownloadMaxBytes: koishi_1.Schema.number().min(1024).default(10 * 1024 * 1024).description('允许转发给 mai.ko 的单张图片最大字节数。'),

package/out/service.d.ts

@@ -38,6 +38,7 @@ export declare class MaibotService extends Service {
     dockerRestart(): Promise<RuntimeStatus>;
     getStatus(): RuntimeStatus;
     handleSession(session: Session, next: () => Awaitable<void | Fragment>): Promise<void | Fragment>;
+    private forwardSessionToMaim;
     dispose(): Promise<void>;
     private logMessageDetail;
     private logMessageSummary;

package/out/service.js

@@ -249,19 +249,15 @@ class MaibotService extends koishi_1.Service {
                     return '';
                 return next();
             }
-            const replyContext = this.history.resolveReplyContext(session, route);
-            const message = await (0, convert_1.sessionToMaimMessage)(session, route, this.apiKey, {
-                resolveImage: (source) => this.resolveImageToBase64(source),
-                replyContext,
-            });
-            this.transport.sendMessage(message);
-            this.history.rememberSession(session, route);
-            this.bridge.maimSent += 1;
-            this.bridge.lastMaimSendAt = Date.now();
-            this.bridge.lastRouteId = route.routeId;
-            this.bridge.lastMessageId = message.message_info.message_id;
-            const replyLog = replyContext ? ` reply=${replyContext.targetMessageId} context=${replyContext.contextCount || 0}` : '';
-            this.logMessageDetail(`koishi -> maimai forwarded: route=${route.routeId}${replyLog} ${(0, logging_1.describeSegment)(message.message_segment)}`);
+            const entries = trigger.entries.length ? trigger.entries : [{ session, route }];
+            if (trigger.forceMention) {
+                this.logMessageSummary(`group trigger reached: route=${route.routeId} count=${trigger.count}/${trigger.threshold} flushing=${entries.length}`);
+            }
+            for (let index = 0; index < entries.length; index++) {
+                const entry = entries[index];
+                const forceMention = !!trigger.forceMention && index === entries.length - 1;
+                await this.forwardSessionToMaim(entry.session, entry.route, forceMention);
+            }
             if (this.pluginConfig.messageMode === 'exclusive')
                 return '';
         }
@@ -273,6 +269,23 @@ class MaibotService extends koishi_1.Service {
         }
         return next();
     }
+    async forwardSessionToMaim(session, route, forceMention = false) {
+        const replyContext = this.history.resolveReplyContext(session, route);
+        const message = await (0, convert_1.sessionToMaimMessage)(session, route, this.apiKey, {
+            resolveImage: (source) => this.resolveImageToBase64(source),
+            replyContext,
+            forceMention,
+        });
+        this.transport.sendMessage(message);
+        this.history.rememberSession(session, route);
+        this.bridge.maimSent += 1;
+        this.bridge.lastMaimSendAt = Date.now();
+        this.bridge.lastRouteId = route.routeId;
+        this.bridge.lastMessageId = message.message_info.message_id;
+        const replyLog = replyContext ? ` reply=${replyContext.targetMessageId} context=${replyContext.contextCount || 0}` : '';
+        const forceLog = forceMention ? ' forced=group-trigger' : '';
+        this.logMessageDetail(`koishi -> maimai forwarded: route=${route.routeId}${replyLog}${forceLog} ${(0, logging_1.describeSegment)(message.message_segment)}`);
+    }
     async dispose() {
         await this.shutdown();
         this.routes.clear();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koishi-plugin-mai-bridge",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "将 maibot 作为 docker 托管的消息回复后端运行，使用 mai.ko 桥接消息收发。",
   "author": "Jelly10086 <wow40469600@gmail.com>",
   "contributors": [

package/src/bridge/convert.ts

@@ -7,6 +7,7 @@ const PLATFORM = 'koishi'
 export interface SessionToMaimOptions {
   resolveImage?: (source: string) => Awaitable<string | undefined>
   replyContext?: ReplyContext
+  forceMention?: boolean
 }
 
 export interface ReplyContext {
@@ -204,6 +205,8 @@ export async function sessionToMaimMessage(
   const messageId = String(session.messageId || session.id || `koishi-${Date.now()}`)
   const senderInfo = buildSenderInfo(session)
   const atBot = isAtBot(session)
+  const forceMention = !!options.forceMention
+  const mentioned = atBot || forceMention
   const replyContext = options.replyContext
   return {
     message_info: {
@@ -225,8 +228,9 @@ export async function sessionToMaimMessage(
         koishi_reply_to_message_id: replyContext?.targetMessageId,
         koishi_reply_context_count: replyContext?.contextCount,
         koishi_is_direct: !!session.isDirect,
-        at_bot: atBot,
-        is_mentioned: atBot,
+        koishi_group_trigger_forced: forceMention,
+        at_bot: mentioned,
+        is_mentioned: mentioned,
       },
       format_info: {
         content_format: ['text', 'image'],

package/src/bridge/group-trigger.ts

@@ -6,32 +6,40 @@ export interface GroupTriggerResult {
   count: number
   threshold: number
   key?: string
+  entries: GroupTriggerEntry[]
+  forceMention?: boolean
+}
+
+export interface GroupTriggerEntry {
+  session: Session
+  route: KoishiRoute
 }
 
 export class GroupMessageTrigger {
-  private counters = new Map<string, number>()
+  private pending = new Map<string, GroupTriggerEntry[]>()
 
   constructor(private threshold: number) {}
 
   test(session: Session, route: KoishiRoute): GroupTriggerResult {
     const threshold = Math.max(1, Math.floor(this.threshold || 1))
+    const entry = { session, route }
     if (threshold <= 1 || session.isDirect || !route.channelId) {
-      return { shouldForward: true, count: 1, threshold }
+      return { shouldForward: true, count: 1, threshold, entries: [entry] }
     }
 
     const key = this.createKey(route)
-    const count = (this.counters.get(key) || 0) + 1
-    if (count >= threshold) {
-      this.counters.delete(key)
-      return { shouldForward: true, count, threshold, key }
+    const entries = [...this.pending.get(key) || [], entry]
+    if (entries.length >= threshold) {
+      this.pending.delete(key)
+      return { shouldForward: true, count: entries.length, threshold, key, entries, forceMention: true }
     }
 
-    this.counters.set(key, count)
-    return { shouldForward: false, count, threshold, key }
+    this.pending.set(key, entries)
+    return { shouldForward: false, count: entries.length, threshold, key, entries: [] }
   }
 
   clear() {
-    this.counters.clear()
+    this.pending.clear()
   }
 
   private createKey(route: KoishiRoute) {

package/src/config.ts

@@ -93,7 +93,7 @@ export const Config: Schema<Config> = Schema.intersect([
       Schema.const('command').description('命令：仅命中指令前缀时转发。'),
     ]).default('coexist').description('消息转发模式。'),
     commandPrefix: Schema.string().default('mai.ko').description('command 模式下触发 mai.ko 的文本前缀。'),
-    groupMessageTriggerCount: Schema.number().min(1).default(1).description('同一群聊累计达到多少条消息后才转发给 mai.ko 触发思考；1 表示每条群消息都转发。私聊不受影响。'),
+    groupMessageTriggerCount: Schema.number().min(1).default(1).description('同一群聊累计达到多少条消息后批量转发并强制触发 mai.ko 思考；1 表示每条群消息都转发。私聊不受影响。'),
     imageDownloadEnabled: Schema.boolean().default(true).description('转发图片消息前由 Koishi 下载图片并转为 mai.ko 可识别的 base64 图片段。'),
     imageDownloadTimeout: Schema.number().min(1000).default(10000).description('下载单张入站图片的超时时间，单位毫秒。'),
     imageDownloadMaxBytes: Schema.number().min(1024).default(10 * 1024 * 1024).description('允许转发给 mai.ko 的单张图片最大字节数。'),

package/src/service.ts

@@ -254,19 +254,17 @@ export class MaibotService extends Service {
         return next()
       }
 
-      const replyContext = this.history.resolveReplyContext(session, route)
-      const message = await sessionToMaimMessage(session, route, this.apiKey, {
-        resolveImage: (source) => this.resolveImageToBase64(source),
-        replyContext,
-      })
-      this.transport.sendMessage(message)
-      this.history.rememberSession(session, route)
-      this.bridge.maimSent += 1
-      this.bridge.lastMaimSendAt = Date.now()
-      this.bridge.lastRouteId = route.routeId
-      this.bridge.lastMessageId = message.message_info.message_id
-      const replyLog = replyContext ? ` reply=${replyContext.targetMessageId} context=${replyContext.contextCount || 0}` : ''
-      this.logMessageDetail(`koishi -> maimai forwarded: route=${route.routeId}${replyLog} ${describeSegment(message.message_segment)}`)
+      const entries = trigger.entries.length ? trigger.entries : [{ session, route }]
+      if (trigger.forceMention) {
+        this.logMessageSummary(`group trigger reached: route=${route.routeId} count=${trigger.count}/${trigger.threshold} flushing=${entries.length}`)
+      }
+
+      for (let index = 0; index < entries.length; index++) {
+        const entry = entries[index]
+        const forceMention = !!trigger.forceMention && index === entries.length - 1
+        await this.forwardSessionToMaim(entry.session, entry.route, forceMention)
+      }
+
       if (this.pluginConfig.messageMode === 'exclusive') return ''
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error)
@@ -278,6 +276,24 @@ export class MaibotService extends Service {
     return next()
   }
 
+  private async forwardSessionToMaim(session: Session, route: ReturnType<RouteRegistry['remember']>, forceMention = false) {
+    const replyContext = this.history.resolveReplyContext(session, route)
+    const message = await sessionToMaimMessage(session, route, this.apiKey, {
+      resolveImage: (source) => this.resolveImageToBase64(source),
+      replyContext,
+      forceMention,
+    })
+    this.transport.sendMessage(message)
+    this.history.rememberSession(session, route)
+    this.bridge.maimSent += 1
+    this.bridge.lastMaimSendAt = Date.now()
+    this.bridge.lastRouteId = route.routeId
+    this.bridge.lastMessageId = message.message_info.message_id
+    const replyLog = replyContext ? ` reply=${replyContext.targetMessageId} context=${replyContext.contextCount || 0}` : ''
+    const forceLog = forceMention ? ' forced=group-trigger' : ''
+    this.logMessageDetail(`koishi -> maimai forwarded: route=${route.routeId}${replyLog}${forceLog} ${describeSegment(message.message_segment)}`)
+  }
+
   async dispose() {
     await this.shutdown()
     this.routes.clear()