yz-yuki-plugin 2.0.5-5 → 2.0.5-7

package/lib/models/bilibili/bilibili.dm.img.js

@@ -0,0 +1,15 @@
+/**获取dm参数 */
+async function getDmImg() {
+    const dm_img_list = [];
+    //Buffer.from("WebGL 1", 'utf-8').toString("base64") //webgl version的值 WebGL 1 的base64 编码
+    const dm_img_str = 'V2ViR0wgMS';
+    //webgl unmasked renderer的值拼接webgl unmasked vendor的值的base64编码
+    const dm_cover_img_str = 'QU5HTEUgKEludGVsLCBJbnRlbChSKSBIRCBHcmFwaGljcyBEaXJlY3QzRDExIHZzXzVfMCBwc181XzApLCBvciBzaW1pbGFyR29vZ2xlIEluYy4gKEludGVsKQ';
+    return {
+        dm_img_list: dm_img_list,
+        dm_img_str: dm_img_str,
+        dm_cover_img_str: dm_cover_img_str
+    };
+}
+
+export { getDmImg };

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

@@ -3,6 +3,7 @@ import lodash from 'lodash';
 import { BiliApi } from './bilibili.api.js';
 import { readSyncCookie, cookieWithBiliTicket, readSavedCookieItems, readSavedCookieOtherItems } from './bilibili.models.js';
 import { getWbiSign } from './bilibili.wbi.js';
+import { getDmImg } from './bilibili.dm.img.js';
 
 class BiliGetWebData {
     constructor(e) { }
@@ -11,6 +12,7 @@ class BiliGetWebData {
         const url = BiliApi.BILIBIL_API.biliDynamicInfoList;
         let { cookie } = await readSyncCookie();
         cookie = await cookieWithBiliTicket(cookie);
+        const dmImg = await getDmImg();
         const data = {
             'offset': '',
             'host_mid': uid,
@@ -18,7 +20,7 @@ class BiliGetWebData {
             'platform': 'web',
             'features': 'itemOpusStyle,listOnlyfans,opusBigCover,onlyfansVote',
             'web_location': '333.999',
-            //...getDmImg(),
+            ...dmImg,
             'x-bili-device-req-json': { platform: 'web', device: 'pc' },
             'x-bili-web-req-json': { spm_id: '333.999' }
         };

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

@@ -17,13 +17,10 @@ class BiliTask {
         this.privateKey = 'Yz:yuki:bili:upPush:private:';
     }
     async hendleEventDynamicData(uid, count = 0) {
+        let { cookie } = await readSyncCookie();
         const resp = await new BiliGetWebData().getBiliDynamicListDataByUid(uid);
         const resjson = await resp.data;
-        let { cookie } = await readSyncCookie();
-        if (resjson.code === 0) {
-            return resjson;
-        }
-        else if (resjson.code === -352) {
+        if (!resjson || resjson.code !== 0 || resjson.code === -352) {
             await postGateway(cookie);
             if (count < 3) {
                 await this.randomDelay(2000, 8000); // 随机延时2-8秒
@@ -32,12 +29,9 @@ class BiliTask {
             }
             else {
                 count = 0;
-                return resjson;
             }
         }
-        else if (resjson.code !== 0) {
-            return resjson;
-        }
+        return resjson;
     }
     async runTask() {
         let biliConfigData = await Config.getUserConfig('bilibili', 'config');
@@ -89,12 +83,12 @@ class BiliTask {
                             }
                             else if (resp.code !== 0) {
                                 logger.error(`获取 ${subInfoOfup.uid} 动态失败，resCode：${resp.code}`);
-                                return;
+                                continue;
                             }
                         }
                         else {
-                            logger.error(`获取 ${subInfoOfup.uid} 动态失败，无响应数据，本次任务终止，待下次任务自动重试`);
-                            return;
+                            logger.error(`获取 ${subInfoOfup.uid} 动态失败，无响应数据，请待下次任务自动重试`);
+                            continue;
                         }
                     }
                     const chatIds = Array.from(new Set([...Object((chatTypeMap.get(subInfoOfup.uid) && chatTypeMap.get(subInfoOfup.uid).chatIds) || []), chatId]));

package/package.json

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