⚡️ 基於MV3版修正小量共通功能代码 (#614)

Author: cyfung1031

src/app/repo/scripts.ts

@@ -24,7 +24,7 @@ export const SCRIPT_RUN_STATUS_ERROR: SCRIPT_RUN_STATUS = "error";
 // 弃用
 export const SCRIPT_RUN_STATUS_RETRY: SCRIPT_RUN_STATUS = "retry";
 
-export type Metadata = { [key: string]: string[] };
+export type SCMetadata = Partial<Record<string, string[]>>;
 
 export type ConfigType =
   | "text"
@@ -63,8 +63,8 @@ export interface Script {
   origin?: string; // 脚本来源
   checkUpdateUrl?: string; // 检查更新URL
   downloadUrl?: string; // 脚本下载URL
-  metadata: Metadata; // 脚本的元数据
-  selfMetadata?: Metadata; // 自定义脚本元数据
+  metadata: SCMetadata; // 脚本的元数据
+  selfMetadata?: SCMetadata; // 自定义脚本元数据
   subscribeUrl?: string; // 如果是通过订阅脚本安装的话,会有订阅地址
   config?: UserConfig; // 通过UserConfig定义的用户配置
   type: SCRIPT_TYPE; // 脚本类型 1:普通脚本 2:定时脚本 3:后台脚本

src/app/repo/subscribe.ts

@@ -1,6 +1,6 @@
 import { DAO, db } from "./dao";
 
-export type Metadata = { [key: string]: string[] };
+export type SCMetadata = Partial<Record<string, string[]>>;
 
 export type SUBSCRIBE_STATUS = 1 | 2 | 3 | 4;
 export const SUBSCRIBE_STATUS_ENABLE: SUBSCRIBE_STATUS = 1;
@@ -18,7 +18,7 @@ export interface Subscribe {
   code: string;
   author: string;
   scripts: { [key: string]: SubscribeScript };
-  metadata: Metadata;
+  metadata: SCMetadata;
   status: SUBSCRIBE_STATUS;
   createtime: number;
   updatetime?: number;

src/app/service/script/manager.ts

@@ -1,5 +1,5 @@
 import { v4 as uuidv4 } from "uuid";
-import { fetchScriptInfo, prepareScriptByCode } from "@App/pkg/utils/script";
+import { fetchScriptBody, fetchScriptInfo, parseMetadata, prepareScriptByCode } from "@App/pkg/utils/script";
 import Cache from "@App/app/cache";
 import CacheKey from "@App/pkg/utils/cache_key";
 import { MessageHander } from "@App/app/message/message";
@@ -132,48 +132,43 @@ export class ScriptManager extends Manager {
     // 检查更新
     const script = await this.scriptDAO.findById(id);
     if (!script) {
-      return Promise.resolve(false);
+      return false;
     }
     this.scriptDAO.update(id, { checktime: new Date().getTime() });
     if (!script.checkUpdateUrl) {
-      return Promise.resolve(false);
+      return false;
     }
     const logger = LoggerCore.getLogger({
       scriptId: id,
       name: script.name,
     });
     try {
-      const info = await fetchScriptInfo(
-        script.checkUpdateUrl,
-        source,
-        false,
-        script.uuid
-      );
-      const { metadata } = info;
+      const code = await fetchScriptBody(script.checkUpdateUrl);
+      const metadata = parseMetadata(code);
       if (!metadata) {
         logger.error("parse metadata failed");
-        return Promise.resolve(false);
+        return false;
       }
       const newVersion = metadata.version && metadata.version[0];
       if (!newVersion) {
-        logger.error("parse version failed", { version: metadata.version[0] });
-        return Promise.resolve(false);
+        logger.error("parse version failed", { version: metadata.version });
+        return false;
       }
       let oldVersion = script.metadata.version && script.metadata.version[0];
       if (!oldVersion) {
         oldVersion = "0.0.0";
       }
       // 对比版本大小
       if (ltever(newVersion, oldVersion, logger)) {
-        return Promise.resolve(false);
+        return false;
       }
       // 进行更新
       this.openUpdatePage(script, source);
     } catch (e) {
       logger.error("check update failed", Logger.E(e));
-      return Promise.resolve(false);
+      return false;
     }
-    return Promise.resolve(true);
+    return true;
   }
 
   // 打开更新窗口
@@ -229,11 +224,12 @@ export class ScriptManager extends Manager {
     source: InstallSource,
     subscribeUrl?: string
   ) {
-    const info = await fetchScriptInfo(url, source, false, uuidv4());
-    const prepareScript = await prepareScriptByCode(info.code, url, info.uuid);
-    prepareScript.script.subscribeUrl = subscribeUrl;
-    await this.event.upsertHandler(prepareScript.script, source);
-    return Promise.resolve(prepareScript.script);
+    const uuid = uuidv4();
+    const code = await fetchScriptBody(url);
+    const { script } = await prepareScriptByCode(code, url, uuid);
+    script.subscribeUrl = subscribeUrl;
+    await this.event.upsertHandler(script, source);
+    return Promise.resolve(script);
   }
 }
 

src/app/service/subscribe/manager.ts

@@ -134,7 +134,7 @@ export default class SubscribeManager extends Manager {
         subscribe.url,
         source,
         false,
-        subscribe.url
+        subscribe.url // 应为 uuid
       );
       const { metadata } = info;
       if (!metadata) {
@@ -143,7 +143,7 @@ export default class SubscribeManager extends Manager {
       }
       const newVersion = metadata.version && metadata.version[0];
       if (!newVersion) {
-        logger.error("parse version failed", { version: metadata.version[0] });
+        logger.error("parse version failed", { version: metadata.version });
         return Promise.resolve(false);
       }
       let oldVersion =

src/locales/locales.ts

@@ -2,7 +2,7 @@ import i18n from "i18next";
 import { initReactI18next } from "react-i18next";
 import dayjs from "dayjs";
 import relativeTime from "dayjs/plugin/relativeTime";
-import { Metadata } from "@App/app/repo/scripts";
+import { SCMetadata } from "@App/app/repo/scripts";
 import enUS from "./en-US/translation.json";
 import viVN from "./vi-VN/translation.json";
 import zhCN from "./zh-CN/translation.json";
@@ -51,13 +51,13 @@ if (!localStorage.language) {
 }
 dayjs.extend(relativeTime);
 
-export function i18nName(script: { name: string; metadata: Metadata }) {
+export function i18nName(script: { name: string; metadata: SCMetadata }) {
   return script.metadata[`name:${i18n.language.toLowerCase()}`]
     ? script.metadata[`name:${i18n.language.toLowerCase()}`][0]
     : script.name;
 }
 
-export function i18nDescription(script: { metadata: Metadata }) {
+export function i18nDescription(script: { metadata: SCMetadata }) {
   return script.metadata[`description:${i18n.language.toLowerCase()}`]
     ? script.metadata[`description:${i18n.language.toLowerCase()}`][0]
     : script.metadata.description;

src/pages/install/description.tsx

@@ -17,7 +17,7 @@ import {
   type ScriptInfo,
 } from "@App/pkg/utils/script";
 import {
-  Metadata,
+  SCMetadata,
   Script,
   SCRIPT_STATUS_DISABLE,
   SCRIPT_STATUS_ENABLE,
@@ -38,7 +38,7 @@ const closeWindow = () => {
 
 export default function Description() {
   const [permission, setPermission] = useState<Permission>([]);
-  const [metadata, setMetadata] = useState<Metadata>({});
+  const [metadata, setMetadata] = useState<SCMetadata>({});
   // 脚本信息包括脚本代码、下载url，但是不包括解析代码后得到的metadata，通过background的缓存获取
   const [info, setInfo] = useState<ScriptInfo>();
   // 对脚本详细的描述

src/pages/options/routes/utils.tsx

@@ -1,7 +1,7 @@
 /* eslint-disable import/prefer-default-export */
 import React from "react";
 import IoC from "@App/app/ioc";
-import { Metadata, Script, ScriptDAO } from "@App/app/repo/scripts";
+import { SCMetadata, Script, ScriptDAO } from "@App/app/repo/scripts";
 import ValueManager from "@App/app/service/value/manager";
 import { Avatar, Button, Space, Tooltip } from "@arco-design/web-react";
 import {
@@ -192,7 +192,7 @@ export function getValues(script: Script) {
 }
 
 export type ScriptIconsProps = {
-  script: { name: string; metadata: Metadata };
+  script: { name: string; metadata: SCMetadata };
   size?: number;
   style?: React.CSSProperties;
 };

src/pages/popup/App.tsx

@@ -28,6 +28,7 @@ import { RiMessage2Line } from "react-icons/ri";
 import semver from "semver";
 import { useTranslation } from "react-i18next";
 import ScriptMenuList from "../components/ScriptMenuList";
+import { getCurrentTab } from "@App/pkg/utils/utils";
 
 const CollapseItem = Collapse.Item;
 
@@ -69,13 +70,13 @@ function App() {
     systemManage.getVersion().then((res) => {
       res && setVersion(res);
     });
-    chrome.tabs.query({ active: true, currentWindow: true }, (tabs) => {
-      if (!tabs.length) {
+    getCurrentTab().then((tab) => {
+      if (!tab) {
         return;
       }
-      setCurrentUrl(tabs[0].url || "");
+      setCurrentUrl(tab.url || "");
       message
-        .syncSend("queryPageScript", { url: tabs[0].url, tabId: tabs[0].id })
+        .syncSend("queryPageScript", { url: tab.url, tabId: tab.id })
         .then(
           (resp: {
             scriptList: ScriptMenu[];