From 69e4f54e2376aa0ca0296e336b3ed4d0257da66b Mon Sep 17 00:00:00 2001
From: Steve Davies <steved@ipcortex.co.uk>
Date: Wed, 8 Jun 2022 12:40:24 +0100
Subject: [PATCH] Cleanup and use ES6

---
 index.js     | 25 +++++++++++++++++--------
 package.json |  1 -
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/index.js b/index.js
index 97a7d7d..1f0b30a 100644
--- a/index.js
+++ b/index.js
@@ -1,14 +1,20 @@
-var fs = require('fs');
-var vm = require('vm');
+const fs = require('fs');
+const vm = require('vm');
 
-var _global = global || GLOBAL;
-_global.XMLHttpRequest = require('xmlhttprequest-cookie').XMLHttpRequest;
-_global.Promise = require('es6-promise-polyfill').Promise;
-_global.WebSocket = require('websocket').w3cwebsocket;
+const XMLHttpRequest = require('xmlhttprequest-cookie').XMLHttpRequest;
+const WebSocket = require('websocket').w3cwebsocket;
 
 var apiFile	= __dirname + '/api.js';
 
 module.exports = (function() {
+	const context = {
+		XMLHttpRequest,
+		WebSocket,
+		setInterval,
+		setTimeout,
+		clearTimeout,
+		console
+	};
 	if(!fs.existsSync(apiFile)) {
 		if(!fs.existsSync(__dirname + '/../../api.js')) {
 			throw new Error('api.js does not exist! (Have you downloaded it using updateAPI.js?)');
@@ -17,8 +23,11 @@ module.exports = (function() {
 			apiFile = __dirname + '/../../api.js';
 		}
 	}
-	var api = fs.readFileSync(apiFile, 'utf8');
-	vm.runInThisContext(api, { filename: apiFile });
+	const api = fs.readFileSync(apiFile, 'utf8');
+	const script = new vm.Script(api);
+	vm.createContext(context);
+	script.runInContext(context);
+	const IPCortex = context.IPCortex;
 	IPCortex.PBX.httpStopReuse();
 	return IPCortex;
 }());
diff --git a/package.json b/package.json
index ff49981..a5f1cc1 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,6 @@
   "license": "BSD",
   "dependencies": {
     "agentkeepalive": "^2.0.2",
-    "es6-promise-polyfill": "^1.2.0",
     "request": "^2.55.0",
     "websocket": "^1.0.22",
     "xmlhttprequest-cookie": "ipcortex/node-xmlhttprequest-cookie"