🚑 紧急修复GM沙盒问题

scriptscat · Oct 11, 2022 · fbe6e05 · fbe6e05
1 parent 259077b
commit fbe6e05
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/build/scriptcat/manifest.json b/build/scriptcat/manifest.json
@@ -1,7 +1,7 @@
 {
     "manifest_version": 2,
     "name": "ScriptCat",
-    "version": "0.9.2",
+    "version": "0.9.3",
     "description": "脚本猫,一个用户脚本的框架,可编写脚本每天帮你自动处理事务.",
     "background": {
         "page": "background.html"

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "scriptcat",
-    "version": "0.9.2",
+    "version": "0.9.3",
     "description": "脚本猫,一个可以执行用户脚本的浏览器扩展,万物皆可脚本化,让你的浏览器可以做更多的事情!",
     "scripts": {
         "lint": "eslint --ext .js,.ts,.tsx tests/ src/",

diff --git a/src/apps/config.ts b/src/apps/config.ts
@@ -1,4 +1,4 @@
-export const ExtVersion = '0.9.2';
+export const ExtVersion = '0.9.3';
 
 export const Server = process.env.NODE_ENV == 'production' ? 'https://sc.icodef.com/' : 'http://localhost:8080/';
 

diff --git a/src/injected.ts b/src/injected.ts
@@ -84,7 +84,7 @@ browserMsg.listen('scripts', (msg) => {
             return;
         }
         if ((<{ [key: string]: () => void }><unknown>window)[script.flag]) {
-            (<{ [key: string]: (context: ScriptContext) => void }><unknown>window)[script.flag].apply(context, [context]);
+            (<{ [key: string]: (GM_Info:any, context: ScriptContext) => void }><unknown>window)[script.flag].apply(context, [GMInfo,context]);
         }
         Object.defineProperty(window, script.flag, {
             get: () => { return undefined; },

diff --git a/src/pkg/sandbox/compile.ts b/src/pkg/sandbox/compile.ts
@@ -1,4 +1,4 @@
-import { FrontenApiValue, SandboxContext, ScriptContext } from '@App/apps/grant/frontend';
+import { FrontenApiValue, FrontendGrant, SandboxContext, ScriptContext } from '@App/apps/grant/frontend';
 import { ScriptCache, Script } from '@App/model/do/script';
 
 // 编译脚本代码字符串
@@ -14,11 +14,11 @@ export function compileScriptCode(script: ScriptCache): string {
 		});
 	code = require + code;
 	return (
-		'with (context) return ((GM_info ,context, fapply, CDATA, uneval, define, module, exports)=>{\n' +
+		'with (context) return ((context, fapply, CDATA, uneval, define, module, exports)=>{\n' +
 		code +
 		'\n//# sourceURL=' +
 		chrome.runtime.getURL('/' + encodeURI(script.name) + '.user.js') +
-		'\n})(GM_info, context)'
+		'\n})(context)'
 	);
 }
 
@@ -53,7 +53,7 @@ export function createSandboxContext(script: ScriptCache): SandboxContext {
 	return <SandboxContext>createContext(context, script);
 }
 
-export function createContext(context: ScriptContext, script: Script): ScriptContext {
+export function createContext(context: ScriptContext, script: ScriptCache): ScriptContext {
 	context['postRequest'] = context.postRequest;
 	context['script'] = context.script;
 	if (script.metadata['grant']) {
@@ -72,7 +72,7 @@ export function createContext(context: ScriptContext, script: Script): ScriptCon
 			setDepend(context, apiVal);
 		});
 	}
-	context['GM_info'] = context.GM_info();
+	context['GM_info'] = FrontendGrant.GM_info(script);
 
 	// 去除原型链
 	return Object.assign({}, context);