koishi-plugin-cat-raising 1.2.1 → 1.3.2

package/lib/index.js

@@ -122,12 +122,14 @@ function extractDateTime(line) {
 __name(extractDateTime, "extractDateTime");
 function extractRewards(line) {
   const rewards = [];
-  const regex = /(?:(\d{1,2})\s*级(?:灯牌)?\s*)?(?:发\s*)?(\d+\.?\d*w\+?|\b\d{3,5}\b)(?:神金|钻石|猫猫钻)?/gi;
+  const regex = /(?:(\d{1,2})\s*级(?:灯牌)?\s*)?(?:发\s*)?(?:神金\s*)?(\d+\.?\d*\s*[wWkK万千]\+?|\b\d{3,5}\b)(?:\s*神金|\s*钻石|\s*猫猫钻)?/gi;
   let match;
   while ((match = regex.exec(line)) !== null) {
     const condition = match[1] ? `${match[1]}级灯牌` : "无限制";
-    const amountStr = (match[2] || "").toLowerCase();
-    const amount = amountStr.includes("w") ? parseFloat(amountStr.replace("w", "")) * 1e4 : parseFloat(amountStr);
+    const amountStr = (match[2] || "").toLowerCase().replace(/\s+/g, "");
+    const base = parseFloat(amountStr.replace(/[^\d.]/g, ""));
+    const multiplier = /[w万]/i.test(amountStr) ? 1e4 : /[k千]/i.test(amountStr) ? 1e3 : 1;
+    const amount = base * multiplier;
     if (!isNaN(amount) && amount > 0) {
       rewards.push({ amount, condition });
     }
@@ -226,20 +228,87 @@ async function sendBilibiliDanmaku(ctx, keyConfig, roomId, message) {
 __name(sendBilibiliDanmaku, "sendBilibiliDanmaku");
 async function fetchBilibiliInfo(ctx, roomId) {
   try {
-    const roomInfo = await ctx.http.get(`https://api.live.bilibili.com/room/v1/Room/get_info?room_id=${roomId}`);
-    const uid = roomInfo?.data?.uid;
+    const commonHeaders = {
+      "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36",
+      "Accept": "application/json, text/plain, */*",
+      "Origin": "https://live.bilibili.com",
+      "Referer": `https://live.bilibili.com/${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}`,
+        { headers: commonHeaders }
+      );
+      uid = infoByRoom?.data?.room_info?.uid || uid;
+      anchorName = infoByRoom?.data?.anchor_info?.base_info?.uname || infoByRoom?.data?.anchor_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}`,
+          { 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}`,
+          { headers: commonHeaders }
+        );
+        anchorName = roomInfo2?.data?.uname || anchorName;
+      } catch {
+      }
+    }
     if (!uid) throw new Error("无法从房间信息中获取UID");
-    const [statsInfo, cardInfo] = await Promise.all([
-      ctx.http.get(`https://api.bilibili.com/x/space/navnum?mid=${uid}`),
-      ctx.http.get(`https://api.bilibili.com/x/web-interface/card?mid=${uid}`)
-    ]);
+    const statsInfo = await ctx.http.get(
+      `https://api.bilibili.com/x/space/navnum?mid=${uid}`,
+      {
+        headers: {
+          ...commonHeaders,
+          Origin: "https://space.bilibili.com",
+          Referer: `https://space.bilibili.com/${uid}`
+        }
+      }
+    );
     const videoCount = statsInfo?.data?.video;
     if (videoCount === void 0) throw new Error("无法从空间信息中获取投稿数");
-    const streamerName = cardInfo?.data?.card?.name;
-    if (!streamerName) throw new Error("无法从账号信息中获取主播昵称");
-    return { videoCount, streamerName };
+    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 {
+      }
+    }
+    return { videoCount, anchorName };
   } catch (error) {
-    ctx.logger.warn(`[API] 获取直播间 ${roomId} 的B站信息失败: ${error.message}`);
+    const status = error?.response?.status;
+    const dataMsg = error?.response?.data?.message;
+    const msg = dataMsg || error?.message || "未知错误";
+    ctx.logger.warn(`[API] 获取直播间 ${roomId} 的B站信息失败: ${msg}${status ? ` (HTTP ${status})` : ""}`);
     return null;
   }
 }
@@ -277,7 +346,9 @@ function apply(ctx, config) {
     let helperMessageId;
     if (groupConfig.sendHelperMessages) {
       try {
+        const displayAnchor = biliInfo.anchorName;
         [helperMessageId] = await session.send(`直播间: ${roomId}
+主播: ${displayAnchor}
 投稿数: ${biliInfo.videoCount}`);
       } catch (e) {
         ctx.logger.warn("[消息] 发送辅助信息失败:", e);
@@ -289,10 +360,11 @@ function apply(ctx, config) {
       return;
     }
     try {
+      const displayAnchor = biliInfo.anchorName;
       const forwardMessage = `${session.content}
 
 ---
-主播: ${biliInfo.streamerName}
+主播: ${displayAnchor}
 投稿数: ${biliInfo.videoCount}`;
       const [forwardedMessageId] = config.isGroup ? await session.bot.sendMessage(config.targetQQ, forwardMessage) : await session.bot.sendPrivateMessage(config.targetQQ, forwardMessage);
       forwardedHistory.push({

package/package.json

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