diff --git a/src/app/service/service_worker/popup.ts b/src/app/service/service_worker/popup.ts index 100408485..04cb9b529 100644 --- a/src/app/service/service_worker/popup.ts +++ b/src/app/service/service_worker/popup.ts @@ -340,7 +340,7 @@ export class PopupService { async getPopupData(req: GetPopupDataReq): Promise { const { url, tabId } = req; const [matchingResult, runScripts, backScriptList] = await Promise.all([ - this.runtime.getPageScriptMatchingResultByUrl(url, true, true), + this.runtime.getPopupPageScriptMatchingResultByUrl(url), this.getScriptMenu(tabId), this.getScriptMenu(-1), ]); diff --git a/src/app/service/service_worker/runtime.test.ts b/src/app/service/service_worker/runtime.test.ts index 0e29cc5bb..09b481f3f 100644 --- a/src/app/service/service_worker/runtime.test.ts +++ b/src/app/service/service_worker/runtime.test.ts @@ -3,7 +3,12 @@ import { RuntimeService } from "./runtime"; import { vi, describe, it, expect, beforeEach, type MockedFunction } from "vitest"; import { randomUUID } from "crypto"; import type { Script, ScriptRunResource } from "@App/app/repo/scripts"; -import { SCRIPT_STATUS_DISABLE, SCRIPT_STATUS_ENABLE, SCRIPT_TYPE_NORMAL } from "@App/app/repo/scripts"; +import { + SCRIPT_STATUS_DISABLE, + SCRIPT_STATUS_ENABLE, + SCRIPT_TYPE_BACKGROUND, + SCRIPT_TYPE_NORMAL, +} from "@App/app/repo/scripts"; import { getCombinedMeta } from "./utils"; import type { SystemConfig } from "@App/pkg/config/config"; import type { Group } from "@Packages/message/server"; @@ -16,10 +21,11 @@ import type { ScriptDAO } from "@App/app/repo/scripts"; import { LocalStorageDAO } from "@App/app/repo/localStorage"; import type { MessageConnect, TMessage } from "@Packages/message/types"; import { obtainBlackList } from "@App/pkg/utils/utils"; +import type { CompiledResource, Resource } from "@App/app/repo/resource"; initTestEnv(); -describe.concurrent("RuntimeService - getPageScriptMatchingResultByUrl 脚本匹配", () => { +describe("RuntimeService - getPageScriptMatchingResultByUrl 脚本匹配", () => { let runtime: RuntimeService; let mockSystemConfig: { getBlacklist: MockedFunction<() => string>; @@ -27,6 +33,20 @@ describe.concurrent("RuntimeService - getPageScriptMatchingResultByUrl 脚本匹 let mockScriptService: { buildScriptRunResource: MockedFunction<(script: Script, scriptFlag?: string) => ScriptRunResource>; }; + let mockValueService: { + getScriptValue: MockedFunction<(script: Script) => Promise>>; + }; + let mockResourceService: { + getScriptResources: MockedFunction<(script: Script, load: boolean) => Promise>>; + updateResource: MockedFunction<(uuid: string, url: string, type: any) => Promise>; + }; + let mockScriptDAO: { + all: MockedFunction<() => Promise>; + gets: MockedFunction<(uuids: string[]) => Promise<(Script | undefined)[]>>; + scriptCodeDAO: { + get: MockedFunction<(uuid: string) => Promise<{ uuid: string; code: string } | undefined>>; + }; + }; // 测试数据创建工具函数 const createMockScript = (overrides: Partial