fix: eval问题 & GM_deleteValue 调用错误

Author: CodFrm

build/scriptcat/manifest.json

@@ -1,7 +1,7 @@
 {
     "manifest_version": 2,
     "name": "ScriptCat",
-    "version": "0.7.3",
+    "version": "0.7.4",
     "description": "脚本猫,一个用户脚本的框架,可编写脚本每天帮你自动处理事务.",
     "background": {
         "page": "background.html"

package.json

@@ -1,6 +1,6 @@
 {
     "name": "scriptcat",
-    "version": "0.7.3",
+    "version": "0.7.4",
     "description": "脚本猫,一个可以执行用户脚本的浏览器扩展,万物皆可脚本化,让你的浏览器可以做更多的事情!",
     "scripts": {
         "test": "jest",

src/apps/config.ts

@@ -1,4 +1,4 @@
-export const ExtVersion = "0.7.3";
+export const ExtVersion = "0.7.4";
 
 export const Server = process.env.NODE_ENV == "production" ? "https://sc.icodef.com/" : "http://localhost:8080/";
 

src/apps/grant/frontend.ts

@@ -343,7 +343,7 @@ export class FrontendGrant implements ScriptContext {
 
     @FrontendGrant.GMFunction({ depend: ['GM_setValue'] })
     public GM_deleteValue(name: string): void {
-        GM_setValue(name, undefined);
+        this.GM_setValue(name, undefined);
     }
 
     @FrontendGrant.GMFunction()

src/pkg/sandbox/sandbox.ts

@@ -42,7 +42,7 @@ for (const key in descs) {
 export function buildThis(global: any, context: any) {
     let special = Object.assign({}, writables);
     // 后台脚本要不要考虑不能使用eval?
-    let _this: any = {};
+    let _this: any = { eval: global.eval };
     let proxy: any = new Proxy(context, {
         defineProperty(_, name, desc) {
             return Object.defineProperty(context, name, desc);
@@ -113,6 +113,5 @@ export function buildThis(global: any, context: any) {
             return ret;
         }
     });
-    _this.eval = global.eval.bind(proxy);
     return proxy;
 }

tests/sandbox.user.js

@@ -0,0 +1,48 @@
+// ==UserScript==
+// @name         油猴兼容测试
+// @namespace    http://tampermonkey.net/
+// @version      0.1
+// @description  try to take over the world!
+// @author       You
+// @match        https://bbs.tampermonkey.net.cn/
+// @icon         https://www.google.com/s2/favicons?domain=tampermonkey.net.cn
+// @resource icon https://bbs.tampermonkey.net.cn/favicon.ico
+// @resource html https://bbs.tampermonkey.net.cn/
+// @resource xml https://bbs.tampermonkey.net.cn/sitemap.xml
+// @grant GM_getResourceText
+// @grant GM_getResourceURL
+// ==/UserScript==
+
+console.log(window.scrollX, window.scrollY);
+
+console.log(addEventListener);
+
+let uia = (function () {
+	console.log('123');
+	return {
+		tip: () => {
+			console.log('aqwe');
+		}
+	}
+})()
+
+uia.tip();
+
+function evalTest() {
+	console.log('okk');
+}
+
+setTimeout(() => {
+	console.log('okk2', window.scrollX, window.scrollY);
+	window.scrollY = 633;
+	console.log('okk2', window.scrollX, window.scrollY);
+}, 1000)
+
+let f = eval('()=>{evalTest()}');
+f();
+console.log(this);
+eval('console.log(this)');
+
+window.onload = () => {
+	console.log('onload');
+}