yz-yuki-plugin 1.0.2-rc.6 → 1.0.2-rc.7

package/lib/apps/bilibili.js

@@ -56,13 +56,17 @@ message.use(async (e) => {
             e.reply("出了点网络问题，等会再试试吧~");
             return false;
         }
-        const resData = res.data || {};
-        if (resData.code !== 0) {
-            e.reply(`订阅校验失败~\nup主uid：${uid} 可能是无效的，或遭遇了风控，请稍后再试~`);
-            logger.mark(`yuki-plugin addDynamicSub Failed：${JSON.stringify(resData)}`);
+        const { code, data } = res.data || {};
+        if (code === -352) {
+            e.reply(`遭遇风控，订阅校验失败~\n请检查Cookie配置后再试~`);
+            logger.mark(`yuki-plugin addDynamicSub Failed：${JSON.stringify(res.data)}`);
             return true;
         }
-        const { items } = resData.data || {};
+        const { has_more, items } = data || {};
+        if ((code === 0) && (has_more === false)) {
+            e.reply(`订阅校验失败~\nup主uid：${uid} 无效，请核对uid后再试~`);
+            return;
+        }
         let name = items.length > 0 ? (items[0].modules.module_author?.name || uid) : uid;
         subData[chatType][chatId].push({
             bot_id: e.self_id,
@@ -358,12 +362,16 @@ message.use(async (e) => {
         return;
     }
     const { code, data } = res.data || {};
-    if (code === -799) {
-        e.reply("遭遇风控：请求过于频繁，请稍后再试。");
+    if (code === -400) {
+        e.reply("获取请求错误~");
+        return;
+    }
+    else if (code === -403) {
+        e.reply("可能是Cookie过期或api参数错误，\n访问权限不足，获取失败。");
         return;
     }
     else if (code === -404) {
-        e.reply("输入的uid无效。");
+        e.reply("用户不存在，输入的uid无效。");
         return;
     }
     const message = [
@@ -372,7 +380,8 @@ message.use(async (e) => {
         `\n等级：${data?.level}`,
     ];
     if (data.live_room) {
-        message.push(`\n***********\n---直播信息---`, `\n直播标题：${data?.live_room?.title}`, `\n直播房间：${data?.live_room?.roomid}`, `\n直播状态：${data?.live_room?.liveStatus ? "直播中" : "未开播"}`, `\n直播链接：${data?.live_room?.url}`, `\n观看人数：${data?.live_room?.watched_show?.num}人`);
+        message.push(`***********\n---直播信息---`, `\n直播标题：${data?.live_room?.title}`, `\n直播房间：${data?.live_room?.roomid}`, `\n直播状态：${data?.live_room?.liveStatus ? "直播中" : "未开播"}`, `\n观看人数：${data?.live_room?.watched_show?.num}人`);
+        e.reply(`直播链接：${data?.live_room?.url}`);
     }
     e.reply(message);
 }, [/^(#|\/)(yuki|优纪)?(b站|B站|bili|bilibili|哔哩|哔哩哔哩)(up|UP)主.*$/]);
@@ -384,17 +393,27 @@ message.use(async (e) => {
         return;
     }
     const { code, data } = await res.data || {};
-    if (code !== 0 || !data.result) {
-        e.reply("哦豁~没有搜索到该用户捏，请换个关键词试试吧~");
+    if (code === -400) {
+        e.reply("搜索请求错误~");
+        return;
+    }
+    else if (code === -412) {
+        e.reply("未配置可用Cookie，请求被拦截，请配置Cookie后再试吧~");
+        return;
+    }
+    if (!data.result) {
+        e.reply("哦豁~没有搜索到该关键词相关的up主信息，请换个关键词试试吧~");
+        return;
+    }
+    if (!Array.isArray(data.result) || !data.result.every(item => typeof item === 'object' && 'uname' in item && 'mid' in item && 'fans' in item)) {
+        e.reply("哦豁~数据格式有误，请检查后重试！");
         return;
     }
     const messages = [];
-    data.result.map((item, index) => {
-        if (index < 5) {
-            messages.push(`${item.uname}\nUID：${item.mid}\n粉丝数：${item.fans}${index < 4 ? "\n" : ""}`);
-        }
-        return item;
-    });
+    for (let index = 0; index < Math.min((data.result).length, 5); index++) {
+        const item = data.result[index];
+        messages.push(`${item.uname}\nUID：${item.mid}\n粉丝数：${item.fans}${index < 4 ? "\n" : ""}`);
+    }
     e.reply(messages.join("\n"));
 }, [/^(#|\/)(yuki|优纪)?搜索(b站|B站|bili|bilibili|哔哩|哔哩哔哩)(up|UP)主.*$/]);
 const YukiBli = message.ok;

package/lib/models/bilibili/bilibili.api.js

@@ -5,6 +5,7 @@ class BiliApi {
         biliSpaceUserInfo: `https://api.bilibili.com/x/space/acc/info`,
         biliSpaceUserInfoWbi: `https://api.bilibili.com/x/space/wbi/acc/info`,
         biliSearchUp: `https://api.bilibili.com/x/web-interface/search/type`,
+        biliSearchUpWbi: `https://api.bilibili.com/x/web-interface/wbi/search/type`,
         biliLiveStatus: 'https://api.live.bilibili.com/room/v1/Room/get_status_info_by_uids',
         biliCard: "https://api.bilibili.com/x/web-interface/card",
         biliStat: "https://api.bilibili.com/x/relation/stat",

package/lib/models/bilibili/bilibili.get.web.data.js

@@ -56,17 +56,20 @@ class BiliGetWebData {
         return res;
     }
     async searchBiliUserInfoByKeyword(keyword) {
-        const url = BiliApi.BILIBIL_API.biliSearchUp;
+        const url = BiliApi.BILIBIL_API.biliSearchUpWbi;
         let { cookie } = await readSyncCookie();
         const data = {
             keyword: keyword,
             page: 1,
             search_type: 'bili_user',
             order: 'totalrank',
-            pagesize: 5
         };
+        let signCookie = await readSavedCookieItems(cookie, ["SESSDATA"], false) || await readSavedCookieOtherItems(cookie, ["SESSDATA"]);
+        const { w_rid, time_stamp } = await getWbiSign(data, BiliApi.BILIBILI_HEADERS, signCookie);
         const params = {
-            ...data
+            ...data,
+            w_rid: w_rid,
+            wts: time_stamp
         };
         const res = await axios.get(url, {
             params,

package/lib/types/models/bilibili/bilibili.api.d.ts

@@ -5,6 +5,7 @@ export declare class BiliApi {
         biliSpaceUserInfo: string;
         biliSpaceUserInfoWbi: string;
         biliSearchUp: string;
+        biliSearchUpWbi: string;
         biliLiveStatus: string;
         biliCard: string;
         biliStat: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yz-yuki-plugin",
-  "version": "1.0.2-rc.6",
+  "version": "1.0.2-rc.7",
   "description": "优纪插件，yunzaijs 关于 微博推送、B站推送 等功能的拓展插件",
   "author": "snowtafir",
   "type": "module",