From 7c1fb8675fea33e6ed3a48db78828e1971c26bd6 Mon Sep 17 00:00:00 2001
From: IceCola <739201322@qq.com>
Date: Sat, 25 May 2024 13:52:55 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85gameEventPromise.js=E3=80=81e?=
 =?UTF-8?q?xtensionMenu.js=E7=9A=84=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 noname/library/element/gameEventPromise.js    | 10 ++++-
 noname/ui/create/menu/pages/exetensionMenu.js | 42 +++++++++----------
 2 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/noname/library/element/gameEventPromise.js b/noname/library/element/gameEventPromise.js
index b210c2021..47ca7e4ab 100644
--- a/noname/library/element/gameEventPromise.js
+++ b/noname/library/element/gameEventPromise.js
@@ -226,8 +226,14 @@ export class GameEventPromise extends Promise {
 			const runCode = function (event, code) {
 				try {
 					// 为了使玩家调试时使用var player=xxx时不报错，故使用var
-					var { player, _trigger: trigger, _result: result } = event;
-					return eval(code);
+					// var { player, _trigger: trigger, _result: result } = event;
+					var context = { 
+						event,
+						player: event.player,
+						_trigger: event.trigger,
+						_result: event.result,
+					};
+					return security.exec(`return ${code}`, context);
 				} catch (error) {
 					return error;
 				}
diff --git a/noname/ui/create/menu/pages/exetensionMenu.js b/noname/ui/create/menu/pages/exetensionMenu.js
index fd8ac2797..2b3ba6185 100644
--- a/noname/ui/create/menu/pages/exetensionMenu.js
+++ b/noname/ui/create/menu/pages/exetensionMenu.js
@@ -380,16 +380,16 @@ export const extensionMenu = function (connectMenu) {
 											if (typeof game.readFile == "function") {
 												info[4].push(
 													"die:ext:" +
-														page.currentExtension +
-														"/audio/die/" +
-														tag.slice(tag.lastIndexOf("/") + 1)
+													page.currentExtension +
+													"/audio/die/" +
+													tag.slice(tag.lastIndexOf("/") + 1)
 												);
 											} else {
 												info[4].push(
 													"die:db:extension-" +
-														page.currentExtension +
-														":audio/die/" +
-														tag.slice(tag.lastIndexOf("/") + 1)
+													page.currentExtension +
+													":audio/die/" +
+													tag.slice(tag.lastIndexOf("/") + 1)
 												);
 											}
 										}
@@ -1679,8 +1679,8 @@ export const extensionMenu = function (connectMenu) {
 						code = container.textarea.value;
 					}
 					try {
-						var card = null;
-						eval(code);
+						debugger; // NEED TO VIEW DATA
+						var { card } = security.exec2(code);
 						if (card == null || typeof card != "object") {
 							throw "err";
 						}
@@ -1769,8 +1769,8 @@ export const extensionMenu = function (connectMenu) {
 						page.content.pack.translate[name] = translate;
 						page.content.pack.translate[name + "_info"] = info;
 						try {
-							var card = null;
-							eval(container.code);
+							debugger; // NEED TO VIEW DATA
+							var { card } = security.exec2(container.code);
 							if (card == null || typeof card != "object") {
 								throw "err";
 							}
@@ -2138,8 +2138,8 @@ export const extensionMenu = function (connectMenu) {
 						code = container.textarea.value;
 					}
 					try {
-						var skill = null;
-						eval(code);
+						debugger; // NEED TO VIEW DATA
+						var { skill } = security.exec2(code);
 						if (skill == null || typeof skill != "object") {
 							throw "err";
 						}
@@ -2321,8 +2321,8 @@ export const extensionMenu = function (connectMenu) {
 						page.content.pack.translate[name] = translate;
 						page.content.pack.translate[name + "_info"] = info;
 						try {
-							var skill = null;
-							eval(container.code);
+							debugger; // NEED TO VIEW DATA
+							var { skill } = security.exec2(container.code);
 							if (skill == null || typeof skill != "object") {
 								throw "err";
 							}
@@ -2452,20 +2452,20 @@ export const extensionMenu = function (connectMenu) {
 						}
 						try {
 							if (link == "content" || link == "precontent") {
-								var func = null;
-								eval("func=" + code);
+								debugger; // NEED TO VIEW DATA
+								var { func } = security.exec2(`func = ${code}`);
 								if (typeof func != "function") {
 									throw "err";
 								}
 							} else if (link == "config") {
-								var config = null;
-								eval(code);
+								debugger; // NEED TO VIEW DATA
+								var { config } = security.exec2(code);
 								if (config == null || typeof config != "object") {
 									throw "err";
 								}
 							} else if (link == "help") {
-								var help = null;
-								eval(code);
+								debugger; // NEED TO VIEW DATA
+								var { help } = security.exec2(code);
 								if (help == null || typeof help != "object") {
 									throw "err";
 								}
@@ -2911,7 +2911,7 @@ export const extensionMenu = function (connectMenu) {
 					referrerPolicy: "no-referrer",
 				})
 					.then((response) => response.text())
-					.then(eval)
+					.then(security.eval)
 					.then(loaded)
 					.catch((reason) => {
 						console.log(reason);