Exposing fetch to functions and initial work on Electron

plugos/environments/node_worker.ts

@@ -1,9 +1,9 @@
 import { preloadModules } from "../../common/preload_modules";
 
 const { parentPort, workerData } = require("worker_threads");
-// @ts-ignore
-let vm2 = `${workerData}/vm2`;
-const { VM, VMScript } = require(vm2);
+const { VM, VMScript } = require(`${workerData}/vm2`);
+const fetch = require(`${workerData}/node-fetch`);
+const WebSocket = require(`${workerData}/ws`);
 
 // console.log("Process env", process.env);
 
@@ -20,11 +20,16 @@ let syscallReqId = 0;
 
 let vm = new VM({
   sandbox: {
+    // Exposing some "safe" APIs
     console,
     setTimeout,
     clearTimeout,
     setInterval,
     clearInterval,
+    fetch,
+    WebSocket,
+    // This is only going to be called for pre-bundled modules, we won't allow
+    // arbitrary requiring of modules
     require: (moduleName: string): any => {
       // console.log("Loading", moduleName);
       if (preloadModules.includes(moduleName)) {
@@ -97,12 +102,6 @@ parentPort.on("message", (data: any) => {
         let syscallId = data.id;
         const lookup = pendingRequests.get(syscallId);
         if (!lookup) {
-          console.log(
-            "Current outstanding requests",
-            pendingRequests,
-            "looking up",
-            syscallId
-          );
           throw Error("Invalid request id");
         }
         pendingRequests.delete(syscallId);

plugos/environments/sandbox_worker.ts

@@ -48,7 +48,7 @@ const preloadedModules: { [key: string]: any } = {
 
 // @ts-ignore
 self.require = (moduleName: string): any => {
-  console.log("Loading", moduleName, preloadedModules[moduleName]);
+  // console.log("Loading", moduleName, preloadedModules[moduleName]);
   return preloadedModules[moduleName];
 };
 

plugos/package.json

@@ -57,6 +57,7 @@
     "node-watch": "^0.7.3",
     "supertest": "^6.2.2",
     "vm2": "^3.9.9",
+    "ws": "^8.5.0",
     "yaml": "^1.10.2",
     "yargs": "^17.3.1"
   },

plugos/yarn.lock

@@ -5566,6 +5566,11 @@ ws@^7.4.6:
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.7.tgz#9e0ac77ee50af70d58326ecff7e85eb3fa375e67"
   integrity sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==
 
+ws@^8.5.0:
+  version "8.5.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.5.0.tgz#bfb4be96600757fe5382de12c670dab984a1ed4f"
+  integrity sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==
+
 xml-name-validator@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"