dev.....!

src/libs/fetch.js

@@ -1,5 +1,5 @@
 import { isExt, isGm } from "./client";
-import { sendMsg } from "./msg";
+import { sendBgMsg } from "./msg";
 import { taskPool } from "./pool";
 import {
   MSG_FETCH,
@@ -172,7 +172,7 @@ export const fetchData = async (
 export const fetchPolyfill = async (input, { isBg = false, ...opts } = {}) => {
   // 插件
   if (isExt && !isBg) {
-    const res = await sendMsg(MSG_FETCH, { input, opts });
+    const res = await sendBgMsg(MSG_FETCH, { input, opts });
     if (res.error) {
       throw new Error(res.error);
     }
@@ -188,9 +188,9 @@ export const fetchPolyfill = async (input, { isBg = false, ...opts } = {}) => {
  * @param {*} interval
  * @param {*} limit
  */
-export const fetchUpdate = async (interval, limit) => {
+export const updateFetchPool = async (interval, limit) => {
   if (isExt) {
-    const res = await sendMsg(MSG_FETCH_LIMIT, { interval, limit });
+    const res = await sendBgMsg(MSG_FETCH_LIMIT, { interval, limit });
     if (res.error) {
       throw new Error(res.error);
     }
@@ -202,9 +202,9 @@ export const fetchUpdate = async (interval, limit) => {
 /**
  * 清空任务池
  */
-export const fetchClear = async () => {
+export const clearFetchPool = async () => {
   if (isExt) {
-    const res = await sendMsg(MSG_FETCH_CLEAR);
+    const res = await sendBgMsg(MSG_FETCH_CLEAR);
     if (res.error) {
       throw new Error(res.error);
     }

src/libs/index.js

@@ -17,11 +17,11 @@ export const tryClearCaches = async () => {
  * @param {*} q
  * @returns
  */
-export const detectLang = async (q) => {
+export const tryDetectLang = async (q) => {
   try {
     const res = await browser?.i18n?.detectLanguage(q);
     return res?.languages?.[0]?.language;
   } catch (err) {
-    console.log("[detect lang]", err);
+    console.log("[detect lang]", err.message);
   }
 };

src/libs/msg.js

@@ -6,8 +6,8 @@ import { browser } from "./browser";
  * @param {*} args
  * @returns
  */
-export const sendMsg = (action, args) =>
-  browser?.runtime?.sendMessage({ action, args });
+export const sendBgMsg = (action, args) =>
+  browser.runtime.sendMessage({ action, args });
 
 /**
  * 发送消息给当前页面
@@ -16,6 +16,6 @@ export const sendMsg = (action, args) =>
  * @returns
  */
 export const sendTabMsg = async (action, args) => {
-  const tabs = await browser?.tabs.query({ active: true, currentWindow: true });
-  return await browser?.tabs.sendMessage(tabs[0].id, { action, args });
+  const tabs = await browser.tabs.query({ active: true, currentWindow: true });
+  return browser.tabs.sendMessage(tabs[0].id, { action, args });
 };

src/libs/subRules.js

@@ -68,5 +68,5 @@ export const loadOrFetchSubRules = async (url) => {
   if (rules?.length) {
     return rules;
   }
-  return await syncSubRules(url);
+  return syncSubRules(url);
 };

src/libs/sync.js

@@ -117,12 +117,12 @@ export const syncShareRules = async ({ rules, syncUrl, syncKey }) => {
  * 同步个人设置和规则
  * @returns
  */
-export const syncAll = async (isBg = false) => {
+export const syncSettingAndRules = async (isBg = false) => {
   await syncSetting(isBg);
   await syncRules(isBg);
 };
 
-export const trySyncAll = async (isBg = false) => {
+export const trySyncSettingAndRules = async (isBg = false) => {
   await trySyncSetting(isBg);
   await trySyncRules(isBg);
 };

src/libs/translator.js

@@ -10,7 +10,7 @@ import {
   SHADOW_KEY,
 } from "../config";
 import Content from "../views/Content";
-import { fetchUpdate, fetchClear } from "./fetch";
+import { updateFetchPool, clearFetchPool } from "./fetch";
 import { debounce } from "./utils";
 
 /**
@@ -90,7 +90,7 @@ export class Translator {
 
   constructor(rule, setting) {
     const { fetchInterval, fetchLimit } = setting;
-    fetchUpdate(fetchInterval, fetchLimit);
+    updateFetchPool(fetchInterval, fetchLimit);
     this._overrideAttachShadow();
 
     this._setting = setting;
@@ -241,7 +241,7 @@ export class Translator {
     this._tranNodes.clear();
 
     // 清空任务池
-    fetchClear();
+    clearFetchPool();
   };
 
   _reTranslate = debounce(() => {

src/libs/utils.js

@@ -34,7 +34,12 @@ export const matchValue = (arr, val) => {
  * @returns
  */
 export const sleep = (delay) =>
-  new Promise((resolve) => setTimeout(resolve, delay));
+  new Promise((resolve) => {
+    const timer = setTimeout(() => {
+      clearTimeout(timer);
+      resolve();
+    }, delay);
+  });
 
 /**
  * 防抖函数