@agoric/internal 0.4.0-u19.0 → 0.4.0-u19.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/internal",
-  "version": "0.4.0-u19.0",
+  "version": "0.4.0-u19.2",
   "description": "Externally unsupported utilities internal to agoric-sdk",
   "type": "module",
   "main": "src/index.js",
@@ -34,7 +34,7 @@
     "jessie.js": "^0.3.4"
   },
   "devDependencies": {
-    "@agoric/cosmic-proto": "^0.5.0-u19.0",
+    "@agoric/cosmic-proto": "^0.5.0-u19.2",
     "@endo/exo": "^1.5.8",
     "@endo/init": "^1.1.8",
     "ava": "^5.3.0",
@@ -60,5 +60,5 @@
   "typeCoverage": {
     "atLeast": 93.04
   },
-  "gitHead": "29e9704c375a06bb617027093b30d2d25faa6471"
+  "gitHead": "f0ae74b84cb6de3724bfdcd18b4bea7e8199dee1"
 }

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

@@ -1 +1 @@
-{"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"}
+{"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;AAIG,6CADK,MAAM,GAAG,SAAS,GAAG,IAAI;;;;eAwEpC;6BAzEa,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,kBAAkB,CAAC,CAAC,CAAC"}

package/src/node/fs-stream.js

@@ -1,6 +1,6 @@
-import { createWriteStream } from 'node:fs';
-import process from 'node:process';
 import { open } from 'node:fs/promises';
+import process from 'node:process';
+import { promisify } from 'node:util';
 
 /**
  * @param {import('fs').ReadStream
@@ -40,10 +40,6 @@ export const fsStreamReady = stream =>
     stream.on('error', onError);
   });
 
-const noPath = /** @type {import('fs').PathLike} */ (
-  /** @type {unknown} */ (undefined)
-);
-
 /** @typedef {NonNullable<Awaited<ReturnType<typeof makeFsStreamWriter>>>} FsStreamWriter */
 /** @param {string | undefined | null} filePath */
 export const makeFsStreamWriter = async filePath => {
@@ -51,12 +47,22 @@ export const makeFsStreamWriter = async filePath => {
     return undefined;
   }
 
-  const handle = await (filePath !== '-' ? open(filePath, 'a') : undefined);
-
-  const stream = handle
-    ? createWriteStream(noPath, { fd: handle.fd })
-    : process.stdout;
+  const useStdout = filePath === '-';
+  const { handle, stream } = await (async () => {
+    if (useStdout) {
+      return { handle: undefined, stream: process.stdout };
+    }
+    const fh = await open(filePath, 'a');
+    return { handle: fh, stream: fh.createWriteStream({ flush: true }) };
+  })();
   await fsStreamReady(stream);
+  const writeAsync = promisify(stream.write.bind(stream));
+  const closeAsync =
+    useStdout || !(/** @type {any} */ (stream).close)
+      ? undefined
+      : promisify(
+          /** @type {import('fs').WriteStream} */ (stream).close.bind(stream),
+        );
 
   let flushed = Promise.resolve();
   let closed = false;
@@ -77,20 +83,14 @@ export const makeFsStreamWriter = async filePath => {
   };
 
   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();
-            }
-          });
-        });
+      : writeAsync(data);
     updateFlushed(written);
-    return written;
+    const waitForDrain = await written;
+    if (waitForDrain) {
+      await new Promise(resolve => stream.once('drain', resolve));
+    }
   };
 
   const flush = async () => {
@@ -107,8 +107,7 @@ export const makeFsStreamWriter = async filePath => {
     // TODO: Consider creating a single Error here to use a write rejection
     closed = true;
     await flush();
-    // @ts-expect-error calling a possibly missing method
-    stream.close?.();
+    await closeAsync?.();
   };
 
   stream.on('error', err => updateFlushed(Promise.reject(err)));