Force script to time out

RocketChat · Jun 26, 2018 · d8bbe04 · d8bbe04
1 parent 73cd594
commit d8bbe04
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/packages/rocketchat-integrations/server/api/api.js b/packages/rocketchat-integrations/server/api/api.js
@@ -62,6 +62,9 @@ const Api = new Restivus({
 const compiledScripts = {};
 function buildSandbox(store = {}) {
 	const sandbox = {
+		scriptTimeout(reject) {
+			return setTimeout(() => reject('timed out'), 3000);
+		},
 		_,
 		s,
 		console,
@@ -243,13 +246,14 @@ function executeIntegrationRest() {
 			const result = Future.fromPromise(vm.runInNewContext(`
 				new Promise((resolve, reject) => {
 					Fiber(() => {
+						scriptTimeout(reject);
 						try {
 							resolve(script.process_incoming_request({ request: request }));
 						} catch(e) {
 							reject(e);
 						}
 					}).run();
-				}).catch((error) => console.error(error));
+				}).catch((error) => { throw new Error(error); });
 			`, sandbox, {
 				timeout: 3000
 			})).wait();