@agoric/xsnap 0.14.3-u17.1 → 0.14.3-u18.1

package/api.js

@@ -7,7 +7,7 @@
  * Also, update golden master test/xs-perf.test.js to reflect new meter
  * version.
  */
-export const METER_TYPE = 'xs-meter-30';
+export const METER_TYPE = 'xs-meter-33';
 
 export const ExitCode = {
   E_UNKNOWN_ERROR: -1,

package/build.env

@@ -1,4 +1,4 @@
 MODDABLE_URL=https://github.com/agoric-labs/moddable.git
 MODDABLE_COMMIT_HASH=f6c5951fc055e4ca592b9166b9ae3cbb9cca6bf0
 XSNAP_NATIVE_URL=https://github.com/agoric-labs/xsnap-pub
-XSNAP_NATIVE_COMMIT_HASH=eef9b67da5517ed18ff9e0073b842db20924eae3
+XSNAP_NATIVE_COMMIT_HASH=105bc6862050695b1723fa76df91564fe8111a37

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/xsnap",
-  "version": "0.14.3-u17.1",
+  "version": "0.14.3-u18.1",
   "description": "Snapshotting VM worker based on Moddable's XS Javascript engine",
   "author": "Agoric",
   "license": "Apache-2.0",
@@ -24,29 +24,29 @@
     "lint:types": "tsc",
     "lint-fix": "eslint --fix 'src/**/*.js' 'test/**/*.js' api.js",
     "test": "ava",
-    "test:c8": "c8 $C8_OPTIONS ava --config=ava-nesm.config.js",
+    "test:c8": "c8 --all $C8_OPTIONS ava",
     "test:xs": "exit 0"
   },
   "dependencies": {
-    "@agoric/internal": "^0.4.0-u17.1",
-    "@agoric/xsnap-lockdown": "^0.14.1-u17.1",
-    "@endo/bundle-source": "^3.4.0",
-    "@endo/errors": "^1.2.5",
-    "@endo/eventual-send": "^1.2.5",
-    "@endo/init": "^1.1.4",
-    "@endo/netstring": "^1.0.10",
-    "@endo/promise-kit": "^1.1.5",
-    "@endo/stream": "^1.2.5",
-    "@endo/stream-node": "^1.1.5",
+    "@agoric/internal": "^0.4.0-u18.1",
+    "@agoric/xsnap-lockdown": "^0.14.1-u18.1",
+    "@endo/bundle-source": "^3.5.0",
+    "@endo/errors": "^1.2.8",
+    "@endo/eventual-send": "^1.2.8",
+    "@endo/init": "^1.1.7",
+    "@endo/netstring": "^1.0.13",
+    "@endo/promise-kit": "^1.1.8",
+    "@endo/stream": "^1.2.8",
+    "@endo/stream-node": "^1.1.8",
     "glob": "^7.1.6",
     "tmp": "^0.2.1"
   },
   "devDependencies": {
-    "@endo/base64": "^1.0.7",
-    "@endo/nat": "^5.0.10",
+    "@endo/base64": "^1.0.9",
+    "@endo/nat": "^5.0.13",
     "@types/glob": "^8.1.0",
     "ava": "^5.3.0",
-    "c8": "^9.1.0"
+    "c8": "^10.1.2"
   },
   "files": [
     "LICENSE*",
@@ -76,7 +76,7 @@
     "workerThreads": false
   },
   "typeCoverage": {
-    "atLeast": 94.04
+    "atLeast": 93.51
   },
-  "gitHead": "5259430561693bfcf58516c3ea54123895859708"
+  "gitHead": "f8c45b8a2e29a51522a81a6692af25b2d7f6b50f"
 }

package/src/avaXS.js

@@ -112,7 +112,7 @@ async function runTestScript(
   /**
    * Handle callback "command" from xsnap subprocess.
    *
-   * @type { (msg: ArrayBuffer) => Promise<ArrayBuffer> }
+   * @type { (msg: ArrayBuffer) => Promise<Uint8Array<ArrayBufferLike>> }
    */
   async function handleCommand(message) {
     /**

package/src/build.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-/* global process */
+/* eslint-env node */
 import * as childProcessTop from 'child_process';
 import { fileURLToPath } from 'url';
 import fsTop from 'fs';

package/src/globals.d.ts

@@ -1,5 +1,5 @@
-declare var issueCommand: (msg: ArrayBuffer) => ArrayBuffer;
+declare var issueCommand: (msg: ArrayBufferLike) => ArrayBuffer;
 
 namespace global {
-  declare var issueCommand: (msg: ArrayBuffer) => ArrayBuffer;
+  declare var issueCommand: (msg: ArrayBufferLike) => ArrayBuffer;
 }

package/src/replay.js

@@ -326,7 +326,7 @@ export async function main(
   await replayXSnap(options, folders, { readdirSync, readFileSync });
 }
 
-/* global process */
+/* eslint-env node */
 if (process.argv[1] === fileURLToPath(new URL(import.meta.url))) {
   main([...process.argv.slice(2)], {
     spawn: childProcessPowers.spawn,

package/src/xsnap.js

@@ -1,4 +1,4 @@
-/* global process */
+/* eslint-env node */
 /* eslint no-await-in-loop: ["off"] */
 
 import { finished } from 'stream/promises';
@@ -141,8 +141,8 @@ const makeSnapshotLoaderWithPipe = async (
  * @property {AsyncIterable<Uint8Array>} [snapshotStream]
  * @property {string} [snapshotDescription]
  * @property {boolean} [snapshotUseFs]
- * @property {'ignore' | 'inherit'} [stdout]
- * @property {'ignore' | 'inherit'} [stderr]
+ * @property {'ignore' | 'inherit' | 'pipe'} [stdout]
+ * @property {'ignore' | 'inherit' | 'pipe'} [stderr]
  * @property {number} [meteringLimit]
  * @property {Record<string, string>} [env]
  */
@@ -501,7 +501,6 @@ export async function xsnap(options) {
         if (cleaned) return;
         cleaned = true;
         sourceStream.unpipe(output);
-        // eslint-disable-next-line no-use-before-define
         output.off('data', onData);
         output.end();
       };

package/src/xsrepl.js

@@ -1,4 +1,4 @@
-/* global process */
+/* eslint-env node */
 /* We make exceptions for test code. This is a test utility. */
 /* eslint no-await-in-loop: ["off"] */
 

package/xsnap-native/xsnap/sources/xsnap-worker.c

@@ -58,6 +58,7 @@ static char* fxReadNetStringError(int code);
 static int fxWriteOkay(FILE* outStream, xsUnsignedValue meterIndex, xsMachine *the, char* buf, size_t len);
 static int fxWriteNetString(FILE* outStream, char* prefix, char* buf, size_t len);
 static char* fxWriteNetStringError(int code);
+static void fxSigPipeHandler(int sigNum);
 
 extern xsIntegerValue fxGetCurrentHeapCount(xsMachine* the);
 
@@ -254,6 +255,14 @@ static char *renderTimestamps() {
 	return timestampBuffer;
 }
 
+static void fxSigPipeHandler(int sigNum)
+{
+	if (sigNum == SIGPIPE) {
+		fprintf(stderr, "Caught SIGPIPE. Has parent died?\n");
+		c_exit(E_IO_ERROR);
+	}
+}
+
 int main(int argc, char* argv[])
 {
 	int argi;
@@ -396,6 +405,9 @@ int main(int argc, char* argv[])
 		machine = xsCreateMachine(creation, "xsnap", NULL);
 		xsBuildAgent(machine);
 	}
+
+	signal(SIGPIPE, fxSigPipeHandler);
+
 	if (!(fromParent = fdopen(3, "rb"))) {
 		fprintf(stderr, "fdopen(3) from parent failed\n");
 		c_exit(E_IO_ERROR);
@@ -931,6 +943,10 @@ static void xs_issueCommand(xsMachine *the)
 	size_t len;
 	int readError = fxReadNetString(fromParent, &buf, &len);
 	if (readError != 0) {
+		if (feof(fromParent)) {
+			fprintf(stderr, "Got EOF on netstring read. Has parent died?\n");
+			c_exit(E_IO_ERROR);
+		}
 		xsUnknownError(fxReadNetStringError(readError));
 	}
 	recordTimestamp(); // after command-result received from parent