koishi-plugin-cat-raising 1.0.0 → 1.1.0

package/lib/index.d.ts

@@ -1,5 +1,12 @@
 import { Context, Schema } from 'koishi';
 export declare const name = "cat-raising";
+/** B站 access_key 配置项 */
+export interface BiliAccessKeyConfig {
+    /** Bilibili access_key */
+    key: string;
+    /** 对此 access_key 的备注，例如所属账号 */
+    remark?: string;
+}
 /** 监听群组的配置 */
 export interface MonitorGroupConfig {
     /** 要监听的 QQ 群号 */
@@ -18,7 +25,7 @@ export interface Config {
     /** 用于防复读的历史记录大小 */
     historySize: number;
     /** 用于发送B站弹幕的 access_key 列表 */
-    biliAccessKeys: string[];
+    biliAccessKeys: BiliAccessKeyConfig[];
 }
 export declare const Config: Schema<Config>;
 /**

package/lib/index.js

@@ -47,7 +47,10 @@ var Config = import_koishi.Schema.object({
     sendHelperMessages: import_koishi.Schema.boolean().description("是否在此群内发送“看到啦”之类的辅助/警告消息").default(true)
   })).description("监听的群组列表及其配置").required(),
   historySize: import_koishi.Schema.number().description("用于防复读的历史记录大小，防止短期内对同一活动重复转发").default(30).min(5).max(100),
-  biliAccessKeys: import_koishi.Schema.array(import_koishi.Schema.string()).description("用于发送B站弹幕的 access_key 列表。插件会随机选择一个使用。如果留空，则不执行发送弹幕功能。").default([])
+  biliAccessKeys: import_koishi.Schema.array(import_koishi.Schema.object({
+    key: import_koishi.Schema.string().description("Bilibili access_key").required(),
+    remark: import_koishi.Schema.string().description("对此 access_key 的备注，例如所属账号")
+  })).description("用于发送B站弹幕的 access_key 列表。插件会为列表中的每个 key 发送弹幕。如果留空，则不执行发送弹幕功能。").default([])
 });
 function preprocessChineseNumerals(text) {
   const numMap = { "零": 0, "一": 1, "二": 2, "两": 2, "三": 3, "四": 4, "五": 5, "六": 6, "七": 7, "八": 8, "九": 9 };
@@ -146,9 +149,10 @@ function parseEventFromText(text) {
   return allRewards.length > 0 ? { dateTime: globalDateTime || "时间未知", rewards: allRewards } : null;
 }
 __name(parseEventFromText, "parseEventFromText");
-var HARD_REJECTION_KEYWORDS = ["发言榜单"];
+var HARD_REJECTION_KEYWORDS = ["发言榜单", "投稿数:"];
 var REJECTION_KEYWORDS = ["签到", "打卡"];
 var OVERRIDE_KEYWORDS = ["神金", "发"];
+var CHECK_IN_REJECTION_REGEX = /\b\d{2,3}\s*\+/;
 var TRIGGER_REGEX = /神金|发|掉落|猫猫钻|w|\b\d{3,5}\b|一千|一百|十|九|八|七|六|五|四|三|两|二|一/i;
 var BILI_APPKEY = "4409e2ce8ffd12b8";
 var BILI_APPSECRET = "59b43e04ad6965f34319062b478f83dd";
@@ -159,48 +163,64 @@ function signBilibiliParams(params, appSecret) {
   return sign;
 }
 __name(signBilibiliParams, "signBilibiliParams");
-async function sendBilibiliDanmaku(ctx, config, roomId, message) {
-  if (!config.biliAccessKeys || config.biliAccessKeys.length === 0) {
-    ctx.logger.info("[弹幕] 未配置 access_key，跳过发送弹幕。");
-    return;
-  }
-  const accessKey = config.biliAccessKeys[Math.floor(Math.random() * config.biliAccessKeys.length)];
+async function sendBilibiliDanmaku(ctx, keyConfig, roomId, message) {
+  const MAX_RETRIES = 4;
+  const RETRY_DELAY_MS = 3e3;
+  const FREQUENCY_LIMIT_KEYWORD = "频率过快";
   const url = "https://api.live.bilibili.com/xlive/app-room/v1/dM/sendmsg";
-  const ts = Math.floor(Date.now() / 1e3);
-  const baseParams = {
-    access_key: accessKey,
-    actionKey: "appkey",
-    appkey: BILI_APPKEY,
-    cid: roomId,
-    msg: message,
-    rnd: ts,
-    color: "16777215",
-    // 白色
-    fontsize: "25",
-    mode: "1",
-    // 滚动弹幕
-    ts
-  };
-  const sign = signBilibiliParams(baseParams, BILI_APPSECRET);
-  const params = { ...baseParams, sign };
-  const formData = new import_url.URLSearchParams();
-  for (const key in params) {
-    formData.append(key, params[key]);
-  }
-  try {
-    const response = await ctx.http.post(url, formData, {
-      headers: {
-        "Content-Type": "application/x-www-form-urlencoded",
-        "User-Agent": "Mozilla/5.0 BiliDroid/6.73.1 (bbcallen@gmail.com) os/android model/Mi 10 Pro mobi_app/android build/6731100 channel/xiaomi innerVer/6731110 osVer/12 network/2"
+  const logIdentifier = keyConfig.remark || keyConfig.key.slice(0, 8);
+  for (let attempt = 0; attempt <= MAX_RETRIES; attempt++) {
+    if (attempt > 0) {
+      await new Promise((resolve) => setTimeout(resolve, RETRY_DELAY_MS));
+    }
+    const ts = Math.floor(Date.now() / 1e3);
+    const baseParams = {
+      access_key: keyConfig.key,
+      actionKey: "appkey",
+      appkey: BILI_APPKEY,
+      cid: roomId,
+      msg: message,
+      rnd: ts,
+      color: "16777215",
+      // 白色
+      fontsize: "25",
+      mode: "1",
+      // 滚动弹幕
+      ts
+    };
+    const sign = signBilibiliParams(baseParams, BILI_APPSECRET);
+    const params = { ...baseParams, sign };
+    const formData = new import_url.URLSearchParams();
+    for (const key in params) {
+      formData.append(key, params[key]);
+    }
+    try {
+      const response = await ctx.http.post(url, formData, {
+        headers: {
+          "Content-Type": "application/x-www-form-urlencoded",
+          "User-Agent": "Mozilla/5.0 BiliDroid/6.73.1 (bbcallen@gmail.com) os/android model/Mi 10 Pro mobi_app/android build/6731100 channel/xiaomi innerVer/6731110 osVer/12 network/2"
+        }
+      });
+      if (response.code === 0) {
+        const successMessage = attempt > 0 ? `[弹幕] [${logIdentifier}] 成功向直播间 ${roomId} 发送弹幕 (重试 ${attempt} 次后)` : `[弹幕] [${logIdentifier}] 成功向直播间 ${roomId} 发送弹幕: "${message}"`;
+        ctx.logger.info(successMessage);
+        return;
       }
-    });
-    if (response.code === 0) {
-      ctx.logger.info(`[弹幕] 成功向直播间 ${roomId} 发送弹幕: "${message}"`);
-    } else {
-      ctx.logger.warn(`[弹幕] 发送失败，直播间 ${roomId}。原因: ${response.message || "未知错误"}`);
+      if (response.message?.includes(FREQUENCY_LIMIT_KEYWORD)) {
+        if (attempt < MAX_RETRIES) {
+          ctx.logger.warn(`[弹幕] [${logIdentifier}] 发送频率过快 (尝试 ${attempt + 1}/${MAX_RETRIES + 1})。准备重试...`);
+          continue;
+        } else {
+          ctx.logger.warn(`[弹幕] [${logIdentifier}] 发送频率过快，已达最大重试次数 (${MAX_RETRIES})，放弃发送。`);
+          return;
+        }
+      }
+      ctx.logger.warn(`[弹幕] [${logIdentifier}] 发送失败，直播间 ${roomId}。原因: ${response.message || "未知错误"}`);
+      return;
+    } catch (error) {
+      ctx.logger.error(`[弹幕] [${logIdentifier}] 发送请求时发生网络错误 (尝试 ${attempt + 1})，直播间 ${roomId}:`, error);
+      return;
     }
-  } catch (error) {
-    ctx.logger.error(`[弹幕] 发送请求时发生网络错误，直播间 ${roomId}:`, error);
   }
 }
 __name(sendBilibiliDanmaku, "sendBilibiliDanmaku");
@@ -228,6 +248,10 @@ function apply(ctx, config) {
     const strippedContent = session.stripped.content;
     if (!strippedContent.trim()) return;
     if (HARD_REJECTION_KEYWORDS.some((keyword) => strippedContent.includes(keyword))) return;
+    if (CHECK_IN_REJECTION_REGEX.test(strippedContent)) {
+      ctx.logger.info(`[忽略] 消息包含签到模式 (如 110+)，判定为非奖励信息。内容: "${strippedContent.replace(/\n/g, " ")}"`);
+      return;
+    }
     if (!TRIGGER_REGEX.test(strippedContent)) return;
     const roomIds = extractAllRoomIds(session.content);
     if (roomIds.length !== 1) {
@@ -243,25 +267,21 @@ function apply(ctx, config) {
     const hasStrongContext = /神金|发|w/i.test(preprocessedMessage);
     const hasTime = parsedEvent.dateTime !== "时间未知";
     if (!hasStrongContext && !hasTime) return;
-    const { dateTime } = parsedEvent;
-    if (forwardedHistory.some((entry) => entry.roomId === roomId && entry.dateTime === dateTime)) {
-      ctx.logger.info(`[防复读] 检测到重复活动: 房间=${roomId}, 时间=${dateTime}`);
-      if (groupConfig.sendHelperMessages) {
-        try {
-          const [warningId] = await session.send(`看到啦看到啦，不要发那么多次嘛~`);
-          if (warningId) warningMessageMap.set(session.messageId, warningId);
-        } catch (e) {
-          ctx.logger.warn("[消息] 发送重复警告失败:", e);
-        }
-      }
-      return;
-    }
     const biliInfo = await fetchBilibiliInfo(ctx, roomId);
     if (!biliInfo) return;
     let helperMessageId;
     if (groupConfig.sendHelperMessages) {
-      [helperMessageId] = await session.send(`直播间: ${roomId}
+      try {
+        [helperMessageId] = await session.send(`直播间: ${roomId}
 投稿数: ${biliInfo.videoCount}`);
+      } catch (e) {
+        ctx.logger.warn("[消息] 发送辅助信息失败:", e);
+      }
+    }
+    const { dateTime } = parsedEvent;
+    if (forwardedHistory.some((entry) => entry.roomId === roomId && entry.dateTime === dateTime)) {
+      ctx.logger.info(`[防复读] 检测到重复活动，已发送辅助信息，跳过转发: 房间=${roomId}, 时间=${dateTime}`);
+      return;
     }
     try {
       const forwardMessage = `${session.content}
@@ -273,12 +293,18 @@ function apply(ctx, config) {
         originalMessageId: session.messageId,
         forwardedMessageId,
         helperMessageId,
-        // helperMessageId 可能是 undefined
+        // 存储辅助消息ID用于撤回联动
         roomId,
         dateTime
       });
       if (forwardedHistory.length > config.historySize) forwardedHistory.shift();
-      await sendBilibiliDanmaku(ctx, config, roomId, "喵喵喵");
+      if (config.biliAccessKeys && config.biliAccessKeys.length > 0) {
+        ctx.logger.info(`[弹幕] 准备为 ${config.biliAccessKeys.length} 个账号发送弹幕到直播间 ${roomId}...`);
+        const danmakuPromises = config.biliAccessKeys.map(
+          (keyConfig) => sendBilibiliDanmaku(ctx, keyConfig, roomId, "喵喵喵")
+        );
+        Promise.allSettled(danmakuPromises);
+      }
     } catch (error) {
       session.send("🐱 - 转发失败，请检查目标QQ/群号配置是否正确");
       ctx.logger.error("[转发] 失败:", error);
@@ -299,7 +325,8 @@ function apply(ctx, config) {
         }
       }
       try {
-        await session.bot.deleteMessage(config.targetQQ, entry.forwardedMessageId);
+        const targetChannel = config.isGroup ? config.targetQQ : `private:${config.targetQQ}`;
+        await session.bot.deleteMessage(targetChannel, entry.forwardedMessageId);
       } catch (e) {
         ctx.logger.warn(`[撤回] 转发消息 (ID: ${entry.forwardedMessageId}) 失败:`, e);
       } finally {

package/package.json

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