yz-yuki-plugin 2.0.4-3 → 2.0.4-5

package/CHANGELOG.md

@@ -1,4 +1,5 @@
 # 2.0.4
+* 优化B站风控相关，新增bili_tiket参数
 * fix Repeated Instantiation Puppeteer
 * 优化获取B站登录ck
 * 添加截图列队，优化配置文件注释

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

@@ -1,7 +1,7 @@
 import axios from 'axios';
 import lodash from 'lodash';
 import { BiliApi } from './bilibili.api.js';
-import { readSyncCookie, readSavedCookieItems, readSavedCookieOtherItems } from './bilibili.models.js';
+import { readSyncCookie, cookieWithBiliTicket, readSavedCookieItems, readSavedCookieOtherItems } from './bilibili.models.js';
 import { getWbiSign } from './bilibili.wbi.js';
 
 class BiliGetWebData {
@@ -11,6 +11,7 @@ class BiliGetWebData {
     async getBiliDynamicListDataByUid(uid) {
         const url = BiliApi.BILIBIL_API.biliDynamicInfoList;
         let { cookie } = await readSyncCookie();
+        cookie = await cookieWithBiliTicket(cookie);
         const data = {
             offset: '',
             host_mid: uid,
@@ -40,6 +41,7 @@ class BiliGetWebData {
     async getBilibiUserInfoByUid(uid) {
         const url = BiliApi.BILIBIL_API.biliSpaceUserInfoWbi;
         let { cookie } = await readSyncCookie();
+        cookie = await cookieWithBiliTicket(cookie);
         const data = {
             mid: uid,
             jsonp: 'jsonp',
@@ -62,6 +64,7 @@ class BiliGetWebData {
     async searchBiliUserInfoByKeyword(keyword) {
         const url = BiliApi.BILIBIL_API.biliSearchUpWbi;
         let { cookie } = await readSyncCookie();
+        cookie = await cookieWithBiliTicket(cookie);
         const data = {
             keyword: keyword,
             page: 1,

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

@@ -55,3 +55,9 @@ export declare function postGateway(cookie: string): Promise<import("axios").Axi
  * @param {string} uuid
 */
 export declare function get_buvid_fp(cookie: string): Promise<string>;
+/**
+ * 获取有效bili_ticket并添加到cookie
+ * @param {string} cookie
+ * @returns {Promise<{ cookie: string; }>} 返回包含最新有效的bili_ticket的cookie
+ */
+export declare function cookieWithBiliTicket(cookie: string): Promise<string>;

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

@@ -10,6 +10,7 @@ import { Segment, Bot, Redis } from 'yunzai';
 import { renderPage } from '../../utils/image.js';
 import { _paths } from '../../utils/paths.js';
 import { BiliApi } from './bilibili.api.js';
+import { getBiliTicket } from './bilibili.ticket.js';
 
 /**
 * *******************************************************************
@@ -362,11 +363,11 @@ async function getNewTempCk() {
     let newTempCk = `${uuid}${buvid3_buvid4}${b_lsid}`; //${buvid_fp}`;
     await saveTempCk(newTempCk);
     const result = await postGateway(newTempCk);
-    const { code, data } = await result.data; // 解析校验结果
-    if (code !== 0) {
-        logger?.mark(`优纪插件：tempCK，Gateway校验失败：${JSON.stringify(data)}`);
+    const data = await result.data; // 解析校验结果
+    if (data?.code !== 0) {
+        logger?.error(`优纪插件：tempCK，Gateway校验失败：${JSON.stringify(data)}`);
     }
-    else if (code === 0) {
+    else if (data?.code === 0) {
         logger?.mark(`优纪插件：tempCK，Gateway校验成功：${JSON.stringify(data)}`);
     }
 }
@@ -526,19 +527,20 @@ async function getPayload(cookie) {
  * @returns 返回POST请求的结果
  */
 async function postGateway(cookie) {
-    const payload = getPayload(cookie);
+    const data = { payload: await getPayload(cookie) };
     const requestUrl = 'https://api.bilibili.com/x/internal/gaia-gateway/ExClimbWuzhi';
-    const headers = lodash.merge({}, BiliApi.BILIBILI_HEADERS, {
-        'Cookie': cookie,
-        'Content-type': 'Application/json',
-        'Charset': 'UTF-8',
-    }, {
-        'Host': 'api.bilibili.com',
-        'Origin': 'https://www.bilibili.com',
-        'Referer': 'https://www.bilibili.com/',
-    });
+    const config = {
+        headers: lodash.merge({}, BiliApi.BILIBILI_HEADERS, {
+            'Cookie': cookie,
+            'Content-type': 'application/json;charset=UTF-8',
+        }, {
+            'Host': 'api.bilibili.com',
+            'Origin': 'https://www.bilibili.com',
+            'Referer': 'https://www.bilibili.com/',
+        })
+    };
     try {
-        const res = await axios.post(requestUrl, { payload }, { headers });
+        const res = await axios.post(requestUrl, data, config);
         return res;
     }
     catch (error) {
@@ -546,5 +548,30 @@ async function postGateway(cookie) {
         throw error;
     }
 }
+/**
+ * 获取有效bili_ticket并添加到cookie
+ * @param {string} cookie
+ * @returns {Promise<{ cookie: string; }>} 返回包含最新有效的bili_ticket的cookie
+ */
+async function cookieWithBiliTicket(cookie) {
+    const BiliJctKey = "Yz:yuki:bili:bili_ticket";
+    cookie = await readSavedCookieItems(cookie, ['bili_ticket'], true);
+    const biliTicket = await Redis.get(BiliJctKey);
+    if (!biliTicket) {
+        try {
+            const csrf = await readSavedCookieItems(cookie, ['bili_jct'], false);
+            const { ticket, ttl } = await getBiliTicket(csrf);
+            await Redis.set(BiliJctKey, ticket, { EX: ttl });
+            return cookie + `;bili_ticket=${ticket};`;
+        }
+        catch (error) {
+            logger?.error(`${error}`);
+            return cookie;
+        }
+    }
+    else {
+        return cookie + `;bili_ticket=${biliTicket};`;
+    }
+}
 
-export { applyLoginQRCode, checkBiliLogin, exitBiliLogin, genUUID, gen_b_lsid, getNewTempCk, pollLoginQRCode, postGateway, readSavedCookieItems, readSavedCookieOtherItems, readSyncCookie, readTempCk, saveLocalBiliCk, saveLoginCookie, saveTempCk };
+export { applyLoginQRCode, checkBiliLogin, cookieWithBiliTicket, exitBiliLogin, genUUID, gen_b_lsid, getNewTempCk, pollLoginQRCode, postGateway, readSavedCookieItems, readSavedCookieOtherItems, readSyncCookie, readTempCk, saveLocalBiliCk, saveLoginCookie, saveTempCk };

package/lib/models/bilibili/bilibili.query.js

@@ -1,6 +1,6 @@
 import moment from 'moment';
 import { Bot, Segment } from 'yunzai';
-import { readSyncCookie } from './bilibili.models.js';
+import { readSyncCookie, cookieWithBiliTicket } from './bilibili.models.js';
 import { BiliApi } from './bilibili.api.js';
 import axios from 'axios';
 import lodash from 'lodash';
@@ -229,10 +229,11 @@ class BiliQuery {
    * @returns {Json} 完整的B站文章内容json数据
   */
     static async getFullArticleContent(postUrl) {
-        const Cookie = await readSyncCookie();
+        let { cookie } = await readSyncCookie();
+        cookie = await cookieWithBiliTicket(cookie);
         try {
             const response = await axios.get(postUrl, {
-                headers: lodash.merge(BiliApi.BILIBILI_ARTICLE_HEADERS, { "Cookie": `${Cookie}`, "Host": "www.bilibili.com" }),
+                headers: lodash.merge(BiliApi.BILIBILI_ARTICLE_HEADERS, { "Cookie": `${cookie}`, "Host": "www.bilibili.com" }),
                 responseType: 'text'
             });
             const text = response.data;

package/lib/models/bilibili/bilibili.ticket.d.ts

@@ -0,0 +1,12 @@
+/**
+ * Get Bilibili web ticket
+ * @param {string | null} csrf CSRF token, can be empty or null, or the cookie's bili_jct value
+ * @returns {Promise<{ code: number, ticket: string, created_at: number, ttl: number }>}
+ * Promise that resolves to an object containing code, ticket, created_at, and ttl values
+ */
+export declare function getBiliTicket(csrf: string | null): Promise<{
+    code?: number;
+    ticket?: string;
+    created_at?: number;
+    ttl?: number;
+}>;

package/lib/models/bilibili/bilibili.ticket.js

@@ -0,0 +1,59 @@
+import { createHmac } from 'crypto';
+import { BiliApi } from './bilibili.api.js';
+
+/**
+ * Generate HMAC-SHA256 signature
+ * @param {string} key     The key string to use for the HMAC-SHA256 hash
+ * @param {string} message The message string to hash
+ * @returns {string} The HMAC-SHA256 signature as a hex string
+ */
+function hmacSha256(key, message) {
+    return createHmac('sha256', key).update(message).digest('hex');
+}
+/**
+ * Get Bilibili web ticket
+ * @param {string | null} csrf CSRF token, can be empty or null, or the cookie's bili_jct value
+ * @returns {Promise<{ code: number, ticket: string, created_at: number, ttl: number }>}
+ * Promise that resolves to an object containing code, ticket, created_at, and ttl values
+ */
+async function getBiliTicket(csrf) {
+    const ts = Math.floor(Date.now() / 1000);
+    const hexSign = hmacSha256('XgwSnGZ1p', `ts${ts}`);
+    const url = 'https://api.bilibili.com/bapis/bilibili.api.ticket.v1.Ticket/GenWebTicket';
+    const params = new URLSearchParams({
+        key_id: 'ec02',
+        hexsign: hexSign,
+        'context[ts]': String(ts),
+        csrf: csrf ?? '' // 使用空字符串代替null
+    });
+    try {
+        const response = await fetch(`${url}?${params}`, {
+            method: 'POST',
+            headers: {
+                'User-Agent': BiliApi.BILIBILI_HEADERS['User-Agent']
+            }
+        });
+        if (!response.ok) {
+            throw new Error(`get bili_jct HTTP error! status: ${response.status}`);
+        }
+        const data = await response.json();
+        if (data.code !== 0) {
+            if (data.code === 400) {
+                throw new Error(`get bili_jct Parameter error! ${data.message}`);
+            }
+            throw new Error(`Failed to retrieve bili ticket: ${data.message}`);
+        }
+        // 返回所需的对象结构
+        return {
+            code: data.code,
+            ticket: data.data?.ticket,
+            created_at: data.data?.created_at,
+            ttl: data.data?.ttl
+        };
+    }
+    catch (error) {
+        throw new Error(`Failed to fetch Bilibili ticket: ${error instanceof Error ? error.message : String(error)}`);
+    }
+}
+
+export { getBiliTicket };

package/package.json

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