✨ 本地/链接导入

Author: CodFrm

package.json

@@ -1,6 +1,6 @@
 {
   "name": "scriptcat",
-  "version": "0.17.0-alpha.4",
+  "version": "0.17.0-beta",
   "description": "脚本猫,一个可以执行用户脚本的浏览器扩展,万物皆可脚本化,让你的浏览器可以做更多的事情!",
   "author": "CodFrm",
   "license": "GPLv3",

scripts/pack.js

@@ -17,8 +17,8 @@ if (version.prerelease.length) {
       betaVersion += parseInt(version.prerelease[1] || "0", 10) + 1 || 1;
       break;
     case "beta":
-      // 第二位进1
-      betaVersion += 10 * (parseInt(version.prerelease[1] || "0", 10) + 1 || 1);
+      // 第三位进1
+      betaVersion += 100 * (parseInt(version.prerelease[1] || "0", 10) + 1 || 1);
       break;
     default:
       throw new Error("未知的版本类型");

src/app/service/service_worker/client.ts

@@ -83,6 +83,10 @@ export class ScriptClient extends Client {
   sortScript(active: string, over: string) {
     return this.do("sortScript", { active, over });
   }
+
+  importByUrl(url: string) {
+    return this.do("importByUrl", url);
+  }
 }
 
 export class ResourceClient extends Client {

src/app/service/service_worker/script.ts

@@ -534,6 +534,10 @@ export class ScriptService {
     }
   }
 
+  importByUrl(url: string) {
+    return this.openInstallPageByUrl(url, "user");
+  }
+
   init() {
     this.listenerScriptInstall();
 
@@ -552,6 +556,7 @@ export class ScriptService {
     this.group.on("requestCheckUpdate", this.requestCheckUpdate.bind(this));
     this.group.on("isInstalled", this.isInstalled.bind(this));
     this.group.on("sortScript", this.sortScript.bind(this));
+    this.group.on("importByUrl", this.importByUrl.bind(this));
 
     // 定时检查更新, 每10分钟检查一次
     chrome.alarms.create("checkScriptUpdate", {

src/manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "__MSG_scriptcat__",
-  "version": "0.17.0.1005",
+  "version": "0.17.0.1100",
   "author": "CodFrm",
   "description": "__MSG_scriptcat_description__",
   "options_ui": {

src/pages/components/layout/MainLayout.tsx

@@ -6,6 +6,7 @@ import {
   Input,
   Layout,
   Menu,
+  Message,
   Modal,
   Space,
   Typography,
@@ -18,6 +19,7 @@ import "./index.css";
 import { useAppDispatch, useAppSelector } from "@App/pages/store/hooks";
 import { selectThemeMode, setDarkMode } from "@App/pages/store/features/config";
 import { RiFileCodeLine, RiImportLine, RiPlayListAddLine, RiTerminalBoxLine, RiTimerLine } from "react-icons/ri";
+import { scriptClient } from "@App/pages/store/features/script";
 
 const MainLayout: React.FC<{
   children: ReactNode;
@@ -48,7 +50,12 @@ const MainLayout: React.FC<{
             title={t("import_link")}
             visible={importVisible}
             onOk={async () => {
-              setImportVisible(false);
+              try {
+                await scriptClient.importByUrl(importRef.current!.dom.value);
+                setImportVisible(false);
+              } catch (e) {
+                Message.error(`${t("import_link_failure")}: ${e}`);
+              }
             }}
             onCancel={() => {
               setImportVisible(false);
@@ -87,31 +94,30 @@ const MainLayout: React.FC<{
                       onClick={() => {
                         const el = document.getElementById("import-local");
                         el!.onchange = (e: Event) => {
-                          // const scriptCtl = IoC.instance(ScriptController) as ScriptController;
-                          // try {
-                          //   // 获取文件
-                          //   // @ts-ignore
-                          //   const file = e.target.files[0];
-                          //   // 实例化 FileReader对象
-                          //   const reader = new FileReader();
-                          //   reader.onload = async (processEvent) => {
-                          //     // 创建blob url
-                          //     const blob = new Blob(
-                          //       // @ts-ignore
-                          //       [processEvent.target!.result],
-                          //       {
-                          //         type: "application/javascript",
-                          //       }
-                          //     );
-                          //     const url = URL.createObjectURL(blob);
-                          //     await scriptCtl.importByUrl(url);
-                          //     Message.success(t("import_local_success"));
-                          //   };
-                          //   // 调用readerAsText方法读取文本
-                          //   reader.readAsText(file);
-                          // } catch (error) {
-                          //   Message.error(`${t("import_local_failure")}: ${e}`);
-                          // }
+                          try {
+                            // 获取文件
+                            // @ts-ignore
+                            const file = e.target.files[0];
+                            // 实例化 FileReader对象
+                            const reader = new FileReader();
+                            reader.onload = async (processEvent) => {
+                              // 创建blob url
+                              const blob = new Blob(
+                                // @ts-ignore
+                                [processEvent.target!.result],
+                                {
+                                  type: "application/javascript",
+                                }
+                              );
+                              const url = URL.createObjectURL(blob);
+                              await scriptClient.importByUrl(url);
+                              Message.success(t("import_local_success"));
+                            };
+                            // 调用readerAsText方法读取文本
+                            reader.readAsText(file);
+                          } catch (error) {
+                            Message.error(`${t("import_local_failure")}: ${e}`);
+                          }
                         };
                         el!.click();
                       }}