Work to reduce bundles size (prebundle modules)

plugos/bin/plugos-bundle.ts

@@ -8,8 +8,14 @@ import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
 import { Manifest } from "../types";
 import YAML from "yaml";
+import { preloadModules } from "../../common/preload_modules";
 
-async function compile(filePath: string, functionName: string, debug: boolean) {
+async function compile(
+  filePath: string,
+  functionName: string,
+  debug: boolean,
+  meta = true
+) {
   let outFile = "_out.tmp";
   let inFile = filePath;
 
@@ -23,7 +29,7 @@ async function compile(filePath: string, functionName: string, debug: boolean) {
   }
 
   // TODO: Figure out how to make source maps work correctly with eval() code
-  let js = await esbuild.build({
+  let result = await esbuild.build({
     entryPoints: [inFile],
     bundle: true,
     format: "iife",
@@ -32,8 +38,15 @@ async function compile(filePath: string, functionName: string, debug: boolean) {
     sourcemap: false, //sourceMap ? "inline" : false,
     minify: !debug,
     outfile: outFile,
+    metafile: true,
+    external: preloadModules,
   });
 
+  if (meta) {
+    let text = await esbuild.analyzeMetafile(result.metafile);
+    console.log("Bundle info for", functionName, text);
+  }
+
   let jsCode = (await readFile(outFile)).toString();
   await unlink(outFile);
   if (inFile !== filePath) {

plugos/environments/node_worker.ts

@@ -1,3 +1,5 @@
+import { preloadModules } from "../../common/preload_modules";
+
 const { parentPort, workerData } = require("worker_threads");
 // @ts-ignore
 let vm2 = `${workerData}/vm2`;
@@ -16,11 +18,17 @@ let pendingRequests = new Map<
 
 let syscallReqId = 0;
 
-// console.log("Here's crypto", crypto);
-
 let vm = new VM({
   sandbox: {
     console,
+    require: (moduleName: string): any => {
+      console.log("Loading", moduleName);
+      if (preloadModules.includes(moduleName)) {
+        return require(`${workerData}/${moduleName}`);
+      } else {
+        throw Error("Cannot import arbitrary modules");
+      }
+    },
     self: {
       syscall: (name: string, ...args: any[]) => {
         return new Promise((resolve, reject) => {

plugos/environments/sandbox_worker.ts

@@ -20,6 +20,7 @@ function workerPostMessage(msg: ControllerMessage) {
 
 declare global {
   function syscall(name: string, ...args: any[]): Promise<any>;
+  // function require(moduleName: string): any;
 }
 
 let syscallReqId = 0;
@@ -37,6 +38,20 @@ self.syscall = async (name: string, ...args: any[]) => {
   });
 };
 
+const preloadedModules: { [key: string]: any } = {
+  "@lezer/lr": require("@lezer/lr"),
+  yaml: require("yaml"),
+};
+// for (const moduleName of preloadModules) {
+//   preloadedModules[moduleName] = require(moduleName);
+// }
+
+// @ts-ignore
+self.require = (moduleName: string): any => {
+  console.log("Loading", moduleName, preloadedModules[moduleName]);
+  return preloadedModules[moduleName];
+};
+
 function wrapScript(code: string) {
   return `return (${code})["default"]`;
 }