sync subscribe rules when browser start or userscript run

2023-08-22 16:27:09 +08:00
parent 2224455a7f
commit ca1e1148d6
10 changed files with 193 additions and 108 deletions
--- a/src/libs/fetch.js
+++ b/src/libs/fetch.js
@@ -65,7 +65,7 @@ const newCacheReq = async (request) => {
 * @param {*} param0
 * @returns
 */
-const fetchApi = async ({ input, init, translator, token }) => {
+const fetchApi = async ({ input, init = {}, translator, token }) => {
  if (translator === OPT_TRANS_MICROSOFT) {
    init.headers["Authorization"] = `Bearer ${token}`;
  } else if (translator === OPT_TRANS_OPENAI) {
@@ -103,14 +103,12 @@ export const fetchPool = taskPool(
 /**
 * 请求数据统一接口
 * @param {*} input
- * @param {*} init
 * @param {*} opts
 * @returns
 */
 export const fetchData = async (
  input,
-  init,
-  { useCache, usePool, translator, token } = {}
+  { useCache, usePool, translator, token, ...init } = {}
 ) => {
  const cacheReq = await newCacheReq(new Request(input, init));
  const cache = await caches.open(CACHE_NAME);
@@ -157,22 +155,21 @@ export const fetchData = async (
 /**
 * fetch 兼容性封装
 * @param {*} input
- * @param {*} init
 * @param {*} opts
 * @returns
 */
-export const fetchPolyfill = async (input, init, opts) => {
+export const fetchPolyfill = async (input, { isBg = false, ...opts } = {}) => {
  // 插件
-  if (isExt) {
-    const res = await sendMsg(MSG_FETCH, { input, init, opts });
+  if (isExt && !isBg) {
+    const res = await sendMsg(MSG_FETCH, { input, opts });
    if (res.error) {
      throw new Error(res.error);
    }
    return res.data;
  }

-  // 油猴/网页
-  return await fetchData(input, init, opts);
+  // 油猴/网页/BackgroundPage
+  return await fetchData(input, opts);
 };

 /**
--- a/src/libs/index.js
+++ b/src/libs/index.js
@@ -10,7 +10,7 @@ import {
 } from "../config";
 import { browser } from "./browser";
 import { isMatch } from "./utils";
-import { tryLoadRules } from "./rules";
+import { loadSubRules } from "./rules";

 /**
 * 获取节点列表并转为数组
@@ -63,7 +63,7 @@ export const matchRule = async (
    try {
      const selectedSub = subrulesList.find((item) => item.selected);
      if (selectedSub?.url) {
-        const subRules = await tryLoadRules(selectedSub.url);
+        const subRules = await loadSubRules(selectedSub.url);
        rules.splice(-1, 0, ...subRules);
      }
    } catch (err) {
--- a/src/libs/rules.js
+++ b/src/libs/rules.js
@@ -9,6 +9,7 @@ import {
  OPT_LANGS_FROM,
  OPT_LANGS_TO,
 } from "../config";
+import { syncOpt } from "./sync";

 const fromLangs = OPT_LANGS_FROM.map((item) => item[0]);
 const toLangs = OPT_LANGS_TO.map((item) => item[0]);
@@ -62,11 +63,11 @@ export const checkRules = (rules) => {
 };

 /**
- * 本地rules缓存
+ * 订阅规则的本地缓存
 */
 export const rulesCache = {
-  fetch: async (url) => {
-    const res = await fetchPolyfill(url);
+  fetch: async (url, isBg = false) => {
+    const res = await fetchPolyfill(url, { isBg });
    const rules = checkRules(res).filter(
      (rule) => rule.pattern.replaceAll(GLOBAL_KEY, "") !== ""
    );
@@ -84,16 +85,61 @@ export const rulesCache = {
 };

 /**
- * 从缓存或远程加载订阅的rules
+ * 同步订阅规则
 * @param {*} url
 * @returns
 */
-export const tryLoadRules = async (url) => {
-  let rules = await rulesCache.get(url);
+export const syncSubRules = async (url, isBg = false) => {
+  const rules = await rulesCache.fetch(url, isBg);
+  if (rules.length > 0) {
+    await rulesCache.set(url, rules);
+  }
+  return rules;
+};
+
+/**
+ * 同步所有订阅规则
+ * @param {*} url
+ * @returns
+ */
+export const syncAllSubRules = async (subrulesList, isBg = false) => {
+  for (let subrules of subrulesList) {
+    try {
+      await syncSubRules(subrules.url, isBg);
+    } catch (err) {
+      console.log(`[sync subrule error]: ${subrules.url}`, err);
+    }
+  }
+};
+
+/**
+ * 根据时间同步所有订阅规则
+ * @param {*} url
+ * @returns
+ */
+export const trySyncAllSubRules = async ({ subrulesList }, isBg = false) => {
+  try {
+    const { subRulesSyncAt } = await syncOpt.load();
+    const now = Date.now();
+    const interval = 24 * 60 * 60 * 1000; // 间隔一天
+    if (now - subRulesSyncAt > interval) {
+      await syncAllSubRules(subrulesList, isBg);
+      await syncOpt.update({ subRulesSyncAt: now });
+    }
+  } catch (err) {
+    console.log("[try sync all subrules]", err);
+  }
+};
+
+/**
+ * 从缓存或远程加载订阅规则
+ * @param {*} url
+ * @returns
+ */
+export const loadSubRules = async (url) => {
+  const rules = await rulesCache.get(url);
  if (rules?.length) {
    return rules;
  }
-  rules = await rulesCache.fetch(url);
-  await rulesCache.set(url, rules);
-  return rules;
+  return await syncSubRules(url);
 };
--- a/src/libs/sync.js
+++ b/src/libs/sync.js
@@ -13,69 +13,95 @@ import { getSetting, getRules } from ".";
 import { apiSyncData } from "../apis";
 import { sha256 } from "./utils";

-export const loadSyncOpt = async () =>
-  (await storage.getObj(STOKEY_SYNC)) || DEFAULT_SYNC;
+/**
+ * 同步相关数据
+ */
+export const syncOpt = {
+  load: async () => (await storage.getObj(STOKEY_SYNC)) || DEFAULT_SYNC,
+  update: async (obj) => {
+    await storage.putObj(STOKEY_SYNC, obj);
+  },
+};

-export const syncSetting = async () => {
+/**
+ * 同步设置
+ * @returns
+ */
+export const syncSetting = async (isBg = false) => {
  try {
-    const { syncUrl, syncKey, settingUpdateAt } = await loadSyncOpt();
+    const { syncUrl, syncKey, settingUpdateAt } = await syncOpt.load();
    if (!syncUrl || !syncKey) {
      return;
    }

    const setting = await getSetting();
-    const res = await apiSyncData(syncUrl, syncKey, {
-      key: KV_SETTING_KEY,
-      value: setting,
-      updateAt: settingUpdateAt,
-    });
+    const res = await apiSyncData(
+      syncUrl,
+      syncKey,
+      {
+        key: KV_SETTING_KEY,
+        value: setting,
+        updateAt: settingUpdateAt,
+      },
+      isBg
+    );

    if (res && res.updateAt > settingUpdateAt) {
-      await storage.putObj(STOKEY_SYNC, {
+      await syncOpt.update({
        settingUpdateAt: res.updateAt,
        settingSyncAt: res.updateAt,
      });
      await storage.setObj(STOKEY_SETTING, res.value);
    } else {
-      await storage.putObj(STOKEY_SYNC, {
-        settingSyncAt: res.updateAt,
-      });
+      await syncOpt.update({ settingSyncAt: res.updateAt });
    }
  } catch (err) {
    console.log("[sync setting]", err);
  }
 };

-export const syncRules = async () => {
+/**
+ * 同步规则
+ * @returns
+ */
+export const syncRules = async (isBg = false) => {
  try {
-    const { syncUrl, syncKey, rulesUpdateAt } = await loadSyncOpt();
+    const { syncUrl, syncKey, rulesUpdateAt } = await syncOpt.load();
    if (!syncUrl || !syncKey) {
      return;
    }

    const rules = await getRules();
-    const res = await apiSyncData(syncUrl, syncKey, {
-      key: KV_RULES_KEY,
-      value: rules,
-      updateAt: rulesUpdateAt,
-    });
+    const res = await apiSyncData(
+      syncUrl,
+      syncKey,
+      {
+        key: KV_RULES_KEY,
+        value: rules,
+        updateAt: rulesUpdateAt,
+      },
+      isBg
+    );

    if (res && res.updateAt > rulesUpdateAt) {
-      await storage.putObj(STOKEY_SYNC, {
+      await syncOpt.update({
        rulesUpdateAt: res.updateAt,
        rulesSyncAt: res.updateAt,
      });
      await storage.setObj(STOKEY_RULES, res.value);
    } else {
-      await storage.putObj(STOKEY_SYNC, {
-        rulesSyncAt: res.updateAt,
-      });
+      await syncOpt.update({ rulesSyncAt: res.updateAt });
    }
  } catch (err) {
    console.log("[sync user rules]", err);
  }
 };

+/**
+ * 同步分享规则
+ * @param {*} param0
+ * @returns
+ */
 export const syncShareRules = async ({ rules, syncUrl, syncKey }) => {
  await apiSyncData(syncUrl, syncKey, {
    key: KV_RULES_SHARE_KEY,
@@ -87,7 +113,11 @@ export const syncShareRules = async ({ rules, syncUrl, syncKey }) => {
  return shareUrl;
 };

-export const syncAll = async () => {
-  await syncSetting();
-  await syncRules();
+/**
+ * 同步个人设置和规则
+ * @returns
+ */
+export const syncAll = async (isBg = false) => {
+  await syncSetting(isBg);
+  await syncRules(isBg);
 };