Refactor and renaming

packages/plugos/environments/node_sandbox.ts

@@ -36,15 +36,21 @@ class NodeWorkerWrapper implements WorkerLike {
 }
 
 // Look for the node_modules directory, to be passed to the worker to find e.g. the vm2 module
-let nodeModulesDir = __dirname;
+export let nodeModulesDir = __dirname;
 while (!fs.existsSync(nodeModulesDir + "/node_modules/vm2")) {
   nodeModulesDir = path.dirname(nodeModulesDir);
 }
 
-export function createSandbox(plug: Plug<any>) {
+export function createSandbox(
+  plug: Plug<any>,
+  preloadedModules: string[] = []
+) {
   let worker = new Worker(workerCode, {
     eval: true,
-    workerData: path.join(nodeModulesDir, "node_modules"),
+    workerData: {
+      nodeModulesPath: path.join(nodeModulesDir, "node_modules"),
+      preloadedModules,
+    },
   });
   return new Sandbox(plug, new NodeWorkerWrapper(worker));
 }

packages/plugos/environments/node_worker.ts

@@ -1,11 +1,9 @@
-import { preloadModules } from "../../silverbullet-common/preload_modules";
+const {
+  parentPort,
+  workerData: { preloadedModules, nodeModulesPath },
+} = require("worker_threads");
 
-const { parentPort, workerData } = require("worker_threads");
-const { VM, VMScript } = require(`${workerData}/vm2`);
-const fetch = require(`${workerData}/node-fetch`);
-const WebSocket = require(`${workerData}/ws`);
-
-// console.log("Process env", process.env);
+const { VM, VMScript } = require(`${nodeModulesPath}/vm2`);
 
 let loadedFunctions = new Map<string, Function>();
 let pendingRequests = new Map<
@@ -26,14 +24,14 @@ let vm = new VM({
     clearTimeout,
     setInterval,
     clearInterval,
-    fetch,
-    WebSocket,
+    fetch: require(`${nodeModulesPath}/node-fetch`),
+    WebSocket: require(`${nodeModulesPath}/ws`),
     // 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)) {
-        return require(`${workerData}/${moduleName}`);
+      if (preloadedModules.includes(moduleName)) {
+        return require(`${nodeModulesPath}/${moduleName}`);
       } else {
         throw Error("Cannot import arbitrary modules");
       }