@agoric/swingset-vat 0.32.3-dev-4fb0418.0 → 0.32.3-dev-d61be8d.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/swingset-vat",
-  "version": "0.32.3-dev-4fb0418.0+4fb0418",
+  "version": "0.32.3-dev-d61be8d.0+d61be8d",
   "description": "Vat/Container Launcher",
   "type": "module",
   "main": "src/index.js",
@@ -27,17 +27,17 @@
     "@types/yargs-parser": "^21.0.0"
   },
   "dependencies": {
-    "@agoric/assert": "0.6.1-dev-4fb0418.0+4fb0418",
-    "@agoric/internal": "0.3.3-dev-4fb0418.0+4fb0418",
-    "@agoric/kmarshal": "0.1.1-dev-4fb0418.0+4fb0418",
-    "@agoric/store": "0.9.3-dev-4fb0418.0+4fb0418",
-    "@agoric/swing-store": "0.9.2-dev-4fb0418.0+4fb0418",
-    "@agoric/swingset-liveslots": "0.10.3-dev-4fb0418.0+4fb0418",
-    "@agoric/swingset-xsnap-supervisor": "0.10.3-dev-4fb0418.0+4fb0418",
-    "@agoric/time": "0.3.3-dev-4fb0418.0+4fb0418",
-    "@agoric/vat-data": "0.5.3-dev-4fb0418.0+4fb0418",
-    "@agoric/xsnap": "0.14.3-dev-4fb0418.0+4fb0418",
-    "@agoric/xsnap-lockdown": "0.14.1-dev-4fb0418.0+4fb0418",
+    "@agoric/assert": "0.6.1-dev-d61be8d.0+d61be8d",
+    "@agoric/internal": "0.3.3-dev-d61be8d.0+d61be8d",
+    "@agoric/kmarshal": "0.1.1-dev-d61be8d.0+d61be8d",
+    "@agoric/store": "0.9.3-dev-d61be8d.0+d61be8d",
+    "@agoric/swing-store": "0.9.2-dev-d61be8d.0+d61be8d",
+    "@agoric/swingset-liveslots": "0.10.3-dev-d61be8d.0+d61be8d",
+    "@agoric/swingset-xsnap-supervisor": "0.10.3-dev-d61be8d.0+d61be8d",
+    "@agoric/time": "0.3.3-dev-d61be8d.0+d61be8d",
+    "@agoric/vat-data": "0.5.3-dev-d61be8d.0+d61be8d",
+    "@agoric/xsnap": "0.14.3-dev-d61be8d.0+d61be8d",
+    "@agoric/xsnap-lockdown": "0.14.1-dev-d61be8d.0+d61be8d",
     "@endo/base64": "^0.2.34",
     "@endo/bundle-source": "^2.7.0",
     "@endo/captp": "^3.1.4",
@@ -102,5 +102,5 @@
   "typeCoverage": {
     "atLeast": 75.26
   },
-  "gitHead": "4fb04184d1fb3497e3b8063bc9563d55fe87351d"
+  "gitHead": "d61be8d7fbda7dd3846cba38f8829e36bfae92a4"
 }

package/src/controller/startNodeSubprocess.js

@@ -17,6 +17,10 @@ export function makeStartSubprocessWorkerNode(
       args.push('--cpu-prof-interval');
       args.push('100');
       args.push('--cpu-prof-name');
+      // cf. https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_282
+      nameDisplayArg = nameDisplayArg
+        .replaceAll(':', '-')
+        .replaceAll(/[^a-z0-9._-]/gi, '_');
       args.push(`CPU.${nameDisplayArg}.cpuprofile`);
     }
     if (debugVats.includes(vatID)) {

package/tools/{run-utils.ts → run-utils.js}

@@ -1,32 +1,29 @@
-/* eslint-disable @jessie.js/safe-await-separator */
 import { Fail, q } from '@agoric/assert';
 import { kunser } from '@agoric/kmarshal';
 import { makeQueue } from '@endo/stream';
-import type { E } from '@endo/eventual-send';
-
-import type { SwingsetController } from '../src/controller/controller.js';
 
 const sink = () => {};
 
-export const makeRunUtils = (
-  controller: SwingsetController,
-  log = (..._) => {},
-) => {
+/**
+ * @param {import('../src/controller/controller.js').SwingsetController} controller
+ * @param {(...args: any[]) => void} [log]
+ */
+export const makeRunUtils = (controller, log = (..._) => {}) => {
   let cranksRun = 0;
 
   const mutex = makeQueue();
 
   mutex.put(controller.run());
 
-  const runThunk = async <T extends () => any>(
-    thunk: T,
-  ): Promise<ReturnType<T>> => {
-    try {
-      // this promise for the last lock may fail
-      await mutex.get();
-    } catch {
-      // noop because the result will resolve for the previous runMethod return
-    }
+  /**
+   * @template {() => any} T
+   * @param {T} thunk
+   * @returns {Promise<ReturnType<T>>}
+   */
+  const runThunk = async thunk => {
+    // this promise for the last lock may fail
+    // sink because the result will resolve for the previous runMethod return
+    await mutex.get().catch(sink);
 
     const thunkResult = await thunk();
 
@@ -60,10 +57,12 @@ export const makeRunUtils = (
     }
   };
 
-  type EVProxy = typeof E & {
-    sendOnly: (presence: unknown) => Record<string, (...args: any) => void>;
-    vat: (name: string) => Record<string, (...args: any) => Promise<any>>;
-  };
+  /**
+   * @typedef {import('@endo/eventual-send').EProxy & {
+   *  sendOnly: (presence: unknown) => Record<string, (...args: any) => void>;
+   *  vat: (name: string) => Record<string, (...args: any) => Promise<any>>;
+   * }} EVProxy
+   */
 
   // IMPORTANT WARNING TO USERS OF `EV`
   //
@@ -109,48 +108,56 @@ export const makeRunUtils = (
   // promise that can remain pending indefinitely, possibly to be settled by a
   // future message delivery.
 
+  /** @type {EVProxy} */
   // @ts-expect-error cast, approximate
-  const EV: EVProxy = presence =>
-    new Proxy(harden({}), {
-      get: (_t, method, _rx) => {
-        const boundMethod = (...args) =>
-          queueAndRun(() =>
-            controller.queueToVatObject(presence, method, args),
-          );
-        return harden(boundMethod);
-      },
-    });
-  EV.vat = vatName =>
-    new Proxy(harden({}), {
-      get: (_t, method, _rx) => {
-        const boundMethod = (...args) =>
-          queueAndRun(() => controller.queueToVatRoot(vatName, method, args));
-        return harden(boundMethod);
-      },
-    });
-  // @ts-expect-error xxx
-  EV.sendOnly = presence =>
-    new Proxy(harden({}), {
-      get: (_t, method, _rx) => {
-        const boundMethod = (...args) =>
-          queueAndRun(
-            () => controller.queueToVatObject(presence, method, args),
-            true,
-          );
-        return harden(boundMethod);
-      },
-    });
-  // @ts-expect-error xxx
-  EV.get = presence =>
-    new Proxy(harden({}), {
-      get: (_t, pathElement, _rx) =>
-        queueAndRun(() =>
-          controller.queueToVatRoot('bootstrap', 'awaitVatObject', [
-            presence,
-            [pathElement],
-          ]),
-        ),
-    });
+  const EV = Object.assign(
+    presence =>
+      new Proxy(harden({}), {
+        get: (_t, method, _rx) => {
+          const boundMethod = (...args) =>
+            queueAndRun(() =>
+              controller.queueToVatObject(presence, method, args),
+            );
+          return harden(boundMethod);
+        },
+      }),
+    {
+      vat: vatName =>
+        new Proxy(harden({}), {
+          get: (_t, method, _rx) => {
+            const boundMethod = (...args) =>
+              queueAndRun(() =>
+                controller.queueToVatRoot(vatName, method, args),
+              );
+            return harden(boundMethod);
+          },
+        }),
+      sendOnly: presence =>
+        new Proxy(harden({}), {
+          get: (_t, method, _rx) => {
+            const boundMethod = (...args) =>
+              queueAndRun(
+                () => controller.queueToVatObject(presence, method, args),
+                true,
+              );
+            return harden(boundMethod);
+          },
+        }),
+      get: presence =>
+        new Proxy(harden({}), {
+          get: (_t, pathElement, _rx) =>
+            queueAndRun(() =>
+              controller.queueToVatRoot('bootstrap', 'awaitVatObject', [
+                presence,
+                [pathElement],
+              ]),
+            ),
+        }),
+    },
+  );
   return harden({ runThunk, EV });
 };
-export type RunUtils = ReturnType<typeof makeRunUtils>;
+
+/**
+ * @typedef {ReturnType<typeof makeRunUtils>} RunUtils
+ */