🐛 修复沙盒模式无法从window读取GM_info的问题 #126

scriptscat · Dec 15, 2022 · f23ccde · f23ccde
1 parent e0a0d64
commit f23ccde
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/src/runtime/content/exec_script.ts b/src/runtime/content/exec_script.ts
@@ -34,6 +34,9 @@ export default class ExecScript {
 
   proxyMessage: ProxyMessageManager;
 
+  // eslint-disable-next-line camelcase
+  GM_info: any;
+
   constructor(
     scriptRes: ScriptRunResouce,
     message: MessageManager,
@@ -45,6 +48,7 @@ export default class ExecScript {
       id: this.scriptRes.id,
       name: this.scriptRes.name,
     });
+    this.GM_info = GMApi.GM_info(this.scriptRes);
     this.proxyMessage = new ProxyMessageManager(message);
     if (scriptFunc) {
       this.scriptFunc = scriptFunc;
@@ -57,7 +61,11 @@ export default class ExecScript {
       this.proxyContent = window;
     } else {
       // 构建脚本GM上下文
-      this.sandboxContent = createContext(scriptRes, this.proxyMessage);
+      this.sandboxContent = createContext(
+        scriptRes,
+        this.GM_info,
+        this.proxyMessage
+      );
       this.proxyContent = proxyContext(window, this.sandboxContent);
     }
   }
@@ -71,7 +79,7 @@ export default class ExecScript {
     this.logger.debug("script start");
     return this.scriptFunc.apply(this.proxyContent, [
       this.proxyContent,
-      GMApi.GM_info(this.scriptRes),
+      this.GM_info,
     ]);
   }
 

diff --git a/src/runtime/content/utils.ts b/src/runtime/content/utils.ts
@@ -56,6 +56,7 @@ function setDepend(context: { [key: string]: any }, apiVal: ApiValue) {
 // 构建沙盒上下文
 export function createContext(
   scriptRes: ScriptRunResouce,
+  GMInfo: any,
   message: MessageManager
 ): GMApi {
   // 按照GMApi构建
@@ -70,7 +71,8 @@ export function createContext(
     connect: GMApi.prototype.connect,
     runFlag: uuidv4(),
     valueUpdate: GMApi.prototype.valueUpdate,
-    GM: {},
+    GM: { Info: GMInfo },
+    GM_info: GMInfo,
   };
   if (scriptRes.metadata.grant) {
     scriptRes.metadata.grant.forEach((val) => {
@@ -193,9 +195,6 @@ export function proxyContext(global: any, context: any) {
       return undefined;
     },
     has(_, name) {
-      if (name === "GM_info") {
-        return false;
-      }
       return true;
     },
     set(_, name: string, val) {