v1.5.4

add rules filter when add rule
2023-08-22 17:52:12 +08:00 · 2023-08-22 17:51:40 +08:00 · 2023-08-22 17:46:57 +08:00 · 2023-08-22 17:37:42 +08:00 · 2023-08-22 16:27:09 +08:00 · 2023-08-22 10:35:57 +08:00
26 changed files with 1033 additions and 230 deletions
--- a/.env
+++ b/.env
@@ -2,11 +2,12 @@ GENERATE_SOURCEMAP=false

 REACT_APP_NAME=KISS Translator
 REACT_APP_NAME_CN=简约翻译
-REACT_APP_VERSION=1.4.6
+REACT_APP_VERSION=1.5.4
 REACT_APP_HOMEPAGE=https://github.com/fishjar/kiss-translator
 REACT_APP_OPTIONSPAGE=https://kiss-translator.rayjar.com/options
 REACT_APP_OPTIONSPAGE2=https://fishjar.github.io/kiss-translator/options.html
 REACT_APP_OPTIONSPAGE_DEV=http://localhost:3000/options.html
 REACT_APP_LOGOURL=https://kiss-translator.rayjar.com/images/logo192.png
+REACT_APP_RULESURL=https://kiss-translator.rayjar.com/kiss-translator-rules.json
 REACT_APP_USERSCRIPT_DOWNLOADURL=https://kiss-translator.rayjar.com/kiss-translator.user.js
 REACT_APP_USERSCRIPT_DOWNLOADURL2=https://fishjar.github.io/kiss-translator/kiss-translator.user.js
--- a/config-overrides.js
+++ b/config-overrides.js
@@ -84,9 +84,11 @@ const userscriptWebpack = (config, env) => {
 // @downloadURL   ${process.env.REACT_APP_USERSCRIPT_DOWNLOADURL}
 // @updateURL     ${process.env.REACT_APP_USERSCRIPT_DOWNLOADURL}
 // @grant         GM.xmlHttpRequest
+// @grant         GM.registerMenuCommand
 // @grant         GM.setValue
 // @grant         GM.getValue
 // @grant         GM.deleteValue
+// @grant         GM.info
 // @grant         unsafeWindow
 // @connect       translate.googleapis.com
 // @connect       api-edge.cognitive.microsofttranslator.com
@@ -94,6 +96,10 @@ const userscriptWebpack = (config, env) => {
 // @connect       api.openai.com
 // @connect       openai.azure.com
 // @connect       workers.dev
+// @connect       github.io
+// @connect       githubusercontent.com
+// @connect       kiss-translator.rayjar.com
+// @connect       ghproxy.com
 // @run-at        document-end
 // ==/UserScript==

--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "name": "kiss-translator",
  "description": "A minimalist bilingual translation Extension & Greasemonkey Script",
-  "version": "1.4.6",
+  "version": "1.5.4",
  "author": "Gabe<yugang2002@gmail.com>",
  "private": true,
  "dependencies": {
--- a/public/_locales/en/messages.json
+++ b/public/_locales/en/messages.json
@@ -4,5 +4,11 @@
  },
  "app_description": {
    "message": "A minimalist bilingual translation Extension & Greasemonkey Script"
+  },
+  "toggle_translate": {
+    "message": "Toggle Translate"
+  },
+  "toggle_style": {
+    "message": "Toggle Style"
  }
 }
--- a/public/_locales/zh_CN/messages.json
+++ b/public/_locales/zh_CN/messages.json
@@ -4,5 +4,11 @@
  },
  "app_description": {
    "message": "一个简约的双语网页翻译扩展 & 油猴脚本"
+  },
+  "toggle_translate": {
+    "message": "切换翻译"
+  },
+  "toggle_style": {
+    "message": "切换样式"
  }
 }
--- a/public/manifest.firefox.json
+++ b/public/manifest.firefox.json
@@ -2,7 +2,7 @@
  "manifest_version": 2,
  "name": "__MSG_app_name__",
  "description": "__MSG_app_description__",
-  "version": "1.4.6",
+  "version": "1.5.4",
  "default_locale": "en",
  "author": "Gabe<yugang2002@gmail.com>",
  "homepage_url": "https://github.com/fishjar/kiss-translator",
@@ -15,6 +15,20 @@
      "matches": ["<all_urls>"]
    }
  ],
+  "commands": {
+    "toggleTranslate": {
+      "suggested_key": {
+        "default": "Alt+Q"
+      },
+      "description": "__MSG_toggle_translate__"
+    },
+    "toggleStyle": {
+      "suggested_key": {
+        "default": "Alt+C"
+      },
+      "description": "__MSG_toggle_style__"
+    }
+  },
  "permissions": ["<all_urls>", "storage"],
  "icons": {
    "16": "images/logo16.png",
--- a/public/manifest.json
+++ b/public/manifest.json
@@ -2,7 +2,7 @@
  "manifest_version": 3,
  "name": "__MSG_app_name__",
  "description": "__MSG_app_description__",
-  "version": "1.4.6",
+  "version": "1.5.4",
  "default_locale": "en",
  "author": "Gabe<yugang2002@gmail.com>",
  "homepage_url": "https://github.com/fishjar/kiss-translator",
@@ -16,6 +16,20 @@
      "matches": ["<all_urls>"]
    }
  ],
+  "commands": {
+    "toggleTranslate": {
+      "suggested_key": {
+        "default": "Alt+Q"
+      },
+      "description": "__MSG_toggle_translate__"
+    },
+    "toggleStyle": {
+      "suggested_key": {
+        "default": "Alt+C"
+      },
+      "description": "__MSG_toggle_style__"
+    }
+  },
  "permissions": ["storage"],
  "host_permissions": ["<all_urls>"],
  "icons": {
--- a/src/apis/index.js
+++ b/src/apis/index.js
@@ -8,9 +8,10 @@ import {
  OPT_LANGS_SPECIAL,
  PROMPT_PLACE_FROM,
  PROMPT_PLACE_TO,
-  KV_HEADER_KEY,
+  KV_SALT_SYNC,
 } from "../config";
 import { getSetting, detectLang } from "../libs";
+import { sha256 } from "../libs/utils";

 /**
 * 同步数据
@@ -19,19 +20,16 @@ import { getSetting, detectLang } from "../libs";
 * @param {*} data
 * @returns
 */
-export const apiSyncData = async (url, key, data) =>
-  fetchPolyfill(
-    url,
-    {
-      headers: {
-        "Content-type": "application/json",
-        [KV_HEADER_KEY]: key,
-      },
-      method: "POST",
-      body: JSON.stringify(data),
+export const apiSyncData = async (url, key, data, isBg = false) =>
+  fetchPolyfill(url, {
+    headers: {
+      "Content-type": "application/json",
+      Authorization: `Bearer ${await sha256(key, KV_SALT_SYNC)}`,
    },
-    { useUnsafe: true }
-  );
+    method: "POST",
+    body: JSON.stringify(data),
+    isBg,
+  });

 /**
 * 谷歌翻译
@@ -52,15 +50,14 @@ const apiGoogleTranslate = async (translator, text, to, from) => {
  };
  const { googleUrl } = await getSetting();
  const input = `${googleUrl}?${queryString.stringify(params)}`;
-  return fetchPolyfill(
-    input,
-    {
-      headers: {
-        "Content-type": "application/json",
-      },
+  return fetchPolyfill(input, {
+    headers: {
+      "Content-type": "application/json",
    },
-    { useCache: true, usePool: true, translator }
-  );
+    useCache: true,
+    usePool: true,
+    translator,
+  });
 };

 /**
@@ -77,17 +74,16 @@ const apiMicrosoftTranslate = (translator, text, to, from) => {
    "api-version": "3.0",
  };
  const input = `${URL_MICROSOFT_TRANS}?${queryString.stringify(params)}`;
-  return fetchPolyfill(
-    input,
-    {
-      headers: {
-        "Content-type": "application/json",
-      },
-      method: "POST",
-      body: JSON.stringify([{ Text: text }]),
+  return fetchPolyfill(input, {
+    headers: {
+      "Content-type": "application/json",
    },
-    { useCache: true, usePool: true, translator }
-  );
+    method: "POST",
+    body: JSON.stringify([{ Text: text }]),
+    useCache: true,
+    usePool: true,
+    translator,
+  });
 };

 /**
@@ -103,31 +99,31 @@ const apiOpenaiTranslate = async (translator, text, to, from) => {
  let prompt = openaiPrompt
    .replaceAll(PROMPT_PLACE_FROM, from)
    .replaceAll(PROMPT_PLACE_TO, to);
-  return fetchPolyfill(
-    openaiUrl,
-    {
-      headers: {
-        "Content-type": "application/json",
-      },
-      method: "POST",
-      body: JSON.stringify({
-        model: openaiModel,
-        messages: [
-          {
-            role: "system",
-            content: prompt,
-          },
-          {
-            role: "user",
-            content: text,
-          },
-        ],
-        temperature: 0,
-        max_tokens: 256,
-      }),
+  return fetchPolyfill(openaiUrl, {
+    headers: {
+      "Content-type": "application/json",
    },
-    { useCache: true, usePool: true, translator, token: openaiKey }
-  );
+    method: "POST",
+    body: JSON.stringify({
+      model: openaiModel,
+      messages: [
+        {
+          role: "system",
+          content: prompt,
+        },
+        {
+          role: "user",
+          content: text,
+        },
+      ],
+      temperature: 0,
+      max_tokens: 256,
+    }),
+    useCache: true,
+    usePool: true,
+    translator,
+    token: openaiKey,
+  });
 };

 /**
--- a/src/background.js
+++ b/src/background.js
@@ -3,6 +3,10 @@ import {
  MSG_FETCH,
  MSG_FETCH_LIMIT,
  MSG_FETCH_CLEAR,
+  MSG_TRANS_TOGGLE,
+  MSG_TRANS_TOGGLE_STYLE,
+  CMD_TOGGLE_TRANSLATE,
+  CMD_TOGGLE_STYLE,
  DEFAULT_SETTING,
  DEFAULT_RULES,
  DEFAULT_SYNC,
@@ -10,11 +14,15 @@ import {
  STOKEY_RULES,
  STOKEY_SYNC,
  CACHE_NAME,
+  STOKEY_RULESCACHE_PREFIX,
+  BUILTIN_RULES,
 } from "./config";
 import storage from "./libs/storage";
 import { getSetting } from "./libs";
 import { syncAll } from "./libs/sync";
 import { fetchData, fetchPool } from "./libs/fetch";
+import { sendTabMsg } from "./libs/msg";
+import { trySyncAllSubRules } from "./libs/rules";

 /**
 * 插件安装
@@ -24,6 +32,10 @@ browser.runtime.onInstalled.addListener(() => {
  storage.trySetObj(STOKEY_SETTING, DEFAULT_SETTING);
  storage.trySetObj(STOKEY_RULES, DEFAULT_RULES);
  storage.trySetObj(STOKEY_SYNC, DEFAULT_SYNC);
+  storage.trySetObj(
+    `${STOKEY_RULESCACHE_PREFIX}${process.env.REACT_APP_RULESURL}`,
+    BUILTIN_RULES
+  );
 });

 /**
@@ -33,13 +45,16 @@ browser.runtime.onStartup.addListener(async () => {
  console.log("browser onStartup");

  // 同步数据
-  await syncAll();
+  await syncAll(true);

  // 清除缓存
-  const { clearCache } = await getSetting();
-  if (clearCache) {
+  const setting = await getSetting();
+  if (setting.clearCache) {
    caches.delete(CACHE_NAME);
  }
+
+  // 同步订阅规则
+  trySyncAllSubRules(setting, true);
 });

 /**
@@ -49,8 +64,8 @@ browser.runtime.onMessage.addListener(
  ({ action, args }, sender, sendResponse) => {
    switch (action) {
      case MSG_FETCH:
-        const { input, init, opts } = args;
-        fetchData(input, init, opts)
+        const { input, opts } = args;
+        fetchData(input, opts)
          .then((data) => {
            sendResponse({ data });
          })
@@ -73,3 +88,19 @@ browser.runtime.onMessage.addListener(
    return true;
  }
 );
+
+/**
+ * 监听快捷键
+ */
+browser.commands.onCommand.addListener((command) => {
+  // console.log(`Command: ${command}`);
+  switch (command) {
+    case CMD_TOGGLE_TRANSLATE:
+      sendTabMsg(MSG_TRANS_TOGGLE);
+      break;
+    case CMD_TOGGLE_STYLE:
+      sendTabMsg(MSG_TRANS_TOGGLE_STYLE);
+      break;
+    default:
+  }
+});
--- a/src/config/i18n.js
+++ b/src/config/i18n.js
@@ -105,8 +105,28 @@ export const I18N = {
    en: `Add`,
  },
  inject_rules: {
-    zh: `注入内置规则`,
-    en: `Inject Built-in Rules`,
+    zh: `注入订阅规则`,
+    en: `Inject Subscribe Rules`,
+  },
+  personal_rules: {
+    zh: `个人规则`,
+    en: `Personal Rules`,
+  },
+  subscribe_rules: {
+    zh: `订阅规则`,
+    en: `Subscribe Rules`,
+  },
+  subscribe_url: {
+    zh: `订阅地址`,
+    en: `Subscribe URL`,
+  },
+  rules_warn_1: {
+    zh: `1、“个人规则”一直生效，选择“注入订阅规则”后，“订阅规则”才会生效。`,
+    en: `1. The "Personal Rules" are always in effect. After selecting "Inject Subscription Rules", the "Subscription Rules" will take effect.`,
+  },
+  rules_warn_2: {
+    zh: `2、“订阅规则”的注入位置是倒数第二的位置，因此除全局规则(*)外，“个人规则”优先级比“订阅规则”高，“个人规则”填写同样的网址会覆盖”订阅规则“的条目。`,
+    en: `2. The injection position of "Subscription Rules" is the penultimate position. Therefore, except for the global rules (*), the priority of "Personal Rules" is higher than that of "Subscription Rules". Filling in the same url in "Personal Rules" will overwrite "Subscription Rules" entry.`,
  },
  sync_warn: {
    zh: `如果服务器存在其他客户端同步的数据，第一次同步将直接覆盖本地配置，后面则根据修改时间，新的覆盖旧的。`,
@@ -196,6 +216,10 @@ export const I18N = {
    zh: `错误的文件类型`,
    en: `Wrong file type`,
  },
+  error_fetch_url: {
+    zh: `请检查url地址是否正确或稍后再试。`,
+    en: `Please check if the url address is correct or try again later.`,
+  },
  openai_api: {
    zh: `OpenAI 接口`,
    en: `OpenAI API`,
@@ -232,4 +256,12 @@ export const I18N = {
    zh: `数据同步密钥`,
    en: `Data Sync Key`,
  },
+  error_got_some_wrong: {
+    zh: "抱歉，出错了！",
+    en: "Sorry, something went wrong!",
+  },
+  error_sync_setting: {
+    zh: "您的同步设置未填写，无法在线分享。",
+    en: "Your sync settings are missing and cannot be shared online.",
+  },
 };
--- a/src/config/index.js
+++ b/src/config/index.js
@@ -16,6 +16,10 @@ export const STOKEY_SETTING = `${APP_NAME}_setting`;
 export const STOKEY_RULES = `${APP_NAME}_rules`;
 export const STOKEY_SYNC = `${APP_NAME}_sync`;
 export const STOKEY_FAB = `${APP_NAME}_fab`;
+export const STOKEY_RULESCACHE_PREFIX = `${APP_NAME}_rulescache_`;
+
+export const CMD_TOGGLE_TRANSLATE = "toggleTranslate";
+export const CMD_TOGGLE_STYLE = "toggleStyle";

 export const CLIENT_WEB = "web";
 export const CLIENT_CHROME = "chrome";
@@ -24,9 +28,11 @@ export const CLIENT_FIREFOX = "firefox";
 export const CLIENT_USERSCRIPT = "userscript";
 export const CLIENT_EXTS = [CLIENT_CHROME, CLIENT_EDGE, CLIENT_FIREFOX];

-export const KV_HEADER_KEY = "X-KISS-PSK";
 export const KV_RULES_KEY = "KT_RULES";
+export const KV_RULES_SHARE_KEY = "KT_RULES_SHARE";
 export const KV_SETTING_KEY = "KT_SETTING";
+export const KV_SALT_SYNC = "KISS-Translator-SYNC";
+export const KV_SALT_SHARE = "KISS-Translator-SHARE";

 export const CACHE_NAME = `${APP_NAME}_cache`;

@@ -34,6 +40,7 @@ export const MSG_FETCH = "fetch";
 export const MSG_FETCH_LIMIT = "fetch_limit";
 export const MSG_FETCH_CLEAR = "fetch_clear";
 export const MSG_TRANS_TOGGLE = "trans_toggle";
+export const MSG_TRANS_TOGGLE_STYLE = "trans_toggle_style";
 export const MSG_TRANS_GETRULE = "trans_getrule";
 export const MSG_TRANS_PUTRULE = "trans_putrule";
 export const MSG_TRANS_CURRULE = "trans_currule";
@@ -147,13 +154,25 @@ export const GLOBLA_RULE = {
  bgColor: "",
 };

+// 订阅列表
+export const DEFAULT_SUBRULES_LIST = [
+  {
+    url: process.env.REACT_APP_RULESURL,
+    selected: true,
+  },
+  {
+    url: "https://fishjar.github.io/kiss-translator/kiss-translator-rules.json",
+  },
+];
+
 export const DEFAULT_SETTING = {
  darkMode: false, // 深色模式
  uiLang: "en", // 界面语言
  fetchLimit: DEFAULT_FETCH_LIMIT, // 最大任务数量
  fetchInterval: DEFAULT_FETCH_INTERVAL, // 任务间隔时间
  clearCache: false, // 是否在浏览器下次启动时清除缓存
-  injectRules: true, // 是否注入内置规则
+  injectRules: true, // 是否注入订阅规则
+  subrulesList: DEFAULT_SUBRULES_LIST, // 订阅列表
  googleUrl: "https://translate.googleapis.com/translate_a/single", // 谷歌翻译接口
  openaiUrl: "https://api.openai.com/v1/chat/completions",
  openaiKey: "",
@@ -173,4 +192,5 @@ export const DEFAULT_SYNC = {
  settingSyncAt: 0,
  rulesUpdateAt: 0,
  rulesSyncAt: 0,
+  subRulesSyncAt: 0, // 订阅规则同步时间
 };
--- a/src/content.js
+++ b/src/content.js
@@ -1,6 +1,7 @@
 import { browser } from "./libs/browser";
 import {
  MSG_TRANS_TOGGLE,
+  MSG_TRANS_TOGGLE_STYLE,
  MSG_TRANS_GETRULE,
  MSG_TRANS_PUTRULE,
 } from "./config";
@@ -13,7 +14,7 @@ import { Translator } from "./libs/translator";
 (async () => {
  const setting = await getSetting();
  const rules = await getRules();
-  const rule = matchRule(rules, document.location.href, setting);
+  const rule = await matchRule(rules, document.location.href, setting);
  const translator = new Translator(rule, setting);

  // 监听消息
@@ -22,6 +23,9 @@ import { Translator } from "./libs/translator";
      case MSG_TRANS_TOGGLE:
        translator.toggle();
        break;
+      case MSG_TRANS_TOGGLE_STYLE:
+        translator.toggleStyle();
+        break;
      case MSG_TRANS_GETRULE:
        break;
      case MSG_TRANS_PUTRULE:
--- a/src/hooks/Alert.js
+++ b/src/hooks/Alert.js
@@ -0,0 +1,60 @@
+import { createContext, useContext, useState, forwardRef } from "react";
+import Snackbar from "@mui/material/Snackbar";
+import MuiAlert from "@mui/material/Alert";
+
+const Alert = forwardRef(function Alert(props, ref) {
+  return <MuiAlert elevation={6} ref={ref} variant="filled" {...props} />;
+});
+
+const AlertContext = createContext(null);
+
+/**
+ * 左下角提示，注入context后，方便全局调用
+ * @param {*} param0
+ * @returns
+ */
+export function AlertProvider({ children }) {
+  const vertical = "top";
+  const horizontal = "center";
+  const [open, setOpen] = useState(false);
+  const [severity, setSeverity] = useState("info");
+  const [message, setMessage] = useState("");
+
+  const error = (msg) => showAlert(msg, "error");
+  const warning = (msg) => showAlert(msg, "warning");
+  const info = (msg) => showAlert(msg, "info");
+  const success = (msg) => showAlert(msg, "success");
+
+  const showAlert = (msg, type) => {
+    setOpen(true);
+    setMessage(msg);
+    setSeverity(type);
+  };
+
+  const handleClose = (_, reason) => {
+    if (reason === "clickaway") {
+      return;
+    }
+    setOpen(false);
+  };
+
+  return (
+    <AlertContext.Provider value={{ error, warning, info, success }}>
+      {children}
+      <Snackbar
+        open={open}
+        autoHideDuration={3000}
+        onClose={handleClose}
+        anchorOrigin={{ vertical, horizontal }}
+      >
+        <Alert onClose={handleClose} severity={severity} sx={{ width: "100%" }}>
+          {message}
+        </Alert>
+      </Snackbar>
+    </AlertContext.Provider>
+  );
+}
+
+export function useAlert() {
+  return useContext(AlertContext);
+}
--- a/src/hooks/Rules.js
+++ b/src/hooks/Rules.js
@@ -1,16 +1,10 @@
-import {
-  STOKEY_RULES,
-  OPT_TRANS_ALL,
-  OPT_STYLE_ALL,
-  OPT_LANGS_FROM,
-  OPT_LANGS_TO,
-  GLOBAL_KEY,
-} from "../config";
+import { STOKEY_RULES, DEFAULT_SUBRULES_LIST } from "../config";
 import storage from "../libs/storage";
 import { useStorages } from "./Storage";
-import { matchValue } from "../libs/utils";
 import { syncRules } from "../libs/sync";
 import { useSync } from "./Sync";
+import { useSetting, useSettingUpdate } from "./Setting";
+import { checkRules } from "../libs/rules";

 /**
 * 匹配规则增删改查 hook
@@ -61,43 +55,53 @@ export function useRules() {

  const merge = async (newRules) => {
    const rules = [...list];
-    const fromLangs = OPT_LANGS_FROM.map((item) => item[0]);
-    const toLangs = OPT_LANGS_TO.map((item) => item[0]);
-    newRules
-      .filter(({ pattern }) => pattern && typeof pattern === "string")
-      .map(
-        ({
-          pattern,
-          selector,
-          translator,
-          fromLang,
-          toLang,
-          textStyle,
-          transOpen,
-          bgColor,
-        }) => ({
-          pattern,
-          selector: typeof selector === "string" ? selector : "",
-          bgColor: typeof bgColor === "string" ? bgColor : "",
-          translator: matchValue([GLOBAL_KEY, ...OPT_TRANS_ALL], translator),
-          fromLang: matchValue([GLOBAL_KEY, ...fromLangs], fromLang),
-          toLang: matchValue([GLOBAL_KEY, ...toLangs], toLang),
-          textStyle: matchValue([GLOBAL_KEY, ...OPT_STYLE_ALL], textStyle),
-          transOpen: matchValue([GLOBAL_KEY, "true", "false"], transOpen),
-        })
-      )
-      .forEach((newRule) => {
-        const rule = rules.find(
-          (oldRule) => oldRule.pattern === newRule.pattern
-        );
-        if (rule) {
-          Object.assign(rule, newRule);
-        } else {
-          rules.unshift(newRule);
-        }
-      });
+    newRules = checkRules(newRules);
+    newRules.forEach((newRule) => {
+      const rule = rules.find((oldRule) => oldRule.pattern === newRule.pattern);
+      if (rule) {
+        Object.assign(rule, newRule);
+      } else {
+        rules.unshift(newRule);
+      }
+    });
    await update(rules);
  };

  return { list, add, del, put, merge };
 }
+
+/**
+ * 订阅规则
+ * @returns
+ */
+export function useSubrules() {
+  const setting = useSetting();
+  const updateSetting = useSettingUpdate();
+  const list = setting?.subrulesList || DEFAULT_SUBRULES_LIST;
+
+  const select = async (url) => {
+    const subrulesList = [...list];
+    subrulesList.forEach((item) => {
+      if (item.url === url) {
+        item.selected = true;
+      } else {
+        item.selected = false;
+      }
+    });
+    await updateSetting({ subrulesList });
+  };
+
+  const add = async (url) => {
+    const subrulesList = [...list];
+    subrulesList.push({ url });
+    await updateSetting({ subrulesList });
+  };
+
+  const del = async (url) => {
+    let subrulesList = [...list];
+    subrulesList = subrulesList.filter((item) => item.url !== url);
+    await updateSetting({ subrulesList });
+  };
+
+  return { list, select, add, del };
+}
--- 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, useUnsafe, 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) {
@@ -73,8 +73,13 @@ const fetchApi = async ({ input, init, useUnsafe, translator, token }) => {
    init.headers["api-key"] = token; // Azure OpenAI
  }

-  if (isGm && !useUnsafe) {
-    return fetchGM(input, init);
+  if (isGm) {
+    const connects = GM?.info?.script?.connects || [];
+    const url = new URL(input);
+    const isSafe = connects.find((item) => url.hostname.endsWith(item));
+    if (isSafe) {
+      return fetchGM(input, init);
+    }
  }
  return fetch(input, init);
 };
@@ -98,14 +103,12 @@ export const fetchPool = taskPool(
 /**
 * 请求数据统一接口
 * @param {*} input
- * @param {*} init
 * @param {*} opts
 * @returns
 */
 export const fetchData = async (
  input,
-  init,
-  { useCache, usePool, translator, useUnsafe, token } = {}
+  { useCache, usePool, translator, token, ...init } = {}
 ) => {
  const cacheReq = await newCacheReq(new Request(input, init));
  const cache = await caches.open(CACHE_NAME);
@@ -123,9 +126,9 @@ export const fetchData = async (
  if (!res) {
    // 发送请求
    if (usePool) {
-      res = await fetchPool.push({ input, init, useUnsafe, translator, token });
+      res = await fetchPool.push({ input, init, translator, token });
    } else {
-      res = await fetchApi({ input, init, useUnsafe, translator, token });
+      res = await fetchApi({ input, init, translator, token });
    }

    if (!res?.ok) {
@@ -152,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
@@ -6,10 +6,11 @@ import {
  STOKEY_FAB,
  GLOBLA_RULE,
  GLOBAL_KEY,
-  BUILTIN_RULES,
+  DEFAULT_SUBRULES_LIST,
 } from "../config";
 import { browser } from "./browser";
 import { isMatch } from "./utils";
+import { loadSubRules } from "./rules";

 /**
 * 获取节点列表并转为数组
@@ -53,18 +54,31 @@ export const setFab = async (obj) => await storage.setObj(STOKEY_FAB, obj);
 * @param {string} href
 * @returns
 */
-export const matchRule = (rules, href, { injectRules }) => {
+export const matchRule = async (
+  rules,
+  href,
+  { injectRules = true, subrulesList = DEFAULT_SUBRULES_LIST }
+) => {
+  rules = [...rules];
  if (injectRules) {
-    rules.splice(-1, 0, ...BUILTIN_RULES);
+    try {
+      const selectedSub = subrulesList.find((item) => item.selected);
+      if (selectedSub?.url) {
+        const subRules = await loadSubRules(selectedSub.url);
+        rules.splice(-1, 0, ...subRules);
+      }
+    } catch (err) {
+      console.log("[load injectRules]", err);
+    }
  }

-  const rule = rules.find((rule) =>
-    rule.pattern.split(",").some((p) => isMatch(href, p.trim()))
+  const rule = rules.find((r) =>
+    r.pattern.split(",").some((p) => isMatch(href, p.trim()))
  );
+
  const globalRule =
-    rules.find((rule) =>
-      rule.pattern.split(",").some((p) => p.trim() === "*")
-    ) || GLOBLA_RULE;
+    rules.find((r) => r.pattern.split(",").some((p) => p.trim() === "*")) ||
+    GLOBLA_RULE;

  if (!rule) {
    return globalRule;
--- a/src/libs/pool.js
+++ b/src/libs/pool.js
@@ -1,3 +1,11 @@
+/**
+ * 任务池
+ * @param {*} fn
+ * @param {*} preFn
+ * @param {*} _interval
+ * @param {*} _limit
+ * @returns
+ */
 export const taskPool = (fn, preFn, _interval = 100, _limit = 100) => {
  const pool = [];
  const maxRetry = 2; // 最大重试次数
@@ -6,11 +14,6 @@ export const taskPool = (fn, preFn, _interval = 100, _limit = 100) => {
  let interval = _interval; // 间隔时间
  let timer = null;

-  /**
-   * 任务池
-   * @param {*} item
-   * @param {*} preArgs
-   */
  const handleTask = async (item, preArgs) => {
    curCount++;
    const { args, resolve, reject, retry } = item;
--- a/src/libs/rules.js
+++ b/src/libs/rules.js
@@ -0,0 +1,145 @@
+import storage from "./storage";
+import { fetchPolyfill } from "./fetch";
+import { matchValue, type } from "./utils";
+import {
+  STOKEY_RULESCACHE_PREFIX,
+  GLOBAL_KEY,
+  OPT_TRANS_ALL,
+  OPT_STYLE_ALL,
+  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]);
+
+/**
+ * 检查过滤rules
+ * @param {*} rules
+ * @returns
+ */
+export const checkRules = (rules) => {
+  if (type(rules) === "string") {
+    rules = JSON.parse(rules);
+  }
+  if (type(rules) !== "array") {
+    throw new Error("data error");
+  }
+
+  const patternSet = new Set();
+  rules = rules
+    .filter((rule) => type(rule) === "object")
+    .filter(({ pattern }) => {
+      if (type(pattern) !== "string" || patternSet.has(pattern.trim())) {
+        return false;
+      }
+      patternSet.add(pattern.trim());
+      return true;
+    })
+    .map(
+      ({
+        pattern,
+        selector,
+        translator,
+        fromLang,
+        toLang,
+        textStyle,
+        transOpen,
+        bgColor,
+      }) => ({
+        pattern: pattern.trim(),
+        selector: type(selector) === "string" ? selector : "",
+        bgColor: type(bgColor) === "string" ? bgColor : "",
+        translator: matchValue([GLOBAL_KEY, ...OPT_TRANS_ALL], translator),
+        fromLang: matchValue([GLOBAL_KEY, ...fromLangs], fromLang),
+        toLang: matchValue([GLOBAL_KEY, ...toLangs], toLang),
+        textStyle: matchValue([GLOBAL_KEY, ...OPT_STYLE_ALL], textStyle),
+        transOpen: matchValue([GLOBAL_KEY, "true", "false"], transOpen),
+      })
+    );
+
+  return rules;
+};
+
+/**
+ * 订阅规则的本地缓存
+ */
+export const rulesCache = {
+  fetch: async (url, isBg = false) => {
+    const res = await fetchPolyfill(url, { isBg });
+    const rules = checkRules(res).filter(
+      (rule) => rule.pattern.replaceAll(GLOBAL_KEY, "") !== ""
+    );
+    return rules;
+  },
+  set: async (url, rules) => {
+    await storage.setObj(`${STOKEY_RULESCACHE_PREFIX}${url}`, rules);
+  },
+  get: async (url) => {
+    return await storage.getObj(`${STOKEY_RULESCACHE_PREFIX}${url}`);
+  },
+  del: async (url) => {
+    await storage.del(`${STOKEY_RULESCACHE_PREFIX}${url}`);
+  },
+};
+
+/**
+ * 同步订阅规则
+ * @param {*} url
+ * @returns
+ */
+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;
+  }
+  return await syncSubRules(url);
+};
--- a/src/libs/sync.js
+++ b/src/libs/sync.js
@@ -3,76 +3,121 @@ import {
  DEFAULT_SYNC,
  KV_SETTING_KEY,
  KV_RULES_KEY,
+  KV_RULES_SHARE_KEY,
  STOKEY_SETTING,
  STOKEY_RULES,
+  KV_SALT_SHARE,
 } from "../config";
 import storage from "../libs/storage";
 import { getSetting, getRules } from ".";
 import { apiSyncData } from "../apis";
+import { sha256 } from "./utils";

-const loadOpt = 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 loadOpt();
+    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 loadOpt();
+    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 rules]", err);
+    console.log("[sync user rules]", err);
  }
 };

-export const syncAll = async () => {
-  await syncSetting();
-  await syncRules();
+/**
+ * 同步分享规则
+ * @param {*} param0
+ * @returns
+ */
+export const syncShareRules = async ({ rules, syncUrl, syncKey }) => {
+  await apiSyncData(syncUrl, syncKey, {
+    key: KV_RULES_SHARE_KEY,
+    value: rules,
+    updateAt: Date.now(),
+  });
+  const psk = await sha256(syncKey, KV_SALT_SHARE);
+  const shareUrl = `${syncUrl}?psk=${psk}`;
+  return shareUrl;
+};
+
+/**
+ * 同步个人设置和规则
+ * @returns
+ */
+export const syncAll = async (isBg = false) => {
+  await syncSetting(isBg);
+  await syncRules(isBg);
 };
--- a/src/libs/translator.js
+++ b/src/libs/translator.js
@@ -5,6 +5,8 @@ import {
  TRANS_MAX_LENGTH,
  EVENT_KISS,
  MSG_TRANS_CURRULE,
+  OPT_STYLE_DASHLINE,
+  OPT_STYLE_FUZZY,
 } from "../config";
 import { queryEls } from ".";
 import Content from "../views/Content";
@@ -86,6 +88,14 @@ export class Translator {
    }
  };

+  toggleStyle = () => {
+    const textStyle =
+      this.rule.textStyle === OPT_STYLE_FUZZY
+        ? OPT_STYLE_DASHLINE
+        : OPT_STYLE_FUZZY;
+    this.rule = { ...this.rule, textStyle };
+  };
+
  _register = () => {
    // 监听节点变化
    this._mutaObserver.observe(document, {
--- a/src/libs/utils.js
+++ b/src/libs/utils.js
@@ -88,3 +88,26 @@ export const isMatch = (s, p) => {

  return p.slice(pIndex).replaceAll("*", "") === "";
 };
+
+/**
+ * 类型检查
+ * @param {*} o
+ * @returns
+ */
+export const type = (o) => {
+  const s = Object.prototype.toString.call(o);
+  return s.match(/\[object (.*?)\]/)[1].toLowerCase();
+};
+
+/**
+ * sha256
+ * @param {*} text
+ * @returns
+ */
+export const sha256 = async (text, salt) => {
+  const data = new TextEncoder().encode(text + salt);
+  const digest = await crypto.subtle.digest({ name: "SHA-256" }, data);
+  return [...new Uint8Array(digest)]
+    .map((b) => b.toString(16).padStart(2, "0"))
+    .join("");
+};
--- a/src/userscript.js
+++ b/src/userscript.js
@@ -5,6 +5,7 @@ import createCache from "@emotion/cache";
 import { CacheProvider } from "@emotion/react";
 import { getSetting, getRules, matchRule, getFab } from "./libs";
 import { Translator } from "./libs/translator";
+import { trySyncAllSubRules } from "./libs/rules";

 /**
 * 入口函数
@@ -29,7 +30,7 @@ import { Translator } from "./libs/translator";
  // 翻译页面
  const setting = await getSetting();
  const rules = await getRules();
-  const rule = matchRule(rules, document.location.href, setting);
+  const rule = await matchRule(rules, document.location.href, setting);
  const translator = new Translator(rule, setting);

  // 浮球按钮
@@ -54,4 +55,23 @@ import { Translator } from "./libs/translator";
      </CacheProvider>
    </React.StrictMode>
  );
+
+  // 注册菜单
+  GM.registerMenuCommand(
+    "Toggle Translate",
+    (event) => {
+      translator.toggle();
+    },
+    "Q"
+  );
+  GM.registerMenuCommand(
+    "Toggle Style",
+    (event) => {
+      translator.toggleStyle();
+    },
+    "C"
+  );
+
+  // 同步订阅规则
+  trySyncAllSubRules(setting);
 })();
--- a/src/views/Action/index.js
+++ b/src/views/Action/index.js
@@ -112,7 +112,9 @@ export default function Action({ translator, fab }) {
          }
        >
          <Paper>
-            <Popup setShowPopup={setShowPopup} translator={translator} />
+            {showPopup && (
+              <Popup setShowPopup={setShowPopup} translator={translator} />
+            )}
          </Paper>
        </Draggable>
        <Draggable
--- a/src/views/Options/Rules.js
+++ b/src/views/Options/Rules.js
@@ -2,6 +2,8 @@ import Box from "@mui/material/Box";
 import Stack from "@mui/material/Stack";
 import TextField from "@mui/material/TextField";
 import Button from "@mui/material/Button";
+import CircularProgress from "@mui/material/CircularProgress";
+import Alert from "@mui/material/Alert";
 import {
  GLOBAL_KEY,
  DEFAULT_RULE,
@@ -9,9 +11,8 @@ import {
  OPT_LANGS_TO,
  OPT_TRANS_ALL,
  OPT_STYLE_ALL,
-  BUILTIN_RULES,
 } from "../../config";
-import { useState, useRef } from "react";
+import { useState, useRef, useEffect, useMemo } from "react";
 import { useI18n } from "../../hooks/I18n";
 import Typography from "@mui/material/Typography";
 import Accordion from "@mui/material/Accordion";
@@ -26,8 +27,21 @@ import FileUploadIcon from "@mui/icons-material/FileUpload";
 import { useSetting, useSettingUpdate } from "../../hooks/Setting";
 import FormControlLabel from "@mui/material/FormControlLabel";
 import Switch from "@mui/material/Switch";
+import Tabs from "@mui/material/Tabs";
+import Tab from "@mui/material/Tab";
+import Radio from "@mui/material/Radio";
+import RadioGroup from "@mui/material/RadioGroup";
+import DeleteIcon from "@mui/icons-material/Delete";
+import IconButton from "@mui/material/IconButton";
+import ShareIcon from "@mui/icons-material/Share";
+import SyncIcon from "@mui/icons-material/Sync";
+import { useSubrules } from "../../hooks/Rules";
+import { rulesCache, loadSubRules, syncSubRules } from "../../libs/rules";
+import { useAlert } from "../../hooks/Alert";
+import { syncOpt, syncShareRules } from "../../libs/sync";
+import { debounce } from "../../libs/utils";

-function RuleFields({ rule, rules, setShow }) {
+function RuleFields({ rule, rules, setShow, setKeyword }) {
  const initFormValues = rule || { ...DEFAULT_RULE, transOpen: "true" };
  const editMode = !!rule;

@@ -61,10 +75,21 @@ function RuleFields({ rule, rules, setShow }) {
    setErrors((pre) => ({ ...pre, [name]: "" }));
  };

+  const handlePatternChange = useMemo(
+    () =>
+      debounce(async (patterns) => {
+        setKeyword(patterns.trim());
+      }, 500),
+    [setKeyword]
+  );
+
  const handleChange = (e) => {
    e.preventDefault();
    const { name, value } = e.target;
    setFormValues((pre) => ({ ...pre, [name]: value }));
+    if (name === "pattern" && !editMode) {
+      handlePatternChange(value);
+    }
  };

  const handleCancel = (e) => {
@@ -384,12 +409,60 @@ function UploadButton({ onChange, text }) {
  );
 }

-export default function Rules() {
+function ShareButton({ rules, injectRules, selectedSub }) {
+  const alert = useAlert();
+  const i18n = useI18n();
+  const handleClick = async () => {
+    try {
+      const { syncUrl, syncKey } = await syncOpt.load();
+      if (!syncUrl || !syncKey) {
+        alert.warning(i18n("error_sync_setting"));
+        return;
+      }
+
+      const shareRules = [...rules.list];
+      if (injectRules) {
+        const subRules = await loadSubRules(selectedSub?.url);
+        shareRules.splice(-1, 0, ...subRules);
+      }
+
+      const url = await syncShareRules({
+        rules: shareRules,
+        syncUrl,
+        syncKey,
+      });
+
+      window.open(url, "_blank");
+    } catch (err) {
+      alert.warning(i18n("error_got_some_wrong"));
+      console.log("[share rules]", err);
+    }
+  };
+
+  return (
+    <Button
+      size="small"
+      variant="outlined"
+      onClick={handleClick}
+      startIcon={<ShareIcon />}
+    >
+      {"分享"}
+    </Button>
+  );
+}
+
+function UserRules() {
  const i18n = useI18n();
  const rules = useRules();
  const [showAdd, setShowAdd] = useState(false);
  const setting = useSetting();
  const updateSetting = useSettingUpdate();
+  const subrules = useSubrules();
+  const [subRules, setSubRules] = useState([]);
+  const [keyword, setKeyword] = useState("");
+
+  const selectedSub = subrules.list.find((item) => item.selected);
+
  const injectRules = !!setting?.injectRules;

  const handleImport = (e) => {
@@ -420,55 +493,322 @@ export default function Rules() {
    });
  };

+  useEffect(() => {
+    (async () => {
+      if (selectedSub?.url) {
+        try {
+          const rules = await loadSubRules(selectedSub?.url);
+          setSubRules(rules);
+        } catch (err) {
+          console.log("[load rules]", err);
+        }
+      }
+    })();
+  }, [selectedSub?.url]);
+
+  useEffect(() => {
+    if (!showAdd) {
+      setKeyword("");
+    }
+  }, [showAdd]);
+
+  return (
+    <Stack spacing={3}>
+      <Stack direction="row" spacing={2} useFlexGap flexWrap="wrap">
+        <Button
+          size="small"
+          variant="contained"
+          disabled={showAdd}
+          onClick={(e) => {
+            e.preventDefault();
+            setShowAdd(true);
+          }}
+        >
+          {i18n("add")}
+        </Button>
+
+        <UploadButton text={i18n("import")} onChange={handleImport} />
+        <DownloadButton
+          data={JSON.stringify([...rules.list].reverse(), null, "\t")}
+          text={i18n("export")}
+        />
+
+        <ShareButton
+          rules={rules}
+          injectRules={injectRules}
+          selectedSub={selectedSub}
+        />
+
+        <FormControlLabel
+          control={
+            <Switch
+              size="small"
+              checked={injectRules}
+              onChange={handleInject}
+            />
+          }
+          label={i18n("inject_rules")}
+        />
+      </Stack>
+
+      {showAdd && (
+        <RuleFields
+          rules={rules}
+          setShow={setShowAdd}
+          setKeyword={setKeyword}
+        />
+      )}
+
+      <Box>
+        {rules.list
+          .filter(
+            (rule) =>
+              rule.pattern.includes(keyword) || keyword.includes(rule.pattern)
+          )
+          .map((rule) => (
+            <RuleAccordion key={rule.pattern} rule={rule} rules={rules} />
+          ))}
+      </Box>
+
+      {injectRules && (
+        <Box>
+          {subRules
+            .filter(
+              (rule) =>
+                rule.pattern.includes(keyword) || keyword.includes(rule.pattern)
+            )
+            .map((rule) => (
+              <RuleAccordion key={rule.pattern} rule={rule} />
+            ))}
+        </Box>
+      )}
+    </Stack>
+  );
+}
+
+function SubRulesItem({ index, url, selectedUrl, subrules, setRules }) {
+  const [loading, setLoading] = useState(false);
+
+  const handleDel = async () => {
+    try {
+      await subrules.del(url);
+      await rulesCache.del(url);
+    } catch (err) {
+      console.log("[del subrules]", err);
+    }
+  };
+
+  const handleSync = async () => {
+    try {
+      setLoading(true);
+      const rules = await syncSubRules(url);
+      if (rules.length > 0 && url === selectedUrl) {
+        setRules(rules);
+      }
+    } catch (err) {
+      console.log("[sync sub rules]", err);
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  return (
+    <Stack direction="row" alignItems="center" spacing={2}>
+      <FormControlLabel value={url} control={<Radio />} label={url} />
+
+      {loading ? (
+        <CircularProgress size={16} />
+      ) : (
+        <IconButton size="small" onClick={handleSync}>
+          <SyncIcon fontSize="small" />
+        </IconButton>
+      )}
+
+      {index !== 0 && selectedUrl !== url && (
+        <IconButton size="small" onClick={handleDel}>
+          <DeleteIcon fontSize="small" />
+        </IconButton>
+      )}
+    </Stack>
+  );
+}
+
+function SubRulesEdit({ subrules }) {
+  const i18n = useI18n();
+  const [inputText, setInputText] = useState("");
+  const [inputError, setInputError] = useState("");
+  const [showInput, setShowInput] = useState(false);
+
+  const handleCancel = (e) => {
+    e.preventDefault();
+    setShowInput(false);
+    setInputText("");
+    setInputError("");
+  };
+
+  const handleSave = async (e) => {
+    e.preventDefault();
+    const url = inputText.trim();
+
+    if (!url) {
+      setInputError(i18n("error_cant_be_blank"));
+      return;
+    }
+
+    if (subrules.list.find((item) => item.url === url)) {
+      setInputError(i18n("error_duplicate_values"));
+      return;
+    }
+
+    try {
+      const rules = await syncSubRules(url);
+      if (rules.length === 0) {
+        throw new Error("empty rules");
+      }
+      await subrules.add(url);
+      setShowInput(false);
+      setInputText("");
+    } catch (err) {
+      console.log("[fetch rules]", err);
+      setInputError(i18n("error_fetch_url"));
+    }
+  };
+
+  const handleInput = (e) => {
+    e.preventDefault();
+    setInputText(e.target.value);
+  };
+
+  const handleFocus = (e) => {
+    e.preventDefault();
+    setInputError("");
+  };
+
+  return (
+    <>
+      <Stack direction="row" alignItems="center" spacing={2}>
+        <Button
+          size="small"
+          variant="contained"
+          disabled={showInput}
+          onClick={(e) => {
+            e.preventDefault();
+            setShowInput(true);
+          }}
+        >
+          {i18n("add")}
+        </Button>
+      </Stack>
+
+      {showInput && (
+        <>
+          <TextField
+            size="small"
+            value={inputText}
+            error={!!inputError}
+            helperText={inputError}
+            onChange={handleInput}
+            onFocus={handleFocus}
+            label={i18n("subscribe_url")}
+          />
+
+          <Stack direction="row" alignItems="center" spacing={2}>
+            <Button size="small" variant="contained" onClick={handleSave}>
+              {i18n("save")}
+            </Button>
+            <Button size="small" variant="outlined" onClick={handleCancel}>
+              {i18n("cancel")}
+            </Button>
+          </Stack>
+        </>
+      )}
+    </>
+  );
+}
+
+function SubRules() {
+  const [loading, setLoading] = useState(false);
+  const [rules, setRules] = useState([]);
+  const subrules = useSubrules();
+  const selectedSub = subrules.list.find((item) => item.selected);
+
+  const handleSelect = (e) => {
+    const url = e.target.value;
+    subrules.select(url);
+  };
+
+  useEffect(() => {
+    (async () => {
+      if (selectedSub?.url) {
+        try {
+          setLoading(true);
+
+          const rules = await loadSubRules(selectedSub?.url);
+          setRules(rules);
+        } catch (err) {
+          console.log("[load rules]", err);
+        } finally {
+          setLoading(false);
+        }
+      }
+    })();
+  }, [selectedSub?.url]);
+
+  return (
+    <Stack spacing={3}>
+      <SubRulesEdit subrules={subrules} />
+
+      <RadioGroup value={selectedSub?.url} onChange={handleSelect}>
+        {subrules.list.map((item, index) => (
+          <SubRulesItem
+            key={item.url}
+            url={item.url}
+            index={index}
+            selectedUrl={selectedSub?.url}
+            subrules={subrules}
+            setRules={setRules}
+          />
+        ))}
+      </RadioGroup>
+
+      <Box>
+        {loading ? (
+          <center>
+            <CircularProgress />
+          </center>
+        ) : (
+          rules.map((rule) => <RuleAccordion key={rule.pattern} rule={rule} />)
+        )}
+      </Box>
+    </Stack>
+  );
+}
+
+export default function Rules() {
+  const i18n = useI18n();
+  const [activeTab, setActiveTab] = useState(0);
+
+  const handleTabChange = (e, newValue) => {
+    setActiveTab(newValue);
+  };
+
  return (
    <Box>
      <Stack spacing={3}>
-        <Stack direction="row" spacing={2}>
-          <Button
-            size="small"
-            variant="contained"
-            disabled={showAdd}
-            onClick={(e) => {
-              e.preventDefault();
-              setShowAdd(true);
-            }}
-          >
-            {i18n("add")}
-          </Button>
+        <Alert severity="info">
+          {i18n("rules_warn_1")}
+          <br />
+          {i18n("rules_warn_2")}
+        </Alert>

-          <UploadButton text={i18n("import")} onChange={handleImport} />
-          <DownloadButton
-            data={JSON.stringify([...rules.list].reverse(), null, "\t")}
-            text={i18n("export")}
-          />
-
-          <FormControlLabel
-            control={
-              <Switch
-                size="small"
-                checked={injectRules}
-                onChange={handleInject}
-              />
-            }
-            label={i18n("inject_rules")}
-          />
-        </Stack>
-
-        {showAdd && <RuleFields rules={rules} setShow={setShowAdd} />}
-
-        <Box>
-          {rules.list.map((rule) => (
-            <RuleAccordion key={rule.pattern} rule={rule} rules={rules} />
-          ))}
+        <Box sx={{ borderBottom: 1, borderColor: "divider" }}>
+          <Tabs value={activeTab} onChange={handleTabChange}>
+            <Tab label={i18n("personal_rules")} />
+            <Tab label={i18n("subscribe_rules")} />
+          </Tabs>
        </Box>
-
-        {injectRules && (
-          <Box>
-            {BUILTIN_RULES.map((rule) => (
-              <RuleAccordion key={rule.pattern} rule={rule} />
-            ))}
-          </Box>
-        )}
+        <div hidden={activeTab !== 0}>{activeTab === 0 && <UserRules />}</div>
+        <div hidden={activeTab !== 1}>{activeTab === 1 && <SubRules />}</div>
      </Stack>
    </Box>
  );
--- a/src/views/Options/SyncSetting.js
+++ b/src/views/Options/SyncSetting.js
@@ -8,6 +8,7 @@ import Link from "@mui/material/Link";
 import { URL_KISS_WORKER } from "../../config";
 import { debounce } from "../../libs/utils";
 import { useMemo } from "react";
+import { syncAll } from "../../libs/sync";

 export default function SyncSetting() {
  const i18n = useI18n();
@@ -15,13 +16,14 @@ export default function SyncSetting() {

  const handleChange = useMemo(
    () =>
-      debounce((e) => {
+      debounce(async (e) => {
        e.preventDefault();
        const { name, value } = e.target;
-        sync.update({
+        await sync.update({
          [name]: value,
        });
-      }, 500),
+        await syncAll();
+      }, 1000),
    [sync]
  );

--- a/src/views/Options/index.js
+++ b/src/views/Options/index.js
@@ -11,6 +11,7 @@ import { isGm } from "../../libs/browser";
 import { sleep } from "../../libs/utils";
 import CircularProgress from "@mui/material/CircularProgress";
 import { syncAll } from "../../libs/sync";
+import { AlertProvider } from "../../hooks/Alert";

 export default function Options() {
  const [error, setError] = useState(false);
@@ -69,16 +70,18 @@ export default function Options() {
  return (
    <StoragesProvider>
      <ThemeProvider>
-        <HashRouter>
-          <Routes>
-            <Route path="/" element={<Layout />}>
-              <Route index element={<Setting />} />
-              <Route path="rules" element={<Rules />} />
-              <Route path="sync" element={<SyncSetting />} />
-              <Route path="about" element={<About />} />
-            </Route>
-          </Routes>
-        </HashRouter>
+        <AlertProvider>
+          <HashRouter>
+            <Routes>
+              <Route path="/" element={<Layout />}>
+                <Route index element={<Setting />} />
+                <Route path="rules" element={<Rules />} />
+                <Route path="sync" element={<SyncSetting />} />
+                <Route path="about" element={<About />} />
+              </Route>
+            </Routes>
+          </HashRouter>
+        </AlertProvider>
      </ThemeProvider>
    </StoragesProvider>
  );
Author	SHA1	Message	Date
Gabe Yuan	1191791447	v1.5.4	2023-08-22 17:52:12 +08:00
Gabe Yuan	5c510f2df2	add rules filter when add rule	2023-08-22 17:51:40 +08:00
Gabe Yuan	7c0aa23177	add rules filter when add rule	2023-08-22 17:46:57 +08:00
Gabe Yuan	4bc1c26653	add rules filter when add rule	2023-08-22 17:37:42 +08:00
Gabe Yuan	ca1e1148d6	sync subscribe rules when browser start or userscript run	2023-08-22 16:27:09 +08:00
Gabe Yuan	2224455a7f	add text description for rules	2023-08-22 10:35:57 +08:00
Gabe Yuan	f463f3ce08	v1.5.3	2023-08-21 23:50:32 +08:00
Gabe Yuan	c0872db98c	auto use unsafe fetch	2023-08-21 23:50:14 +08:00
Gabe Yuan	d3a5d91f01	auto use unsafe fetch	2023-08-21 23:46:42 +08:00
Gabe Yuan	3e9338be0e	v1.5.2	2023-08-21 22:24:42 +08:00
Gabe Yuan	ef7f1ad638	fetch subrules use unsafe fetch	2023-08-21 21:35:53 +08:00
Gabe Yuan	1f10ebe404	fetch subrules use unsafe fetch	2023-08-21 21:31:20 +08:00
Gabe Yuan	f4a8251c61	add shortcut: Toggle Style	2023-08-21 16:06:21 +08:00
Gabe Yuan	f585a43480	v1.5.1	2023-08-21 14:52:57 +08:00
Gabe Yuan	3a11465c24	fix stack useFlexGap	2023-08-21 14:43:22 +08:00
Gabe Yuan	3c3ebdf96c	add command shortcuts & menu command	2023-08-21 14:03:39 +08:00
Gabe Yuan	6b30f443e1	v1.5.0	2023-08-20 23:32:06 +08:00
Gabe Yuan	232e9a47a2	share rules	2023-08-20 23:30:08 +08:00
Gabe Yuan	7ec43a1d3f	Subscribe Rules	2023-08-20 19:27:29 +08:00