yz-yuki-plugin 2.0.8-9 → 2.0.9-1

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

@@ -1,18 +1,21 @@
-import axios from 'axios';
-import lodash from 'lodash';
 import BiliApi from './bilibili.main.api.js';
-import { readSyncCookie, cookieWithBiliTicket, readSavedCookieItems, readSavedCookieOtherItems } from './bilibili.main.models.js';
-import { getWbiSign } from './bilibili.risk.wbi.js';
+import BiliCookieManager from './bilibili.risk.cookie.js';
 import { getDmImg } from './bilibili.risk.dm.img.js';
+import { getWbiSign } from './bilibili.risk.wbi.js';
+import axioss from 'axios';
+import { wrapper } from 'axios-cookiejar-support';
+import lodash from 'lodash';
+import * as tough from 'tough-cookie';
 
+const axios = wrapper(axioss);
 class BilibiliWebDataFetcher {
     e;
     constructor(e) { }
     /**通过uid获取up动态数据表*/
     async getBiliDynamicListDataByUid(uid) {
         const url = BiliApi.BILIBIL_API.biliDynamicInfoList;
-        let { cookie } = await readSyncCookie();
-        cookie = await cookieWithBiliTicket(cookie);
+        const bili_jct = await BiliCookieManager.checkCookieBiliTicket();
+        const { cookie, mark } = await BiliCookieManager.readSyncCookie();
         const dmImg = await getDmImg();
         const data = {
             'offset': '',
@@ -25,31 +28,76 @@ class BilibiliWebDataFetcher {
             'x-bili-device-req-json': { platform: 'web', device: 'pc' },
             'x-bili-web-req-json': { spm_id: '333.999' }
         };
-        let signCookie = (await readSavedCookieItems(cookie, ['SESSDATA'], false)) || (await readSavedCookieOtherItems(cookie, ['SESSDATA']));
+        // 根据 mark 的值计算 signCookie
+        const signCookie = mark === 'localCk'
+            ? (await BiliCookieManager.readSavedCookieItems(`${bili_jct}+${cookie}`, ['SESSDATA'], false)) ||
+                (await BiliCookieManager.readSavedCookieOtherItems(`${bili_jct}+${cookie}`, ['SESSDATA']))
+            : (await BiliCookieManager.readSavedCookieItems(await BiliCookieManager.getCookieStringForUrl(url), ['SESSDATA'], false)) ||
+                (await BiliCookieManager.readSavedCookieOtherItems(await BiliCookieManager.getCookieStringForUrl(url), ['SESSDATA']));
         const { w_rid, time_stamp } = await getWbiSign(data, BiliApi.BILIBILI_HEADERS, signCookie);
         const params = {
             ...data,
             w_rid: w_rid,
             wts: time_stamp
         };
-        const res = await axios(url, {
-            method: 'GET',
+        const headers = lodash.merge(BiliApi.BILIBILI_HEADERS, {
+            Cookie: mark === 'localCk' ? `${bili_jct}+${cookie}` : undefined,
+            Host: `api.bilibili.com`,
+            Origin: 'https://space.bilibili.com',
+            Referer: `https://space.bilibili.com/${uid}/dynamic`
+        });
+        const ck = cookie instanceof tough.CookieJar ? cookie : undefined;
+        // (1) 保存初始状态
+        let initialCookies;
+        if (ck) {
+            initialCookies = await new Promise((resolve, reject) => {
+                ck.store.getAllCookies((err, cookies) => {
+                    if (err)
+                        reject(err);
+                    else
+                        resolve(cookies || []);
+                });
+            });
+        }
+        const res = await axios.get(url, {
+            jar: ck, // 仅在非 localCk 时传递 jar
             params,
             timeout: 15000,
-            headers: lodash.merge(BiliApi.BILIBILI_HEADERS, {
-                Cookie: `${cookie}`,
-                Host: `api.bilibili.com`,
-                Origin: 'https://space.bilibili.com',
-                Referer: `https://space.bilibili.com/${uid}/dynamic`
-            })
+            headers
         });
+        // (3) 获取请求完成后的 Cookie 状态
+        let updatedCookies;
+        if (ck) {
+            updatedCookies = await new Promise((resolve, reject) => {
+                ck.store.getAllCookies((err, cookies) => {
+                    if (err)
+                        reject(err);
+                    else
+                        resolve(cookies || []);
+                });
+            });
+        }
+        if (ck && initialCookies instanceof Array && updatedCookies instanceof Array) {
+            // 构建初始状态的 Map
+            const initialCookieMap = new Map(initialCookies.map(c => [`${c.key}:${c.domain}`, c]));
+            // 构建更新后的 Map
+            const updatedCookieMap = new Map(updatedCookies.map(c => [`${c.key}:${c.domain}`, c]));
+            // 比较两个 Map
+            for (const [key, updatedCookie] of updatedCookieMap.entries()) {
+                const initialCookie = initialCookieMap.get(key);
+                if (!initialCookie || initialCookie.value !== updatedCookie.value) {
+                    console.log(`Weibo Cookie ${updatedCookie.key} was updated.`);
+                    await BiliCookieManager.saveCookiesToRedis(ck); // 更新同步到 Redis
+                }
+            }
+        }
         return res;
     }
     /**通过uid获取up详情*/
     async getBilibiUserInfoByUid(uid) {
         const url = BiliApi.BILIBIL_API.biliSpaceUserInfoWbi;
-        let { cookie } = await readSyncCookie();
-        cookie = await cookieWithBiliTicket(cookie);
+        const bili_jct = await BiliCookieManager.checkCookieBiliTicket();
+        const { cookie, mark } = await BiliCookieManager.readSyncCookie();
         const dmImg = await getDmImg();
         const data = {
             mid: uid,
@@ -58,81 +106,102 @@ class BilibiliWebDataFetcher {
             web_location: 1550101,
             ...dmImg
         };
-        let signCookie = (await readSavedCookieItems(cookie, ['SESSDATA'], false)) || (await readSavedCookieOtherItems(cookie, ['SESSDATA']));
+        // 根据 mark 的值计算 signCookie
+        const signCookie = mark === 'localCk'
+            ? (await BiliCookieManager.readSavedCookieItems(`${bili_jct}+${cookie}`, ['SESSDATA'], false)) ||
+                (await BiliCookieManager.readSavedCookieOtherItems(`${bili_jct}+${cookie}`, ['SESSDATA']))
+            : (await BiliCookieManager.readSavedCookieItems(await BiliCookieManager.getCookieStringForUrl(url), ['SESSDATA'], false)) ||
+                (await BiliCookieManager.readSavedCookieOtherItems(await BiliCookieManager.getCookieStringForUrl(url), ['SESSDATA']));
         const { w_rid, time_stamp } = await getWbiSign(data, BiliApi.BILIBILI_HEADERS, signCookie);
         const params = {
             ...data,
             w_rid: w_rid,
             wts: time_stamp
         };
-        const res = await axios(url, {
-            method: 'GET',
+        const headers = lodash.merge(BiliApi.BILIBILI_HEADERS, {
+            Cookie: mark === 'localCk' ? `${bili_jct}+${cookie}` : undefined,
+            Host: `api.bilibili.com`,
+            Origin: 'https://space.bilibili.com',
+            Referer: `https://space.bilibili.com/${uid}/dynamic`
+        });
+        const ck = cookie instanceof tough.CookieJar ? cookie : undefined;
+        const res = await axios.get(url, {
+            jar: ck, // 仅在非 localCk 时传递 jar
             params,
-            timeout: 10000,
-            headers: lodash.merge(BiliApi.BILIBILI_HEADERS, {
-                Cookie: `${cookie}`,
-                Host: `api.bilibili.com`,
-                Origin: 'https://space.bilibili.com',
-                Referer: `https://space.bilibili.com/${uid}/dynamic`
-            })
+            timeout: 15000,
+            headers
         });
         return res;
     }
     /**通过关键词搜索up*/
     async searchBiliUserInfoByKeyword(keyword) {
         const url = BiliApi.BILIBIL_API.biliSearchUpWbi;
-        let { cookie } = await readSyncCookie();
-        cookie = await cookieWithBiliTicket(cookie);
+        const bili_jct = await BiliCookieManager.checkCookieBiliTicket();
+        const { cookie, mark } = await BiliCookieManager.readSyncCookie();
         const data = {
             keyword: keyword,
             page: 1,
             search_type: 'bili_user',
             order: 'totalrank'
         };
-        let signCookie = (await readSavedCookieItems(cookie, ['SESSDATA'], false)) || (await readSavedCookieOtherItems(cookie, ['SESSDATA']));
+        // 根据 mark 的值计算 signCookie
+        const signCookie = mark === 'localCk'
+            ? (await BiliCookieManager.readSavedCookieItems(`${bili_jct}+${cookie}`, ['SESSDATA'], false)) ||
+                (await BiliCookieManager.readSavedCookieOtherItems(`${bili_jct}+${cookie}`, ['SESSDATA']))
+            : (await BiliCookieManager.readSavedCookieItems(await BiliCookieManager.getCookieStringForUrl(url), ['SESSDATA'], false)) ||
+                (await BiliCookieManager.readSavedCookieOtherItems(await BiliCookieManager.getCookieStringForUrl(url), ['SESSDATA']));
         const { w_rid, time_stamp } = await getWbiSign(data, BiliApi.BILIBILI_HEADERS, signCookie);
         const params = {
             ...data,
             w_rid: w_rid,
             wts: time_stamp
         };
-        const res = await axios(url, {
-            method: 'GET',
+        const headers = lodash.merge(BiliApi.BILIBILI_HEADERS, {
+            Cookie: mark === 'localCk' ? `${bili_jct}+${cookie}` : undefined,
+            Host: `api.bilibili.com`,
+            Origin: 'https://www.bilibili.com',
+            Referer: `https://www.bilibili.com/`
+        });
+        const ck = cookie instanceof tough.CookieJar ? cookie : undefined;
+        const res = await axios.get(url, {
+            jar: ck, // 仅在非 localCk 时传递 jar
             params,
-            timeout: 10000,
-            headers: lodash.merge(BiliApi.BILIBILI_HEADERS, {
-                Cookie: `${cookie}`,
-                Host: `api.bilibili.com`,
-                Origin: 'https://www.bilibili.com',
-                Referer: `https://www.bilibili.com/`
-            })
+            timeout: 15000,
+            headers
         });
         return res;
     }
     /*通过aid/bvid获取视频信息*/
     async getBiliVideoInfoByAid_BV(vedioID) {
         const url = BiliApi.BILIBIL_API.biliVideoInfoWbi;
-        let { cookie } = await readSyncCookie();
-        cookie = await cookieWithBiliTicket(cookie);
+        const bili_jct = await BiliCookieManager.checkCookieBiliTicket();
+        const { cookie, mark } = await BiliCookieManager.readSyncCookie();
         let referer = vedioID?.bvid ? `https://www.bilibili.com/video/${vedioID.bvid}` : `https://www.bilibili.com/video/av${vedioID.aid}`;
         let data = vedioID?.bvid ? { bvid: vedioID.bvid } : { aid: vedioID.aid };
-        let signCookie = (await readSavedCookieItems(cookie, ['SESSDATA'], false)) || (await readSavedCookieOtherItems(cookie, ['SESSDATA']));
+        // 根据 mark 的值计算 signCookie
+        const signCookie = mark === 'localCk'
+            ? (await BiliCookieManager.readSavedCookieItems(`${bili_jct}+${cookie}`, ['SESSDATA'], false)) ||
+                (await BiliCookieManager.readSavedCookieOtherItems(`${bili_jct}+${cookie}`, ['SESSDATA']))
+            : (await BiliCookieManager.readSavedCookieItems(await BiliCookieManager.getCookieStringForUrl(url), ['SESSDATA'], false)) ||
+                (await BiliCookieManager.readSavedCookieOtherItems(await BiliCookieManager.getCookieStringForUrl(url), ['SESSDATA']));
         const { w_rid, time_stamp } = await getWbiSign(data, BiliApi.BILIBILI_HEADERS, signCookie);
         const params = {
             ...data,
             w_rid: w_rid,
             wts: time_stamp
         };
-        const res = await axios(url, {
-            method: 'GET',
+        const headers = lodash.merge(BiliApi.BILIBILI_HEADERS, {
+            Cookie: mark === 'localCk' ? `${bili_jct}+${cookie}` : undefined,
+            Host: `api.bilibili.com`,
+            Origin: 'https://www.bilibili.com',
+            Referer: referer
+        });
+        const ck = cookie instanceof tough.CookieJar ? cookie : undefined;
+        const res = await axios.get(url, {
+            jar: ck, // 仅在非 localCk 时传递 jar
             params,
-            timeout: 5000,
-            headers: lodash.merge(BiliApi.BILIBILI_HEADERS, {
-                Cookie: `${cookie}`,
-                Host: `api.bilibili.com`,
-                Origin: 'https://www.bilibili.com',
-                Referer: referer
-            })
+            timeout: 15000,
+            headers
         });
         return res;
     }
@@ -140,14 +209,16 @@ class BilibiliWebDataFetcher {
     async getBVIDByShortUrl(tvUrlID) {
         const ShortVideoUrlApi = BiliApi.BILIBIL_API.biliShortVideoUrl;
         const url = `${ShortVideoUrlApi}${tvUrlID}`;
-        let { cookie } = await readSyncCookie();
-        cookie = await cookieWithBiliTicket(cookie);
-        const res = await axios(url, {
-            method: 'GET',
-            timeout: 5000,
-            headers: lodash.merge(BiliApi.BILIBILI_DYNAMIC_SPACE_HEADERS, {
-                Cookie: `${cookie}`
-            })
+        const bili_jct = await BiliCookieManager.checkCookieBiliTicket();
+        const { cookie, mark } = await BiliCookieManager.readSyncCookie();
+        const headers = lodash.merge(BiliApi.BILIBILI_DYNAMIC_SPACE_HEADERS, {
+            Cookie: mark === 'localCk' ? `${bili_jct}+${cookie}` : undefined
+        });
+        const ck = cookie instanceof tough.CookieJar ? cookie : undefined;
+        const res = await axios.get(url, {
+            jar: ck, // 仅在非 localCk 时传递 jar
+            timeout: 15000,
+            headers
         });
         const htmlContent = await res.data;
         const htmlContentRegex = /itemprop="url"\s*content="https:\/\/www.bilibili.com\/video\/(BV[a-zA-Z0-9]+)\/">/;

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

@@ -1,9 +1,10 @@
-import moment from 'moment';
-import { Segment } from 'yunzaijs';
-import { readSyncCookie, cookieWithBiliTicket } from './bilibili.main.models.js';
 import BiliApi from './bilibili.main.api.js';
-import axios from 'axios';
+import BiliCookieManager from './bilibili.risk.cookie.js';
+import axioss from 'axios';
 import lodash from 'lodash';
+import moment from 'moment';
+import * as tough from 'tough-cookie';
+import { Segment } from 'yunzaijs';
 
 class BiliQuery {
     /**
@@ -246,11 +247,18 @@ class BiliQuery {
      * @returns  完整的B站文章内容json数据
      */
     static async getFullArticleContent(postUrl) {
-        let { cookie } = await readSyncCookie();
-        cookie = await cookieWithBiliTicket(cookie);
+        const bili_jct = await BiliCookieManager.checkCookieBiliTicket();
+        const { cookie, mark } = await BiliCookieManager.readSyncCookie();
         try {
-            const response = await axios.get(postUrl, {
-                headers: lodash.merge(BiliApi.BILIBILI_ARTICLE_HEADERS, { Cookie: `${cookie}`, Host: 'www.bilibili.com' }),
+            const headers = lodash.merge(BiliApi.BILIBILI_ARTICLE_HEADERS, {
+                Cookie: mark === 'localCk' ? `${bili_jct}+${cookie}` : undefined,
+                Host: 'www.bilibili.com'
+            });
+            const ck = cookie instanceof tough.CookieJar ? cookie : undefined;
+            const response = await axioss.get(postUrl, {
+                jar: ck, // 仅在非 localCk 时传递 jar
+                timeout: 15000,
+                headers,
                 responseType: 'text'
             });
             const text = response.data;

package/lib/models/bilibili/bilibili.main.task.js

@@ -1,10 +1,11 @@
-import QRCode from 'qrcode';
-import { Redis, Segment, Bot } from 'yunzaijs';
-import Config from '../../utils/config.js';
-import { renderPage } from '../../utils/image.js';
 import { BilibiliWebDataFetcher } from './bilibili.main.get.web.data.js';
-import { readSyncCookie, postGateway } from './bilibili.main.models.js';
 import { BiliQuery } from './bilibili.main.query.js';
+import BiliCookieManager from './bilibili.risk.cookie.js';
+import Config from '../../utils/config.js';
+import { renderPage } from '../../utils/image.js';
+import QRCode from 'qrcode';
+import * as tough from 'tough-cookie';
+import { Redis, Segment, Bot } from 'yunzaijs';
 
 class BiliTask {
     taskName;
@@ -17,11 +18,27 @@ class BiliTask {
         this.privateKey = 'Yz:yuki:bili:upPush:private:';
     }
     async hendleEventDynamicData(uid, count = 0) {
-        let { cookie } = await readSyncCookie();
+        let { cookie, mark } = await BiliCookieManager.readSyncCookie();
         const resp = await new BilibiliWebDataFetcher().getBiliDynamicListDataByUid(uid);
         const resjson = await resp?.data;
         if (!resjson || resjson.code !== 0 || resjson.code === -352) {
-            await postGateway(cookie);
+            let ck;
+            if (mark === 'localCk') {
+                ck = cookie;
+            }
+            else {
+                if (cookie instanceof tough.CookieJar) {
+                    ck = await new Promise((resolve, reject) => {
+                        cookie.getCookieString('https://www.bilibili.com', (err, cookieString) => {
+                            if (err)
+                                reject(err);
+                            else
+                                resolve(cookieString || '');
+                        });
+                    });
+                }
+            }
+            await BiliCookieManager.postGateway(ck);
             if (count < 2) {
                 await this.randomDelay(2000, 8000); // 随机延时2-8秒
                 await this.hendleEventDynamicData(uid, count + 1);