koishi-plugin-aipo-asbbot 0.2.0 → 0.2.1

package/lib/chatSend.d.ts

@@ -24,26 +24,46 @@ export interface ChatSendResult {
 }
 /** 调用者头像 + @（QQ 原生 MD 排版通用前缀） */
 export declare function avatarAt(userId: string): string;
+type PassiveSource = {
+    type: 'msg_id';
+    id: string;
+    payload: {
+        msg_id: string;
+    };
+} | {
+    type: 'event_id';
+    id: string;
+    payload: {
+        event_id: string;
+    };
+};
 /** 内容发送模块 */
 export declare const Chat: {
     config: Config;
     ctx: Context;
-    chache: {};
-    messageIdTemp: {};
+    chache: Record<string, number>;
+    messageIdTemp: Record<string, string>;
+    buttonEventIdTemp: Record<string, string>;
     init(config: Config, ctx: Context): Promise<void>;
     /**
      * 发送消息（Markdown 优先，失败自动降级）。
-     * @param session Koishi 会话
-     * @param content Markdown 内容
-     * @param fallbackText 降级用纯文本（不传时自动从 content 提取纯文本，避免把 MD 语法当普通文本发出）
-     * @param keyboard QQ 下挂按钮组件（仅 Markdown 模式生效，降级纯文本时忽略）
-     * @returns 实际发送模式 { sent: true, mode: 'markdown' | 'text' }
-     * @throws 两种模式均发送失败时抛出“消息发送失败”
      */
     send(session: Session, content: string, fallbackText?: string, keyboard?: QQKeyboard): Promise<ChatSendResult>;
     isUseMd(session: Session): boolean;
-    /** 清除一条 msgid 记录 */
+    /** 优先取当前 session 的 msg_id；如果是按钮事件，则取 event_id */
+    getCurrentPassiveSource(session: Session): PassiveSource | null;
+    /**
+     * 超过被动 MD 上限时：
+     * 1. 优先找 message 事件中缓存的新 msg_id
+     * 2. 没有新 msg_id，再找按钮事件缓存的 event_id
+     */
+    getNextPassiveSource(userId: string, current: PassiveSource): PassiveSource | null;
+    getCacheKey(source: PassiveSource): string;
+    /** 清除一条 msg_id/event_id 计数记录 */
     clearChache(): void;
     /** 清除一条 messageId 缓存 */
     clearMessageIdTemp(): void;
+    /** 清除一条按钮 event_id 缓存 */
+    clearButtonEventIdTemp(): void;
 };
+export {};

package/lib/index.js

@@ -202,95 +202,169 @@ var Chat = {
   config: {},
   ctx: {},
   chache: {},
+  // message 事件缓存：userId -> msg_id
   messageIdTemp: {},
+  // 按钮事件缓存：userId -> event_id
+  buttonEventIdTemp: {},
   async init(config, ctx) {
     Chat.config = config;
     Chat.ctx = ctx;
     Chat.config.deBug && console.log(Chat.chache);
     ctx.on("message", (session) => {
-      if (!Chat.messageIdTemp[session.userId]) {
-        Chat.messageIdTemp[session.userId] = {};
-      }
+      if (!session.userId || !session.messageId) return;
       Chat.messageIdTemp[session.userId] = session.messageId;
       Chat.clearMessageIdTemp();
     }, true);
+    ctx.on("interaction/button", (session) => {
+      const eventId = session.event?._data?.id;
+      if (!session.userId || !eventId) {
+        Chat.config.deBug && console.log("[Chat] button interaction has no event_id:", session.event?._data);
+        return;
+      }
+      Chat.buttonEventIdTemp[session.userId] = eventId;
+      Chat.clearButtonEventIdTemp();
+      Chat.config.deBug && console.log("[Chat] cached button event_id:", eventId);
+    });
   },
   /**
    * 发送消息（Markdown 优先，失败自动降级）。
-   * @param session Koishi 会话
-   * @param content Markdown 内容
-   * @param fallbackText 降级用纯文本（不传时自动从 content 提取纯文本，避免把 MD 语法当普通文本发出）
-   * @param keyboard QQ 下挂按钮组件（仅 Markdown 模式生效，降级纯文本时忽略）
-   * @returns 实际发送模式 { sent: true, mode: 'markdown' | 'text' }
-   * @throws 两种模式均发送失败时抛出“消息发送失败”
    */
-  async send(session, content, fallbackText, keyboard2) {
-    const resolvedFallback = fallbackText ?? markdownToPlainText(content);
+  async send(session, content, fallbackText = content, keyboard2) {
     if (session.platform !== "qq") {
-      await session.send(resolvedFallback);
+      await session.send(fallbackText);
       return { sent: true, mode: "text" };
     }
-    if (Chat.config.useMd) {
-      const messageId = session.messageId;
-      const userId = session.userId;
-      if (Chat.chache[messageId] == void 0) {
-        Chat.chache[messageId] = 0;
-      }
-      const mdContent = {
-        msg_id: session.messageId,
-        msg_type: 2,
-        msg_seq: ++Chat.chache[messageId] == 1 ? 0 : Chat.chache[messageId],
-        markdown: {
-          content
-        },
-        ...keyboard2 ? { keyboard: keyboard2 } : {}
-      };
-      if (Chat.chache[messageId] > 1) {
-        Chat.config.deBug && console.log(`检测到MD连续发送，尝试递增 msg_seq 再进行再次发送；第${Chat.chache[messageId] + 1}次。`);
-        if (Chat.chache[messageId] > 5) {
-          if (Chat.messageIdTemp[userId] && mdContent.msg_id != Chat.messageIdTemp[userId]) {
-            Chat.config.deBug && console.log("middleware 存在新 mse_id 数据，使用更新数据");
-            mdContent.msg_id = Chat.messageIdTemp[userId];
-            mdContent.msg_seq = 0;
-          } else {
-            await session.send(resolvedFallback);
-            Chat.clearChache();
-            return { sent: true, mode: "text" };
-          }
+    if (!Chat.config.useMd) {
+      await session.send(fallbackText);
+      return { sent: true, mode: "text" };
+    }
+    const userId = session.userId;
+    let source = Chat.getCurrentPassiveSource(session);
+    if (!source) {
+      Chat.config.deBug && console.log("[Chat.send] no msg_id/event_id, fallback to text");
+      await session.send(fallbackText);
+      return { sent: true, mode: "text" };
+    }
+    const cacheKey = Chat.getCacheKey(source);
+    if (Chat.chache[cacheKey] == void 0) {
+      Chat.chache[cacheKey] = 0;
+    }
+    let seq = ++Chat.chache[cacheKey];
+    let msgSeq = seq === 1 ? 0 : seq;
+    if (seq > 1) {
+      Chat.config.deBug && console.log(`检测到 MD 连续发送，尝试递增 msg_seq；当前第 ${seq} 次。`);
+    }
+    if (seq > 5) {
+      const nextSource = Chat.getNextPassiveSource(userId, source);
+      if (nextSource) {
+        source = nextSource;
+        const nextCacheKey = Chat.getCacheKey(source);
+        if (Chat.chache[nextCacheKey] == void 0) {
+          Chat.chache[nextCacheKey] = 0;
         }
+        const nextSeq = ++Chat.chache[nextCacheKey];
+        msgSeq = nextSeq === 1 ? 0 : nextSeq;
+        Chat.config.deBug && console.log(`[Chat.send] 被动 MD 超过上限，切换到 ${source.type}: ${source.id}`);
+      } else {
+        await session.send(fallbackText);
+        Chat.clearChache();
+        return { sent: true, mode: "text" };
+      }
+    }
+    const mdContent = {
+      ...source.payload,
+      msg_type: 2,
+      msg_seq: msgSeq,
+      markdown: {
+        content
+      },
+      ...keyboard2 ? { keyboard: keyboard2 } : {}
+    };
+    try {
+      if (session.guildId) {
+        await session.bot.internal.sendMessage(session.channelId, mdContent);
+      } else {
+        mdContent.markdown.content = mdContent.markdown.content.replace(/<qqbot-at-user[^>]*\/>/g, "");
+        await session.bot.internal.sendPrivateMessage(session.userId, mdContent);
       }
+      Chat.clearChache();
+      return { sent: true, mode: "markdown" };
+    } catch (error) {
+      Chat.config.deBug && console.log("[Chat.send] Markdown 发送失败，回退普通文本", error);
       try {
-        if (session.guildId) {
-          await session.bot.internal.sendMessage(session.channelId, mdContent);
-        } else {
-          mdContent.markdown.content = mdContent.markdown.content = mdContent.markdown.content.replace(/<qqbot-at-user[^>]*\/>/g, "");
-          await session.bot.internal.sendPrivateMessage(session.userId, mdContent);
-        }
+        await session.send(fallbackText);
         Chat.clearChache();
-        return { sent: true, mode: "markdown" };
+        return { sent: true, mode: "text" };
       } catch {
-        Chat.config.deBug && console.log("[Chat.send] Markdown 发送失败，回退普通文本");
-        try {
-          await session.send(resolvedFallback);
-          Chat.clearChache();
-          return { sent: true, mode: "text" };
-        } catch {
-          Chat.clearChache();
-          throw new Error("消息发送失败");
-        }
+        Chat.clearChache();
+        throw new Error("消息发送失败");
       }
-    } else {
-      await session.send(resolvedFallback);
-      return { sent: true, mode: "text" };
     }
   },
-  // 当前 session 是否可以使用MD
+  // 当前 session 是否可以使用 MD
   isUseMd(session) {
     if (session.platform !== "qq") return false;
-    if (Chat.chache[session.messageId] == void 0) return true;
-    return Chat.chache[session.messageId] <= 5;
+    const source = Chat.getCurrentPassiveSource(session);
+    if (!source) return false;
+    const cacheKey = Chat.getCacheKey(source);
+    if (Chat.chache[cacheKey] == void 0) return true;
+    return Chat.chache[cacheKey] <= 5;
+  },
+  /** 优先取当前 session 的 msg_id；如果是按钮事件，则取 event_id */
+  getCurrentPassiveSource(session) {
+    if (session.messageId) {
+      return {
+        type: "msg_id",
+        id: session.messageId,
+        payload: {
+          msg_id: session.messageId
+        }
+      };
+    }
+    const eventId = session.event?._data?.id;
+    if (eventId) {
+      return {
+        type: "event_id",
+        id: eventId,
+        payload: {
+          event_id: eventId
+        }
+      };
+    }
+    return null;
   },
-  /** 清除一条 msgid 记录 */
+  /**
+   * 超过被动 MD 上限时：
+   * 1. 优先找 message 事件中缓存的新 msg_id
+   * 2. 没有新 msg_id，再找按钮事件缓存的 event_id
+   */
+  getNextPassiveSource(userId, current) {
+    const cachedMessageId = Chat.messageIdTemp[userId];
+    if (cachedMessageId && !(current.type === "msg_id" && current.id === cachedMessageId)) {
+      return {
+        type: "msg_id",
+        id: cachedMessageId,
+        payload: {
+          msg_id: cachedMessageId
+        }
+      };
+    }
+    const cachedButtonEventId = Chat.buttonEventIdTemp[userId];
+    if (cachedButtonEventId && !(current.type === "event_id" && current.id === cachedButtonEventId)) {
+      return {
+        type: "event_id",
+        id: cachedButtonEventId,
+        payload: {
+          event_id: cachedButtonEventId
+        }
+      };
+    }
+    return null;
+  },
+  getCacheKey(source) {
+    return `${source.type}:${source.id}`;
+  },
+  /** 清除一条 msg_id/event_id 计数记录 */
   clearChache() {
     const chache = Object.keys(Chat.chache);
     if (chache.length >= 40) {
@@ -303,12 +377,15 @@ var Chat = {
     if (messageIdTempList.length > 150) {
       delete Chat.messageIdTemp[messageIdTempList[0]];
     }
+  },
+  /** 清除一条按钮 event_id 缓存 */
+  clearButtonEventIdTemp() {
+    const buttonEventIdTempList = Object.keys(Chat.buttonEventIdTemp);
+    if (buttonEventIdTempList.length > 150) {
+      delete Chat.buttonEventIdTemp[buttonEventIdTempList[0]];
+    }
   }
 };
-function markdownToPlainText(md) {
-  return md.replace(/!\[[^\]]*\]\([^)]*\)/g, "").replace(/```[\s\S]*?```/g, (m) => m.replace(/```(?:[a-zA-Z]*)?\s*\n?|```/g, "")).replace(/`([^`]+)`/g, "$1").replace(/\*\*([^*]+)\*\*/g, "$1").replace(/__([^_]+)__/g, "$1").replace(/\*([^*]+)\*/g, "$1").replace(/_([^_]+)_/g, "$1").replace(/~~([^~]+)~~/g, "$1").replace(/\[([^\]]+)\]\(([^)]+)\)/g, "$1").replace(/<qqbot-cmd-input[^>]*?show="([^"]*)"[^>]*\/>/g, "$1").replace(/<qqbot-cmd-input[^>]*\/>/g, "").replace(/<qqbot-at-user[^>]*\/>/g, "").replace(/^#+\s*/gm, "").replace(/^>\s*/gm, "").replace(/^\|[-:\s|]+\|$/gm, "").replace(/^\|/gm, "").replace(/\|$/gm, "").replace(/\|/g, "  ").replace(/[ ]{3,}/g, "  ").replace(/\n{3,}/g, "\n\n").replace(/^ +| +$/gm, "").trim();
-}
-__name(markdownToPlainText, "markdownToPlainText");
 
 // src/storageQueue.ts
 var queues = {};

package/package.json

@@ -1,7 +1,7 @@
   {
     "name": "koishi-plugin-aipo-asbbot",
     "description": "乐高的API服务[自用]",
-    "version": "0.2.0",
+    "version": "0.2.1",
     "main": "lib/index.js",
     "typings": "lib/index.d.ts",
     "files": [