@agoric/xsnap 0.14.3-dev-4a1e4c3.0 → 0.14.3-dev-7ceb7f7.0

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-dev-4a1e4c3.0+4a1e4c3",
+  "version": "0.14.3-dev-7ceb7f7.0+7ceb7f7",
   "description": "Snapshotting VM worker based on Moddable's XS Javascript engine",
   "author": "Agoric",
   "license": "Apache-2.0",
@@ -28,8 +28,8 @@
     "test:xs": "exit 0"
   },
   "dependencies": {
-    "@agoric/internal": "0.3.3-dev-4a1e4c3.0+4a1e4c3",
-    "@agoric/xsnap-lockdown": "0.14.1-dev-4a1e4c3.0+4a1e4c3",
+    "@agoric/internal": "0.3.3-dev-7ceb7f7.0+7ceb7f7",
+    "@agoric/xsnap-lockdown": "0.14.1-dev-7ceb7f7.0+7ceb7f7",
     "@endo/bundle-source": "^3.4.0",
     "@endo/errors": "^1.2.5",
     "@endo/eventual-send": "^1.2.5",
@@ -78,5 +78,5 @@
   "typeCoverage": {
     "atLeast": 94.04
   },
-  "gitHead": "4a1e4c38ee972c8836aa74acaccb0251dec97638"
+  "gitHead": "7ceb7f7f2b618179098442fc103f636f989474b6"
 }

package/src/xsnap.js

@@ -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]
  */

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