fix: make code clearer

packages/SwingSet/src/controller.js

@@ -26,6 +26,9 @@ import { insistStorageAPI } from './storageAPI';
 import { insistCapData } from './capdata';
 import { parseVatSlot } from './parseVatSlots';
 
+// FIXME: Put this somewhere better.
+process.on('unhandledRejection', e => console.log('unhandledRejection', e));
+
 const ADMIN_DEVICE_PATH = require.resolve('./kernel/vatAdmin/vatAdmin-src');
 const ADMIN_VAT_PATH = require.resolve('./kernel/vatAdmin/vatAdminWrapper');
 
@@ -197,32 +200,29 @@ function realmRegisterEndOfCrank(fn) {
     { registerEndOfCrank },
   );
 
-  return src => {
-    // FIXME: Note that this replaceGlobalMeter endowment is not any
-    // worse than before metering existed.  However, it probably is
-    // only necessary to be added to the kernel, rather than all
-    // static vats once we add metering support to the dynamic vat
-    // implementation.
-    // FIXME: Same for registerEndOfCrank.
-
-    // Cope with ESM problems.
-    src = src.replace(/(_[a-zA-Z0-9]{3}\u200d\.e)/g, 'eval');
-
-    // Support both getExport and nestedEvaluate module format.
+  return (src, filePrefix = '/SwingSet-bundled-source') => {
     const nestedEvaluate = source =>
       s.evaluate(source, {
+        // Support both getExport and nestedEvaluate module format.
         require: r,
+        nestedEvaluate,
+
+        // FIXME: Note that this replaceGlobalMeter endowment is not any
+        // worse than before metering existed.  However, it probably is
+        // only necessary to be added to the kernel, rather than all
+        // static vats once we add metering support to the dynamic vat
+        // implementation.
+        // FIXME: Same for registerEndOfCrank.
         registerEndOfCrank: realmRegisterEndOfCrank,
         replaceGlobalMeter,
-        nestedEvaluate,
       });
-    return nestedEvaluate(src)().default;
+    return nestedEvaluate(src)(filePrefix).default;
   };
 }
 
 function buildSESKernel(sesEvaluator, endowments) {
   const kernelSource = getKernelSource();
-  const buildKernel = sesEvaluator(kernelSource);
+  const buildKernel = sesEvaluator(kernelSource, '/SwingSet-kernel');
   return buildKernel(endowments);
 }
 
@@ -266,7 +266,7 @@ export async function buildVatController(config, withSES = true, argv = []) {
   // Evaluate source to produce a setup function. This binds withSES from the
   // enclosing context and evaluates it either in a SES context, or without SES
   // by directly calling require().
-  async function evaluateToSetup(sourceIndex) {
+  async function evaluateToSetup(sourceIndex, filePrefix = undefined) {
     if (!(sourceIndex[0] === '.' || path.isAbsolute(sourceIndex))) {
       throw Error(
         'sourceIndex must be relative (./foo) or absolute (/foo) not bare (foo)',
@@ -284,7 +284,7 @@ export async function buildVatController(config, withSES = true, argv = []) {
         'nestedEvaluate',
       );
       const actualSource = `(${source})\n${sourceMap}`;
-      setup = sesEvaluator(actualSource);
+      setup = sesEvaluator(actualSource, filePrefix);
     } else {
       // eslint-disable-next-line global-require,import/no-dynamic-require
       setup = require(`${sourceIndex}`).default;
@@ -298,8 +298,8 @@ export async function buildVatController(config, withSES = true, argv = []) {
     setImmediate,
     hostStorage,
     runEndOfCrank,
-    vatAdminDevSetup: await evaluateToSetup(ADMIN_DEVICE_PATH),
-    vatAdminVatSetup: await evaluateToSetup(ADMIN_VAT_PATH),
+    vatAdminDevSetup: await evaluateToSetup(ADMIN_DEVICE_PATH, '/SwingSet/src'),
+    vatAdminVatSetup: await evaluateToSetup(ADMIN_VAT_PATH, '/SwingSet/src'),
   };
 
   const kernel = withSES
@@ -308,12 +308,12 @@ export async function buildVatController(config, withSES = true, argv = []) {
 
   async function addGenesisVat(name, sourceIndex, options = {}) {
     console.log(`= adding vat '${name}' from ${sourceIndex}`);
-    const setup = await evaluateToSetup(sourceIndex);
+    const setup = await evaluateToSetup(sourceIndex, `/SwingSet-vat-${name}`);
     kernel.addGenesisVat(name, setup, options);
   }
 
   async function addGenesisDevice(name, sourceIndex, endowments) {
-    const setup = await evaluateToSetup(sourceIndex);
+    const setup = await evaluateToSetup(sourceIndex, `/SwingSet-dev-${name}`);
     kernel.addGenesisDevice(name, setup, endowments);
   }
 

packages/bundle-source/README.md

@@ -54,5 +54,5 @@ The advantage of this format is that it helps preserve the filenames within
 the bundle in the event of any stack traces.
 
 Also, the toplevel `getExport(filePrefix = "/bundled-source")` accepts an
-optional `filePrefix` argument in order to help sanitize stack
-traces (which is prepended to relative paths for the bundled files).
+optional `filePrefix` argument (which is prepended to relative paths for the
+bundled files) in order to help give context to stack traces.

packages/bundle-source/src/index.js

@@ -119,7 +119,7 @@ return module.exports;
       throw Error('need to override nestedEvaluate');
     };
     function computeExports(filename, powers) {
-      const { require: myRequire, _log } = powers;
+      const { require: systemRequire, _log } = powers;
       // This captures the endowed require.
       const match = filename.match(/^(.*)\/[^\/]+$/);
       const thisdir = match ? match[1] : '.';
@@ -171,7 +171,14 @@ return module.exports;
       const code = createEvalString(filename);
       if (!code) {
         // log('missing code for', filename, sourceBundle);
-        return myRequire(filename);
+        if (systemRequire) {
+          return systemRequire(filename);
+        }
+        throw Error(
+          `require(${JSON.stringify(
+            filename,
+          )}) failed; no toplevel require endowment`,
+        );
       }
 
       // log('evaluating', typeof nestedEvaluate, code);