@agoric/internal 0.4.0 → 0.4.1-upgrade-23-dev-bd79330.0.bd79330

package/README.md

@@ -7,6 +7,7 @@ This package contains code that is required by agoric-sdk and not meant to be im
 Like all `@agoric` packages it follows Semantic Versioning. Unlike the others, it will never have a stable API. In terms of [SemVer spec item 4](https://semver.org/#spec-item-4), it will never reach 1.0:
 > Major version zero (0.y.z) is for initial development. Anything MAY change at any time. The public API SHOULD NOT be considered stable.
 
+To keep down the size of [@endo/bundle-source](https://github.com/endojs/endo/tree/master/packages/bundle-source) bundles of source that imports from this package, modules that depend upon it should use deep imports (e.g., `import { defineName } from '@agoric/internal/src/js-utils.js';`) rather than importing the entire module.
 
 # Design
 
@@ -19,7 +20,3 @@ It is meant to be a home for modules that have no dependencies on other packages
 This package may not take dependencies on any others in this repository.
 
 It must never export ambient types.
-
-It should not be imported by deep imports. Eventually this will be enforced by [`exports`](https://nodejs.org/api/packages.html#exports) but the tooling isn't ready:
-    - https://github.com/import-js/eslint-plugin-import/issues/1810
-    - https://github.com/microsoft/TypeScript/issues/33079 (or some related problem with JSdoc types)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/internal",
-  "version": "0.4.0",
+  "version": "0.4.1-upgrade-23-dev-bd79330.0.bd79330",
   "description": "Externally unsupported utilities internal to agoric-sdk",
   "type": "module",
   "main": "src/index.js",
@@ -9,18 +9,19 @@
   },
   "scripts": {
     "build": "exit 0",
-    "prepack": "yarn run -T tsc --build tsconfig.build.json",
-    "postpack": "git clean -f '*.d.*ts*' '*.tsbuildinfo'",
+    "prepack": "yarn run -T prepack-package",
+    "postpack": "yarn run -T postpack-package",
     "test": "ava",
     "test:nyc": "exit 0",
     "test:xs": "exit 0",
     "lint-fix": "yarn lint:eslint --fix",
     "lint": "yarn run -T run-s --continue-on-error 'lint:*'",
-    "lint:eslint": "yarn run -T eslint .",
+    "lint:eslint": "node ../../scripts/eslint-repo.mjs .",
     "lint:types": "yarn run -T tsc"
   },
   "dependencies": {
-    "@agoric/base-zone": "0.2.0",
+    "@agoric/base-zone": "0.2.1-upgrade-23-dev-bd79330.0.bd79330",
+    "@endo/cache-map": "^1.1.0",
     "@endo/common": "^1.2.13",
     "@endo/compartment-mapper": "^1.6.3",
     "@endo/errors": "^1.2.13",
@@ -33,15 +34,16 @@
     "@endo/patterns": "^1.7.0",
     "@endo/promise-kit": "^1.1.13",
     "@endo/stream": "^1.2.13",
-    "anylogger": "^0.21.0",
+    "import-meta-resolve": "^4.1.0",
     "jessie.js": "^0.3.4"
   },
   "devDependencies": {
-    "@agoric/cosmic-proto": "0.5.0",
+    "@agoric/cosmic-proto": "0.5.1-upgrade-23-dev-bd79330.0.bd79330",
     "@endo/exo": "^1.5.12",
     "@endo/init": "^1.1.12",
+    "@endo/ses-ava": "^1.3.2",
     "@fast-check/ava": "^2.0.1",
-    "ava": "^5.3.0",
+    "ava": "^6.4.1",
     "tsd": "^0.33.0"
   },
   "ava": {
@@ -56,13 +58,13 @@
   "license": "Apache-2.0",
   "files": [
     "src",
-    "exported.js"
+    "vendor"
   ],
   "publishConfig": {
     "access": "public"
   },
   "typeCoverage": {
-    "atLeast": 93.02
+    "atLeast": 92.84
   },
-  "gitHead": "0922d0447ab8fae9d2d87415964403330b5ca313"
+  "gitHead": "bd79330f78dae2faf9cc3d8b10063567700da07b"
 }

package/src/action-types.d.ts

@@ -11,14 +11,28 @@
  * - ../../cosmic-swingset/src/launch-chain.js
  */
 export type SwingsetMessageType = (typeof SwingsetMessageType)[keyof typeof SwingsetMessageType];
-export namespace SwingsetMessageType {
-    let AG_COSMOS_INIT: "AG_COSMOS_INIT";
-    let BEGIN_BLOCK: "BEGIN_BLOCK";
-    let END_BLOCK: "END_BLOCK";
-    let COMMIT_BLOCK: "COMMIT_BLOCK";
-    let AFTER_COMMIT_BLOCK: "AFTER_COMMIT_BLOCK";
-    let SWING_STORE_EXPORT: "SWING_STORE_EXPORT";
-}
+/**
+ * Types of messages used for communication between a cosmos-sdk blockchain node
+ * and its paired swingset VM, especially for the ABCI lifecycle. See:
+ *
+ * - https://github.com/tendermint/tendermint/blob/v0.34.x/spec/abci/abci.md#block-execution
+ * - ../../../golang/cosmos/vm/action.go
+ * - ../../../golang/cosmos/app/app.go
+ * - ../../../golang/cosmos/x/swingset/abci.go
+ * - ../../../golang/cosmos/x/swingset/keeper/swing_store_exports_handler.go
+ * - ../../cosmic-swingset/src/chain-main.js
+ * - ../../cosmic-swingset/src/launch-chain.js
+ *
+ * @enum {(typeof SwingsetMessageType)[keyof typeof SwingsetMessageType]}
+ */
+export const SwingsetMessageType: import("./keyMirror.js").KeyMirrorResult<{
+    AG_COSMOS_INIT: null;
+    BEGIN_BLOCK: null;
+    END_BLOCK: null;
+    COMMIT_BLOCK: null;
+    AFTER_COMMIT_BLOCK: null;
+    SWING_STORE_EXPORT: null;
+}>;
 export const AG_COSMOS_INIT: "AG_COSMOS_INIT";
 export const BEGIN_BLOCK: "BEGIN_BLOCK";
 export const END_BLOCK: "END_BLOCK";
@@ -37,18 +51,31 @@ export const SWING_STORE_EXPORT: "SWING_STORE_EXPORT";
  * - ../../../golang/cosmos/x/vibc/types/ibc_module.go
  */
 export type QueuedActionType = (typeof QueuedActionType)[keyof typeof QueuedActionType];
-export namespace QueuedActionType {
-    let CORE_EVAL: "CORE_EVAL";
-    let DELIVER_INBOUND: "DELIVER_INBOUND";
-    let IBC_EVENT: "IBC_EVENT";
-    let INSTALL_BUNDLE: "INSTALL_BUNDLE";
-    let PLEASE_PROVISION: "PLEASE_PROVISION";
-    let VBANK_BALANCE_UPDATE: "VBANK_BALANCE_UPDATE";
-    let WALLET_ACTION: "WALLET_ACTION";
-    let WALLET_SPEND_ACTION: "WALLET_SPEND_ACTION";
-    let VTRANSFER_IBC_EVENT: "VTRANSFER_IBC_EVENT";
-    let KERNEL_UPGRADE_EVENTS: "KERNEL_UPGRADE_EVENTS";
-}
+/**
+ * Types of "action" messages consumed by the swingset VM from actionQueue or
+ * highPriorityQueue during END_BLOCK. See:
+ *
+ * - ../../../golang/cosmos/x/swingset/keeper/msg_server.go
+ * - ../../../golang/cosmos/x/swingset/keeper/proposal.go
+ * - ../../../golang/cosmos/x/vbank/vbank.go
+ * - ../../../golang/cosmos/x/vibc/handler.go
+ * - ../../../golang/cosmos/x/vibc/keeper/triggers.go
+ * - ../../../golang/cosmos/x/vibc/types/ibc_module.go
+ *
+ * @enum {(typeof QueuedActionType)[keyof typeof QueuedActionType]}
+ */
+export const QueuedActionType: import("./keyMirror.js").KeyMirrorResult<{
+    CORE_EVAL: null;
+    DELIVER_INBOUND: null;
+    IBC_EVENT: null;
+    INSTALL_BUNDLE: null;
+    PLEASE_PROVISION: null;
+    VBANK_BALANCE_UPDATE: null;
+    WALLET_ACTION: null;
+    WALLET_SPEND_ACTION: null;
+    VTRANSFER_IBC_EVENT: null;
+    KERNEL_UPGRADE_EVENTS: null;
+}>;
 export const CORE_EVAL: "CORE_EVAL";
 export const DELIVER_INBOUND: "DELIVER_INBOUND";
 export const IBC_EVENT: "IBC_EVENT";

package/src/action-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"action-types.d.ts","sourceRoot":"","sources":["action-types.js"],"names":[],"mappings":";;;;;;;;;;;;kCAcU,CAAC,OAAO,mBAAmB,EAAE,MAAM,OAAO,mBAAmB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;+BAiC9D,CAAC,OAAO,gBAAgB,EAAE,MAAM,OAAO,gBAAgB,CAAC"}
+{"version":3,"file":"action-types.d.ts","sourceRoot":"","sources":["action-types.js"],"names":[],"mappings":";;;;;;;;;;;;kCAcU,CAAC,OAAO,mBAAmB,EAAE,MAAM,OAAO,mBAAmB,CAAC;AAZxE;;;;;;;;;;;;;GAaG;AACH;;;;;;;GAOG;;;;;;;;;;;;;;;;;;+BAwBO,CAAC,OAAO,gBAAgB,EAAE,MAAM,OAAO,gBAAgB,CAAC;AAXlE;;;;;;;;;;;;GAYG;AACH;;;;;;;;;;;GAWG"}

package/src/action-types.js

@@ -1,4 +1,4 @@
-// @jessie-check
+import { keyMirror } from './keyMirror.js';
 
 /**
  * Types of messages used for communication between a cosmos-sdk blockchain node
@@ -14,13 +14,13 @@
  *
  * @enum {(typeof SwingsetMessageType)[keyof typeof SwingsetMessageType]}
  */
-export const SwingsetMessageType = /** @type {const} */ ({
-  AG_COSMOS_INIT: 'AG_COSMOS_INIT', // used to synchronize at process launch
-  BEGIN_BLOCK: 'BEGIN_BLOCK',
-  END_BLOCK: 'END_BLOCK',
-  COMMIT_BLOCK: 'COMMIT_BLOCK',
-  AFTER_COMMIT_BLOCK: 'AFTER_COMMIT_BLOCK',
-  SWING_STORE_EXPORT: 'SWING_STORE_EXPORT', // used to synchronize data export
+export const SwingsetMessageType = keyMirror({
+  AG_COSMOS_INIT: null, // used to synchronize at process launch
+  BEGIN_BLOCK: null,
+  END_BLOCK: null,
+  COMMIT_BLOCK: null,
+  AFTER_COMMIT_BLOCK: null,
+  SWING_STORE_EXPORT: null, // used to synchronize data export
 });
 harden(SwingsetMessageType);
 
@@ -47,17 +47,17 @@ export const {
  *
  * @enum {(typeof QueuedActionType)[keyof typeof QueuedActionType]}
  */
-export const QueuedActionType = /** @type {const} */ ({
-  CORE_EVAL: 'CORE_EVAL',
-  DELIVER_INBOUND: 'DELIVER_INBOUND',
-  IBC_EVENT: 'IBC_EVENT',
-  INSTALL_BUNDLE: 'INSTALL_BUNDLE',
-  PLEASE_PROVISION: 'PLEASE_PROVISION',
-  VBANK_BALANCE_UPDATE: 'VBANK_BALANCE_UPDATE',
-  WALLET_ACTION: 'WALLET_ACTION',
-  WALLET_SPEND_ACTION: 'WALLET_SPEND_ACTION',
-  VTRANSFER_IBC_EVENT: 'VTRANSFER_IBC_EVENT',
-  KERNEL_UPGRADE_EVENTS: 'KERNEL_UPGRADE_EVENTS',
+export const QueuedActionType = keyMirror({
+  CORE_EVAL: null,
+  DELIVER_INBOUND: null,
+  IBC_EVENT: null,
+  INSTALL_BUNDLE: null,
+  PLEASE_PROVISION: null,
+  VBANK_BALANCE_UPDATE: null,
+  WALLET_ACTION: null,
+  WALLET_SPEND_ACTION: null,
+  VTRANSFER_IBC_EVENT: null,
+  KERNEL_UPGRADE_EVENTS: null,
 });
 harden(QueuedActionType);
 

package/src/ava-force-exit.d.mts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=ava-force-exit.d.mts.map

package/src/ava-force-exit.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ava-force-exit.d.mts","sourceRoot":"","sources":["ava-force-exit.mjs"],"names":[],"mappings":""}

package/src/ava-force-exit.mjs

@@ -0,0 +1,6 @@
+import process from 'node:process';
+import { registerCompletionHandler } from 'ava';
+
+registerCompletionHandler(() => {
+  process.exit();
+});

package/src/batched-deliver.d.ts

@@ -4,8 +4,8 @@
 /**
  * @param {DeliverMessages} deliver
  * @param {{
- *   clearTimeout: import('node:timers').clearTimeout;
- *   setTimeout: import('node:timers').setTimeout;
+ *   clearTimeout: clearTimeout;
+ *   setTimeout: setTimeout;
  * }} io
  * @param {number} batchTimeoutMs
  */
@@ -13,6 +13,10 @@ export function makeBatchedDeliver(deliver: DeliverMessages, { clearTimeout, set
     clearTimeout: typeof globalThis.clearTimeout;
     setTimeout: typeof globalThis.setTimeout;
 }, batchTimeoutMs?: number): (message: unknown[], ackNum: number) => Promise<void>;
+/**
+ * @import {clearTimeout} from 'node:timers';
+ * @import {setTimeout} from 'node:timers';
+ */
 export const DEFAULT_BATCH_TIMEOUT_MS: 1000;
 export type DeliverMessages = (message: unknown[], ackNum: number) => Promise<void>;
 //# sourceMappingURL=batched-deliver.d.ts.map

package/src/batched-deliver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"batched-deliver.d.ts","sourceRoot":"","sources":["batched-deliver.js"],"names":[],"mappings":"AAKA;;GAEG;AAEH;;;;;;;GAOG;AACH,4CAPW,eAAe,gCACf;IACN,YAAY,EAAE,8BAAkC,CAAC;IACjD,UAAU,EAAE,4BAAgC,CAAC;CAC9C,mBACO,MAAM,aATM,OAAO,EAAE,UAAU,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAiDjE;AApDD,uCAAwC,IAAI,CAAC;8BAGhC,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC"}
+{"version":3,"file":"batched-deliver.d.ts","sourceRoot":"","sources":["batched-deliver.js"],"names":[],"mappings":"AASA;;GAEG;AAEH;;;;;;;GAOG;AACH,4CAPW,eAAe,gCACf;IACN,YAAY,iCAAe;IAC3B,UAAU,+BAAa;CACxB,mBACO,MAAM,aATM,OAAO,EAAE,UAAU,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAiDjE;AAzDD;;;GAGG;AAEH,uCAAwC,IAAI,CAAC;8BAGhC,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC"}

package/src/batched-deliver.js

@@ -1,6 +1,10 @@
-// @jessie-check
 // @ts-check
 
+/**
+ * @import {clearTimeout} from 'node:timers';
+ * @import {setTimeout} from 'node:timers';
+ */
+
 export const DEFAULT_BATCH_TIMEOUT_MS = 1000;
 
 /**
@@ -10,8 +14,8 @@ export const DEFAULT_BATCH_TIMEOUT_MS = 1000;
 /**
  * @param {DeliverMessages} deliver
  * @param {{
- *   clearTimeout: import('node:timers').clearTimeout;
- *   setTimeout: import('node:timers').setTimeout;
+ *   clearTimeout: clearTimeout;
+ *   setTimeout: setTimeout;
  * }} io
  * @param {number} batchTimeoutMs
  */

package/src/build-cache-types.d.ts

@@ -0,0 +1,33 @@
+export interface LockLifecycleEvent {
+    key: string;
+    lockPath: string;
+    type: 'lock-acquired' | 'lock-released';
+}
+export interface LockWaitingEvent {
+    key: string;
+    lockPath: string;
+    type: 'lock-waiting';
+    waitedMs: number;
+}
+export interface LockBrokenEvent {
+    ageMs?: number;
+    key: string;
+    lockPath: string;
+    ownerPid?: number;
+    reason: 'dead-owner' | 'stale-age';
+    staleLockMs?: number;
+    type: 'lock-broken';
+}
+export type BuildCacheEvent = LockLifecycleEvent | LockWaitingEvent | LockBrokenEvent;
+export interface DirectoryLockPowers {
+    acquireTimeoutMs: number;
+    delayMs: (ms: number) => Promise<unknown>;
+    fs: Pick<typeof import('node:fs/promises'), 'mkdir' | 'readFile' | 'rm' | 'stat' | 'writeFile'>;
+    isPidAlive: (pid: number) => boolean;
+    lockRoot: string;
+    now: () => number;
+    onEvent?: (event: BuildCacheEvent) => void;
+    pid: number;
+    staleLockMs: number;
+}
+//# sourceMappingURL=build-cache-types.d.ts.map

package/src/build-cache-types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"build-cache-types.d.ts","sourceRoot":"","sources":["build-cache-types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,kBAAkB;IACjC,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,eAAe,GAAG,eAAe,CAAC;CACzC;AAED,MAAM,WAAW,gBAAgB;IAC/B,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,cAAc,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,eAAe;IAC9B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,YAAY,GAAG,WAAW,CAAC;IACnC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,aAAa,CAAC;CACrB;AAED,MAAM,MAAM,eAAe,GACvB,kBAAkB,GAClB,gBAAgB,GAChB,eAAe,CAAC;AAEpB,MAAM,WAAW,mBAAmB;IAClC,gBAAgB,EAAE,MAAM,CAAC;IACzB,OAAO,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAC1C,EAAE,EAAE,IAAI,CACN,cAAc,kBAAkB,CAAC,EACjC,OAAO,GAAG,UAAU,GAAG,IAAI,GAAG,MAAM,GAAG,WAAW,CACnD,CAAC;IACF,UAAU,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,MAAM,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,IAAI,CAAC;IAC3C,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW,EAAE,MAAM,CAAC;CACrB"}

package/src/build-cache-types.js

@@ -0,0 +1,42 @@
+                                     
+              
+                   
+                                          
+ 
+
+                                   
+              
+                   
+                       
+                   
+ 
+
+                                  
+                 
+              
+                   
+                    
+                                     
+                       
+                      
+ 
+
+                             
+                      
+                    
+                    
+
+                                      
+                           
+                                            
+           
+                                      
+                                                      
+    
+                                       
+                   
+                    
+                                             
+              
+                      
+ 

package/src/build-cache.d.ts

@@ -0,0 +1,12 @@
+export function makeDirectoryLock(powers: DirectoryLockPowers): {
+    withLock: (key: string, body: () => Promise<any>) => Promise<any>;
+};
+export function writeFileAtomic({ fs, filePath, data, now, pid }: {
+    fs: Pick<typeof import("node:fs/promises"), "rename" | "writeFile">;
+    filePath: string;
+    data: string;
+    now: () => number;
+    pid: number;
+}): Promise<void>;
+import type { DirectoryLockPowers } from './build-cache-types.js';
+//# sourceMappingURL=build-cache.d.ts.map

package/src/build-cache.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"build-cache.d.ts","sourceRoot":"","sources":["build-cache.js"],"names":[],"mappings":"AAUO,0CAFI,mBAAmB;oBAkEjB,MAAM,QACN,MAAM,OAAO,CAAC,GAAG,CAAC;EAsF9B;AAgBM,kEAVI;IACN,EAAE,EAAE,IAAI,CAAC,iCAA0B,EAAE,QAAQ,GAAG,WAAW,CAAC,CAAC;IAC7D,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,MAAM,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;CACb,iBASH;yCAlLsD,wBAAwB"}

package/src/build-cache.js

@@ -0,0 +1,184 @@
+/* eslint-env node */
+import path from 'node:path';
+
+/**
+ * @import {BuildCacheEvent, DirectoryLockPowers} from './build-cache-types.js';
+ */
+
+/**
+ * @param {DirectoryLockPowers} powers
+ */
+export const makeDirectoryLock = powers => {
+  const {
+    fs,
+    delayMs,
+    now,
+    pid,
+    isPidAlive,
+    lockRoot,
+    staleLockMs,
+    acquireTimeoutMs,
+    onEvent = () => {},
+  } = powers;
+  const safeEmit = event => {
+    try {
+      onEvent(event);
+    } catch {
+      // Event sinks must not interfere with cache lock correctness.
+    }
+  };
+
+  /** @param {string} dpath */
+  const mkdirUnlessExists = async dpath => {
+    await null; // avoid accidentally catching synchronous exceptions
+    try {
+      await fs.mkdir(dpath);
+      return true;
+    } catch (err) {
+      const e = /** @type {NodeJS.ErrnoException} */ (err);
+      if (e.code === 'EEXIST') {
+        return false;
+      }
+      throw err;
+    }
+  };
+
+  /** @param {string} fpath */
+  const statUnlessMissing = async fpath => {
+    await null; // avoid accidentally catching synchronous exceptions
+    try {
+      return await fs.stat(fpath);
+    } catch (err) {
+      const e = /** @type {NodeJS.ErrnoException} */ (err);
+      if (e.code === 'ENOENT') {
+        return undefined;
+      }
+      throw err;
+    }
+  };
+
+  /** @param {string} fpath */
+  const readUnlessMissing = async fpath => {
+    await null; // avoid accidentally catching synchronous exceptions
+    try {
+      return await fs.readFile(fpath, 'utf8');
+    } catch (err) {
+      const e = /** @type {NodeJS.ErrnoException} */ (err);
+      if (e.code === 'ENOENT') {
+        return undefined;
+      }
+      throw err;
+    }
+  };
+
+  /**
+   * @param {string} key
+   * @param {() => Promise<any>} body
+   */
+  const withLock = async (key, body) => {
+    const lockPath = path.join(lockRoot, `${encodeURIComponent(key)}.lock`);
+    const ownerPath = path.join(lockPath, 'owner.json');
+    await fs.mkdir(lockRoot, { recursive: true });
+    const started = now();
+
+    const maybeBreakStaleLock = async () => {
+      const ownerText = await readUnlessMissing(ownerPath);
+      if (ownerText) {
+        try {
+          const ownerInfo = JSON.parse(ownerText);
+          if (
+            ownerInfo &&
+            typeof ownerInfo === 'object' &&
+            Number.isInteger(ownerInfo.pid) &&
+            !isPidAlive(ownerInfo.pid)
+          ) {
+            await fs.rm(lockPath, { recursive: true, force: true });
+            safeEmit({
+              type: 'lock-broken',
+              key,
+              lockPath,
+              reason: 'dead-owner',
+              ownerPid: ownerInfo.pid,
+            });
+            return true;
+          }
+        } catch {
+          // rely on age-based lock breaking for malformed owner files
+        }
+      }
+
+      const lockStats = await statUnlessMissing(lockPath);
+      if (!lockStats) {
+        return true;
+      }
+      const ageMs = now() - lockStats.mtimeMs;
+      if (ageMs >= staleLockMs) {
+        await fs.rm(lockPath, { recursive: true, force: true });
+        safeEmit({
+          type: 'lock-broken',
+          key,
+          lockPath,
+          reason: 'stale-age',
+          ageMs,
+          staleLockMs,
+        });
+        return true;
+      }
+
+      return false;
+    };
+
+    for (;;) {
+      if (await mkdirUnlessExists(lockPath)) {
+        await fs.writeFile(
+          ownerPath,
+          JSON.stringify({ pid, createdAt: now() }),
+          'utf8',
+        );
+        safeEmit({ type: 'lock-acquired', key, lockPath });
+        break;
+      }
+      const recovered = await maybeBreakStaleLock();
+      if (recovered) {
+        continue;
+      }
+      const waitedMs = now() - started;
+      safeEmit({ type: 'lock-waiting', key, lockPath, waitedMs });
+      if (waitedMs >= acquireTimeoutMs) {
+        throw Error(`Timed out waiting for cache lock ${lockPath}`);
+      }
+      await delayMs(20);
+    }
+
+    try {
+      return await body();
+    } finally {
+      await fs.rm(lockPath, { recursive: true, force: true });
+      safeEmit({ type: 'lock-released', key, lockPath });
+    }
+  };
+
+  return harden({ withLock });
+};
+harden(makeDirectoryLock);
+
+let atomicWriteSequence = 0;
+
+/**
+ * @param {{
+ *   fs: Pick<import('node:fs/promises'), 'rename' | 'writeFile'>;
+ *   filePath: string;
+ *   data: string;
+ *   now: () => number;
+ *   pid: number;
+ * }} options
+ * @throws {NodeJS.ErrnoException} when a unique temp file cannot be created
+ *   or the atomic rename fails.
+ */
+export const writeFileAtomic = async ({ fs, filePath, data, now, pid }) => {
+  atomicWriteSequence += 1;
+  const tempPath = `${filePath}.${pid}.${now()}.${atomicWriteSequence}.tmp`;
+  await fs.writeFile(tempPath, data, { flag: 'wx' });
+  await fs.rename(tempPath, filePath);
+};
+harden(writeFileAtomic);

package/src/callback.d.ts

@@ -5,26 +5,24 @@ export function makeFunctionCallback<I extends (...args: any[]) => any, T extend
 export function makeSyncMethodCallback<I extends (...args: any[]) => any, P extends PropertyKey, T extends { [x in P]: (...args: [...B, ...Parameters<I>]) => ReturnType<I>; } = { [x in P]: I; }, B extends any[] = []>(target: T, methodName: P, ...bound: B): SyncCallback<I>;
 export function makeMethodCallback<I extends (...args: any[]) => any, P extends PropertyKey, T extends ERef<{ [x in P]: (...args: [...B, ...Parameters<I>]) => ReturnType<I>; }> = ERef<{ [x in P]: I; }>, B extends any[] = []>(target: T, methodName: P, ...bound: B): Callback<I>;
 export function isCallback(callback: any): callback is Callback<any>;
-export function prepareAttenuator<M extends PropertyKey>(zone: import("@agoric/base-zone").Zone, methodNames: M[], { interfaceGuard, tag }?: {
-    interfaceGuard?: import("@endo/patterns").InterfaceGuard<{ [K in M]: import("@endo/patterns").MethodGuard; }> | undefined;
+export function prepareAttenuator<M extends PropertyKey>(zone: Zone, methodNames: M[], { interfaceGuard, tag }?: {
+    interfaceGuard?: InterfaceGuard<{ [K in M]: MethodGuard; }> | undefined;
     tag?: string | undefined;
 }): (args_0: {
     target?: any;
     isSync?: boolean | undefined;
     overrides?: { [K_1 in M]?: Callback<any> | null | undefined; } | undefined;
 }) => import("@endo/exo").Guarded<{ [K_2 in M]: (this: any, ...args: any[]) => any; }>;
-export function prepareGuardedAttenuator<G extends import("@endo/patterns").InterfaceGuard>(zone: import("@agoric/base-zone").Zone, interfaceGuard: G, opts?: {
+export function prepareGuardedAttenuator<G extends InterfaceGuard>(zone: Zone, interfaceGuard: G, opts?: {
     tag?: string | undefined;
 }): MakeAttenuator<any>;
-export type MakeAttenuator<T extends import("@endo/exo").Methods> = (...args: Parameters<ReturnType<(<M extends PropertyKey>(zone: import("@agoric/base-zone").Zone, methodNames: M[], { interfaceGuard, tag }?: {
-    interfaceGuard?: import("@endo/patterns").InterfaceGuard<{ [K in M]: import("@endo/patterns").MethodGuard; }> | undefined;
-    tag?: string | undefined;
-}) => (args_0: {
-    target?: any;
-    isSync?: boolean | undefined;
-    overrides?: { [K_1 in M]?: Callback<any> | null | undefined; } | undefined;
-}) => import("@endo/exo").Guarded<{ [K_2 in M]: (this: any, ...args: any[]) => any; }>)>>) => import("@endo/exo").Farable<T>;
+export type MakeAttenuator<T extends Methods> = (...args: Parameters<ReturnType<typeof prepareAttenuator>>) => Farable<T>;
 import type { SyncCallback } from './types.js';
 import type { Callback } from './types.js';
 import type { ERef } from '@endo/far';
+import type { Zone } from '@agoric/base-zone';
+import type { MethodGuard } from '@endo/patterns';
+import type { InterfaceGuard } from '@endo/patterns';
+import type { Methods } from '@endo/exo';
+import type { Farable } from '@endo/exo';
 //# sourceMappingURL=callback.d.ts.map

package/src/callback.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"callback.d.ts","sourceRoot":"","sources":["callback.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"callback.d.ts","sourceRoot":"","sources":["callback.js"],"names":[],"mappings":"AAuDO,yBALgC,CAAC,SAA3B,CAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAI,YAC3B,aAAa,CAAC,CAAC,WACf,UAAU,CAAC,CAAC,CAAC,GACX,UAAU,CAAC,CAAC,CAAC,CAQzB;AAWM,sBALgC,CAAC,SAA3B,CAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAI,YAC3B,SAAS,CAAC,CAAC,WACX,UAAU,CAAC,CAAC,CAAC,GACX,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAQ3C;AAaM,yCAPgC,CAAC,SAA3B,CAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAI,EAC+B,CAAC,SAAzD,CAAE,GAAG,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,UAAU,CAAC,CAAC,CAAE,MAC7C,CAAC,SAAT,GAAG,EAAG,eACT,CAAC,YACD,CAAC,GACC,aAAa,CAAC,CAAC,CAQ3B;AAaM,qCAPgC,CAAC,SAA3B,CAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAI,EACqC,CAAC,SAA/D,KAAM,CAAC,GAAG,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,UAAU,CAAC,CAAC,CAAC,CAAE,YACnD,CAAC,SAAT,GAAG,EAAG,eACT,CAAC,YACD,CAAC,GACC,SAAS,CAAC,CAAC,CAQvB;AAiBM,uCAXgC,CAAC,SAA3B,CAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAI,EACX,CAAC,SAAd,WAAY,EAGnB,CAAC,SAFK,GACP,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,UAAU,CAAC,CAAC,CAAC,GAC9D,MAAO,CAAC,cACS,CAAC,SAAT,GAAG,EAAG,eACT,CAAC,cACD,CAAC,YACD,CAAC,GACC,aAAa,CAAC,CAAC,CAW3B;AAiBM,mCAXgC,CAAC,SAA3B,CAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAI,EACX,CAAC,SAAd,WAAY,EAGlB,CAAC,SAFI,KAAM,GACb,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,UAAU,CAAC,CAAC,CAAC,GAC/D,CAAE,WAAY,CAAC,eACG,CAAC,SAAT,GAAG,EAAG,eACT,CAAC,cACD,CAAC,YACD,CAAC,GACC,SAAS,CAAC,CAAC,CAWvB;AAOM,qCAHI,GAAG,GACD,QAAQ,IAAI,SAAS,GAAG,CAAC,CAcrC;AAgBM,kCAVoB,CAAC,SAAd,WAAY,QACf,IAAI,eACJ,CAAC,EAAE,4BAEX;IAEU,cAAc,qBADrB,CAAC;IAGkB,GAAG;CAC3B;aAgEc,GAAG;;;uDArDgB,GAAG,WAAW,GAAG,EAAE,KAAK,GAAG,KAwF5D;AAYM,yCANuB,CAAC,SAAlB,cAAgB,QAClB,IAAI,kBACJ,CAAC,SAET;IAAsB,GAAG;CAAC,GAQT,cAAc,CAAC,GAAG,CAAC,CACtC;2BAvSsB,CAAC,SAAX,OAAS,IACT,CACZ,GAAO,IAAI,EAAE,UAAU,CAAC,UAAU,CAAC,OAAO,iBAAiB,CAAC,CAAC,KACtD,QAAQ,CAAC,CAAC;kCAdwB,YAAY;8BAAZ,YAAY;0BAP/B,WAAW;0BAGX,mBAAmB;iCAEZ,gBAAgB;oCADb,gBAAgB;6BAHvB,WAAW;6BACX,WAAW"}