yz-yuki-plugin 2.0.6-12 → 2.0.6-13

package/CHANGELOG.md

@@ -1,4 +1,5 @@
 # 2.0.6
+* 优化api请求
 * 优化消息发送
 * 优化文字动态图片资源的发送
 * 依赖升级

package/lib/apps/bilibili.js

@@ -4,7 +4,7 @@ import { Messages, Redis } from 'yunzaijs';
 import { BiliQuery } from '../models/bilibili/bilibili.main.query.js';
 import { BiliTask } from '../models/bilibili/bilibili.main.task.js';
 import Config from '../utils/config.js';
-import { BiliGetWebData } from '../models/bilibili/bilibili.main.get.web.data.js';
+import { BilibiliWebDataFetcher } from '../models/bilibili/bilibili.main.get.web.data.js';
 import { readLoginCookie, applyLoginQRCode, pollLoginQRCode, saveLoginCookie, postGateway, exitBiliLogin, checkBiliLogin, readSavedCookieItems, saveLocalBiliCk, readSyncCookie, getNewTempCk, saveTempCk } from '../models/bilibili/bilibili.main.models.js';
 
 const message = new Messages('message');
@@ -52,8 +52,8 @@ message.use(async (e) => {
             return;
         }
         // 获取 Bilibili 动态信息
-        const res = await new BiliGetWebData(e).getBiliDynamicListDataByUid(uid);
-        if (res.statusText !== 'OK') {
+        const res = await new BilibiliWebDataFetcher(e).getBiliDynamicListDataByUid(uid);
+        if (res?.statusText !== 'OK') {
             e.reply('出了点网络问题，等会再试试吧~');
             return false;
         }
@@ -66,8 +66,8 @@ message.use(async (e) => {
         let infoName = '';
         if (code === 0 && has_more === false) {
             e.reply(`检测到该uid的主页空间动态内容为空，\n执行uid：${uid} 校验...`);
-            const resp = await new BiliGetWebData(e).getBilibiUserInfoByUid(uid);
-            if (resp.statusText !== 'OK') {
+            const resp = await new BilibiliWebDataFetcher(e).getBilibiUserInfoByUid(uid);
+            if (resp?.statusText !== 'OK') {
                 e.reply('出了点网络问题，发起uid校验失败，等会再试试吧~');
                 return false;
             }
@@ -438,8 +438,8 @@ message.use(async (e) => {
 /**通过uid获取up主信息 */
 message.use(async (e) => {
     let uid = e.msg.replace(/^(#|\/)(yuki|优纪)?(b站|B站|bili|bilibili|哔哩|哔哩哔哩)(up|UP)主/g, '').trim();
-    const res = await new BiliGetWebData(e).getBilibiUserInfoByUid(uid);
-    if (res.statusText !== 'OK') {
+    const res = await new BilibiliWebDataFetcher(e).getBilibiUserInfoByUid(uid);
+    if (res?.statusText !== 'OK') {
         e.reply('诶嘿，出了点网络问题，等会再试试吧~');
         return;
     }
@@ -466,8 +466,8 @@ message.use(async (e) => {
 /** 根据名称搜索up的uid*/
 message.use(async (e) => {
     let keyword = e.msg.replace(/^(#|\/)(yuki|优纪)?搜索(b站|B站|bili|bilibili|哔哩|哔哩哔哩)(up|UP)主/g, '').trim();
-    const res = await new BiliGetWebData(e).searchBiliUserInfoByKeyword(keyword);
-    if (res.statusText !== 'OK') {
+    const res = await new BilibiliWebDataFetcher(e).searchBiliUserInfoByKeyword(keyword);
+    if (res?.statusText !== 'OK') {
         e.reply('诶嘿，出了点网络问题，等会再试试吧~');
         return;
     }

package/lib/apps/weibo.js

@@ -2,7 +2,7 @@ import { Messages } from 'yunzaijs';
 import { WeiboQuery } from '../models/weibo/weibo.main.query.js';
 import { WeiboTask } from '../models/weibo/weibo.main.task.js';
 import Config from '../utils/config.js';
-import { WeiboGetWebData } from '../models/weibo/weibo.main.get.web.data.js';
+import { WeiboWebDataFetcher } from '../models/weibo/weibo.main.get.web.data.js';
 
 const message = new Messages('message');
 let weiboPushData = Config.getConfigData('config', 'weibo', 'push');
@@ -46,8 +46,8 @@ message.use(async (e) => {
             return;
         }
         // 获取 微博 博主信息
-        const res = await new WeiboGetWebData(e).getBloggerInfo(uid);
-        if (res.statusText !== 'OK') {
+        const res = await new WeiboWebDataFetcher(e).getBloggerInfo(uid);
+        if (res?.statusText !== 'OK') {
             e.reply('出了点网络问题，等会再试试吧~');
             return false;
         }
@@ -211,8 +211,8 @@ message.use(async (e) => {
 /**通过uid获取up主信息 */
 message.use(async (e) => {
     let uid = e.msg.replace(/^(#|\/)(yuki|优纪)?(微博|weibo|WEIBO)(博|bo|BO)主/g, '').trim();
-    const res = await new WeiboGetWebData(e).getBloggerInfo(uid);
-    if (res.statusText !== 'OK') {
+    const res = await new WeiboWebDataFetcher(e).getBloggerInfo(uid);
+    if (res?.statusText !== 'OK') {
         e.reply('诶嘿，出了点网络问题，等会再试试吧~');
         return;
     }
@@ -240,8 +240,8 @@ message.use(async (e) => {
 /** 根据昵称搜索博主信息*/
 message.use(async (e) => {
     let keyword = e.msg.replace(/^(#|\/)(yuki|优纪)?搜索(微博|weibo|WEIBO)(博|bo|BO)主/g, '').trim();
-    const res = await new WeiboGetWebData(e).searchBloggerInfo(keyword);
-    if (res.statusText !== 'OK') {
+    const res = await new WeiboWebDataFetcher(e).searchBloggerInfo(keyword);
+    if (res?.statusText !== 'OK') {
         e.reply('诶嘿，出了点网络问题，等会再试试吧~');
         return;
     }

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

@@ -1,4 +1,5 @@
 import axios from 'axios';
+import https from 'https';
 import lodash from 'lodash';
 import BiliApi from './bilibili.main.api.js';
 import { readSyncCookie, cookieWithBiliTicket, readSavedCookieItems, readSavedCookieOtherItems } from './bilibili.main.models.js';
@@ -6,8 +7,39 @@ import { getWbiSign } from './bilibili.risk.wbi.js';
 import { getDmImg } from './bilibili.risk.dm.img.js';
 import { getWebId } from './bilibili.risk.w_webid.js';
 
-class BiliGetWebData {
-    constructor(e) { }
+class BiliHttpClient {
+    client;
+    constructor() {
+        this.client = this.initializeClient();
+    }
+    initializeClient() {
+        const httpsAgent = new https.Agent({
+            keepAlive: true,
+            maxSockets: 100,
+            timeout: 20000
+        });
+        const client = axios.create({
+            httpsAgent: httpsAgent,
+            timeout: 20000
+        });
+        return client;
+    }
+    async request(url, config) {
+        try {
+            const response = await this.client.request({ url, ...config });
+            return response;
+        }
+        catch (error) {
+            console.error('BiliHttpClient Request failed:', error);
+            // 重新创建 AxiosInstance
+            this.client = this.initializeClient();
+        }
+    }
+}
+class BilibiliWebDataFetcher extends BiliHttpClient {
+    constructor(e) {
+        super();
+    }
     /**通过uid获取up动态数据表*/
     async getBiliDynamicListDataByUid(uid) {
         const url = BiliApi.BILIBIL_API.biliDynamicInfoList;
@@ -32,7 +64,8 @@ class BiliGetWebData {
             w_rid: w_rid,
             wts: time_stamp
         };
-        const res = await axios.get(url, {
+        const res = await this.request(url, {
+            method: 'GET',
             params,
             timeout: 10000,
             headers: lodash.merge(BiliApi.BILIBILI_HEADERS, {
@@ -67,7 +100,8 @@ class BiliGetWebData {
             w_rid: w_rid,
             wts: time_stamp
         };
-        const res = await axios.get(url, {
+        const res = await this.request(url, {
+            method: 'GET',
             params,
             timeout: 5000,
             headers: lodash.merge(BiliApi.BILIBILI_HEADERS, {
@@ -97,7 +131,8 @@ class BiliGetWebData {
             w_rid: w_rid,
             wts: time_stamp
         };
-        const res = await axios.get(url, {
+        const res = await this.request(url, {
+            method: 'GET',
             params,
             timeout: 5000,
             headers: lodash.merge(BiliApi.BILIBILI_HEADERS, {
@@ -111,4 +146,4 @@ class BiliGetWebData {
     }
 }
 
-export { BiliGetWebData };
+export { BilibiliWebDataFetcher };

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

@@ -145,8 +145,8 @@ async function checkBiliLogin(e) {
             let current_exp = level_info?.current_exp;
             let next_exp = level_info?.next_exp;
             const LoginCookieTTL = await readLoginCookieTTL();
-            const LoginCookieTTLStr = LoginCookieTTL === -1 ? '永久' : LoginCookieTTL === -2 ? '未登录或登录状态无效' : `${new Date(Date.now() + LoginCookieTTL * 1000).toLocaleString()}`;
-            e.reply(`~B站账号已登陆~，有效期至：${LoginCookieTTLStr}。\n昵称：${uname}\nuid：${mid}\n硬币：${money}\n经验等级：${current_level}\n当前经验值exp：${current_exp}\n下一等级所需exp：${next_exp}`);
+            const LoginCookieTTLStr = LoginCookieTTL === -1 ? '永久' : LoginCookieTTL === -2 ? '-' : `${new Date(Date.now() + LoginCookieTTL * 1000).toLocaleString()}`;
+            e.reply(`~B站账号已登陆~\n有效期至：${LoginCookieTTLStr}。\n昵称：${uname}\nuid：${mid}\n硬币：${money}\n经验等级：${current_level}\n当前经验值exp：${current_exp}\n下一等级所需exp：${next_exp}`);
         }
         else {
             // 处理其他情况

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

@@ -2,7 +2,7 @@ import QRCode from 'qrcode';
 import { Redis, Segment, Bot } from 'yunzaijs';
 import Config from '../../utils/config.js';
 import { renderPage } from '../../utils/image.js';
-import { BiliGetWebData } from './bilibili.main.get.web.data.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';
 
@@ -10,16 +10,18 @@ class BiliTask {
     taskName;
     groupKey;
     privateKey;
+    BilibiliWebDataFetcher;
     e;
     constructor(e) {
         this.taskName = 'biliTask';
         this.groupKey = 'Yz:yuki:bili:upPush:group:';
         this.privateKey = 'Yz:yuki:bili:upPush:private:';
+        this.BilibiliWebDataFetcher = new BilibiliWebDataFetcher();
     }
     async hendleEventDynamicData(uid, count = 0) {
         let { cookie } = await readSyncCookie();
-        const resp = await new BiliGetWebData().getBiliDynamicListDataByUid(uid);
-        const resjson = await resp.data;
+        const resp = await this.BilibiliWebDataFetcher.getBiliDynamicListDataByUid(uid);
+        const resjson = await resp?.data;
         if (!resjson || resjson.code !== 0 || resjson.code === -352) {
             await postGateway(cookie);
             if (count < 2) {

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

@@ -1,17 +1,49 @@
 import axios from 'axios';
+import https from 'https';
 import { WeiboApi } from './weibo.main.api.js';
 import { WeiboQuery } from './weibo.main.query.js';
 
-class WeiboGetWebData {
+class WeiboHttpClient {
+    client;
+    constructor() {
+        this.client = this.initializeClient();
+    }
+    initializeClient() {
+        const httpsAgent = new https.Agent({
+            keepAlive: true,
+            maxSockets: 100,
+            timeout: 20000
+        });
+        const client = axios.create({
+            httpsAgent: httpsAgent,
+            timeout: 20000
+        });
+        return client;
+    }
+    async request(url, config) {
+        try {
+            const response = await this.client.request({ url, ...config });
+            return response;
+        }
+        catch (error) {
+            console.error('WeiboHttpClient Request failed:', error);
+            // 重新创建 AxiosInstance
+            this.client = this.initializeClient();
+        }
+    }
+}
+class WeiboWebDataFetcher extends WeiboHttpClient {
     e;
-    constructor(e) { }
+    constructor(e) {
+        super();
+    }
     /**通过uid获取博主信息 */
     async getBloggerInfo(target) {
         const param = { containerid: '100505' + target };
         const url = new URL(WeiboApi.WEIBO_API.weiboGetIndex);
         url.search = new URLSearchParams(param).toString();
-        const resp = await axios.get(url.toString(), {
-            timeout: 10000,
+        const resp = await this.request(url.toString(), {
+            method: 'GET',
             headers: { 'accept': '*/*', 'Content-Type': 'application/json', 'referer': 'https://m.weibo.cn' }
         });
         return resp;
@@ -22,9 +54,9 @@ class WeiboGetWebData {
         const params = {
             q: keyword
         };
-        const resp = await axios.get(url, {
+        const resp = await this.request(url, {
+            method: 'GET',
             params,
-            timeout: 10000,
             headers: { 'accept': '*/*', 'Content-Type': 'application/json', 'referer': 'https://s.weibo.com' }
         });
         return resp;
@@ -36,13 +68,13 @@ class WeiboGetWebData {
         url.search = new URLSearchParams(params).toString();
         await new Promise(resolve => setTimeout(resolve, Math.floor(Math.random() * (6500 - 1000 + 1) + 1000)));
         try {
-            const response = await axios.get(url.toString(), {
-                timeout: 15000,
+            const response = await this.request(url.toString(), {
+                method: 'GET',
                 headers: { 'accept': '*/*', 'Content-Type': 'application/json', 'referer': 'https://m.weibo.cn' }
             });
-            const { ok, data, msg } = response.data;
+            const { ok, data, msg } = response?.data;
             if (!ok && msg !== '这里还没有内容') {
-                throw new Error(response.config.url);
+                throw new Error(response?.config.url);
             }
             return data.cards.filter(WeiboQuery.filterCardTypeCustom);
         }
@@ -53,4 +85,4 @@ class WeiboGetWebData {
     }
 }
 
-export { WeiboGetWebData };
+export { WeiboWebDataFetcher };

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

@@ -2,18 +2,20 @@ import QRCode from 'qrcode';
 import { Redis, Segment, Bot } from 'yunzaijs';
 import Config from '../../utils/config.js';
 import { renderPage } from '../../utils/image.js';
-import { WeiboGetWebData } from './weibo.main.get.web.data.js';
+import { WeiboWebDataFetcher } from './weibo.main.get.web.data.js';
 import { WeiboQuery } from './weibo.main.query.js';
 
 class WeiboTask {
     taskName;
     groupKey;
     privateKey;
+    WeiboWebDataFetcher;
     e;
     constructor(e) {
         this.taskName = 'weiboTask';
         this.groupKey = 'Yz:yuki:weibo:upPush:group:';
         this.privateKey = 'Yz:yuki:weibo:upPush:private:';
+        this.WeiboWebDataFetcher = new WeiboWebDataFetcher(e);
     }
     /**
      * 执行动态推送任务
@@ -59,7 +61,7 @@ class WeiboTask {
                         dynamicList[subInfoOfup.uid] = dynamicData;
                     }
                     else {
-                        resp = await await new WeiboGetWebData().getBloggerDynamicList(subInfoOfup.uid); // 获取指定 uid 的动态列表
+                        resp = await this.WeiboWebDataFetcher.getBloggerDynamicList(subInfoOfup.uid); // 获取指定 uid 的动态列表
                         if (resp) {
                             requestedDataOfUids.set(subInfoOfup.uid, resp); // 将响应数据存储到映射中
                             const dynamicData = resp || [];

package/package.json

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