🐛 修复include、GM.*和ExternalMessage问题

scriptscat · Oct 31, 2022 · fe96990 · fe96990
1 parent 1067285
commit fe96990
Show file tree

Hide file tree

Showing 21 changed files with 205 additions and 66 deletions.
diff --git a/build/pack.js b/build/pack.js
@@ -33,16 +33,16 @@ str = str.replace(/"version": "(.*?)"/, `"version": "${manifest.version}"`);
 fs.writeFileSync("./src/manifest.json", str);
 
 // 处理configSystem version
-let configSystem = fs.readFileSync("./src/pkg/config/config.ts").toString();
+let configSystem = fs.readFileSync("./src/app/const.ts").toString();
 // 如果是由github action的分支触发的构建,在版本中再加上commit id
 if (process.env.GITHUB_REF_TYPE === "branch") {
   package.version += `+${process.env.GITHUB_SHA.substring(0, 7)}`;
 }
 configSystem = configSystem.replace(
-  /\/\* version \*\/ "(.*?)"/,
-  `/* version */ "${package.version}"`
+  /ExtVersion = "(.*?)";/,
+  `ExtVersion = "${package.version}";`
 );
-fs.writeFileSync("./src/pkg/config/config.ts", configSystem);
+fs.writeFileSync("./src/app/const.ts", configSystem);
 
 execSync("npm run build", { stdio: "inherit" });
 

diff --git a/src/app/const.ts b/src/app/const.ts
@@ -0,0 +1,12 @@
+export const ExtVersion = "0.10.0-alpha.1";
+
+export const Server = "https://sc.icodef.com/";
+
+export const ExternalWhitelist = [
+  "greasyfork.org",
+  "scriptcat.org",
+  "tampermonkey.net.cn",
+  "openuserjs.org",
+];
+
+export const ExternalMessage = "externalMessage";
diff --git a/src/app/service/system/manager.ts b/src/app/service/system/manager.ts
@@ -1,5 +1,7 @@
+import { ExternalMessage, ExtVersion, Server } from "@App/app/const";
 import IoC from "@App/app/ioc";
 import { MessageHander } from "@App/app/message/message";
+import { ScriptDAO } from "@App/app/repo/scripts";
 import { SystemConfig } from "@App/pkg/config/config";
 import Manager from "../manager";
 
@@ -8,17 +10,18 @@ import Manager from "../manager";
 export class SystemManager extends Manager {
   systemConfig: SystemConfig;
 
+  scriptDAO: ScriptDAO;
+
   constructor(message: MessageHander, systemConfig: SystemConfig) {
-    super(message);
+    super(message, "system");
+    this.scriptDAO = new ScriptDAO();
     this.systemConfig = systemConfig;
   }
 
   init() {
     // 两小时检查一次更新
     const checkUpdate = () => {
-      fetch(
-        `${this.systemConfig.server}api/v1/system/version?version=${this.systemConfig.version}`
-      )
+      fetch(`${Server}api/v1/system/version?version=${ExtVersion}`)
         .then((resp) => resp.json())
         .then((resp: { data: { notice: string; version: string } }) => {
           chrome.storage.local.get(["notice"], (items) => {
@@ -50,6 +53,33 @@ export class SystemManager extends Manager {
         }
       });
     }
+    // 处理
+    this.message.setHandler(
+      ExternalMessage,
+      async (
+        _action,
+        {
+          action,
+          name,
+          namespace,
+        }: { action: string; name: string; namespace: string }
+      ) => {
+        if (action === "isInstalled") {
+          const script = await this.scriptDAO.findByNameAndNamespace(
+            name,
+            namespace
+          );
+          if (script) {
+            return Promise.resolve({
+              installed: true,
+              version: script.metadata.version && script.metadata.version[0],
+            });
+          }
+          return Promise.resolve({ installed: false });
+        }
+        return Promise.resolve(false);
+      }
+    );
   }
 
   getNotice(): Promise<{ notice: string; isRead: boolean }> {

diff --git a/src/inject.ts b/src/inject.ts
@@ -18,8 +18,6 @@ const logger = new LoggerCore({
 
 message.setHandler("pageLoad", (_action, data) => {
   logger.logger().debug("inject start");
-
-  const runtime = new InjectRuntime(data.scripts, flag);
-
+  const runtime = new InjectRuntime(message, data.scripts, flag);
   runtime.start();
 });
diff --git a/src/pages/components/ScriptStorage/index.tsx b/src/pages/components/ScriptStorage/index.tsx
@@ -45,7 +45,6 @@ const ScriptStorage: React.FC<{
     // 监听值变化
     const channel = valueCtrl.watchValue(script);
     channel.setHandler((value: Value) => {
-      console.log("value changed", value);
       setData((prev) => {
         const index = prev.findIndex((item) => item.key === value.key);
         if (index === -1) {

diff --git a/src/pages/components/UserConfigPanel/index.tsx b/src/pages/components/UserConfigPanel/index.tsx
@@ -159,7 +159,7 @@ const UserConfigPanel: React.FC<{
                               placeholder={item.description}
                             >
                               {options!.map((option) => (
-                                <Select.Option value={option}>
+                                <Select.Option key={option} value={option}>
                                   {option}
                                 </Select.Option>
                               ))}

diff --git a/src/pages/components/layout/MainLayout.tsx b/src/pages/components/layout/MainLayout.tsx
@@ -75,17 +75,17 @@ const MainLayout: React.FC<{
                       </Space>
                     </a>
                   </Menu.Item>
-                  <Menu.Item key="dark">
+                  <Menu.Item key="background">
                     <a href="#/script/editor?template=background">
                       <RiTerminalBoxLine /> 添加后台脚本
                     </a>
                   </Menu.Item>
-                  <Menu.Item key="auto">
+                  <Menu.Item key="crontab">
                     <a href="#/script/editor?template=crontab">
                       <RiTimerLine /> 添加定时脚本
                     </a>
                   </Menu.Item>
-                  <Menu.Item key="auto">
+                  <Menu.Item key="link">
                     <IconLink /> 链接导入
                   </Menu.Item>
                 </Menu>

diff --git a/src/pages/components/layout/Sider.tsx b/src/pages/components/layout/Sider.tsx
@@ -26,7 +26,7 @@ if (!hash.length) {
 
 const Sider: React.FC = () => {
   const [menuSelect, setMenuSelect] = useState(hash);
-  const [collapsed, setCollapsed] = useState(true);
+  const [collapsed, setCollapsed] = useState(false);
 
   return (
     <HashRouter>

diff --git a/src/pages/options/routes/Logger.tsx b/src/pages/options/routes/Logger.tsx
@@ -147,9 +147,6 @@ function Subscribe() {
           <Card
             bordered={false}
             title="运行日志"
-            style={{
-              padding: 8,
-            }}
             extra={
               <Space size="large">
                 <DatePicker.RangePicker

diff --git a/src/pages/options/routes/ScriptList.tsx b/src/pages/options/routes/ScriptList.tsx
@@ -43,6 +43,7 @@ import {
   RiPlayFill,
   RiSettings3Fill,
   RiStopFill,
+  RiUploadCloudFill,
 } from "react-icons/ri";
 import { Link, useNavigate, useSearchParams } from "react-router-dom";
 import ScriptController from "@App/app/service/script/controller";
@@ -615,6 +616,13 @@ function ScriptList() {
                   }}
                 />
               ))}
+            <Button
+              type="text"
+              icon={<RiUploadCloudFill />}
+              style={{
+                color: "var(--color-text-2)",
+              }}
+            />
           </Button.Group>
         );
       },

diff --git a/src/pages/options/routes/Setting.tsx b/src/pages/options/routes/Setting.tsx
@@ -50,6 +50,7 @@ function Setting() {
             }
             actionButton={[
               <Button
+                key="save"
                 type="primary"
                 onClick={async () => {
                   // 保存到配置中去

diff --git a/src/pages/options/routes/Tools.tsx b/src/pages/options/routes/Tools.tsx
@@ -87,6 +87,7 @@ function Tools() {
             }}
             actionButton={[
               <Button
+                key="backup"
                 type="primary"
                 loading={loading.cloud}
                 onClick={() => {
@@ -115,6 +116,7 @@ function Tools() {
                 备份
               </Button>,
               <Button
+                key="list"
                 type="primary"
                 onClick={async () => {
                   let fs = await FileSystemFactory.create(

diff --git a/src/pages/options/routes/script/ScriptEditor.tsx b/src/pages/options/routes/script/ScriptEditor.tsx
@@ -397,6 +397,7 @@ function ScriptEditor() {
               // 没有子菜单
               return (
                 <Button
+                  key={`m_${item.title}`}
                   size="mini"
                   onClick={() => {
                     setEditors((prev) => {
@@ -428,6 +429,7 @@ function ScriptEditor() {
                     {item.items.map((menuItem, i) => {
                       const btn = (
                         <Button
+                          key={`sm_${menuItem.title}`}
                           size="mini"
                           onClick={() => {
                             setEditors((prev) => {
@@ -481,7 +483,9 @@ function ScriptEditor() {
                 trigger="click"
                 position="bl"
               >
-                <Button size="mini">{item.title}</Button>
+                <Button key={`m_${item.title}`} size="mini">
+                  {item.title}
+                </Button>
               </Dropdown>
             );
           })}
@@ -517,9 +521,9 @@ function ScriptEditor() {
             >
               已安装脚本
             </Button>
-            {scriptList.map((script, index) => (
+            {scriptList.map((script) => (
               <Button
-                key={`s_${index.toString()}`}
+                key={`s_${script.id}`}
                 size="mini"
                 className="text-left"
                 style={{

diff --git a/src/pages/popup/App.tsx b/src/pages/popup/App.tsx
@@ -1,3 +1,4 @@
+import { ExtVersion } from "@App/app/const";
 import IoC from "@App/app/ioc";
 import MessageInternal from "@App/app/message/internal";
 import SystemManager from "@App/app/service/system/manager";
@@ -41,7 +42,7 @@ function App() {
   const [showAlert, setShowAlert] = useState(false);
   const [notice, setNotice] = useState("");
   const [isRead, setIsRead] = useState(true);
-  const [version, setVersion] = useState(systemManage.systemConfig.version);
+  const [version, setVersion] = useState(ExtVersion);
 
   const message = IoC.instance(MessageInternal) as MessageInternal;
   useEffect(() => {
@@ -196,10 +197,8 @@ function App() {
         </CollapseItem>
       </Collapse>
       <div className="flex flex-row arco-card-header !h-6">
-        <span className="text-1 font-500">
-          v{systemManage.systemConfig.version}
-        </span>
-        {semver.lt(systemManage.systemConfig.version, version) && (
+        <span className="text-1 font-500">v{ExtVersion}</span>
+        {semver.lt(ExtVersion, version) && (
           // eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions
           <span
             onClick={() => {

diff --git a/src/pkg/config/config.ts b/src/pkg/config/config.ts
@@ -73,23 +73,6 @@ export class SystemConfig {
     return ret;
   }
 
-  get version() {
-    return /* version */ "0.10.0-alpha.1";
-  }
-
-  get server() {
-    return "https://sc.icodef.com/";
-  }
-
-  get externalWhitelist() {
-    return [
-      "greasyfork.org",
-      "scriptcat.org",
-      "tampermonkey.net.cn",
-      "openuserjs.org",
-    ];
-  }
-
   public get changetime() {
     return <number>this.cache.get("changetime") || 0;
   }

diff --git a/src/pkg/utils/match.test.ts b/src/pkg/utils/match.test.ts
@@ -246,6 +246,13 @@ describe("UrlInclude-2", () => {
     expect(url.match("http://domain2.com/")).toEqual(["ok4"]);
     expect(url.match("http://domain2/123")).toEqual(["ok4"]);
   });
+  it("nomral", () => {
+    const url = new UrlInclude<string>();
+    url.add("*://*.bilibili.com/bangumi/play/*", "ok1");
+    expect(url.match("https://www.bilibili.com/bangumi/play/ep691613")).toEqual(
+      ["ok1"]
+    );
+  });
 });
 
 describe("match *", () => {

diff --git a/src/runtime/background/runtime.ts b/src/runtime/background/runtime.ts
@@ -260,7 +260,7 @@ export default class Runtime extends Manager {
       "queryPageScript",
       (action: string, { url, tabId }: any) => {
         const tabMap = scriptMenu.get(tabId);
-        const matchScripts = this.match.match(url);
+        const matchScripts = this.matchUrl(url, false);
         const scriptList: ScriptMenu[] = [];
         matchScripts.forEach((item) => {
           const menus: ScriptMenuItem[] = [];
@@ -328,25 +328,10 @@ export default class Runtime extends Manager {
             return;
           }
 
-          const scripts = this.match.match(sender.url);
-          const filter: ScriptRunResouce[] = [];
-
-          scripts.forEach((script) => {
-            if (script.status !== SCRIPT_STATUS_ENABLE) {
-              return;
-            }
-            if (script.metadata.noframes) {
-              if (sender.frameId !== 0) {
-                return;
-              }
-            }
-            filter.push(script);
-          });
-          if (!filter.length) {
-            return;
-          }
-
-          resolve({ flag: scriptFlag, scripts: filter });
+          const filter: ScriptRunResouce[] = this.matchUrl(
+            sender.url,
+            sender.frameId !== 0
+          );
 
           // 注入运行框架
           chrome.tabs.executeScript(sender.tabId, {
@@ -361,6 +346,14 @@ export default class Runtime extends Manager {
                 }())`,
             runAt: "document_start",
           });
+
+          if (!filter.length) {
+            resolve({ flag: scriptFlag, scripts: [] });
+            return;
+          }
+
+          resolve({ flag: scriptFlag, scripts: filter });
+
           // 注入脚本
           filter.forEach((script) => {
             let runAt = "document_idle";
@@ -450,6 +443,25 @@ export default class Runtime extends Manager {
     return this.disable(script);
   }
 
+  matchUrl(url: string, frame: boolean) {
+    const scripts = this.match.match(url);
+    // 再include中匹配
+    scripts.push(...this.include.match(url));
+    const filter: { [key: string]: ScriptRunResouce } = {};
+    // 去重
+    scripts.forEach((script) => {
+      if (script.status !== SCRIPT_STATUS_ENABLE) {
+        return;
+      }
+      if (frame && script.metadata.noframes) {
+        return;
+      }
+      filter[script.id] = script;
+    });
+    // 转换成数组
+    return Object.keys(filter).map((key) => filter[key]);
+  }
+
   // 脚本删除
   async scriptDelete(script: Script): Promise<boolean> {
     // 清理匹配资源