@agoric/internal 0.3.3-dev-4ac8a49.0.4ac8a49 → 0.3.3-dev-28c592b.0.28c592b

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/internal",
-  "version": "0.3.3-dev-4ac8a49.0.4ac8a49",
+  "version": "0.3.3-dev-28c592b.0.28c592b",
   "description": "Externally unsupported utilities internal to agoric-sdk",
   "type": "module",
   "main": "src/index.js",
@@ -20,7 +20,7 @@
     "lint:types": "yarn run -T tsc"
   },
   "dependencies": {
-    "@agoric/base-zone": "0.1.1-dev-4ac8a49.0.4ac8a49",
+    "@agoric/base-zone": "0.1.1-dev-28c592b.0.28c592b",
     "@endo/cache-map": "^1.1.0",
     "@endo/common": "^1.2.13",
     "@endo/compartment-mapper": "^1.6.3",
@@ -38,7 +38,7 @@
     "jessie.js": "^0.3.4"
   },
   "devDependencies": {
-    "@agoric/cosmic-proto": "0.4.1-dev-4ac8a49.0.4ac8a49",
+    "@agoric/cosmic-proto": "0.4.1-dev-28c592b.0.28c592b",
     "@endo/exo": "^1.5.12",
     "@endo/init": "^1.1.12",
     "@endo/ses-ava": "^1.3.2",
@@ -66,5 +66,5 @@
   "typeCoverage": {
     "atLeast": 92.84
   },
-  "gitHead": "4ac8a4962fdaba6b98d4f171e2e0701026ca753e"
+  "gitHead": "28c592b4b262dcb4a35c9fa4adbda76db0858953"
 }

package/src/node/fs-stream.d.ts

@@ -1,9 +1,11 @@
-export function fsStreamReady(stream: ReadStream | WriteStream | Socket): Promise<void>;
+export function fsStreamReady(stream: StreamLike): Promise<void>;
 export function makeFsStreamWriter(filePath: string | undefined | null): Promise<{
     write: (data: any) => Promise<void>;
     flush: () => Promise<void>;
     close: () => Promise<void>;
 } | undefined>;
+export type StreamLike = ReadStream | WriteStream | Socket;
+export type EventName = "drain" | "ready";
 export type FsStreamWriter = NonNullable<Awaited<ReturnType<typeof makeFsStreamWriter>>>;
 import type { ReadStream } from 'fs';
 import type { WriteStream } from 'fs';

package/src/node/fs-stream.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fs-stream.d.ts","sourceRoot":"","sources":["fs-stream.js"],"names":[],"mappings":"AAcO,sCAHI,UAAU,GAAG,WAAW,GAAG,MAAM,GAC/B,OAAO,CAAC,IAAI,CAAC,CAgCtB;AAmDG,6CADK,MAAM,GAAG,SAAS,GAAG,IAAI;;;;eAsEpC;6BAvEa,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,kBAAkB,CAAC,CAAC,CAAC;gCAxF5C,IAAI;iCACH,IAAI;4BACT,KAAK"}
+{"version":3,"file":"fs-stream.d.ts","sourceRoot":"","sources":["fs-stream.js"],"names":[],"mappings":"AAiBO,sCAHI,UAAU,GACR,OAAO,CAAC,IAAI,CAAC,CAgCtB;AA8GG,6CADK,MAAM,GAAG,SAAS,GAAG,IAAI;;;;eAsEpC;yBAxNa,UAAU,GAAG,WAAW,GAAG,MAAM;wBACjC,OAAO,GAAG,OAAO;6BAgJjB,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,kBAAkB,CAAC,CAAC,CAAC;gCAtJ5C,IAAI;iCACH,IAAI;4BACT,KAAK"}

package/src/node/fs-stream.js

@@ -8,8 +8,11 @@ import { promisify } from 'node:util';
  * @import {Socket} from 'net';
  */
 
+/** @typedef {ReadStream | WriteStream | Socket} StreamLike */
+/** @typedef {'drain' | 'ready'} EventName */
+
 /**
- * @param {ReadStream | WriteStream | Socket} stream
+ * @param {StreamLike} stream
  * @returns {Promise<void>}
  */
 export const fsStreamReady = stream =>
@@ -45,13 +48,15 @@ export const fsStreamReady = stream =>
   });
 
 /**
- * Wait for a stream event and reject on stream error first.
+ * Subscribe fresh listeners for a single stream event and reject on stream
+ * error first.
  *
- * @param {ReadStream | WriteStream | Socket} stream
- * @param {'drain' | 'ready'} eventName
+ * @param {StreamLike} stream
+ * @param {EventName} eventName
+ * @param {() => void} [onCleanup] called when the event is emitted or an error occurs, after listeners are removed
  * @returns {Promise<void>}
  */
-const onceWithError = (stream, eventName) =>
+const subscribeOnceWithError = (stream, eventName, onCleanup = () => {}) =>
   new Promise((resolve, reject) => {
     const onEvent = () => {
       cleanup();
@@ -65,11 +70,68 @@ const onceWithError = (stream, eventName) =>
     const cleanup = () => {
       stream.off(eventName, onEvent);
       stream.off('error', onError);
+      onCleanup();
     };
     stream.on(eventName, onEvent);
     stream.on('error', onError);
   });
 
+/**
+ * Memoize promises to prevent multiple subscriptions to the same event on the
+ * same stream.  This is necessary to prevent:
+ *
+ * (node:1224) MaxListenersExceededWarning: Possible EventEmitter memory leak
+ * detected. 11 drain listeners added to [WriteStream]. MaxListeners is 10. Use
+ * emitter.setMaxListeners() to increase limit
+ *
+ * @param {(stream: StreamLike,
+ *   eventName: EventName, onDone?: () => void) => Promise<void>} doOnceWithError
+ * @returns {(stream: StreamLike,
+ *   eventName: EventName) => Promise<void>}
+ */
+const makeMemoizedOnceWithError = doOnceWithError => {
+  /**
+   * @type {Map<string, WeakMap<StreamLike, Promise<void>>>}
+   */
+  const promiseFromEventAndStream = new Map();
+
+  /**
+   * Wait for a stream event and reject on stream error first.
+   *
+   * @param {StreamLike} stream
+   * @param {EventName} eventName
+   * @returns {Promise<void>}
+   */
+  const memoizedOnceWithError = (stream, eventName) => {
+    let promiseFromStream = promiseFromEventAndStream.get(eventName);
+    if (!promiseFromStream) {
+      promiseFromStream = new WeakMap();
+      promiseFromEventAndStream.set(eventName, promiseFromStream);
+    }
+    /** @type {Promise<void> | undefined} */
+    let promise = promiseFromStream.get(stream);
+    if (promise) {
+      return promise;
+    }
+    promise = doOnceWithError(stream, eventName, () =>
+      promiseFromStream.delete(stream),
+    );
+    promiseFromStream.set(stream, promise);
+    return promise;
+  };
+
+  return memoizedOnceWithError;
+};
+
+/**
+ * Wait for a stream event and reject on stream error first.
+ *
+ * @param {StreamLike} stream
+ * @param {EventName} eventName
+ * @returns {Promise<void>}
+ */
+const onceWithError = makeMemoizedOnceWithError(subscribeOnceWithError);
+
 /**
  * @param {WriteStream | Socket} stream
  * @param {string | Uint8Array} data