@agoric/internal 0.3.3-dev-cb1866d.0.cb1866d → 0.3.3-dev-588c42f.0.588c42f

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/internal",
-  "version": "0.3.3-dev-cb1866d.0.cb1866d",
+  "version": "0.3.3-dev-588c42f.0.588c42f",
   "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-cb1866d.0.cb1866d",
+    "@agoric/base-zone": "0.1.1-dev-588c42f.0.588c42f",
     "@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-cb1866d.0.cb1866d",
+    "@agoric/cosmic-proto": "0.4.1-dev-588c42f.0.588c42f",
     "@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": "cb1866dfac010587765a8927bee0205e309271be"
+  "gitHead": "588c42f376700adc36f9a847e3a66d973d3cee12"
 }

package/src/lib-nodejs/spawnSubprocessWorker.js

@@ -19,8 +19,8 @@ import {
 // JSON-serializable data.
 
 // eslint-disable-next-line no-unused-vars
-function parentLog(first, ...args) {
-  // console.error(`--parent: ${first}`, ...args);
+function parentLog(_first, ..._args) {
+  // console.error(`--parent: ${_first}`, ..._args);
 }
 
 // we send on fd3, and receive on fd4. We pass fd1/2 (stdout/err) through, so

package/src/lib-nodejs/worker-protocol.js

@@ -7,11 +7,11 @@ import { Transform } from 'stream';
 export function arrayEncoderStream() {
   /**
    * @param {any} object
-   * @param {BufferEncoding} encoding
+   * @param {BufferEncoding} _encoding
    * @param {any} callback
    * @this {{ push: (b: Buffer) => void }}
    */
-  function transform(object, encoding, callback) {
+  function transform(object, _encoding, callback) {
     if (!Array.isArray(object)) {
       throw Error('stream requires Arrays');
     }
@@ -30,11 +30,11 @@ export function arrayEncoderStream() {
 export function arrayDecoderStream() {
   /**
    * @param {Buffer} buf
-   * @param {BufferEncoding} encoding
+   * @param {BufferEncoding} _encoding
    * @param {any} callback
    * @this {{ push: (b: Buffer) => void }}
    */
-  function transform(buf, encoding, callback) {
+  function transform(buf, _encoding, callback) {
     let err;
     try {
       if (!Buffer.isBuffer(buf)) {

package/src/marshal/wrap-marshaller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wrap-marshaller.d.ts","sourceRoot":"","sources":["wrap-marshaller.js"],"names":[],"mappings":"AAqHO,kDATO,IAAI,wBACP,QAAQ,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,aAAa,GAAG,WAAW,CAAC,CAAC,kEAC7D,kBAAkB,+CAE1B;IAAiD,SAAS;IACT,SAAS;IACjC,eAAe;CACxC,GAAU,UAAU,CAAC,OAAO,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CA4RrD;AAOM,+CAJO,IAAI,wBACP,QAAQ,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,aAAa,GAAG,WAAW,CAAC,CAAC,GAC3D,UAAU,CAAC,OAAO,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAyBrD;AAxTM,qCATO,IAAI,wBACP,QAAQ,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,aAAa,GAAG,WAAW,CAAC,CAAC,kEAC7D,kBAAkB,+CAE1B;IAAiD,SAAS;IACT,SAAS;IACjC,eAAe;CACxC,GAAU,UAAU,CAAC,OAAO,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CA4RrD;;;;;wBA1Xa,IAAI,cACL,SAAS,MAAM,QAAQ,IAAI,CAAC,CAAC,CAAC;4BAG7B,WAAW,GAAG,YAAY,MAAM,EAAE;iCAyClC,IAAI,cACL,WAAW,CAAC,IAAI,CAAC,GAAG,WAAW,WAAW,EAAE,aAAa,CAAC;6BArD7C,aAAa;wCAD0B,eAAe;gCAHnD,iBAAiB;oBAN1B,WAAW;6BASkC,eAAe;2BAFxD,qBAAqB;8BACN,kBAAkB;AAHzD;;;;;;GAMG;AAEH;;;;;;GAMG;AAEH,kEAAkE;AAElE,+BAA+B;AAC/B,0BADe,IAAI;IAsBjB;;;;OAIG;IACH,0CAHW,WAAW,CAAC,MAAI,CAAC,GACf,MAAI,CAIhB;IArBD;;;OAGG;IACH,kBAHW,IAAI,UACJ,MAAM,EAUhB;IAfD,4BAA4B;IAC5B,sBADW,aAAa,CACH;;CAwBtB;gCA7CsC,kBAAkB"}
+{"version":3,"file":"wrap-marshaller.d.ts","sourceRoot":"","sources":["wrap-marshaller.js"],"names":[],"mappings":"AAqHO,kDATO,IAAI,wBACP,QAAQ,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,aAAa,GAAG,WAAW,CAAC,CAAC,kEAC7D,kBAAkB,+CAE1B;IAAiD,SAAS;IACT,SAAS;IACjC,eAAe;CACxC,GAAU,UAAU,CAAC,OAAO,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CA4RrD;AAOM,+CAJO,IAAI,wBACP,QAAQ,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,aAAa,GAAG,WAAW,CAAC,CAAC,GAC3D,UAAU,CAAC,OAAO,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAyBrD;AAxTM,qCATO,IAAI,wBACP,QAAQ,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,aAAa,GAAG,WAAW,CAAC,CAAC,kEAC7D,kBAAkB,+CAE1B;IAAiD,SAAS;IACT,SAAS;IACjC,eAAe;CACxC,GAAU,UAAU,CAAC,OAAO,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CA4RrD;;;;;wBA1Xa,IAAI,cACL,SAAS,MAAM,QAAQ,IAAI,CAAC,CAAC,CAAC;4BAG7B,WAAW,GAAG,YAAY,MAAM,EAAE;iCAyClC,IAAI,cACL,WAAW,CAAC,IAAI,CAAC,GAAG,WAAW,WAAW,EAAE,aAAa,CAAC;6BArD7C,aAAa;wCAD0B,eAAe;gCAHnD,iBAAiB;oBAN1B,WAAW;6BASkC,eAAe;2BAFxD,qBAAqB;8BACN,kBAAkB;AAHzD;;;;;;GAMG;AAEH;;;;;;GAMG;AAEH,kEAAkE;AAElE,+BAA+B;AAC/B,0BADe,IAAI;IAsBjB;;;;OAIG;IACH,0CAHW,WAAW,CAAC,MAAI,CAAC,GACf,MAAI,CAIhB;IArBD;;;OAGG;IACH,kBAHW,IAAI,UACJ,MAAM,EAUhB;IAfD,4BAA4B;IAC5B,sBADW,aAAa,CACsB;;CAwB/C;gCA7CsC,kBAAkB"}

package/src/marshal/wrap-marshaller.js

@@ -31,7 +31,7 @@ class SlotWrapper {
   #slot;
 
   /** @type {InterfaceSpec} */
-  [Symbol.toStringTag];
+  [Symbol.toStringTag] = 'Alleged: SlotWrapper';
 
   /**
    * @param {Slot} slot

package/src/netstring.js

@@ -21,11 +21,11 @@ export function encode(data) {
 export function netstringEncoderStream() {
   /**
    * @param {Buffer} chunk
-   * @param {BufferEncoding} encoding
+   * @param {BufferEncoding} _encoding
    * @param {any} callback
    * @this {{ push: (b: Buffer) => void }}
    */
-  function transform(chunk, encoding, callback) {
+  function transform(chunk, _encoding, callback) {
     if (!Buffer.isBuffer(chunk)) {
       throw Error('stream requires Buffers');
     }
@@ -93,11 +93,11 @@ export function netstringDecoderStream(optMaxChunkSize) {
   let buffered = Buffer.from('');
   /**
    * @param {Buffer} chunk
-   * @param {BufferEncoding} encoding
+   * @param {BufferEncoding} _encoding
    * @param {any} callback
    * @this {{ push: (b: Buffer) => void }}
    */
-  function transform(chunk, encoding, callback) {
+  function transform(chunk, _encoding, callback) {
     if (!Buffer.isBuffer(chunk)) {
       throw Error('stream requires Buffers');
     }

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;AAIG,6CADK,MAAM,GAAG,SAAS,GAAG,IAAI;;;;eAsEpC;6BAvEa,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,kBAAkB,CAAC,CAAC,CAAC;gCAzC5C,IAAI;iCACH,IAAI;4BACT,KAAK"}
+{"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"}

package/src/node/fs-stream.js

@@ -44,6 +44,53 @@ export const fsStreamReady = stream =>
     stream.on('error', onError);
   });
 
+/**
+ * Wait for a stream event and reject on stream error first.
+ *
+ * @param {ReadStream | WriteStream | Socket} stream
+ * @param {'drain' | 'ready'} eventName
+ * @returns {Promise<void>}
+ */
+const onceWithError = (stream, eventName) =>
+  new Promise((resolve, reject) => {
+    const onEvent = () => {
+      cleanup();
+      resolve();
+    };
+    /** @param {Error} err */
+    const onError = err => {
+      cleanup();
+      reject(err);
+    };
+    const cleanup = () => {
+      stream.off(eventName, onEvent);
+      stream.off('error', onError);
+    };
+    stream.on(eventName, onEvent);
+    stream.on('error', onError);
+  });
+
+/**
+ * @param {WriteStream | Socket} stream
+ * @param {string | Uint8Array} data
+ * @returns {Promise<boolean>} whether caller must await drain
+ */
+const writeChunk = (stream, data) =>
+  new Promise((resolve, reject) => {
+    let waitForDrain;
+    try {
+      waitForDrain = !stream.write(data, err => {
+        if (err) {
+          reject(err);
+          return;
+        }
+        resolve(waitForDrain);
+      });
+    } catch (err) {
+      reject(err);
+    }
+  });
+
 /** @typedef {NonNullable<Awaited<ReturnType<typeof makeFsStreamWriter>>>} FsStreamWriter */
 /** @param {string | undefined | null} filePath */
 export const makeFsStreamWriter = async filePath => {
@@ -60,7 +107,7 @@ export const makeFsStreamWriter = async filePath => {
     return { handle: fh, stream: fh.createWriteStream({ flush: true }) };
   })();
   await fsStreamReady(stream);
-  const writeAsync = promisify(stream.write.bind(stream));
+  const waitForDrainAsync = () => onceWithError(stream, 'drain');
   const closeAsync =
     useStdout || !(/** @type {any} */ (stream).close)
       ? undefined
@@ -87,11 +134,11 @@ export const makeFsStreamWriter = async filePath => {
   const write = async data => {
     const written = closed
       ? Promise.reject(Error('Stream closed'))
-      : writeAsync(data);
+      : writeChunk(stream, data);
     updateFlushed(written);
     const waitForDrain = await written;
     if (waitForDrain) {
-      await new Promise(resolve => stream.once('drain', resolve));
+      await waitForDrainAsync();
     }
   };