yz-yuki-plugin 2.0.7-5 → 2.0.7-7

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

@@ -4,7 +4,6 @@ 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 { getDmImg } from './bilibili.risk.dm.img.js';
-import { getWebId } from './bilibili.risk.w_webid.js';
 
 class BilibiliWebDataFetcher {
     e;
@@ -52,20 +51,17 @@ class BilibiliWebDataFetcher {
         let { cookie } = await readSyncCookie();
         cookie = await cookieWithBiliTicket(cookie);
         const dmImg = await getDmImg();
-        const w_webid = await getWebId(uid);
         const data = {
             mid: uid,
             token: '',
             platform: 'web',
             web_location: 1550101,
-            ...dmImg,
-            w_webid: w_webid
+            ...dmImg
         };
         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,
-            w_webid: w_webid,
             w_rid: w_rid,
             wts: time_stamp
         };

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

@@ -421,15 +421,22 @@ class BiliTask {
                             }
                         }
                         if (sendMode === 'SINGLE') {
+                            let allSent = true;
                             for (let i = 0; i < messages.length; i++) {
-                                await this.sendMessageApi(chatId, bot_id, chatType, messages[i]);
+                                if (!(await this.sendMessageApi(chatId, bot_id, chatType, messages[i]))) {
+                                    allSent = false;
+                                    break; // 如果有任何一条消息发送失败，停止发送后续消息
+                                }
+                            }
+                            if (allSent) {
+                                await Redis.set(sendMarkKey, '1', { EX: 3600 * 72 }); // 发送成功后设置标记
+                                await this.randomDelay(1000, 2000); // 随机延时1-2秒
                             }
-                            await Redis.set(sendMarkKey, '1', { EX: 3600 * 72 }); // 发送成功后设置标记
-                            await this.randomDelay(1000, 2000); // 随机延时1-2秒
                         }
                         else if (sendMode === 'MERGE') {
-                            await this.sendMessageApi(chatId, bot_id, chatType, messages);
-                            await Redis.set(sendMarkKey, '1', { EX: 3600 * 72 }); // 发送成功后设置标记
+                            if (await this.sendMessageApi(chatId, bot_id, chatType, messages)) {
+                                await Redis.set(sendMarkKey, '1', { EX: 3600 * 72 }); // 发送成功后设置标记
+                            }
                         }
                     }
                 }
@@ -445,21 +452,18 @@ class BiliTask {
      * @param message 消息内容
      */
     async sendMessageApi(chatId, bot_id, chatType, message) {
-        if (chatType === 'group') {
-            await (Bot[bot_id] ?? Bot)
-                ?.pickGroup(String(chatId))
-                .sendMsg(message) // 发送群聊
-                .catch((error) => {
-                global?.logger?.error(`群组[${chatId}]推送失败：${JSON.stringify(error)}`);
-            });
+        try {
+            if (chatType === 'group') {
+                await (Bot[bot_id] ?? Bot)?.pickGroup(String(chatId)).sendMsg(message); // 发送群聊
+            }
+            else if (chatType === 'private') {
+                await (Bot[bot_id] ?? Bot)?.pickFriend(String(chatId)).sendMsg(message); // 发送好友私聊
+            }
+            return true; // 发送成功
         }
-        else if (chatType === 'private') {
-            await (Bot[bot_id] ?? Bot)
-                ?.pickFriend(String(chatId))
-                .sendMsg(message)
-                .catch((error) => {
-                global?.logger?.error(`用户[${chatId}]推送失败：${JSON.stringify(error)}`);
-            }); // 发送好友私聊
+        catch (error) {
+            global?.logger?.error(`${chatType === 'group' ? '群聊' : '私聊'} ${chatId} 消息发送失败：${JSON.stringify(error)}`);
+            return false; // 发送失败
         }
     }
     /**

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

@@ -1,16 +1,16 @@
 /**获取dm参数 */
 async function getDmImg() {
-    const dm_img_list = [];
+    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';
-    const dm_img_inter = { ds: [], wh: [0, 0, 0], of: [0, 0, 0] };
+    const dm_img_inter = `{ds:[],wh:[0,0,0],of:[0,0,0]}`;
     return {
-        dm_img_list: String(dm_img_list).replace(/\s+/g, ''),
+        dm_img_list: dm_img_list,
         dm_img_str: dm_img_str,
         dm_cover_img_str: dm_cover_img_str,
-        dm_img_inter: String(dm_img_inter).replace(/\s+/g, '')
+        dm_img_inter: dm_img_inter
     };
 }
 

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

@@ -368,15 +368,22 @@ class WeiboTask {
                             LogMark.add('1');
                         }
                         if (sendMode === 'SINGLE') {
+                            let allSent = true;
                             for (let i = 0; i < messages.length; i++) {
-                                await this.sendMessageApi(chatId, bot_id, chatType, messages[i]);
+                                if (!(await this.sendMessageApi(chatId, bot_id, chatType, messages[i]))) {
+                                    allSent = false;
+                                    break; // 如果有任何一条消息发送失败，停止发送后续消息
+                                }
+                            }
+                            if (allSent) {
+                                await Redis.set(sendMarkKey, '1', { EX: 3600 * 72 }); // 发送成功后设置标记
+                                await this.randomDelay(1000, 2000); // 随机延时1-2秒
                             }
-                            await Redis.set(sendMarkKey, '1', { EX: 3600 * 72 }); // 发送成功后设置标记
-                            await this.randomDelay(1000, 2000); // 随机延时1-2秒
                         }
                         else if (sendMode === 'MERGE') {
-                            await this.sendMessageApi(chatId, bot_id, chatType, messages);
-                            await Redis.set(sendMarkKey, '1', { EX: 3600 * 72 }); // 发送成功后设置标记
+                            if (await this.sendMessageApi(chatId, bot_id, chatType, messages)) {
+                                await Redis.set(sendMarkKey, '1', { EX: 3600 * 72 }); // 发送成功后设置标记
+                            }
                         }
                     }
                 }
@@ -392,21 +399,18 @@ class WeiboTask {
      * @param message 消息内容
      */
     async sendMessageApi(chatId, bot_id, chatType, message) {
-        if (chatType === 'group') {
-            await (Bot[bot_id] ?? Bot)
-                ?.pickGroup(String(chatId))
-                .sendMsg(message) // 发送群聊
-                .catch(error => {
-                global?.logger?.error(`群组[${chatId}]推送失败：${JSON.stringify(error)}`);
-            });
+        try {
+            if (chatType === 'group') {
+                await (Bot[bot_id] ?? Bot)?.pickGroup(String(chatId)).sendMsg(message); // 发送群聊
+            }
+            else if (chatType === 'private') {
+                await (Bot[bot_id] ?? Bot)?.pickFriend(String(chatId)).sendMsg(message); // 发送好友私聊
+            }
+            return true; // 发送成功
         }
-        else if (chatType === 'private') {
-            await (Bot[bot_id] ?? Bot)
-                ?.pickFriend(String(chatId))
-                .sendMsg(message)
-                .catch(error => {
-                global?.logger?.error(`用户[${chatId}]推送失败：${JSON.stringify(error)}`);
-            }); // 发送好友私聊
+        catch (error) {
+            global?.logger?.error(`${chatType === 'group' ? '群聊' : '私聊'} ${chatId} 消息发送失败：${JSON.stringify(error)}`);
+            return false; // 发送失败
         }
     }
     /**

package/package.json

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

package/lib/models/bilibili/bilibili.risk.w_webid.js

@@ -1,46 +0,0 @@
-import axios from 'axios';
-import lodash from 'lodash';
-import { Redis } from 'yunzaijs';
-import BiliApi from './bilibili.main.api.js';
-import { readSyncCookie, cookieWithBiliTicket } from './bilibili.main.models.js';
-
-async function getWebId(uid) {
-    const w_webid_key = 'Yz:yuki:bili:w_webid';
-    const w_webid = await Redis.get(w_webid_key);
-    const keyTTL = await Redis.ttl(w_webid_key);
-    if (w_webid && keyTTL < 259200) {
-        return String(w_webid);
-    }
-    else {
-        const url = `https://space.bilibili.com/${uid ? uid : 401742377}/dynamic`;
-        let { cookie } = await readSyncCookie();
-        cookie = await cookieWithBiliTicket(cookie);
-        const res = await axios.get(url, {
-            timeout: 8000,
-            headers: lodash.merge(BiliApi.BILIBILI_DYNAMIC_SPACE_HEADERS, {
-                Cookie: `${cookie}`,
-                Host: `space.bilibili.com`
-            })
-        });
-        const htmlContent = await res.data;
-        const htmlContentRegex = /="__RENDER_DATA__"\s*type="application\/json">(.*?)<\/script>/;
-        const __RENDER_DATA__ = htmlContent.match(htmlContentRegex);
-        if (__RENDER_DATA__ && __RENDER_DATA__[1]) {
-            const decoded__RENDER_DATA__JsonString = decodeURIComponent(__RENDER_DATA__[1]);
-            const accessIdRegex = /"access_id":"(.*?)"/;
-            const access_id = decoded__RENDER_DATA__JsonString.match(accessIdRegex);
-            const ExpirationTimeRegex = /document.getElementById\("__RENDER_DATA__"\).*?setTimeout\(function\(\)\s*{window.location.reload\(true\);},\s*(\d+)\s*\*\s*(\d+)\);<\/script>/;
-            const ExpirationTime = htmlContent.match(ExpirationTimeRegex);
-            if (access_id && access_id[1] && ExpirationTime && ExpirationTime[1]) {
-                await Redis.set(w_webid_key, access_id[1], { EX: Number(ExpirationTime[1]) });
-                return String(access_id[1]);
-            }
-            else {
-                console.error('Failed to get access_id from __RENDER_DATA__');
-                return null;
-            }
-        }
-    }
-}
-
-export { getWebId };