optimize fetchpool

src/libs/auth.js

@@ -1,6 +1,6 @@
 import storage from "./storage";
 import { STOKEY_MSAUTH, URL_MICROSOFT_AUTH } from "../config";
-import { fetchPolyfill } from "./fetch";
+import { fetchData } from "./fetch";
 
 const parseMSToken = (token) => {
   try {
@@ -34,7 +34,7 @@ const _msAuth = () => {
     }
 
     // 缓存没有或失效，查询接口
-    token = await fetchPolyfill(URL_MICROSOFT_AUTH);
+    token = await fetchData(URL_MICROSOFT_AUTH);
     exp = parseMSToken(token);
     await storage.setObj(STOKEY_MSAUTH, { token, exp });
     return [token, exp];

src/libs/fetch.js

@@ -1,11 +1,16 @@
 import { isExt, isGm } from "./browser";
 import { sendMsg } from "./msg";
+import { taskPool } from "./pool";
 import {
   MSG_FETCH,
+  MSG_FETCH_LIMIT,
   CACHE_NAME,
   OPT_TRANS_MICROSOFT,
   OPT_TRANS_OPENAI,
+  DEFAULT_FETCH_INTERVAL,
+  DEFAULT_FETCH_LIMIT,
 } from "../config";
+import { msAuth } from "./auth";
 
 /**
  * 油猴脚本的请求封装
@@ -47,14 +52,7 @@ const fetchGM = async (input, { method = "GET", headers, body } = {}) =>
  * @param {*} request
  * @returns
  */
-const newCacheReq = async (request, translator) => {
-  if (translator === OPT_TRANS_MICROSOFT) {
-    request.headers.delete("Authorization");
-  } else if (translator === OPT_TRANS_OPENAI) {
-    request.headers.delete("Authorization");
-    request.headers.delete("api-key");
-  }
-
+const newCacheReq = async (request) => {
   if (request.method !== "GET") {
     const body = await request.text();
     const cacheUrl = new URL(request.url);
@@ -66,7 +64,42 @@ const newCacheReq = async (request, translator) => {
 };
 
 /**
- * 请求数据
+ * 发起请求
+ * @param {*} param0
+ * @returns
+ */
+const fetchApi = async ({ input, init, useUnsafe, translator, token }) => {
+  if (translator === OPT_TRANS_MICROSOFT) {
+    init.headers["Authorization"] = `Bearer ${token}`;
+  } else if (translator === OPT_TRANS_OPENAI) {
+    init.headers["Authorization"] = `Bearer ${token}`; // // OpenAI
+    init.headers["api-key"] = token; // Azure OpenAI
+  }
+
+  if (isGm && !useUnsafe) {
+    return fetchGM(input, init);
+  }
+  return fetch(input, init);
+};
+
+/**
+ * 请求池实例
+ */
+export const fetchPool = taskPool(
+  fetchApi,
+  async ({ translator }) => {
+    if (translator === OPT_TRANS_MICROSOFT) {
+      const [token] = await msAuth();
+      return { token };
+    }
+    return {};
+  },
+  DEFAULT_FETCH_INTERVAL,
+  DEFAULT_FETCH_LIMIT
+);
+
+/**
+ * 请求数据统一接口
  * @param {*} input
  * @param {*} init
  * @param {*} opts
@@ -75,9 +108,9 @@ const newCacheReq = async (request, translator) => {
 export const fetchData = async (
   input,
   init,
-  { useCache, translator, useUnsafe } = {}
+  { useCache, usePool, translator, useUnsafe, token } = {}
 ) => {
-  const cacheReq = await newCacheReq(new Request(input, init), translator);
+  const cacheReq = await newCacheReq(new Request(input, init));
   const cache = await caches.open(CACHE_NAME);
   let res;
 
@@ -90,25 +123,25 @@ export const fetchData = async (
     }
   }
 
-  // 发送请求
   if (!res) {
-    if (isGm && !useUnsafe) {
-      res = await fetchGM(input, init);
+    // 发送请求
+    if (usePool) {
+      res = await fetchPool.push({ input, init, useUnsafe, translator, token });
     } else {
-      res = await fetch(input, init);
+      res = await fetchApi({ input, init, useUnsafe, translator, token });
     }
-  }
 
-  if (!res?.ok) {
-    throw new Error(`response: ${res.statusText}`);
-  }
+    if (!res?.ok) {
+      throw new Error(`response: ${res.statusText}`);
+    }
 
-  // 插入缓存
-  if (useCache) {
-    try {
-      await cache.put(cacheReq, res.clone());
-    } catch (err) {
-      console.log("[cache put]", err);
+    // 插入缓存
+    if (useCache) {
+      try {
+        await cache.put(cacheReq, res.clone());
+      } catch (err) {
+        console.log("[cache put]", err);
+      }
     }
   }
 
@@ -139,3 +172,19 @@ export const fetchPolyfill = async (input, init, opts) => {
   // 油猴/网页
   return await fetchData(input, init, opts);
 };
+
+/**
+ * 更新 fetch pool 参数
+ * @param {*} interval
+ * @param {*} limit
+ */
+export const fetchUpdate = async (interval, limit) => {
+  if (isExt) {
+    const res = await sendMsg(MSG_FETCH_LIMIT, { interval, limit });
+    if (res.error) {
+      throw new Error(res.error);
+    }
+  } else {
+    fetchPool.update(interval, limit);
+  }
+};

src/libs/pool.js

@@ -1,12 +1,4 @@
-import {
-  DEFAULT_FETCH_INTERVAL,
-  DEFAULT_FETCH_LIMIT,
-  OPT_TRANS_MICROSOFT,
-} from "../config";
-import { apiTranslate } from "../apis";
-import { msAuth } from "./auth";
-
-const _taskPool = (fn, preFn, _interval = 100, _limit = 100) => {
+export const taskPool = (fn, preFn, _interval = 100, _limit = 100) => {
   const pool = [];
   const maxRetry = 2; // 最大重试次数
   let maxCount = _limit; // 最大数量
@@ -14,11 +6,16 @@ const _taskPool = (fn, preFn, _interval = 100, _limit = 100) => {
   let interval = _interval; // 间隔时间
   let timer;
 
+  /**
+   * 任务池
+   * @param {*} item
+   * @param {*} preArgs
+   */
   const handleTask = async (item, preArgs) => {
     curCount++;
     const { args, resolve, reject, retry } = item;
     try {
-      const res = await fn(args, preArgs);
+      const res = await fn({ ...args, ...preArgs });
       resolve(res);
     } catch (err) {
       if (retry < maxRetry) {
@@ -71,16 +68,3 @@ const _taskPool = (fn, preFn, _interval = 100, _limit = 100) => {
     },
   };
 };
-
-export const transPool = _taskPool(
-  apiTranslate,
-  async ({ translator }) => {
-    if (translator === OPT_TRANS_MICROSOFT) {
-      const [token] = await msAuth();
-      return { token };
-    }
-    return {};
-  },
-  DEFAULT_FETCH_INTERVAL,
-  DEFAULT_FETCH_LIMIT
-);