@agoric/swingset-vat 0.32.3-dev-47470c7.0 → 0.32.3-dev-de9b2e7.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/swingset-vat",
-  "version": "0.32.3-dev-47470c7.0+47470c7",
+  "version": "0.32.3-dev-de9b2e7.0+de9b2e7",
   "description": "Vat/Container Launcher",
   "type": "module",
   "main": "src/index.js",
@@ -27,15 +27,15 @@
     "@types/yargs-parser": "^21.0.0"
   },
   "dependencies": {
-    "@agoric/internal": "0.3.3-dev-47470c7.0+47470c7",
-    "@agoric/kmarshal": "0.1.1-dev-47470c7.0+47470c7",
-    "@agoric/store": "0.9.3-dev-47470c7.0+47470c7",
-    "@agoric/swing-store": "0.9.2-dev-47470c7.0+47470c7",
-    "@agoric/swingset-liveslots": "0.10.3-dev-47470c7.0+47470c7",
-    "@agoric/swingset-xsnap-supervisor": "0.10.3-dev-47470c7.0+47470c7",
-    "@agoric/time": "0.3.3-dev-47470c7.0+47470c7",
-    "@agoric/vat-data": "0.5.3-dev-47470c7.0+47470c7",
-    "@agoric/xsnap-lockdown": "0.14.1-dev-47470c7.0+47470c7",
+    "@agoric/internal": "0.3.3-dev-de9b2e7.0+de9b2e7",
+    "@agoric/kmarshal": "0.1.1-dev-de9b2e7.0+de9b2e7",
+    "@agoric/store": "0.9.3-dev-de9b2e7.0+de9b2e7",
+    "@agoric/swing-store": "0.9.2-dev-de9b2e7.0+de9b2e7",
+    "@agoric/swingset-liveslots": "0.10.3-dev-de9b2e7.0+de9b2e7",
+    "@agoric/swingset-xsnap-supervisor": "0.10.3-dev-de9b2e7.0+de9b2e7",
+    "@agoric/time": "0.3.3-dev-de9b2e7.0+de9b2e7",
+    "@agoric/vat-data": "0.5.3-dev-de9b2e7.0+de9b2e7",
+    "@agoric/xsnap-lockdown": "0.14.1-dev-de9b2e7.0+de9b2e7",
     "@endo/base64": "^1.0.9",
     "@endo/bundle-source": "^3.5.1",
     "@endo/captp": "^4.4.4",
@@ -102,5 +102,5 @@
   "typeCoverage": {
     "atLeast": 76.25
   },
-  "gitHead": "47470c7d3999c1222677244ed29ce6fc60c7766f"
+  "gitHead": "de9b2e7ca244a6d131f2e4206aeee76f814382e4"
 }

package/src/controller/controller.js

@@ -38,6 +38,7 @@ import { makeStartSubprocessWorkerNode } from './startNodeSubprocess.js';
 
 /**
  * @import {EReturn} from '@endo/far';
+ * @import {LimitedConsole} from '@agoric/internal';
  * @import {VatID} from '../types-internal.js';
  */
 
@@ -89,6 +90,21 @@ function makeConsole(prefixer) {
   });
 }
 
+/**
+ * A console-like object for logging. It starts as the global console but is
+ * immediately replaced with an anylogger instance dedicated to this file, and
+ * upon creation of a controller is replaced again with an anylogger dedicated
+ * to that controller (and which also emits slog entries).
+ *
+ * @type {LimitedConsole}
+ */
+let sloggingConsole = console;
+/** @type {(newConsole: LimitedConsole) => void} */
+const setSloggingConsole = newConsole => {
+  sloggingConsole = newConsole;
+};
+setSloggingConsole(makeConsole('SwingSet:controller'));
+
 /**
  * @param {unknown} e
  * @param {Promise} pr
@@ -96,7 +112,7 @@ function makeConsole(prefixer) {
 function onUnhandledRejection(e, pr) {
   // Don't trigger sensitive hosts (like AVA).
   pr.catch(() => {});
-  console.error('🤞 UnhandledPromiseRejection:', e);
+  sloggingConsole.error('🤞 UnhandledPromiseRejection:', e);
 }
 
 /**
@@ -151,23 +167,6 @@ export async function makeSwingsetController(
     throw Error('SES must be installed before calling makeSwingsetController');
   }
 
-  const startXSnap = makeStartXSnap({
-    bundleHandler,
-    snapStore: kernelStorage.snapStore,
-    spawn,
-    fs,
-    tmpName,
-    debug: !!env.XSNAP_DEBUG,
-    workerTraceRootPath: env.XSNAP_TEST_RECORD,
-    profileVats,
-    debugVats,
-  });
-  const startSubprocessWorkerNode = makeStartSubprocessWorkerNode(
-    startSubprocessWorker,
-    profileVats,
-    debugVats,
-  );
-
   /** @type {(obj: SlogProps) => void} */
   function writeSlogObject(obj) {
     if (!slogSender) return;
@@ -184,6 +183,7 @@ export async function makeSwingsetController(
     // rearrange the fields a bit to make it more legible to humans
     slogSender(harden({ type, ...props, ...timings }));
   }
+
   /**
    * Capture an extended process in the slog, writing an entry with `type`
    * $startLabel and then later (if the function returns successfully or calls
@@ -204,7 +204,8 @@ export async function makeSwingsetController(
     const [startLabel, endLabel] = labels;
     const props = { ...startProps };
     if (hasOwn(props, 'type') || hasOwn(props, 'seconds')) {
-      console.error('startProps must not include "type" or "seconds"');
+      const msg = 'startProps must not include "type" or "seconds"';
+      sloggingConsole.error(Error(msg));
       delete props.type;
       delete props.seconds;
     }
@@ -216,8 +217,7 @@ export async function makeSwingsetController(
         // `finish` should only be called once.
         // Log a stack-bearing error instance, but throw something more opaque.
         const msg = `slog event ${startLabel} ${q(startProps || {})} already finished; ignoring props ${q(extraProps || {})}`;
-        const err = Error(msg);
-        console.error(err);
+        sloggingConsole.error(Error(msg));
         Fail`slog event ${startLabel} already finished`;
       }
       finished = true;
@@ -225,9 +225,8 @@ export async function makeSwingsetController(
         // Preserve extraProps as an atomic unit by deleting prior occurrences.
         for (const name of Object.keys(extraProps)) delete props[name];
         if (hasOwn(extraProps, 'type') || hasOwn(extraProps, 'seconds')) {
-          console.error(
-            `extraProps ${q(extraProps)} must not include "type" or "seconds"`,
-          );
+          const msg = `extraProps ${q(extraProps)} must not include "type" or "seconds"`;
+          sloggingConsole.error(Error(msg));
           const {
             type: _ignoredType,
             seconds: _ignoredSeconds,
@@ -250,13 +249,38 @@ export async function makeSwingsetController(
     } catch (cause) {
       if (!finished) {
         const msg = `unfinished slog event ${startLabel} ${q(startProps || {})}`;
-        const err = Error(msg, { cause });
-        console.error(err);
+        sloggingConsole.error(Error(msg, { cause }));
       }
       throw cause;
     }
   };
 
+  const controllerConsole = makeConsole(`${debugPrefix}SwingSet:controller`);
+  const controllerSloggingConsole = makeLimitedConsole(level => {
+    return (...args) => {
+      controllerConsole[level](...args);
+      writeSlogObject({ type: 'console', source: 'controller', level, args });
+    };
+  });
+  setSloggingConsole(controllerSloggingConsole);
+
+  const startXSnap = makeStartXSnap({
+    bundleHandler,
+    snapStore: kernelStorage.snapStore,
+    spawn,
+    fs,
+    tmpName,
+    debug: !!env.XSNAP_DEBUG,
+    workerTraceRootPath: env.XSNAP_TEST_RECORD,
+    profileVats,
+    debugVats,
+  });
+  const startSubprocessWorkerNode = makeStartSubprocessWorkerNode(
+    startSubprocessWorker,
+    profileVats,
+    debugVats,
+  );
+
   const kernelInitLabels = /** @type {const} */ ([
     'kernel-init-start',
     'kernel-init-finish',