koishi-plugin-cat-raising 1.3.0 → 1.3.4

package/lib/index.js

@@ -107,7 +107,7 @@ function extractDateTime(line) {
   if (match = line.match(/(\d{1,2})\s*[月.]\s*(\d{1,2})\s*日?/)) return `${match[1]}月${match[2]}日`;
   if (match = line.match(/每晚\s*(\d{1,2})\s*[点时]/)) return `每晚 ${match[1].padStart(2, "0")}:00`;
   if (match = line.match(/(\d{1,2}\s*月\s*(?:上|中|下)旬)/)) return match[1];
-  if (match = line.match(/(\d{1,2})[:：.点时]\s*(\d{1,2})/)) return `${match[1].padStart(2, "0")}:${match[2].padStart(2, "0")}`;
+  if (match = line.match(/(\d{1,2})[:：∶.点时]\s*(\d{1,2})/)) return `${match[1].padStart(2, "0")}:${match[2].padStart(2, "0")}`;
   if (match = line.match(/(\d{1,2})\s*点\s*半/)) return `${match[1].padStart(2, "0")}:30`;
   if (match = line.match(/\b(\d{1,2})\s*[.点时](?!\d)/)) return `${match[1].padStart(2, "0")}:00`;
   if (match = line.match(/(\d{1,2})\s*分/)) {
@@ -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 });
     }
@@ -232,11 +234,32 @@ async function fetchBilibiliInfo(ctx, roomId) {
       "Origin": "https://live.bilibili.com",
       "Referer": `https://live.bilibili.com/${roomId}`
     };
-    const roomInfo = await ctx.http.get(
-      `https://api.live.bilibili.com/room/v1/Room/get_info?room_id=${roomId}`,
-      { headers: commonHeaders }
-    );
-    const uid = roomInfo?.data?.uid;
+    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 = await ctx.http.get(
       `https://api.bilibili.com/x/space/navnum?mid=${uid}`,
@@ -250,7 +273,86 @@ async function fetchBilibiliInfo(ctx, roomId) {
     );
     const videoCount = statsInfo?.data?.video;
     if (videoCount === void 0) throw new Error("无法从空间信息中获取投稿数");
-    return { videoCount };
+    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 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;
     const dataMsg = error?.response?.data?.message;
@@ -293,7 +395,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);
@@ -305,9 +409,11 @@ function apply(ctx, config) {
       return;
     }
     try {
+      const displayAnchor = biliInfo.anchorName;
       const forwardMessage = `${session.content}
 
 ---
+主播: ${displayAnchor}
 投稿数: ${biliInfo.videoCount}`;
       const [forwardedMessageId] = config.isGroup ? await session.bot.sendMessage(config.targetQQ, forwardMessage) : await session.bot.sendPrivateMessage(config.targetQQ, forwardMessage);
       forwardedHistory.push({
@@ -369,6 +475,10 @@ function apply(ctx, config) {
   });
 }
 __name(apply, "apply");
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+__name(sleep, "sleep");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Config,

package/package.json

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