@agoric/swingset-vat 0.32.3-dev-0dccf64.0.0dccf64 → 0.32.3-dev-3dacdc3.0.3dacdc3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/swingset-vat",
-  "version": "0.32.3-dev-0dccf64.0.0dccf64",
+  "version": "0.32.3-dev-3dacdc3.0.3dacdc3",
   "description": "Vat/Container Launcher",
   "type": "module",
   "main": "src/index.js",
@@ -22,7 +22,7 @@
     "lint:eslint": "yarn run -T eslint ."
   },
   "devDependencies": {
-    "@agoric/xsnap": "0.14.3-dev-0dccf64.0.0dccf64",
+    "@agoric/xsnap": "0.14.3-dev-3dacdc3.0.3dacdc3",
     "@types/better-sqlite3": "^7.6.13",
     "@types/microtime": "^2.1.0",
     "@types/tmp": "^0.2.0",
@@ -30,15 +30,15 @@
     "ava": "^6.4.1"
   },
   "dependencies": {
-    "@agoric/internal": "0.3.3-dev-0dccf64.0.0dccf64",
-    "@agoric/kmarshal": "0.1.1-dev-0dccf64.0.0dccf64",
-    "@agoric/store": "0.9.3-dev-0dccf64.0.0dccf64",
-    "@agoric/swing-store": "0.9.2-dev-0dccf64.0.0dccf64",
-    "@agoric/swingset-liveslots": "0.10.3-dev-0dccf64.0.0dccf64",
-    "@agoric/swingset-xsnap-supervisor": "0.10.3-dev-0dccf64.0.0dccf64",
-    "@agoric/time": "0.3.3-dev-0dccf64.0.0dccf64",
-    "@agoric/vat-data": "0.5.3-dev-0dccf64.0.0dccf64",
-    "@agoric/xsnap-lockdown": "0.14.1-dev-0dccf64.0.0dccf64",
+    "@agoric/internal": "0.3.3-dev-3dacdc3.0.3dacdc3",
+    "@agoric/kmarshal": "0.1.1-dev-3dacdc3.0.3dacdc3",
+    "@agoric/store": "0.9.3-dev-3dacdc3.0.3dacdc3",
+    "@agoric/swing-store": "0.9.2-dev-3dacdc3.0.3dacdc3",
+    "@agoric/swingset-liveslots": "0.10.3-dev-3dacdc3.0.3dacdc3",
+    "@agoric/swingset-xsnap-supervisor": "0.10.3-dev-3dacdc3.0.3dacdc3",
+    "@agoric/time": "0.3.3-dev-3dacdc3.0.3dacdc3",
+    "@agoric/vat-data": "0.5.3-dev-3dacdc3.0.3dacdc3",
+    "@agoric/xsnap-lockdown": "0.14.1-dev-3dacdc3.0.3dacdc3",
     "@endo/base64": "^1.0.12",
     "@endo/bundle-source": "^4.1.2",
     "@endo/captp": "^4.4.8",
@@ -105,5 +105,5 @@
   "typeCoverage": {
     "atLeast": 76.72
   },
-  "gitHead": "0dccf64926ac58da475a8eb599300841f55ee84f"
+  "gitHead": "3dacdc33b578ee52258e5771192bf8e57beb603b"
 }

package/tools/bundleTool.js

@@ -321,10 +321,30 @@ harden(provideBundleCache);
 export const unsafeMakeBundleCache = dest =>
   makeNodeBundleCache(dest, {}, s => import(s));
 
-const sharedBundleCachePath = fileURLToPath(
+/**
+ * This is a hack to share bundles across multiple SwingSet instances. It is
+ * not safe to use in general, as it does not coordinate access to the shared
+ * cache. It is only safe if all users are cooperative and use the same locking
+ * mechanism, which is currently only this module's `withBundleLock`. Even then,
+ * there is a risk of lock contention and timeouts if multiple users are trying
+ * to build the same bundle at the same time. Use with caution.
+ *
+ * Also note that assumes bundles are stored in a `bundles` directory at the
+ * root of the project, which is not guaranteed to be the case in all
+ * environments.
+ */
+export const sharedBundleCachePath = fileURLToPath(
   new URL('../../../bundles', import.meta.url),
 );
 
+/**
+ * "Unsafe" because it entails ambient authority.
+ *
+ * Also note that it uses the shared bundle cache path, which is exported
+ * separately for use in other contexts that need to know where the shared
+ * bundles are located, but that also makes it more likely to cause conflicts if
+ * used in multiple places at once.
+ */
 export const unsafeSharedBundleCache = unsafeMakeBundleCache(
   sharedBundleCachePath,
 );

package/tools/test-swingset.js

@@ -1,13 +1,11 @@
 /* eslint-env node */
-import fs from 'fs';
-import path from 'path';
-import { fileURLToPath } from 'url';
 import { makeReadJsonFile } from '@agoric/internal/src/node/read-json.js';
-import { provideBundleCache } from './bundleTool.js';
+import fs from 'fs';
 import {
   buildSwingsetKernelConfig,
   initializeSwingsetKernel,
 } from '../src/controller/initializeSwingset.js';
+import { unsafeSharedBundleCache } from './bundleTool.js';
 
 /**
  * @import {SwingSetConfig} from '../src/types-external.js';
@@ -18,14 +16,10 @@ import {
 
 const readBundleSpecFile = makeReadJsonFile(fs.promises);
 
-const sharedBundleCachePath = fileURLToPath(
-  new URL('../../../bundles', import.meta.url),
-);
-
 /**
  * Test-only wrapper that supplies ambient-powered bundleSpec loading.
  *
- * @param {SwingSetConfig} config
+ * @param {Omit<SwingSetConfig, 'bundleCachePath' | 'bundleFormat' | 'includeDevDependencies'>} config
  * @param {unknown} bootstrapArgs
  * @param {SwingStoreKernelStorage} kernelStorage
  * @param {InitializationOptions} initializationOptions
@@ -38,20 +32,7 @@ export const initializeTestSwingset = async (
   initializationOptions = {},
   runtimeOptions = {},
 ) => {
-  const {
-    bundleCachePath = sharedBundleCachePath,
-    includeDevDependencies,
-    bundleFormat,
-  } = config;
-  const cache = await provideBundleCache(
-    path.resolve(bundleCachePath),
-    {
-      dev: includeDevDependencies,
-      format: bundleFormat,
-      byteLimit: Infinity,
-    },
-    spec => import(spec),
-  );
+  const cache = await unsafeSharedBundleCache;
 
   const kernelConfig = await buildSwingsetKernelConfig(
     config,