@agoric/xsnap 0.14.3-dev-b047af2.0 → 0.14.3-dev-3eb4230.0

package/api.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/xsnap",
-  "version": "0.14.3-dev-b047af2.0+b047af2",
+  "version": "0.14.3-dev-3eb4230.0+3eb4230",
   "description": "Snapshotting VM worker based on Moddable's XS Javascript engine",
   "author": "Agoric",
   "license": "Apache-2.0",
@@ -13,10 +13,10 @@
   "scripts": {
     "repl": "node src/xsrepl.js",
     "build:bin": "if test -d ./test; then node src/build.js; else yarn build:from-env; fi",
-    "build:env": "if test -d ./test; then node src/build.js --show-env > build.env; fi",
+    "build:env": "test -d ./test && node src/build.js --show-env > build.env",
     "build:from-env": "{ cat build.env; echo node src/build.js; } | xargs env",
     "build": "yarn build:bin && yarn build:env",
-    "postinstall": "node src/build.js",
+    "postinstall": "yarn build:from-env",
     "clean": "rm -rf xsnap-native/xsnap/build",
     "lint": "run-s --continue-on-error lint:*",
     "lint:js": "eslint 'src/**/*.js' 'test/**/*.js' api.js",
@@ -27,21 +27,21 @@
     "test:xs": "exit 0"
   },
   "dependencies": {
-    "@agoric/assert": "0.6.1-dev-b047af2.0+b047af2",
-    "@agoric/internal": "0.3.3-dev-b047af2.0+b047af2",
-    "@agoric/xsnap-lockdown": "0.14.1-dev-b047af2.0+b047af2",
-    "@endo/bundle-source": "^3.1.0",
-    "@endo/eventual-send": "^1.1.2",
-    "@endo/init": "^1.0.4",
-    "@endo/netstring": "^1.0.4",
-    "@endo/promise-kit": "^1.0.4",
-    "@endo/stream": "^1.1.0",
-    "@endo/stream-node": "^1.0.4",
+    "@agoric/assert": "0.6.1-dev-3eb4230.0+3eb4230",
+    "@agoric/internal": "0.3.3-dev-3eb4230.0+3eb4230",
+    "@agoric/xsnap-lockdown": "0.14.1-dev-3eb4230.0+3eb4230",
+    "@endo/bundle-source": "^3.2.1",
+    "@endo/eventual-send": "^1.2.0",
+    "@endo/init": "^1.1.0",
+    "@endo/netstring": "^1.0.5",
+    "@endo/promise-kit": "^1.1.0",
+    "@endo/stream": "^1.2.0",
+    "@endo/stream-node": "^1.1.0",
     "glob": "^7.1.6",
     "tmp": "^0.2.1"
   },
   "devDependencies": {
-    "@endo/base64": "^1.0.2",
+    "@endo/base64": "^1.0.3",
     "@types/glob": "^8.1.0",
     "ava": "^5.3.0",
     "c8": "^9.1.0"
@@ -50,14 +50,7 @@
     "LICENSE*",
     "api.js",
     "build.env",
-    "moddable/modules/data",
-    "moddable/xs/includes",
-    "moddable/xs/makefiles",
-    "moddable/xs/platforms/*.h",
-    "moddable/xs/sources",
-    "src",
-    "xsnap-native/xsnap/makefiles",
-    "xsnap-native/xsnap/sources"
+    "src"
   ],
   "publishConfig": {
     "access": "public"
@@ -75,5 +68,5 @@
   "typeCoverage": {
     "atLeast": 94.44
   },
-  "gitHead": "b047af28aef5e4fd7e66e31de252f7233ccb5e29"
+  "gitHead": "3eb4230d9b76e6145385b96882120c3f9529cfb9"
 }

package/src/build.js

@@ -149,9 +149,12 @@ const makeSubmodule = (path, repoUrl, { git }) => {
  *     rmdirSync: typeof import('fs').rmdirSync,
  *     readFile: typeof import('fs').promises.readFile,
  *   },
+ *   os: {
+ *     type: typeof import('os').type,
+ *   }
  * }} io
  */
-const updateSubmodules = async (args, { env, stdout, spawn, fs }) => {
+async function main(args, { env, stdout, spawn, fs, os }) {
   const git = makeCLI('git', { spawn });
 
   // When changing/adding entries here, make sure to search the whole project
@@ -211,22 +214,7 @@ const updateSubmodules = async (args, { env, stdout, spawn, fs }) => {
       await submodule.init();
     }
   }
-};
 
-/**
- * @param {{
- *   spawn: typeof import('child_process').spawn,
- *   fs: {
- *     existsSync: typeof import('fs').existsSync,
- *     rmdirSync: typeof import('fs').rmdirSync,
- *     readFile: typeof import('fs').promises.readFile,
- *   },
- *   os: {
- *     type: typeof import('os').type,
- *   }
- * }} io
- */
-const makeXsnap = async ({ spawn, fs, os }) => {
   const pjson = await fs.readFile(asset('../package.json'), 'utf-8');
   const pkg = JSON.parse(pjson);
 
@@ -251,51 +239,6 @@ const makeXsnap = async ({ spawn, fs, os }) => {
       },
     );
   }
-};
-
-/**
- * @param {string[]} args
- * @param {{
- *   env: Record<string, string | undefined>,
- *   stdout: typeof process.stdout,
- *   spawn: typeof import('child_process').spawn,
- *   fs: {
- *     existsSync: typeof import('fs').existsSync,
- *     rmdirSync: typeof import('fs').rmdirSync,
- *     readFile: typeof import('fs').promises.readFile,
- *   },
- *   os: {
- *     type: typeof import('os').type,
- *   }
- * }} io
- */
-async function main(args, { env, stdout, spawn, fs, os }) {
-  // I solemnly swear I will do no synchronous work followed by a variable
-  // number turns of the event loop.
-  await null;
-
-  // If this is a working copy of xsnap in a checkout of agoric-sdk, we need to
-  // either clone or update submodules.
-  // Otherwise, we are running from an extracted npm tarball in a dependent
-  // package's node_modules, in which case we should just `make` with the
-  // `moddable` directory provided by npm.
-  // This will avoid rebuilding native xsnap in the common case for end users.
-  //
-  // | moddable/ | moddable/.git | working copy |
-  // | --------- | ------------- | ------------ |
-  // | ABSENT    | ABSENT        | YES          |
-  // | ABSENT    | EXISTS        | *            |
-  // | EXISTS    | ABSENT        | NO           |
-  // | EXISTS    | EXISTS        | YES          |
-  //
-  // We short-circuit after a single stat if moddable/.git exists because that
-  // implies that moddable/ exists.
-  const isWorkingCopy =
-    fs.existsSync('moddable/.git') || !fs.existsSync('moddable');
-  if (isWorkingCopy) {
-    await updateSubmodules(args, { env, stdout, spawn, fs });
-  }
-  await makeXsnap({ spawn, fs, os });
 }
 
 const run = () =>

package/moddable/modules/data/base64/base64.js

@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2016-2017  Moddable Tech, Inc.
- *
- *   This file is part of the Moddable SDK Runtime.
- * 
- *   The Moddable SDK Runtime is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Lesser General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- * 
- *   The Moddable SDK Runtime is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU Lesser General Public License for more details.
- * 
- *   You should have received a copy of the GNU Lesser General Public License
- *   along with the Moddable SDK Runtime.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-/*
-	base64
-*/
-
-export default class {
-	static encode(buffer) @ "xs_base64_encode";
-	static decode(string) @ "xs_base64_decode";
-}

package/moddable/modules/data/base64/manifest.json

@@ -1,11 +0,0 @@
-{
-	"modules": {
-		"*": [
-			"./base64",
-			"./modBase64"
-		]
-	},
-	"preload": [
-		"base64"
-	]
-}

package/moddable/modules/data/base64/modBase64.c

@@ -1,188 +0,0 @@
-/*
- * Copyright (c) 2016-2021  Moddable Tech, Inc.
- *
- *   This file is part of the Moddable SDK Runtime.
- * 
- *   The Moddable SDK Runtime is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Lesser General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- * 
- *   The Moddable SDK Runtime is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU Lesser General Public License for more details.
- * 
- *   You should have received a copy of the GNU Lesser General Public License
- *   along with the Moddable SDK Runtime.  If not, see <http://www.gnu.org/licenses/>.
- *
- * This file incorporates work covered by the following copyright and  
- * permission notice:  
- *
- *       Copyright (C) 2010-2016 Marvell International Ltd.
- *       Copyright (C) 2002-2010 Kinoma, Inc.
- *
- *       Licensed under the Apache License, Version 2.0 (the "License");
- *       you may not use this file except in compliance with the License.
- *       You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *       Unless required by applicable law or agreed to in writing, software
- *       distributed under the License is distributed on an "AS IS" BASIS,
- *       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *       See the License for the specific language governing permissions and
- *       limitations under the License.
- */
-
-/*
-	modeled on FskStrB64Decode and FskStrB64Encode from KPR.
-*/
-
-#include "xsmc.h"
-#include "xsHost.h"
-
-void xs_base64_encode(xsMachine *the)
-{
-	static const char b64[] ICACHE_XS6RO2_ATTR = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-	xsType		srcType;
-	uint8_t		*src, *dst;
-	uint32_t	srcSize, dstSize;
-	uint8_t		a, b, c;
-
-	srcType = xsmcTypeOf(xsArg(0));
-	if (xsStringType == srcType) {
-		src = (uint8_t *)xsmcToString(xsArg(0));
-		srcSize = c_strlen((char *)src);
-	}
-	else
-		xsmcGetBufferReadable(xsArg(0), (void **)&src, &srcSize);
-	dstSize = (((srcSize + 2) / 3) * 4) + 1;
-
-	xsResult = xsStringBuffer(NULL, dstSize);
-	if (xsStringType == srcType)
-		src = (uint8_t *)xsmcToString(xsArg(0));		// refresh pointer
-	else
-		xsmcGetBufferReadable(xsArg(0), (void **)&src, &srcSize);
-	dst = (uint8_t *)xsmcToString(xsResult);
-
-	while (srcSize > 2) {
-		a = c_read8(src++);
-		b = c_read8(src++);
-		c = c_read8(src++);
-		*dst++ = c_read8(b64 + ((a & 0xfc) >> 2));
-		*dst++ = c_read8(b64 + (((a & 0x3) << 4) | ((b & 0xf0) >> 4)));
-		*dst++ = c_read8(b64 + (((b & 0xf) << 2) | ((c & 0xc0) >> 6)));
-		*dst++ = c_read8(b64 + (c & 0x3f));
-		srcSize -= 3;
-	}
-
-	if (srcSize == 2) {
-		a = c_read8(src++);
-		b = c_read8(src++);
-		*dst++ = c_read8(b64 + ((a & 0xfc) >> 2));
-		*dst++ = c_read8(b64 + (((a & 0x3) << 4) | ((b & 0xf0) >> 4)));
-		*dst++ = c_read8(b64 + ((b & 0xf) << 2));
-		*dst++ = '=';
-	}
-	else if (srcSize == 1) {
-		a = c_read8(src++);
-		*dst++ = c_read8(b64 + ((a & 0xfc) >> 2));
-		*dst++ = c_read8(b64 + ((a & 0x3) << 4));
-		*dst++ = '=';
-		*dst++ = '=';
-	}
-
-	*dst++ = 0;
-}
-
-void xs_base64_decode(xsMachine *the)
-{
-	uint8_t		*src;
-	uint32_t	srcSize, dstSize, srcIndex, dstIndex;
-	uint8_t		aFlag = 0;
-	uint8_t		aByte;
-	uint8_t		aBuffer[4];
-	uint8_t		*dst, *dstStart;
-
-	src = (uint8_t *)xsmcToString(xsArg(0));
-	srcSize = c_strlen((char *)src);
-
-	dstSize = (srcSize / 4) * 3;
-	if (c_read8(src + srcSize - 1) == '=')
-		dstSize--;
-	if (c_read8(src + srcSize - 2) == '=')
-		dstSize--;
-	srcIndex = 0;
-
-	xsmcSetArrayBufferResizable(xsResult, NULL, dstSize, dstSize);
-	dst = dstStart = xsmcToArrayBuffer(xsResult);
-
-	src = (uint8_t *)xsmcToString(xsArg(0));	// refresh pointer
-
-	dstIndex = 3;
-	while ((aByte = c_read8(src++))) {
-		if (('A' <= aByte) && (aByte <= 'Z'))
-			aByte = aByte - 'A';
-		else if (('a' <= aByte) && (aByte <= 'z'))
-			aByte = aByte - 'a' + 26;
-		else if (('0' <= aByte) && (aByte <= '9'))
-			aByte = aByte - '0' + 52;
-		else if (aByte == '+')
-			aByte = 62;
-		else if (aByte == '/')
-			aByte = 63;
-		else if (aByte == '=') {
-			if (srcIndex == 2) {
-				if (c_read8(src) == '=') {
-					aBuffer[srcIndex++] = 0;
-					dstIndex = 1;
-					aByte = 0;
-					aFlag = 1;
-				}
-				else
-					continue;
-			}
-			else if (srcIndex == 3) {
-				dstIndex = 2;
-				aByte = 0;
-				aFlag = 1;
-			}
-			else
-				continue;
-		}
-		else
-			continue;
-		aBuffer[srcIndex++] = aByte;
-		if (srcIndex == 4) {
-			*dst++ = (aBuffer[0] << 2) | ((aBuffer[1] & 0x30) >> 4);
-			if (dstIndex > 1)
-				*dst++ = ((aBuffer[1] & 0x0F) << 4) | ((aBuffer[2] & 0x3C) >> 2);
-			if (dstIndex > 2)
-				*dst++ = ((aBuffer[2] & 0x03) << 6) | (aBuffer[3] & 0x3F);
-			srcIndex = 0;
-		}
-		if (aFlag)
-			break;
-	}
-
-	xsmcSetArrayBufferLength(xsResult, dst - dstStart);
-}
-
-void modInstallBase64(xsMachine *the)
-{
-	#define kNamespace (0)
-	#define kScratch (1)
-
-	xsBeginHost(the);
-	xsmcVars(2);
-
-	xsVar(kNamespace) = xsNewObject();
-	xsmcSet(xsGlobal, xsID("Base64"), xsVar(kNamespace));
-	xsVar(kScratch) = xsNewHostFunction(xs_base64_encode, 1);
-	xsmcSet(xsVar(kNamespace), xsID("encode"), xsVar(kScratch));
-	xsVar(kScratch) = xsNewHostFunction(xs_base64_decode, 1);
-	xsmcSet(xsVar(kNamespace), xsID("decode"), xsVar(kScratch));
-
-	xsEndHost(the);
-}

package/moddable/modules/data/binaryMessage/BinaryMessage.js

@@ -1,106 +0,0 @@
-/*
- * Copyright (c) 2016-2019  Moddable Tech, Inc.
- *
- *   This file is part of the Moddable SDK Tools.
- *
- *   The Moddable SDK Tools is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   The Moddable SDK Tools is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with the Moddable SDK Tools.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-const BinaryMessage = {
-	Float32: {
-		bytesLength:4,
-		getter:DataView.prototype.getFloat32,
-		setter:DataView.prototype.setFloat32,
-	},
-	Float64: {
-		bytesLength:8,
-		getter:DataView.prototype.getFloat64,
-		setter:DataView.prototype.setFloat64,
-	},
-	Int8: {
-		bytesLength:1,
-		getter:DataView.prototype.getInt8,
-		setter:DataView.prototype.setInt8,
-	},
-	Int16: {
-		bytesLength:2,
-		getter:DataView.prototype.getInt16,
-		setter:DataView.prototype.setInt16,
-	},
-	Int32: {
-		bytesLength:4,
-		getter:DataView.prototype.getInt32,
-		setter:DataView.prototype.setInt32,
-	},
-	Uint8: {
-		bytesLength:1,
-		getter:DataView.prototype.getUint8,
-		setter:DataView.prototype.setUint8,
-	},
-	Uint16: {
-		bytesLength:2,
-		getter:DataView.prototype.getUint16,
-		setter:DataView.prototype.setUint16,
-	},
-	Uint32: {
-		bytesLength:4,
-		getter:DataView.prototype.getUint32,
-		setter:DataView.prototype.setUint32,
-	},
-	generate(format) {
-		let message = {};
-		format.forEach(item => {
-			let value = 0;
-			let range = item.range;
-			if (range) 
-				value = range[value];
-			message[item.name] = value;
-		});
-		return message;
-	},
-	parse(format, buffer, endian) {
-		let view = new DataView(buffer);
-		let message = {};
-		let bytesLength = 0;
-		format.forEach(item => {
-			let value = item.type.getter.call(view, bytesLength, endian);
-			let range = item.range;
-			if (range) 
-				value = range[value];
-			message[item.name] = value;
-			bytesLength += item.type.bytesLength;
-		});
-		return message;
-	},
-	serialize(format, message, endian) {
-		let bytesLength = format.reduce((sum, item) => sum + item.type.bytesLength, 0);
-		let buffer = new ArrayBuffer(bytesLength);
-		let view = new DataView(buffer);
-		bytesLength = 0;
-		format.forEach(item => {
-			let value = message[item.name];
-			let range = item.range;
-			if (range) 
-				value = range.findIndex(string => string == value);
-			item.type.setter.call(view, bytesLength, value, endian);
-			bytesLength += item.type.bytesLength;
-		});
-		return buffer;
-	},
-}
-
-Object.freeze(BinaryMessage, true);
-
-export default BinaryMessage;