✨ 排除指定网址执行 #144

Author: CodFrm

src/app/service/script/controller.ts

@@ -50,4 +50,8 @@ export default class ScriptController {
   importByUrl(url: string) {
     return this.dispatchEvent("importByUrl", url);
   }
+
+  exclude(id: number, exclude: string, remove: boolean) {
+    return this.dispatchEvent("exclude", { id, exclude, remove });
+  }
 }

src/app/service/script/event.ts

@@ -16,6 +16,7 @@ export type ScriptEvent =
   | "enable"
   | "disable"
   | "delete"
+  | "exclude"
   | "checkUpdate"
   | "importByUrl";
 
@@ -168,4 +169,54 @@ export default class ScriptEventListener {
   public importByUrlHandler(url: string) {
     return this.manager.openInstallPageByUrl(url);
   }
+
+  @ListenEventDecorator("exclude")
+  public excludeHandler({
+    id,
+    exclude,
+    remove,
+  }: {
+    id: number;
+    exclude: string;
+    remove: boolean;
+  }) {
+    const logger = this.logger.with({ scriptId: id });
+    return new Promise((resolve, reject) => {
+      this.dao
+        .findById(id)
+        .then((script) => {
+          if (!script) {
+            return reject(new Error("脚本不存在"));
+          }
+          script.selfMetadata = script.selfMetadata || {};
+          const excludes = script.selfMetadata.exclude || [];
+          if (remove) {
+            for (let i = 0; i < excludes.length; i += 1) {
+              if (excludes[i] === exclude) {
+                excludes.splice(i, 1);
+              }
+            }
+          } else {
+            excludes.push(exclude);
+          }
+          script.selfMetadata.exclude = excludes;
+          this.dao.save(script).then(
+            () => {
+              logger.info("script exclude success");
+              ScriptManager.hook.trigger("upsert", script, "system");
+              resolve({ id: script.id });
+            },
+            (e) => {
+              logger.error("script exclude failed", Logger.E(e));
+              reject(e);
+            }
+          );
+          return resolve(1);
+        })
+        .catch((e) => {
+          logger.error("exclude error", Logger.E(e));
+          reject(e);
+        });
+    });
+  }
 }

src/pages/components/ScriptMenuList/index.tsx

@@ -15,6 +15,7 @@ import {
   IconDelete,
   IconEdit,
   IconMenu,
+  IconMinus,
   IconSettings,
 } from "@arco-design/web-react/icon";
 import IoC from "@App/app/ioc";
@@ -25,15 +26,34 @@ import RuntimeController from "@App/runtime/content/runtime";
 
 const CollapseItem = Collapse.Item;
 
+function isExclude(script: ScriptMenu, host: string) {
+  if (!script.customExclude) {
+    return false;
+  }
+  for (let i = 0; i < script.customExclude.length; i += 1) {
+    if (script.customExclude[i] === `*://${host}*`) {
+      return true;
+    }
+  }
+  return false;
+}
+
 // 用于popup页的脚本操作列表
 const ScriptMenuList: React.FC<{
   script: ScriptMenu[];
   isBackscript: boolean;
-}> = ({ script, isBackscript }) => {
+  currentUrl: string;
+}> = ({ script, isBackscript, currentUrl }) => {
   const [list, setList] = useState([] as ScriptMenu[]);
   const message = IoC.instance(MessageInternal) as MessageInternal;
   const scriptCtrl = IoC.instance(ScriptController) as ScriptController;
   const runtimeCtrl = IoC.instance(RuntimeController) as RuntimeController;
+  let url: URL;
+  try {
+    url = new URL(currentUrl);
+  } catch (e) {
+    // ignore error
+  }
   useEffect(() => {
     setList(script);
   }, [script]);
@@ -116,11 +136,7 @@ const ScriptMenuList: React.FC<{
                       overflow: "hidden",
                       textOverflow: "ellipsis",
                       whiteSpace: "nowrap",
-                      color:
-                        item.runStatus &&
-                        item.runStatus !== SCRIPT_RUN_STATUS_RUNNING
-                          ? "rgb(var(--gray-5))"
-                          : "",
+                      color: item.runNum === 0 ? "rgb(var(--gray-5))" : "",
                     }}
                   >
                     {item.name}
@@ -170,6 +186,28 @@ const ScriptMenuList: React.FC<{
               >
                 编辑
               </Button>
+              {url && (
+                <Button
+                  className="text-left"
+                  status="warning"
+                  type="secondary"
+                  icon={<IconMinus />}
+                  onClick={() => {
+                    scriptCtrl
+                      .exclude(
+                        item.id,
+                        `*://${url.host}*`,
+                        isExclude(item, url.host)
+                      )
+                      .finally(() => {
+                        window.close();
+                      });
+                  }}
+                >
+                  {isExclude(item, url.host) ? "恢复" : "排除"}
+                  {` ${url.host} 在上执行`}
+                </Button>
+              )}
               <Popconfirm
                 title="确定要删除此脚本吗?"
                 icon={<IconDelete />}

src/pages/popup/App.tsx

@@ -43,6 +43,7 @@ function App() {
   const [notice, setNotice] = useState("");
   const [isRead, setIsRead] = useState(true);
   const [version, setVersion] = useState(ExtVersion);
+  const [currentUrl, setCurrentUrl] = useState("");
 
   const message = IoC.instance(MessageInternal) as MessageInternal;
   useEffect(() => {
@@ -59,6 +60,7 @@ function App() {
       if (!tabs.length) {
         return;
       }
+      setCurrentUrl(tabs[0].url || "");
       message
         .syncSend("queryPageScript", { url: tabs[0].url, tabId: tabs[0].id })
         .then(
@@ -70,6 +72,9 @@ function App() {
             const list = resp.scriptList;
             list.sort((a, b) => {
               if (a.enable === b.enable) {
+                if (a.runNum !== b.runNum) {
+                  return b.runNum - a.runNum;
+                }
                 return b.updatetime - a.updatetime;
               }
               return a.enable ? -1 : 1;
@@ -114,22 +119,18 @@ function App() {
                   style={{
                     maxHeight: "none",
                   }}
-                  onClickMenuItem={(key) => {
+                  onClickMenuItem={async (key) => {
                     switch (key) {
                       case "newScript":
-                        chrome.tabs.query({ active: true }, async (tab) => {
-                          if (tab.length) {
-                            await chrome.storage.local.set({
-                              activeTabUrl: {
-                                url: tab[0].url,
-                              },
-                            });
-                            window.open(
-                              "/src/options.html#/script/editor?target=initial",
-                              "_blank"
-                            );
-                          }
+                        await chrome.storage.local.set({
+                          activeTabUrl: {
+                            url: currentUrl,
+                          },
                         });
+                        window.open(
+                          "/src/options.html#/script/editor?target=initial",
+                          "_blank"
+                        );
                         break;
                       default:
                         window.open(key, "_blank");
@@ -189,7 +190,11 @@ function App() {
           style={{ padding: "0" }}
           contentStyle={{ padding: "0" }}
         >
-          <ScriptMenuList script={scriptList} isBackscript={false} />
+          <ScriptMenuList
+            script={scriptList}
+            isBackscript={false}
+            currentUrl={currentUrl}
+          />
         </CollapseItem>
 
         <CollapseItem
@@ -198,7 +203,11 @@ function App() {
           style={{ padding: "0" }}
           contentStyle={{ padding: "0" }}
         >
-          <ScriptMenuList script={backScriptList} isBackscript />
+          <ScriptMenuList
+            script={backScriptList}
+            isBackscript
+            currentUrl={currentUrl}
+          />
         </CollapseItem>
       </Collapse>
       <div className="flex flex-row arco-card-header !h-6">

src/runtime/background/runtime.ts

@@ -10,6 +10,7 @@ import {
   SCRIPT_TYPE_NORMAL,
   ScriptDAO,
   ScriptRunResouce,
+  SCRIPT_RUN_STATUS_RUNNING,
 } from "@App/app/repo/scripts";
 import ResourceManager from "@App/app/service/resource/manager";
 import ValueManager from "@App/app/service/value/manager";
@@ -48,6 +49,7 @@ export type ScriptMenu = {
   runStatus?: SCRIPT_RUN_STATUS;
   runNum: number;
   menus?: ScriptMenuItem[];
+  customExclude?: string[];
 };
 
 // 后台脚本将会将代码注入到沙盒中
@@ -69,6 +71,9 @@ export default class Runtime extends Manager {
 
   include: UrlInclude<ScriptRunResouce> = new UrlInclude();
 
+  // 自定义排除
+  customizeExclude: UrlMatch<ScriptRunResouce> = new UrlMatch();
+
   static hook = new Hook<"runStatus">();
 
   // 运行中和开启的后台脚本
@@ -258,7 +263,7 @@ export default class Runtime extends Manager {
       number,
       Map<number, { script: Script; runNum: number }>
     >();
-    const addRunScript = (tabId: number, script: Script) => {
+    const addRunScript = (tabId: number, script: Script, num: number = 1) => {
       let scripts = runScript.get(tabId);
       if (!scripts) {
         scripts = new Map();
@@ -270,7 +275,7 @@ export default class Runtime extends Manager {
         scripts.set(script.id, scriptNum);
       }
       if (script.status === SCRIPT_STATUS_ENABLE) {
-        scriptNum.runNum += 1;
+        scriptNum.runNum += num;
       }
     };
     chrome.tabs.onRemoved.addListener((tabId) => {
@@ -279,12 +284,19 @@ export default class Runtime extends Manager {
     // 给popup页面获取运行脚本,与菜单
     this.message.setHandler(
       "queryPageScript",
-      async (action: string, { tabId }: any) => {
+      async (action: string, { url, tabId }: any) => {
         const tabMap = scriptMenu.get(tabId);
-        const matchScripts = runScript.get(tabId) || [];
-        const allPromise: Promise<ScriptMenu>[] = Array.from(
-          matchScripts,
-          async ([, item]: [number, { script: Script; runNum: number }]) => {
+        const run = runScript.get(tabId);
+        let matchScripts = [];
+        if (!run) {
+          matchScripts = this.matchUrl(url).map((item) => {
+            return { runNum: 0, script: item };
+          });
+        } else {
+          matchScripts = Array.from(run.values());
+        }
+        const allPromise: Promise<ScriptMenu>[] = matchScripts.map(
+          async (item) => {
             const menus: ScriptMenuItem[] = [];
             if (tabMap) {
               tabMap.get(item.script.id)?.forEach((scriptItem) => {
@@ -306,6 +318,8 @@ export default class Runtime extends Manager {
                 updatetime: item.script.updatetime || item.script.createtime,
                 hasUserConfig: !!item.script.config,
                 runNum: item.runNum,
+                customExclude:
+                  item.script.selfMetadata && item.script.selfMetadata.exclude,
                 menus,
               };
             }
@@ -316,6 +330,7 @@ export default class Runtime extends Manager {
               updatetime: script.updatetime || script.createtime,
               hasUserConfig: !!script?.config,
               runNum: item.runNum,
+              customExclude: script.selfMetadata && script.selfMetadata.exclude,
               menus,
             };
           }
@@ -338,14 +353,18 @@ export default class Runtime extends Manager {
               });
             });
           }
+
           backScriptList.push({
             id: item.id,
             name: item.name,
             enable: item.status === SCRIPT_STATUS_ENABLE,
             updatetime: item.updatetime || item.createtime,
             runStatus: item.runStatus,
             hasUserConfig: !!item.config,
-            runNum: item.status === SCRIPT_STATUS_ENABLE ? 1 : 0,
+            runNum:
+              item.runStatus && item.runStatus !== SCRIPT_RUN_STATUS_RUNNING
+                ? 1
+                : 0,
             menus,
           });
         });
@@ -371,6 +390,11 @@ export default class Runtime extends Manager {
             // 清理之前的数据
             runScript.delete(sender.tabId);
           }
+          const exclude = this.customizeExclude.match(sender.url);
+          // 自定义排除的
+          exclude.forEach((val) => {
+            addRunScript(sender.tabId!, val, 0);
+          });
           const filter: ScriptRunResouce[] = this.matchUrl(
             sender.url,
             (script) => {
@@ -579,6 +603,15 @@ export default class Runtime extends Manager {
         }
       });
     }
+    if (script.selfMetadata && script.selfMetadata.exclude) {
+      script.selfMetadata.exclude.forEach((url) => {
+        try {
+          this.customizeExclude.add(url, script);
+        } catch (e) {
+          logger.error("url加载错误", Logger.E(e));
+        }
+      });
+    }
     return Promise.resolve(true);
   }