koishi-plugin-cat-raising 1.3.5 → 1.3.7

package/lib/index.d.ts

@@ -26,6 +26,12 @@ export interface Config {
     historySize: number;
     /** 用于发送B站弹幕的 access_key 列表 */
     biliAccessKeys: BiliAccessKeyConfig[];
+    /** 硬拒绝关键词列表 */
+    hardRejectionKeywords: string[];
+    /** 发送弹幕的延迟下限（秒） */
+    danmakuDelayMinSeconds?: number;
+    /** 发送弹幕的延迟上限（秒） */
+    danmakuDelayMaxSeconds?: number;
 }
 export declare const Config: Schema<Config>;
 /**

package/lib/index.js

@@ -39,19 +39,30 @@ var import_koishi = require("koishi");
 var crypto = __toESM(require("crypto"));
 var import_url = require("url");
 var name = "cat-raising";
-var Config = import_koishi.Schema.object({
-  targetQQ: import_koishi.Schema.string().description("目标QQ号或QQ群号").required(),
-  isGroup: import_koishi.Schema.boolean().description("是否为QQ群").default(false),
-  monitorGroups: import_koishi.Schema.array(import_koishi.Schema.object({
-    groupId: import_koishi.Schema.string().description("要监听的 QQ 群号").required(),
-    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.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([])
-});
+var Config = import_koishi.Schema.intersect([
+  import_koishi.Schema.object({
+    targetQQ: import_koishi.Schema.string().description("转发目标：填 QQ 或 群号").role("link").required(),
+    isGroup: import_koishi.Schema.boolean().description("目标类型：群聊则勾选").default(false)
+  }).description("基础设置"),
+  import_koishi.Schema.object({
+    monitorGroups: import_koishi.Schema.array(import_koishi.Schema.object({
+      groupId: import_koishi.Schema.string().description("监听群号").role("link").required(),
+      sendHelperMessages: import_koishi.Schema.boolean().description("在群内发送「直播间/主播/投稿数」等提示消息").default(true)
+    })).description("监听群组").required(),
+    historySize: import_koishi.Schema.number().description("防复读历史条数（避免短期重复转发）").role("slider", { min: 5, max: 100, step: 1 }).default(30)
+  }).description("监听设置"),
+  import_koishi.Schema.object({
+    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("备注（例如所属账号）")
+    })).description("弹幕账号配置（留空则不发弹幕）").default([]),
+    danmakuDelayMinSeconds: import_koishi.Schema.number().description("弹幕延迟下限（秒）").role("slider", { min: 0, max: 60, step: 1 }).default(8),
+    danmakuDelayMaxSeconds: import_koishi.Schema.number().description("弹幕延迟上限（秒）").role("slider", { min: 0, max: 60, step: 1 }).default(10)
+  }).description("弹幕设置"),
+  import_koishi.Schema.object({
+    hardRejectionKeywords: import_koishi.Schema.array(import_koishi.Schema.string()).description("命中则忽略的关键词（硬拒绝）").default(["发言榜单", "投稿数:", "预告"])
+  }).description("过滤规则")
+]);
 function preprocessChineseNumerals(text) {
   const numMap = { "零": 0, "一": 1, "二": 2, "两": 2, "三": 3, "四": 4, "五": 5, "六": 6, "七": 7, "八": 8, "九": 9 };
   const unitMap = {
@@ -151,7 +162,6 @@ function parseEventFromText(text) {
   return allRewards.length > 0 ? { dateTime: globalDateTime || "时间未知", rewards: allRewards } : null;
 }
 __name(parseEventFromText, "parseEventFromText");
-var HARD_REJECTION_KEYWORDS = ["发言榜单", "投稿数:"];
 var REJECTION_KEYWORDS = ["签到", "打卡"];
 var OVERRIDE_KEYWORDS = ["神金", "发"];
 var CHECK_IN_REJECTION_REGEX = /\b\d{2,3}\s*\+/;
@@ -237,28 +247,47 @@ async function fetchBilibiliInfo(ctx, roomId) {
     let uid;
     let anchorName = "未知";
     try {
-      const infoByRoom = await ctx.http.get(
-        `https://api.live.bilibili.com/xlive/web-room/v1/index/getInfoByRoom?room_id=${roomId}`,
+      const anchorInRoom = await ctx.http.get(
+        `https://api.live.bilibili.com/live_user/v1/UserInfo/get_anchor_in_room?roomid=${roomId}`,
         { headers: commonHeaders }
       );
-      uid = infoByRoom?.data?.room_info?.uid || uid;
-      anchorName = infoByRoom?.data?.anchor_info?.base_info?.uname || infoByRoom?.data?.anchor_info?.uname || anchorName;
+      uid = anchorInRoom?.data?.info?.uid || uid;
+      anchorName = anchorInRoom?.data?.info?.uname || anchorName;
     } catch {
     }
     if (!uid || anchorName === "未知") {
       try {
-        const initInfo = await ctx.http.get(
-          `https://api.live.bilibili.com/room/v1/Room/room_init?id=${roomId}`,
+        const roomInfo = await ctx.http.get(
+          `https://api.live.bilibili.com/room/v1/Room/get_info?room_id=${roomId}`,
           { headers: commonHeaders }
         );
-        uid = initInfo?.data?.uid || uid;
-        const roomInfo2 = await ctx.http.get(
-          `https://api.live.bilibili.com/room/v1/Room/get_info?room_id=${initInfo?.data?.room_id || roomId}`,
+        uid = roomInfo?.data?.uid || uid;
+        anchorName = roomInfo?.data?.uname || anchorName;
+      } catch {
+      }
+    }
+    if (anchorName === "未知" || !uid) {
+      await sleep(300);
+      try {
+        const anchorInRoom2 = await ctx.http.get(
+          `https://api.live.bilibili.com/live_user/v1/UserInfo/get_anchor_in_room?roomid=${roomId}`,
           { headers: commonHeaders }
         );
-        anchorName = roomInfo2?.data?.uname || anchorName;
+        uid = uid || anchorInRoom2?.data?.info?.uid;
+        anchorName = anchorInRoom2?.data?.info?.uname || anchorName;
       } catch {
       }
+      if (!uid || anchorName === "未知") {
+        try {
+          const roomInfo2 = await ctx.http.get(
+            `https://api.live.bilibili.com/room/v1/Room/get_info?room_id=${roomId}`,
+            { headers: commonHeaders }
+          );
+          uid = uid || roomInfo2?.data?.uid;
+          anchorName = roomInfo2?.data?.uname || anchorName;
+        } catch {
+        }
+      }
     }
     if (!uid) throw new Error("无法从房间信息中获取UID");
     const statsInfo = await ctx.http.get(
@@ -273,93 +302,6 @@ async function fetchBilibiliInfo(ctx, roomId) {
     );
     const videoCount = statsInfo?.data?.video;
     if (videoCount === void 0) throw new Error("无法从空间信息中获取投稿数");
-    try {
-      const anchorInfo = await ctx.http.get(
-        `https://api.bilibili.com/x/space/acc/info?mid=${uid}`,
-        {
-          headers: {
-            ...commonHeaders,
-            Origin: "https://space.bilibili.com",
-            Referer: `https://space.bilibili.com/${uid}`
-          }
-        }
-      );
-      anchorName = anchorInfo?.data?.name || anchorName;
-    } catch {
-    }
-    if (anchorName === "未知") {
-      try {
-        const liveUser = await ctx.http.get(
-          `https://api.live.bilibili.com/live_user/v3/UserInfo/get_info?uid=${uid}`,
-          {
-            headers: {
-              ...commonHeaders,
-              Origin: "https://live.bilibili.com",
-              Referer: `https://live.bilibili.com/${roomId}`
-            }
-          }
-        );
-        anchorName = liveUser?.data?.info?.uname || anchorName;
-      } catch {
-      }
-    }
-    if (anchorName === "未知") {
-      try {
-        const baseInfo = await ctx.http.get(
-          `https://api.live.bilibili.com/xlive/web-room/v1/index/getRoomBaseInfo?room_id=${roomId}`,
-          { headers: commonHeaders }
-        );
-        anchorName = baseInfo?.data?.anchor_info?.base_info?.uname || baseInfo?.data?.anchor_info?.uname || baseInfo?.data?.room_info?.uname || baseInfo?.data?.uname || anchorName;
-      } catch {
-      }
-    }
-    if (anchorName === "未知") {
-      await sleep(300);
-      try {
-        const infoByRoom2 = await ctx.http.get(
-          `https://api.live.bilibili.com/xlive/web-room/v1/index/getInfoByRoom?room_id=${roomId}`,
-          { headers: commonHeaders }
-        );
-        anchorName = infoByRoom2?.data?.anchor_info?.base_info?.uname || infoByRoom2?.data?.anchor_info?.uname || anchorName;
-      } catch {
-      }
-      try {
-        const anchorInRoom = await ctx.http.get(
-          `https://api.live.bilibili.com/live_user/v1/guard/get_anchor_in_room?roomid=${roomId}`,
-          { headers: commonHeaders }
-        );
-        anchorName = anchorInRoom?.data?.info?.uname || anchorName;
-      } catch {
-      }
-      try {
-        const anchorInfo2 = await ctx.http.get(
-          `https://api.bilibili.com/x/space/acc/info?mid=${uid}`,
-          {
-            headers: {
-              ...commonHeaders,
-              Origin: "https://space.bilibili.com",
-              Referer: `https://space.bilibili.com/${uid}`
-            }
-          }
-        );
-        anchorName = anchorInfo2?.data?.name || anchorName;
-      } catch {
-      }
-      try {
-        const liveUser2 = await ctx.http.get(
-          `https://api.live.bilibili.com/live_user/v3/UserInfo/get_info?uid=${uid}`,
-          {
-            headers: {
-              ...commonHeaders,
-              Origin: "https://live.bilibili.com",
-              Referer: `https://live.bilibili.com/${roomId}`
-            }
-          }
-        );
-        anchorName = liveUser2?.data?.info?.uname || anchorName;
-      } catch {
-      }
-    }
     return { videoCount, anchorName };
   } catch (error) {
     const status = error?.response?.status;
@@ -378,7 +320,7 @@ function apply(ctx, config) {
     if (!groupConfig) return;
     const strippedContent = session.stripped.content;
     if (!strippedContent.trim()) return;
-    if (HARD_REJECTION_KEYWORDS.some((keyword) => strippedContent.includes(keyword))) return;
+    if (config.hardRejectionKeywords.some((keyword) => strippedContent.includes(keyword))) return;
     if (CHECK_IN_REJECTION_REGEX.test(strippedContent)) {
       ctx.logger.info(`[忽略] 消息包含签到模式 (如 110+)，判定为非奖励信息。内容: "${strippedContent.replace(/\n/g, " ")}"`);
       return;
@@ -434,11 +376,16 @@ function apply(ctx, config) {
       });
       if (forwardedHistory.length > config.historySize) forwardedHistory.shift();
       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);
+        const min = Math.max(0, config.danmakuDelayMinSeconds ?? 8);
+        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 danmakuPromises = config.biliAccessKeys.map(
+            (keyConfig) => sendBilibiliDanmaku(ctx, keyConfig, roomId, "喵喵喵")
+          );
+          Promise.allSettled(danmakuPromises);
+        }, delayMs);
       }
     } catch (error) {
       session.send("🐱 - 转发失败，请检查目标QQ/群号配置是否正确");

package/package.json

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