From d6b2470a8b10ce2f68fafc6909233b594946ae2b Mon Sep 17 00:00:00 2001
From: Daryl Ronningen <relms@relms.dev>
Date: Mon, 21 Jun 2021 15:31:29 -0700
Subject: [PATCH] feat(commands): finished vm command

---
 .idea/codeStyles/Project.xml |  3 +++
 license-header.txt           |  2 +-
 package.json                 |  2 +-
 src/commands/utils/vm.ts     | 47 ++++++++++++++++++++++++++++++------
 tsconfig.json                |  1 +
 5 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 70d13db..4812db2 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -54,6 +54,7 @@
     <TypeScriptCodeStyleSettings version="0">
       <option name="FORCE_SEMICOLON_STYLE" value="true" />
       <option name="USE_PUBLIC_MODIFIER" value="true" />
+      <option name="PREFER_AS_TYPE_CAST" value="true" />
       <option name="USE_DOUBLE_QUOTES" value="false" />
       <option name="FORCE_QUOTE_STYlE" value="true" />
       <option name="ENFORCE_TRAILING_COMMA" value="WhenMultiline" />
@@ -91,6 +92,7 @@
       <option name="ALIGN_MULTILINE_FOR" value="false" />
       <option name="SPACE_BEFORE_IF_PARENTHESES" value="false" />
       <option name="SPACE_BEFORE_CATCH_PARENTHESES" value="false" />
+      <option name="SPACE_BEFORE_SWITCH_PARENTHESES" value="false" />
       <indentOptions>
         <option name="INDENT_SIZE" value="2" />
         <option name="CONTINUATION_INDENT_SIZE" value="2" />
@@ -113,6 +115,7 @@
       <option name="ALIGN_MULTILINE_FOR" value="false" />
       <option name="SPACE_BEFORE_IF_PARENTHESES" value="false" />
       <option name="SPACE_BEFORE_CATCH_PARENTHESES" value="false" />
+      <option name="SPACE_BEFORE_SWITCH_PARENTHESES" value="false" />
       <indentOptions>
         <option name="INDENT_SIZE" value="2" />
         <option name="CONTINUATION_INDENT_SIZE" value="2" />
diff --git a/license-header.txt b/license-header.txt
index 7cc480e..2686a0b 100644
--- a/license-header.txt
+++ b/license-header.txt
@@ -13,4 +13,4 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with ArgonBot.  If not, see <https: //www.gnu.org/licenses/>.
- */
\ No newline at end of file
+ */
diff --git a/package.json b/package.json
index 9a7f0b6..47c1033 100644
--- a/package.json
+++ b/package.json
@@ -50,6 +50,7 @@
 		"sodium": "^3.0.2",
 		"terminal-link": "^3.0.0",
 		"tslib": "^2.3.0",
+		"typescript": "^4.3.4",
 		"utf-8-validate": "^5.0.5",
 		"vm2": "^3.9.3",
 		"zlib-sync": "^0.1.7"
@@ -93,7 +94,6 @@
 		"standard-version": "^9.3.0",
 		"ts-node": "^10.0.0",
 		"tsconfig-paths": "^3.9.0",
-		"typescript": "^4.3.4",
 		"typescript-eslint-language-service": "^4.1.4"
 	},
 	"eslintConfig": {
diff --git a/src/commands/utils/vm.ts b/src/commands/utils/vm.ts
index e56412a..a726842 100644
--- a/src/commands/utils/vm.ts
+++ b/src/commands/utils/vm.ts
@@ -14,27 +14,58 @@
  * You should have received a copy of the GNU General Public License
  * along with ArgonBot.  If not, see <https: //www.gnu.org/licenses/>.
  */
-import { VM } from 'vm2';
+import { NodeVM } from 'vm2';
+import { transpile } from 'typescript';
 import Command from '@structures/command';
 
 import type { Client, Message } from 'discord.js';
 
 export class vm extends Command {
-	public constructor(client: Client) {
-		super(client);
+	public constructor(client: Client, file: string) {
+		super(client, file);
 	}
 
-	public run(message: Message, vmLang: string, code: string): void {
-		const javascriptVM = new VM({ eval: false, timeout: 1000, wasm: false });
+	public async run(message: Message, vmLang: string, ...codeArray: string[]): Promise<void> {
+		const code = codeArray.join(' ');
+		const javascriptVM = new NodeVM({ eval: false, timeout: 1000, wasm: false, console: 'off' });
 
 		switch(vmLang.toLowerCase()) {
 			case 'js':
 			case 'javascript':
-				message.reply('Computing JavaScript code... Please wait!');
-				javascriptVM.run(code);
+				await message.reply('Computing JavaScript code... Please wait!');
+
+				try {
+					let returnVal: string;
+					if(!code.includes('module.exports = '))
+						returnVal = await javascriptVM.run(`module.exports = (() => {${code}})();`);
+					else
+						returnVal = await javascriptVM.run(`(() => {${code}})()`);
+
+					await message.reply(`\`\`\`js\n${returnVal}\`\`\``);
+				} catch(err) {
+					await message.reply(`An error has occurred while executing JavaScript code!\n\`\`\`\n${err.message}\n\`\`\``);
+				}
+				break;
+			case 'ts':
+			case 'typescript':
+				await message.reply('Computing TypeScript code... Please wait!');
+
+				try {
+					const jsCode = transpile(code);
+					let returnVal: string;
+
+					if(!jsCode.includes('module.exports = '))
+						returnVal = await javascriptVM.run(`module.exports = (() => {${jsCode}}()`);
+					else
+						returnVal = await javascriptVM.run(`(() => {${jsCode}}()`);
+
+					await message.reply(`\`\`\`js\n${returnVal}\`\`\``);
+				} catch(err) {
+					await message.reply(`An error has occurred while executing TypeScript code!\n\`\`\`\n${err.message}\n\`\`\``);
+				}
 				break;
 			default:
-				message.reply('Unknown Language given!');
+				await message.reply('Unknown Language given!');
 		}
 	}
 }
diff --git a/tsconfig.json b/tsconfig.json
index 342254e..54b6b0d 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -85,5 +85,6 @@
 	},
 	"include": [
 		"src/**/*.ts",
+		"*.json"
 	]
 }