optimize: api request

snowtafir · Feb 10, 2025 · 5720643 · 5720643
1 parent 285ece2
commit 5720643
Show file tree

Hide file tree

Showing 9 changed files with 111 additions and 31 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,5 @@
 # 2.0.6
+* 优化api请求
 * 优化消息发送
 * 优化文字动态图片资源的发送
 * 依赖升级

diff --git a/apps/bilibili.ts b/apps/bilibili.ts
@@ -5,7 +5,7 @@ import { BiliQuery } from '@/models/bilibili/bilibili.main.query';
 import { BiliTask } from '@/models/bilibili/bilibili.main.task';
 import Config from '@/utils/config';
 import { _paths } from '@/utils/paths';
-import { BiliGetWebData } from '@/models/bilibili/bilibili.main.get.web.data';
+import { BilibiliWebDataFetcher } from '@/models/bilibili/bilibili.main.get.web.data';
 import {
   applyLoginQRCode,
   checkBiliLogin,
@@ -144,7 +144,7 @@ export default class YukiBili extends Plugin {
       }
 
       // 获取 Bilibili 动态信息
-      const res = await new BiliGetWebData(this.e).getBiliDynamicListDataByUid(uid);
+      const res = await new BilibiliWebDataFetcher(this.e).getBiliDynamicListDataByUid(uid);
 
       if (res.statusText !== 'OK') {
         this.e.reply('出了点网络问题，等会再试试吧~');
@@ -163,7 +163,7 @@ export default class YukiBili extends Plugin {
       if (code === 0 && has_more === false) {
         this.e.reply(`检测到该uid的主页空间动态内容为空，\n执行uid：${uid} 校验...`);
 
-        const resp = await new BiliGetWebData(this.e).getBilibiUserInfoByUid(uid);
+        const resp = await new BilibiliWebDataFetcher(this.e).getBilibiUserInfoByUid(uid);
 
         if (resp.statusText !== 'OK') {
           this.e.reply('出了点网络问题，发起uid校验失败，等会再试试吧~');
@@ -575,7 +575,7 @@ export default class YukiBili extends Plugin {
   async getBilibiUserInfoByUid() {
     let uid = this.e.msg.replace(/^(#|\/)(yuki|优纪)?(b站|B站|bili|bilibili|哔哩|哔哩哔哩)(up|UP)主/g, '').trim();
 
-    const res = await new BiliGetWebData(this.e).getBilibiUserInfoByUid(uid);
+    const res = await new BilibiliWebDataFetcher(this.e).getBilibiUserInfoByUid(uid);
 
     if (res.statusText !== 'OK') {
       this.e.reply('诶嘿，出了点网络问题，等会再试试吧~');
@@ -613,7 +613,7 @@ export default class YukiBili extends Plugin {
   async searchBiliUserInfoByKeyword() {
     let keyword = this.e.msg.replace(/^(#|\/)(yuki|优纪)?搜索(b站|B站|bili|bilibili|哔哩|哔哩哔哩)(up|UP)主/g, '').trim();
 
-    const res = await new BiliGetWebData(this.e).searchBiliUserInfoByKeyword(keyword);
+    const res = await new BilibiliWebDataFetcher(this.e).searchBiliUserInfoByKeyword(keyword);
 
     if (res.statusText !== 'OK') {
       this.e.reply('诶嘿，出了点网络问题，等会再试试吧~');

diff --git a/apps/weibo.ts b/apps/weibo.ts
@@ -3,7 +3,7 @@ import { WeiboQuery } from '@/models/weibo/weibo.main.query';
 import { WeiboTask } from '@/models/weibo/weibo.main.task';
 import Config from '@/utils/config';
 import { _paths } from '@/utils/paths';
-import { WeiboGetWebData } from '@/models/weibo/weibo.main.get.web.data';
+import { WeiboWebDataFetcher } from '@/models/weibo/weibo.main.get.web.data';
 
 declare const logger: any;
 
@@ -97,7 +97,7 @@ export default class YukiWeibo extends Plugin {
       }
 
       // 获取 微博 博主信息
-      const res = await new WeiboGetWebData(this.e).getBloggerInfo(uid);
+      const res = await new WeiboWebDataFetcher(this.e).getBloggerInfo(uid);
 
       if (res.statusText !== 'OK') {
         this.e.reply('出了点网络问题，等会再试试吧~');
@@ -296,7 +296,7 @@ export default class YukiWeibo extends Plugin {
   async getWeiboUserInfoByUid() {
     let uid = this.e.msg.replace(/^(#|\/)(yuki|优纪)?(微博|weibo|WEIBO)(博|bo|BO)主/g, '').trim();
 
-    const res = await new WeiboGetWebData(this.e).getBloggerInfo(uid);
+    const res = await new WeiboWebDataFetcher(this.e).getBloggerInfo(uid);
 
     if (res.statusText !== 'OK') {
       this.e.reply('诶嘿，出了点网络问题，等会再试试吧~');
@@ -334,7 +334,7 @@ export default class YukiWeibo extends Plugin {
   async searchWeiboUserInfoByKeyword() {
     let keyword = this.e.msg.replace(/^(#|\/)(yuki|优纪)?搜索(微博|weibo|WEIBO)(博|bo|BO)主/g, '').trim();
 
-    const res = await new WeiboGetWebData(this.e).searchBloggerInfo(keyword);
+    const res = await new WeiboWebDataFetcher(this.e).searchBloggerInfo(keyword);
 
     if (res.statusText !== 'OK') {
       this.e.reply('诶嘿，出了点网络问题，等会再试试吧~');

diff --git a/models/bilibili/bilibili.main.get.web.data.ts b/models/bilibili/bilibili.main.get.web.data.ts
@@ -1,13 +1,49 @@
-import axios from 'axios';
+import axios, { AxiosInstance, AxiosRequestConfig } from 'axios';
 import lodash from 'lodash';
+import https from 'https';
 import BiliApi from '@/models/bilibili/bilibili.main.api';
 import { cookieWithBiliTicket, readSavedCookieItems, readSavedCookieOtherItems, readSyncCookie } from '@/models/bilibili/bilibili.mian.models';
 import { getWbiSign } from '@/models/bilibili/bilibili.risk.wbi';
 import { getDmImg } from '@/models/bilibili/bilibili.risk.dm.img';
 import { getWebId } from '@/models/bilibili/bilibili.risk.w_webid';
 
-export class BiliGetWebData {
-  constructor(e?) {}
+class BiliHttpClient {
+  httpsAgent: https.Agent;
+  client: AxiosInstance;
+
+  constructor() {
+    this.initializeClient();
+  }
+
+  private initializeClient() {
+    this.httpsAgent = new https.Agent({
+      keepAlive: true,
+      maxSockets: 100,
+      timeout: 20000
+    });
+
+    this.client = axios.create({
+      httpsAgent: this.httpsAgent,
+      timeout: 20000
+    });
+  }
+
+  async request(url: string, config?: AxiosRequestConfig) {
+    try {
+      const response = await this.client.request({ url, ...config });
+      return response;
+    } catch (error) {
+      console.error('BiliHttpClient Request failed:', error);
+      // 重新创建 AxiosInstance
+      this.initializeClient();
+    }
+  }
+}
+
+export class BilibiliWebDataFetcher extends BiliHttpClient {
+  constructor(e?) {
+    super();
+  }
 
   /**通过uid获取up动态数据表*/
   async getBiliDynamicListDataByUid(uid: any) {
@@ -34,9 +70,10 @@ export 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,
+      timeout: 20000,
       headers: lodash.merge(BiliApi.BILIBILI_HEADERS, {
         Cookie: `${cookie}`,
         Host: `api.bilibili.com`,
@@ -70,7 +107,8 @@ export 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, {
@@ -102,7 +140,8 @@ export 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, {

diff --git a/models/bilibili/bilibili.main.task.ts b/models/bilibili/bilibili.main.task.ts
@@ -4,7 +4,7 @@ import { MainProps } from '@/components/dynamic/MainPage';
 import Config from '@/utils/config';
 import { renderPage } from '@/utils/image';
 import { ScreenshotOptions } from '@/utils/puppeteer.render';
-import { BiliGetWebData } from '@/models/bilibili/bilibili.main.get.web.data';
+import { BilibiliWebDataFetcher } from '@/models/bilibili/bilibili.main.get.web.data';
 import { postGateway, readSyncCookie } from '@/models/bilibili/bilibili.mian.models';
 import { BiliQuery } from '@/models/bilibili/bilibili.main.query';
 
@@ -14,16 +14,18 @@ export class BiliTask {
   taskName: string;
   groupKey: string;
   privateKey: string;
+  BilibiliWebDataFetcher: BilibiliWebDataFetcher;
   e?: EventType;
   constructor(e?: EventType) {
     this.taskName = 'biliTask';
     this.groupKey = 'Yz:yuki:bili:upPush:group:';
     this.privateKey = 'Yz:yuki:bili:upPush:private:';
+    this.BilibiliWebDataFetcher = new BilibiliWebDataFetcher();
   }
 
   async hendleEventDynamicData(uid: string | number, count: number = 0): Promise<any> {
     let { cookie } = await readSyncCookie();
-    const resp = await new BiliGetWebData().getBiliDynamicListDataByUid(uid);
+    const resp = await this.BilibiliWebDataFetcher.getBiliDynamicListDataByUid(uid);
     const resjson = await resp.data;
 
     if (!resjson || resjson.code !== 0 || resjson.code === -352) {

diff --git a/models/bilibili/bilibili.mian.models.ts b/models/bilibili/bilibili.mian.models.ts
@@ -173,7 +173,7 @@ export async function checkBiliLogin(e: EventType) {
       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}`
+        `~B站账号已登陆~\n有效期至：${LoginCookieTTLStr}。\n昵称：${uname}\nuid：${mid}\n硬币：${money}\n经验等级：${current_level}\n当前经验值exp：${current_exp}\n下一等级所需exp：${next_exp}`
       );
     } else {
       // 处理其他情况

diff --git a/models/weibo/weibo.main.get.web.data.ts b/models/weibo/weibo.main.get.web.data.ts
@@ -1,22 +1,58 @@
-import axios from 'axios';
+import axios, { AxiosInstance, AxiosRequestConfig } from 'axios';
+import https from 'https';
 import { EventType } from 'yunzaijs';
 import { WeiboApi } from '@/models/weibo/weibo.main.api';
 import { WeiboQuery } from '@/models/weibo/weibo.main.query';
 
 declare const logger: any;
 
-export class WeiboGetWebData {
+class WeiboHttpClient {
+  httpsAgent: https.Agent;
+  client: AxiosInstance;
+
+  constructor() {
+    this.initializeClient();
+  }
+
+  private initializeClient() {
+    this.httpsAgent = new https.Agent({
+      keepAlive: true,
+      maxSockets: 100,
+      timeout: 20000
+    });
+
+    this.client = axios.create({
+      httpsAgent: this.httpsAgent,
+      timeout: 20000
+    });
+  }
+
+  async request(url: string, config?: AxiosRequestConfig) {
+    try {
+      const response = await this.client.request({ url, ...config });
+      return response;
+    } catch (error) {
+      console.error('WeiboHttpClient Request failed:', error);
+      // 重新创建 AxiosInstance
+      this.initializeClient();
+    }
+  }
+}
+
+export class WeiboWebDataFetcher extends WeiboHttpClient {
   e?: EventType;
-  constructor(e?: EventType) {}
+  constructor(e?: EventType) {
+    super();
+  }
 
   /**通过uid获取博主信息 */
   async getBloggerInfo(target: any) {
     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;
@@ -30,9 +66,9 @@ export class WeiboGetWebData {
       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;
@@ -47,8 +83,8 @@ export class WeiboGetWebData {
     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;

diff --git a/models/weibo/weibo.main.task.ts b/models/weibo/weibo.main.task.ts
@@ -4,7 +4,7 @@ import { MainProps } from '@/components/dynamic/MainPage';
 import Config from '@/utils/config';
 import { renderPage } from '@/utils/image';
 import { ScreenshotOptions } from '@/utils/puppeteer.render';
-import { WeiboGetWebData } from '@/models/weibo/weibo.main.get.web.data';
+import { WeiboWebDataFetcher } from '@/models/weibo/weibo.main.get.web.data';
 import { WeiboQuery } from '@/models/weibo/weibo.main.query';
 
 declare const logger: any;
@@ -13,11 +13,13 @@ export class WeiboTask {
   taskName: string;
   groupKey: string;
   privateKey: string;
+  WeiboWebDataFetcher: WeiboWebDataFetcher;
   e?: EventType;
   constructor(e?) {
     this.taskName = 'weiboTask';
     this.groupKey = 'Yz:yuki:weibo:upPush:group:';
     this.privateKey = 'Yz:yuki:weibo:upPush:private:';
+    this.WeiboWebDataFetcher = new WeiboWebDataFetcher(e);
   }
 
   /**
@@ -96,7 +98,7 @@ export class WeiboTask {
             const dynamicData = resp || [];
             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 || [];

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "yuki-plugin",
-  "version": "2.0.6-12",
+  "version": "2.0.6-13",
   "author": "snowtafir",
   "description": "优纪插件，yunzai-V4 关于 微博推送、B站推送 等功能的拓展插件",
   "main": "./index",