koishi-plugin-cat-raising 1.3.7 → 1.3.8

package/lib/index.js

@@ -315,6 +315,8 @@ __name(fetchBilibiliInfo, "fetchBilibiliInfo");
 function apply(ctx, config) {
   const forwardedHistory = [];
   const warningMessageMap = /* @__PURE__ */ new Map();
+  const pendingDanmakuTimersByMessage = /* @__PURE__ */ new Map();
+  const pendingDanmakuTimersByRoom = /* @__PURE__ */ new Map();
   ctx.on("message", async (session) => {
     const groupConfig = config.monitorGroups.find((g) => g.groupId === session.channelId);
     if (!groupConfig) return;
@@ -380,12 +382,22 @@ function apply(ctx, config) {
         const max = Math.max(min, config.danmakuDelayMaxSeconds ?? 10);
         const delayMs = (Math.floor(Math.random() * (max - min + 1)) + min) * 1e3;
         ctx.logger.info(`[弹幕] ${config.biliAccessKeys.length} 个账号将于 ${Math.round(delayMs / 1e3)} 秒后发送弹幕到直播间 ${roomId}。`);
-        setTimeout(() => {
+        const timer = setTimeout(() => {
+          const list1 = pendingDanmakuTimersByMessage.get(session.messageId);
+          if (list1) pendingDanmakuTimersByMessage.set(session.messageId, list1.filter((t) => t !== timer));
+          const list2 = pendingDanmakuTimersByRoom.get(roomId);
+          if (list2) pendingDanmakuTimersByRoom.set(roomId, list2.filter((t) => t !== timer));
           const danmakuPromises = config.biliAccessKeys.map(
             (keyConfig) => sendBilibiliDanmaku(ctx, keyConfig, roomId, "喵喵喵")
           );
           Promise.allSettled(danmakuPromises);
         }, delayMs);
+        const byMsg = pendingDanmakuTimersByMessage.get(session.messageId) || [];
+        byMsg.push(timer);
+        pendingDanmakuTimersByMessage.set(session.messageId, byMsg);
+        const byRoom = pendingDanmakuTimersByRoom.get(roomId) || [];
+        byRoom.push(timer);
+        pendingDanmakuTimersByRoom.set(roomId, byRoom);
       }
     } catch (error) {
       session.send("🐱 - 转发失败，请检查目标QQ/群号配置是否正确");
@@ -399,6 +411,16 @@ function apply(ctx, config) {
     const entryIndex = forwardedHistory.findIndex((entry) => entry.originalMessageId === originalMessageId);
     if (entryIndex !== -1) {
       const entry = forwardedHistory[entryIndex];
+      const timersByMsg = pendingDanmakuTimersByMessage.get(originalMessageId);
+      if (timersByMsg) {
+        for (const t of timersByMsg) clearTimeout(t);
+        pendingDanmakuTimersByMessage.delete(originalMessageId);
+      }
+      const timersByRoom = pendingDanmakuTimersByRoom.get(entry.roomId);
+      if (timersByRoom) {
+        for (const t of timersByRoom) clearTimeout(t);
+        pendingDanmakuTimersByRoom.delete(entry.roomId);
+      }
       if (entry.helperMessageId) {
         try {
           await session.bot.deleteMessage(session.channelId, entry.helperMessageId);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-cat-raising",
   "description": "",
-  "version": "1.3.7",
+  "version": "1.3.8",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [