Merge branch 'main' of gitea.icodef.com:codfrm/scriptcat-mv3

src/app/service/service_worker/runtime.ts

@@ -147,6 +147,7 @@ export class RuntimeService {
             matches: ["<all_urls>"],
             allFrames: true,
             runAt: "document_start",
+            world: "ISOLATED",
           },
         ]);
       }
@@ -185,9 +186,19 @@ export class RuntimeService {
       registerScript.runAt = getRunAt(script.metadata["run-at"]);
     }
     chrome.userScripts.register([registerScript], () => {
+      // 标记为已注册
       Cache.getInstance().set("registryScript:" + script.uuid, true);
     });
-    // 标记为已注册
+    console.log(registerScript);
+    // 把脚本uuid注册到content页面
+    chrome.userScripts.register([
+      {
+        id: "content-" + scriptRes.uuid,
+        js: [{ code: "window.a=1;console.log('window.a',window,window.b)" }],
+        matches: dealMatches(matches),
+        runAt: "document_start",
+      },
+    ]);
   }
 
   unregistryPageScript(script: Script) {

src/content.ts

@@ -23,3 +23,7 @@ client.pageLoad().then((data) => {
   const runtime = new ContentRuntime(send, msg);
   runtime.start(data.scripts);
 });
+
+chrome.storage.local.get((data) => {
+  console.log(data);
+});

src/runtime/content/utils.ts

@@ -29,7 +29,9 @@ export function compileScript(code: string): ScriptFunc {
 }
 
 export function compileInjectScript(script: ScriptRunResouce): string {
-  return `window['${script.flag}']=function(context,GM_info){\n${script.code}\n}`;
+  return (
+    `console.log(window,'` + script.flag + `');window['${script.flag}']=function(context,GM_info){\n${script.code}\n}`
+  );
 }
 
 // 设置api依赖