Merge pull request #1 from e2b-dev/wip

merge rip into master

Author: mishushakov

.eslintrc.yml

@@ -4,7 +4,7 @@ extends:
         - eslint:recommended
 
 parserOptions:
-        ecmaVersion: 5
+        ecmaVersion: 2017
 
 env:
         node: true

lib/server/index.js

@@ -57,7 +57,7 @@ var sourceFiles = [
 });
 
 // iife
-sourceFiles.unshift("(function() {");
+sourceFiles.unshift("(async function() {");
 sourceFiles.push("})();");
 
 

lib/server/main.js

@@ -80,7 +80,7 @@ function onUncaughtException(error) {
     });
 }
 
-function onMessage(message) {
+async function onMessage(message) {
     log("RECEIVED:", message);
 
     var action = message[0];
@@ -97,11 +97,11 @@ function onMessage(message) {
         captureGlobalContext(context);
 
         if (action === "getAllPropertyNames") {
-            onNameRequest(code, context);
+            await onNameRequest(code, context);
         } else if (action === "inspect") {
-            onInspectRequest(code, context);
+            await onInspectRequest(code, context);
         } else if (action === "run") {
-            onRunRequest(code, context);
+            await onRunRequest(code, context);
         } else if (action === "reply") {
             onReply(message, context);
         } else {
@@ -118,26 +118,26 @@ function onReply(message, context) {
     context.requester.receive(requestId, reply);
 }
 
-function onNameRequest(code, context) {
+async function onNameRequest(code, context) {
     var message = {
         id: context.id,
-        names: getAllPropertyNames(run(code)),
+        names: getAllPropertyNames(await run(code)),
         end: true,
     };
     context.send(message);
 }
 
-function onInspectRequest(code, context) {
+async function onInspectRequest(code, context) {
     var message = {
         id: context.id,
-        inspection: inspect(run(code)),
+        inspection: inspect(await run(code)),
         end: true,
     };
     context.send(message);
 }
 
-function onRunRequest(code, context) {
-    var result = run(code);
+async function onRunRequest(code, context) {
+    var result = await run(code);
 
     // If a result has already been sent, do not send this result.
     if (context._done) {
@@ -292,6 +292,6 @@ function inspect(object) {
     }
 }
 
-function run(code) {
-    return vm.runInThisContext(code);
+async function run(code) {
+    return await vm.runInThisContext(code, { importModuleDynamically: vm.constants.USE_MAIN_CONTEXT_DEFAULT_LOADER });
 }