package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "schat2-clive",
-  "version": "1.23.0",
+  "version": "1.22.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "schat2-clive",
-      "version": "1.23.0",
+      "version": "1.22.1",
       "license": "ISC",
       "dependencies": {
         "bhttp": "^1.2.8",
@@ -24,7 +24,6 @@
         "simple-node-logger": "^21.8.12",
         "string-similarity": "^4.0.4",
         "tensify": "^0.0.4",
-        "vm2": "^3.9.11",
         "ws": "^8.2.3",
         "yargs": "^17.2.1"
       },
@@ -3667,40 +3666,6 @@
       "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
       "dev": true
     },
-    "node_modules/vm2": {
-      "version": "3.9.11",
-      "resolved": "https://registry.npmjs.org/vm2/-/vm2-3.9.11.tgz",
-      "integrity": "sha512-PFG8iJRSjvvBdisowQ7iVF580DXb1uCIiGaXgm7tynMR1uTBlv7UJlB1zdv5KJ+Tmq1f0Upnj3fayoEOPpCBKg==",
-      "dependencies": {
-        "acorn": "^8.7.0",
-        "acorn-walk": "^8.2.0"
-      },
-      "bin": {
-        "vm2": "bin/vm2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      }
-    },
-    "node_modules/vm2/node_modules/acorn": {
-      "version": "8.8.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
-      "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/vm2/node_modules/acorn-walk": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
-      "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
     "node_modules/w3c-hr-time": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
@@ -6734,27 +6699,6 @@
       "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
       "dev": true
     },
-    "vm2": {
-      "version": "3.9.11",
-      "resolved": "https://registry.npmjs.org/vm2/-/vm2-3.9.11.tgz",
-      "integrity": "sha512-PFG8iJRSjvvBdisowQ7iVF580DXb1uCIiGaXgm7tynMR1uTBlv7UJlB1zdv5KJ+Tmq1f0Upnj3fayoEOPpCBKg==",
-      "requires": {
-        "acorn": "^8.7.0",
-        "acorn-walk": "^8.2.0"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "8.8.1",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
-          "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA=="
-        },
-        "acorn-walk": {
-          "version": "8.2.0",
-          "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
-          "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA=="
-        }
-      }
-    },
     "w3c-hr-time": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "schat2-clive",
-  "version": "1.23.0",
+  "version": "1.22.1",
   "description": "Game host for SChat 2-powered chat sites",
   "main": "src/app.js",
   "scripts": {
@@ -33,7 +33,6 @@
     "simple-node-logger": "^21.8.12",
     "string-similarity": "^4.0.4",
     "tensify": "^0.0.4",
-    "vm2": "^3.9.11",
     "ws": "^8.2.3",
     "yargs": "^17.2.1"
   },

src/games/javascript.js

@@ -1,49 +0,0 @@
-'use strict';
-
-const { NodeVM } = require('vm2');
-const util = require('util');
-const crypto = require('crypto');
-const timers = require('timers');
-
-const style = require('../utils/style');
-
-const vm = new NodeVM({
-	console: 'inherit',
-	sandbox: {
-		util,
-		crypto,
-		timers,
-	},
-});
-
-const vmConsole = [];
-
-vm.on('console.log', (data, ...args) => {
-	vmConsole.push(data);
-	console.log(args);
-});
-
-async function onCommand(args, context) {
-	const script = args.join(' ');
-
-	context.logger.info(`JavaScript ran by ${context.user.username}: ${script}`);
-
-	try {
-		const result = await vm.run(script, {
-			sandbox: {
-				console: {
-					log: () => console.log('console loggin!'),
-				},
-			},
-		});
-
-		context.sendMessage(`${style.green('<success>')} ${result} | ${vmConsole.join(' ')}`, context.room.id);
-	} catch (error) {
-		context.sendMessage(`${style.red(`<${error.name}>`)} ${error.message}`, context.room.id);
-	}
-}
-
-module.exports = {
-	onCommand,
-	commands: ['js', '>'],
-};

src/play.js

@@ -197,7 +197,7 @@ function getMessageRoom(message, bot) {
 
 function onMessage(message, bot, games) {
 	const body = message.originalBody || message.body;
-	const [, command, subcommand] = body?.match(new RegExp(`^${config.prefix}([\\w>]+)(?:\\:(\\w+))?`)) || [];
+	const [, command, subcommand] = body?.match(new RegExp(`^${config.prefix}(\\w+)(?:\\:(\\w+))?`)) || [];
 	const user = getMessageUser(message, bot);
 	const room = getMessageRoom(message, bot);