@agoric/internal 0.3.3-dev-d122756.0 → 0.3.3-dev-7ae1f27.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/internal",
-  "version": "0.3.3-dev-d122756.0+d122756",
+  "version": "0.3.3-dev-7ae1f27.0+7ae1f27",
   "description": "Externally unsupported utilities internal to agoric-sdk",
   "type": "module",
   "main": "src/index.js",
@@ -20,7 +20,7 @@
     "lint:types": "tsc"
   },
   "dependencies": {
-    "@agoric/base-zone": "0.1.1-dev-d122756.0+d122756",
+    "@agoric/base-zone": "0.1.1-dev-7ae1f27.0+7ae1f27",
     "@endo/common": "^1.2.7",
     "@endo/errors": "^1.2.7",
     "@endo/far": "^1.1.8",
@@ -59,5 +59,5 @@
   "typeCoverage": {
     "atLeast": 93.42
   },
-  "gitHead": "d122756b667949664b0259f0a58f61d1d1f14d03"
+  "gitHead": "7ae1f278fa8cbeb0cfc777b7cebf507b1f07c958"
 }

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":"AAOO,sCAHI,OAAO,IAAI,EAAE,UAAU,GAAG,OAAO,IAAI,EAAE,WAAW,GAChD,OAAO,CAAC,IAAI,CAAC,CAgCtB;AAQG,6CADK,MAAM,GAAG,SAAS,GAAG,IAAI;;;;eA2DpC;6BA5Da,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,kBAAkB,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,8 +1,11 @@
 import { createWriteStream } from 'node:fs';
+import process from 'node:process';
 import { open } from 'node:fs/promises';
 
 /**
- * @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 =>
@@ -48,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 => AggregateError([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;
       }
@@ -95,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 });
 };