@agoric/internal 0.3.3-other-dev-8f8782b.0 → 0.3.3-other-dev-3eb1a1d.0

package/src/marshal.js

@@ -0,0 +1,137 @@
+// @ts-check
+import { Fail } from '@endo/errors';
+import { Far } from '@endo/far';
+import { makeMarshal } from '@endo/marshal';
+import { isStreamCell } from './lib-chainStorage.js';
+
+/**
+ * Should be a union with Remotable, but that's `any`, making this type
+ * meaningless
+ *
+ * @typedef {{ getBoardId: () => string | null }} BoardRemote
+ */
+
+/**
+ * @param {{ boardId: string | null; iface?: string }} slotInfo
+ * @returns {BoardRemote}
+ */
+export const makeBoardRemote = ({ boardId, iface }) => {
+  const nonalleged = iface ? iface.replace(/^Alleged: /, '') : '';
+  return Far(`BoardRemote${nonalleged}`, { getBoardId: () => boardId });
+};
+
+/**
+ * @param {string} boardId
+ * @param {string} iface
+ */
+export const slotToBoardRemote = (boardId, iface) =>
+  makeBoardRemote({ boardId, iface });
+
+/** @param {BoardRemote | object} val */
+const boardValToSlot = val => {
+  if ('getBoardId' in val) {
+    return val.getBoardId();
+  }
+  throw Fail`unknown obj in boardSlottingMarshaller.valToSlot ${val}`;
+};
+
+/**
+ * A marshaller which can serialize getBoardId() -bearing Remotables. This
+ * allows the caller to pick their slots. The deserializer is configurable: the
+ * default cannot handle Remotable-bearing data.
+ *
+ * @param {(slot: string, iface: string) => any} [slotToVal]
+ * @returns {Omit<
+ *   import('@endo/marshal').Marshal<string | null>,
+ *   'serialize' | 'unserialize'
+ * >}
+ */
+export const boardSlottingMarshaller = (slotToVal = undefined) => {
+  return makeMarshal(boardValToSlot, slotToVal, {
+    serializeBodyFormat: 'smallcaps',
+  });
+};
+
+// TODO: Consolidate with `insistCapData` functions from swingset-liveslots,
+// swingset-xsnap-supervisor, etc.
+/**
+ * @param {unknown} data
+ * @returns {asserts data is import('@endo/marshal').CapData<string>}
+ */
+const assertCapData = data => {
+  assert.typeof(data, 'object');
+  assert(data);
+  assert.typeof(data.body, 'string');
+  assert(Array.isArray(data.slots));
+  // XXX check that the .slots array elements are actually strings
+};
+harden(assertCapData);
+
+/**
+ * Read and unmarshal a value from a map representation of vstorage data
+ *
+ * @param {Map<string, string>} data
+ * @param {string} key
+ * @param {ReturnType<
+ *   typeof import('@endo/marshal').makeMarshal
+ * >['fromCapData']} fromCapData
+ * @param {number} index index of the desired value in a deserialized stream
+ *   cell
+ * @returns {any}
+ */
+export const unmarshalFromVstorage = (data, key, fromCapData, index) => {
+  const serialized = data.get(key) || Fail`no data for ${key}`;
+  assert.typeof(serialized, 'string');
+  assert.typeof(index, 'number');
+
+  const streamCell = JSON.parse(serialized);
+  if (!isStreamCell(streamCell)) {
+    throw Fail`not a StreamCell: ${streamCell}`;
+  }
+
+  const { values } = streamCell;
+  values.length > 0 || Fail`no StreamCell values: ${streamCell}`;
+
+  const marshalled = values.at(index);
+  assert.typeof(marshalled, 'string');
+
+  /** @type {import('@endo/marshal').CapData<string>} */
+  const capData = harden(JSON.parse(marshalled));
+  assertCapData(capData);
+
+  const unmarshalled = fromCapData(capData);
+  return unmarshalled;
+};
+harden(unmarshalFromVstorage);
+
+/**
+ * Provide access to object graphs serialized in vstorage.
+ *
+ * @param {[string, string][]} entries
+ * @param {(slot: string, iface?: string) => any} [slotToVal]
+ */
+export const makeHistoryReviver = (entries, slotToVal = undefined) => {
+  const board = boardSlottingMarshaller(slotToVal);
+  const vsMap = new Map(entries);
+  /** @param {...unknown} args } */
+  const fromCapData = (...args) =>
+    Reflect.apply(board.fromCapData, board, args);
+  /** @param {string} key } */
+  const getItem = key => unmarshalFromVstorage(vsMap, key, fromCapData, -1);
+  /** @param {string} prefix } */
+  const children = prefix => {
+    prefix.endsWith('.') || Fail`prefix must end with '.'`;
+    return harden([
+      ...new Set(
+        entries
+          .map(([k, _]) => k)
+          .filter(k => k.startsWith(prefix))
+          .map(k => k.slice(prefix.length).split('.')[0]),
+      ),
+    ]);
+  };
+  /** @param {string} k } */
+  const has = k => vsMap.get(k) !== undefined;
+
+  return harden({ getItem, children, has });
+};

package/src/method-tools.d.ts

@@ -1,3 +1,4 @@
 export function getMethodNames<K extends PropertyKey>(val: Record<K, any>): K[];
+export function getStringMethodNames<K extends PropertyKey>(val: Record<K, any>): string[];
 export function bindAllMethods<T extends Record<PropertyKey, any>>(obj: T): T;
 //# sourceMappingURL=method-tools.d.ts.map

package/src/method-tools.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"method-tools.d.ts","sourceRoot":"","sources":["method-tools.js"],"names":[],"mappings":"AAyCO,gFAoBN;AAgCM,8EAeJ"}
+{"version":3,"file":"method-tools.d.ts","sourceRoot":"","sources":["method-tools.js"],"names":[],"mappings":"AA0CO,+BAJoB,CAAC,SAAd,WAAY,OACf,MAAM,CAAC,CAAC,EAAE,GAAG,CAAC,GACZ,CAAC,EAAE,CAsBf;AAUM,qCAJoB,CAAC,SAAd,WAAY,OACf,MAAM,CAAC,CAAC,EAAE,GAAG,CAAC,GACZ,MAAM,EAAE,CAKlB;AA+BI,+BAJiC,CAAC,SAA3B,MAAM,CAAC,WAAW,EAAE,GAAG,CAAE,OAC5B,CAAC,GACC,CAAC,CAiBX"}

package/src/method-tools.js

@@ -2,7 +2,8 @@
 import { isObject } from '@endo/marshal';
 
 /**
- * @file method-tools use dynamic property lookup, which is not Jessie-compatible
+ * @file method-tools use dynamic property lookup, which is not
+ *   Jessie-compatible
  */
 
 const { getPrototypeOf, create, fromEntries, getOwnPropertyDescriptors } =
@@ -12,8 +13,8 @@ const { ownKeys, apply } = Reflect;
 /**
  * Prioritize symbols as earlier than strings.
  *
- * @param {string|symbol} a
- * @param {string|symbol} b
+ * @param {string | symbol} a
+ * @param {string | symbol} b
  * @returns {-1 | 0 | 1}
  */
 const compareStringified = (a, b) => {
@@ -62,25 +63,37 @@ export const getMethodNames = val => {
 };
 harden(getMethodNames);
 
+/**
+ * The subset of `getMethodNames` containing only string names, without symbols
+ *
+ * @template {PropertyKey} K
+ * @param {Record<K, any>} val
+ * @returns {string[]}
+ */
+export const getStringMethodNames = val =>
+  /** @type {string[]} */ (
+    getMethodNames(val).filter(name => typeof name === 'string')
+  );
+
 /**
  * TODO This function exists only to ease the
  * https://github.com/Agoric/agoric-sdk/pull/5970 transition, from all methods
- * being own properties to methods being inherited from a common prototype.
- * This transition breaks two patterns used in prior code: autobinding,
- * and enumerating methods by enumerating own properties. For both, the
- * preferred repairs are
- *    * autobinding: Replace, for example,
- *      `foo(obj.method)` with `foo(arg => `obj.method(arg))`. IOW, stop relying
- *      on expressions like `obj.method` to extract a method still bound to the
- *      state of `obj` because, for virtual and durable objects,
- *      they no longer will after #5970.
- *    * method enumeration: Replace, for example
- *      `Reflect.ownKeys(obj)` with `getMethodNames(obj)`.
+ * being own properties to methods being inherited from a common prototype. This
+ * transition breaks two patterns used in prior code: autobinding, and
+ * enumerating methods by enumerating own properties. For both, the preferred
+ * repairs are
+ *
+ * - autobinding: Replace, for example, `foo(obj.method)` with `foo(arg =>
+ *   `obj.method(arg))`. IOW, stop relying on expressions like `obj.method`to
+ *   extract a method still bound to the state of`obj` because, for virtual and
+ *   durable objects, they no longer will after #5970.
+ * - method enumeration: Replace, for example `Reflect.ownKeys(obj)` with
+ *   `getMethodNames(obj)`.
  *
  * Once all problematic cases have been converted in this manner, this
  * `bindAllMethods` hack can and TODO should be deleted. However, we currently
- * have no reliable static way to track down and fix all autobinding sites.
- * For those objects that have not yet been fully repaired by the above two
+ * have no reliable static way to track down and fix all autobinding sites. For
+ * those objects that have not yet been fully repaired by the above two
  * techniques, `bindAllMethods` creates an object that acts much like the
  * pre-#5970 objects, with all their methods as instance-bound own properties.
  * It does this by making a new object inheriting from `obj` where the new

package/src/netstring.d.ts

@@ -0,0 +1,24 @@
+/**
+ * @param {Buffer} data
+ * @returns {Buffer} netstring-wrapped
+ */
+export function encode(data: Buffer): Buffer;
+export function netstringEncoderStream(): Transform;
+/**
+ * @param {Buffer} data containing zero or more netstrings and maybe some
+ *   leftover bytes
+ * @param {number} [optMaxChunkSize]
+ * @returns {{ leftover: Buffer; payloads: Buffer[] }} zero or more decoded
+ *   Buffers, one per netstring,
+ */
+export function decode(data: Buffer, optMaxChunkSize?: number | undefined): {
+    leftover: Buffer;
+    payloads: Buffer[];
+};
+/**
+ * @param {number} [optMaxChunkSize]
+ * @returns {Transform}
+ */
+export function netstringDecoderStream(optMaxChunkSize?: number | undefined): Transform;
+import { Transform } from 'stream';
+//# sourceMappingURL=netstring.d.ts.map

package/src/netstring.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"netstring.d.ts","sourceRoot":"","sources":["netstring.js"],"names":[],"mappings":"AASA;;;GAGG;AACH,6BAHW,MAAM,GACJ,MAAM,CAMlB;AAGD,oDAsBC;AAED;;;;;;GAMG;AACH,6BANW,MAAM,yCAGJ;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,EAAE,CAAA;CAAE,CAmCpD;AAED;;;GAGG;AAEH,8EAHa,SAAS,CAoCrB;0BAvHyB,QAAQ"}

package/src/netstring.js

@@ -0,0 +1,124 @@
+/* eslint-env node */
+import { Fail } from '@endo/errors';
+
+// adapted from 'netstring-stream', https://github.com/tlivings/netstring-stream/
+import { Transform } from 'stream';
+
+const COLON = 58;
+const COMMA = 44;
+
+/**
+ * @param {Buffer} data
+ * @returns {Buffer} netstring-wrapped
+ */
+export function encode(data) {
+  const prefix = Buffer.from(`${data.length}:`);
+  const suffix = Buffer.from(',');
+  return Buffer.concat([prefix, data, suffix]);
+}
+
+// input is a sequence of strings, output is a byte pipe
+export function netstringEncoderStream() {
+  /**
+   * @param {Buffer} chunk
+   * @param {BufferEncoding} encoding
+   * @param {any} callback
+   * @this {{ push: (b: Buffer) => void }}
+   */
+  function transform(chunk, encoding, callback) {
+    if (!Buffer.isBuffer(chunk)) {
+      throw Error('stream requires Buffers');
+    }
+    let err;
+    try {
+      this.push(encode(chunk));
+    } catch (e) {
+      err = e;
+    }
+    callback(err);
+  }
+  // (maybe empty) Buffer in, Buffer out. We use writableObjectMode to
+  // indicate that empty input buffers are important
+  return new Transform({ transform, writableObjectMode: true });
+}
+
+/**
+ * @param {Buffer} data containing zero or more netstrings and maybe some
+ *   leftover bytes
+ * @param {number} [optMaxChunkSize]
+ * @returns {{ leftover: Buffer; payloads: Buffer[] }} zero or more decoded
+ *   Buffers, one per netstring,
+ */
+export function decode(data, optMaxChunkSize) {
+  // TODO: it would be more efficient to accumulate pending data in an array,
+  // rather than doing a concat each time
+  let start = 0;
+  const payloads = [];
+
+  for (;;) {
+    const colon = data.indexOf(COLON, start);
+    if (colon === -1) {
+      break; // still waiting for `${LENGTH}:`
+    }
+    const sizeString = data.toString('utf-8', start, colon);
+    const size = parseInt(sizeString, 10);
+    if (!(size > -1)) {
+      // reject NaN, all negative numbers
+      Fail`unparsable size ${sizeString}, should be integer`;
+    }
+    if (optMaxChunkSize) {
+      size <= optMaxChunkSize ||
+        Fail`size ${size} exceeds limit of ${optMaxChunkSize}`;
+    }
+    if (data.length < colon + 1 + size + 1) {
+      break; // still waiting for `${DATA}.`
+    }
+    data[colon + 1 + size] === COMMA ||
+      Fail`malformed netstring: not terminated by comma`;
+    payloads.push(data.subarray(colon + 1, colon + 1 + size));
+    start = colon + 1 + size + 1;
+  }
+
+  const leftover = data.subarray(start);
+  return { leftover, payloads };
+}
+
+/**
+ * @param {number} [optMaxChunkSize]
+ * @returns {Transform}
+ */
+// input is a byte pipe, output is a sequence of Buffers
+export function netstringDecoderStream(optMaxChunkSize) {
+  let buffered = Buffer.from('');
+  /**
+   * @param {Buffer} chunk
+   * @param {BufferEncoding} encoding
+   * @param {any} callback
+   * @this {{ push: (b: Buffer) => void }}
+   */
+  function transform(chunk, encoding, callback) {
+    if (!Buffer.isBuffer(chunk)) {
+      throw Error('stream requires Buffers');
+    }
+    buffered = Buffer.concat([buffered, chunk]);
+    let err;
+    try {
+      const { leftover, payloads } = decode(buffered, optMaxChunkSize);
+      buffered = leftover;
+      for (let i = 0; i < payloads.length; i += 1) {
+        this.push(payloads[i]);
+      }
+    } catch (e) {
+      err = e;
+    }
+    // we buffer all data internally, to accommodate netstrings larger than
+    // Transform's default buffer size, and callback() indicates that we've
+    // consumed the input
+    callback(err);
+  }
+
+  // Buffer in, Buffer out, except that each output Buffer is precious, even
+  // empty ones, and without readableObjectMode the Stream will discard empty
+  // buffers
+  return new Transform({ transform, readableObjectMode: true });
+}

package/src/node/buffer-line-transform.d.ts

@@ -1,41 +1,45 @@
-/// <reference types="node" />
 /**
  * @typedef {object} BufferLineTransformOptions
- * @property {Buffer | string | number} [break] line break matcher for Buffer.indexOf() (default: 10)
- * @property {BufferEncoding} [breakEncoding] if break is a string, the encoding to use
+ * @property {Buffer | string | number} [break] line break matcher for
+ *   Buffer.indexOf() (default: 10)
+ * @property {BufferEncoding} [breakEncoding] if break is a string, the encoding
+ *   to use
  */
 export default class BufferLineTransform extends Transform {
     /**
-     * The BufferLineTransform is reading String or Buffer content from a Readable stream
-     * and writing each line as a Buffer in object mode
+     * The BufferLineTransform is reading String or Buffer content from a Readable
+     * stream and writing each line as a Buffer in object mode
      *
-     * @param {import('node:stream').TransformOptions & BufferLineTransformOptions} [options]
+     * @param {import('node:stream').TransformOptions &
+     *   BufferLineTransformOptions} [options]
      */
     constructor(options?: (import("stream").TransformOptions & BufferLineTransformOptions) | undefined);
     _breakValue: string | number | Buffer;
     _breakEncoding: BufferEncoding | undefined;
     _breakLength: number;
-    /** @type {Array<Buffer>} */
-    _chunks: Array<Buffer>;
+    /** @type {Buffer[]} */
+    _chunks: Buffer[];
     /**
-     * @override
      * @param {any} chunk
      * @param {BufferEncoding | 'buffer'} encoding
      * @param {import('node:stream').TransformCallback} cb
+     * @override
      */
-    override _transform(chunk: any, encoding: BufferEncoding | 'buffer', cb: import('node:stream').TransformCallback): void;
+    override _transform(chunk: any, encoding: BufferEncoding | "buffer", cb: import("node:stream").TransformCallback): void;
     /** @param {Buffer} line */
     _writeItem(line: Buffer): void;
 }
 export type BufferLineTransformOptions = {
     /**
-     * line break matcher for Buffer.indexOf() (default: 10)
+     * line break matcher for
+     * Buffer.indexOf() (default: 10)
      */
     break?: string | number | Buffer | undefined;
     /**
-     * if break is a string, the encoding to use
+     * if break is a string, the encoding
+     * to use
      */
     breakEncoding?: BufferEncoding | undefined;
 };
-import { Transform } from "stream";
+import { Transform } from 'node:stream';
 //# sourceMappingURL=buffer-line-transform.d.ts.map

package/src/node/buffer-line-transform.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buffer-line-transform.d.ts","sourceRoot":"","sources":["buffer-line-transform.js"],"names":[],"mappings":";AAKA;;;;GAIG;AAEH;IACE;;;;;OAKG;IACH,oGAuBC;IAhBC,sCAAmC;IACnC,2CAAmC;IAWnC,qBAA+B;IAE/B,4BAA4B;IAC5B,SADW,MAAM,MAAM,CAAC,CACP;IAGnB;;;;;OAKG;IACH,2BAJW,GAAG,YACH,cAAc,GAAG,QAAQ,MACzB,OAAO,aAAa,EAAE,iBAAiB,QAgDjD;IAeD,2BAA2B;IAC3B,iBADY,MAAM,QAOjB;CACF"}
+{"version":3,"file":"buffer-line-transform.d.ts","sourceRoot":"","sources":["buffer-line-transform.js"],"names":[],"mappings":"AAKA;;;;;;GAMG;AAEH;IACE;;;;;;OAMG;IACH,oGAuBC;IAhBC,sCAAmC;IACnC,2CAAmC;IAWnC,qBAA+B;IAE/B,uBAAuB;IACvB,SADW,MAAM,EAAE,CACF;IAGnB;;;;;OAKG;IACH,2BALW,GAAG,YACH,cAAc,GAAG,QAAQ,MACzB,OAAO,aAAa,EAAE,iBAAiB,QAiDjD;IAeD,2BAA2B;IAC3B,iBADY,MAAM,QAOjB;CACF;;;;;;;;;;;;;0BAtHyB,aAAa"}

package/src/node/buffer-line-transform.js

@@ -1,20 +1,23 @@
-/* global Buffer */
+/* eslint-env node */
 /* eslint-disable no-underscore-dangle */
 
 import { Transform } from 'node:stream';
 
 /**
  * @typedef {object} BufferLineTransformOptions
- * @property {Buffer | string | number} [break] line break matcher for Buffer.indexOf() (default: 10)
- * @property {BufferEncoding} [breakEncoding] if break is a string, the encoding to use
+ * @property {Buffer | string | number} [break] line break matcher for
+ *   Buffer.indexOf() (default: 10)
+ * @property {BufferEncoding} [breakEncoding] if break is a string, the encoding
+ *   to use
  */
 
 export default class BufferLineTransform extends Transform {
   /**
-   * The BufferLineTransform is reading String or Buffer content from a Readable stream
-   * and writing each line as a Buffer in object mode
+   * The BufferLineTransform is reading String or Buffer content from a Readable
+   * stream and writing each line as a Buffer in object mode
    *
-   * @param {import('node:stream').TransformOptions & BufferLineTransformOptions} [options]
+   * @param {import('node:stream').TransformOptions &
+   *   BufferLineTransformOptions} [options]
    */
   constructor(options) {
     const {
@@ -37,15 +40,15 @@ export default class BufferLineTransform extends Transform {
     }
     this._breakLength = breakLength;
 
-    /** @type {Array<Buffer>} */
+    /** @type {Buffer[]} */
     this._chunks = [];
   }
 
   /**
-   * @override
    * @param {any} chunk
    * @param {BufferEncoding | 'buffer'} encoding
    * @param {import('node:stream').TransformCallback} cb
+   * @override
    */
   _transform(chunk, encoding, cb) {
     try {
@@ -96,8 +99,8 @@ export default class BufferLineTransform extends Transform {
   }
 
   /**
-   * @override
    * @param {import('node:stream').TransformCallback} cb
+   * @override
    */
   _flush(cb) {
     if (this._chunks.length) {

package/src/node/createBundles.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createBundles.d.ts","sourceRoot":"","sources":["createBundles.js"],"names":[],"mappings":"AAUO,6EAyBN;AAEM,mFAMN;AAEM,iGAkCN"}
+{"version":3,"file":"createBundles.d.ts","sourceRoot":"","sources":["createBundles.js"],"names":[],"mappings":"AAYO,6EAgCN;AAEM,mFAMN;AAEM,iGAkCN"}

package/src/node/createBundles.js

@@ -1,10 +1,12 @@
+/* eslint-env node */
 // Use modules not prefixed with `node:` since some deploy scripts may
 // still be running in esm emulation
 import path from 'path';
 import { spawnSync } from 'child_process';
 import { createRequire } from 'module';
 
-const { Fail, quote: q } = assert;
+import { Fail, q } from '@endo/errors';
+
 const BUNDLE_SOURCE_PROGRAM = 'bundle-source';
 const req = createRequire(import.meta.url);
 
@@ -22,14 +24,21 @@ export const createBundlesFromAbsolute = async sourceBundles => {
     }
     const bundle = match[1];
 
-    const args = cacheToArgs.get(cache) || ['--to', cache];
+    const args = cacheToArgs.get(cache) || ['--cache-js', cache];
+    args.push('--elide-comments');
     args.push(srcPath, bundle);
     cacheToArgs.set(cache, args);
   }
 
   for (const args of cacheToArgs.values()) {
     console.log(BUNDLE_SOURCE_PROGRAM, ...args);
-    const { status } = spawnSync(prog, args, { stdio: 'inherit' });
+    const env = /** @type {NodeJS.ProcessEnv} */ (
+      /** @type {unknown} */ ({
+        __proto__: process.env,
+        LOCKDOWN_OVERRIDE_TAMING: 'severe',
+      })
+    );
+    const { status } = spawnSync(prog, args, { stdio: 'inherit', env });
     status === 0 ||
       Fail`${q(BUNDLE_SOURCE_PROGRAM)} failed with status ${q(status)}`;
   }

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

@@ -1,4 +1,4 @@
-export function fsStreamReady(stream: import("fs").ReadStream | import("fs").WriteStream): Promise<void>;
+export function fsStreamReady(stream: import("fs").ReadStream | import("fs").WriteStream | import("net").Socket): Promise<void>;
 export function makeFsStreamWriter(filePath: string | undefined | null): Promise<{
     write: (data: any) => Promise<void>;
     flush: () => Promise<void>;

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

@@ -1 +1 @@
-{"version":3,"file":"fs-stream.d.ts","sourceRoot":"","sources":["fs-stream.js"],"names":[],"mappings":"AAQO,sCAHI,OAAO,IAAI,EAAE,UAAU,GAAG,OAAO,IAAI,EAAE,WAAW,GAChD,QAAQ,IAAI,CAAC,CAgCtB;AAQG,6CADK,MAAM,GAAG,SAAS,GAAG,IAAI;;;;eA2DpC;6BA5Da,YAAY,QAAQ,WAAW,yBAAyB,CAAC,CAAC,CAAC"}
+{"version":3,"file":"fs-stream.d.ts","sourceRoot":"","sources":["fs-stream.js"],"names":[],"mappings":"AAUO,sCALI,OAAO,IAAI,EAAE,UAAU,GAC3B,OAAO,IAAI,EAAE,WAAW,GACxB,OAAO,KAAK,EAAE,MAAM,GACd,OAAO,CAAC,IAAI,CAAC,CAgCtB;AAQG,6CADK,MAAM,GAAG,SAAS,GAAG,IAAI;;;;eAqEpC;6BAtEa,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,kBAAkB,CAAC,CAAC,CAAC"}

package/src/node/fs-stream.js

@@ -1,9 +1,11 @@
 import { createWriteStream } from 'node:fs';
+import process from 'node:process';
 import { open } from 'node:fs/promises';
-import { makeAggregateError } from '../utils.js';
 
 /**
- * @param {import("fs").ReadStream | import("fs").WriteStream} stream
+ * @param {import('fs').ReadStream
+ *   | import('fs').WriteStream
+ *   | import('net').Socket} stream
  * @returns {Promise<void>}
  */
 export const fsStreamReady = stream =>
@@ -19,13 +21,13 @@ export const fsStreamReady = stream =>
     }
 
     const onReady = () => {
-      cleanup(); // eslint-disable-line no-use-before-define
+      cleanup();
       resolve();
     };
 
     /** @param {Error} err */
     const onError = err => {
-      cleanup(); // eslint-disable-line no-use-before-define
+      cleanup();
       reject(err);
     };
 
@@ -49,45 +51,51 @@ export const makeFsStreamWriter = async filePath => {
     return undefined;
   }
 
-  const handle = await open(filePath, 'a');
+  const handle = await (filePath !== '-' ? open(filePath, 'a') : undefined);
 
-  const stream = createWriteStream(noPath, { fd: handle.fd });
+  const stream = handle
+    ? createWriteStream(noPath, { fd: handle.fd })
+    : process.stdout;
   await fsStreamReady(stream);
 
   let flushed = Promise.resolve();
   let closed = false;
 
-  const write = async data => {
-    if (closed) {
-      throw Error('Stream closed');
-    }
-
-    /** @type {Promise<void>} */
-    const written = new Promise((resolve, reject) => {
-      stream.write(data, err => {
-        if (err) {
-          reject(err);
-        } else {
-          resolve();
-        }
-      });
-    });
+  const updateFlushed = p => {
     flushed = flushed.then(
-      () => written,
-      async err =>
-        Promise.reject(
-          written.then(
-            () => err,
-            writtenError => makeAggregateError([err, writtenError]),
-          ),
+      () => p,
+      err =>
+        p.then(
+          () => Promise.reject(err),
+          pError =>
+            Promise.reject(
+              pError !== err ? AggregateError([err, pError]) : err,
+            ),
         ),
     );
+    flushed.catch(() => {});
+  };
+
+  const write = async data => {
+    /** @type {Promise<void>} */
+    const written = closed
+      ? Promise.reject(Error('Stream closed'))
+      : new Promise((resolve, reject) => {
+          stream.write(data, err => {
+            if (err) {
+              reject(err);
+            } else {
+              resolve();
+            }
+          });
+        });
+    updateFlushed(written);
     return written;
   };
 
   const flush = async () => {
     await flushed;
-    await handle.sync().catch(err => {
+    await handle?.sync().catch(err => {
       if (err.code === 'EINVAL') {
         return;
       }
@@ -96,10 +104,14 @@ export const makeFsStreamWriter = async filePath => {
   };
 
   const close = async () => {
+    // TODO: Consider creating a single Error here to use a write rejection
     closed = true;
     await flush();
-    stream.close();
+    // @ts-expect-error calling a possibly missing method
+    stream.close?.();
   };
 
+  stream.on('error', err => updateFlushed(Promise.reject(err)));
+
   return harden({ write, flush, close });
 };