@agoric/xsnap 0.14.3-u16.1 → 0.14.3-u17.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-28';
+export const METER_TYPE = 'xs-meter-30';
 
 export const ExitCode = {
   E_UNKNOWN_ERROR: -1,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/xsnap",
-  "version": "0.14.3-u16.1",
+  "version": "0.14.3-u17.1",
   "description": "Snapshotting VM worker based on Moddable's XS Javascript engine",
   "author": "Agoric",
   "license": "Apache-2.0",
@@ -28,22 +28,22 @@
     "test:xs": "exit 0"
   },
   "dependencies": {
-    "@agoric/assert": "^0.6.1-u16.0",
-    "@agoric/internal": "^0.4.0-u16.1",
-    "@agoric/xsnap-lockdown": "^0.14.1-u16.0",
-    "@endo/bundle-source": "^3.2.3",
-    "@endo/eventual-send": "^1.2.2",
-    "@endo/init": "^1.1.2",
-    "@endo/netstring": "^1.0.7",
-    "@endo/promise-kit": "^1.1.2",
-    "@endo/stream": "^1.2.2",
-    "@endo/stream-node": "^1.1.2",
+    "@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",
     "glob": "^7.1.6",
     "tmp": "^0.2.1"
   },
   "devDependencies": {
-    "@endo/base64": "^1.0.5",
-    "@endo/nat": "^5.0.7",
+    "@endo/base64": "^1.0.7",
+    "@endo/nat": "^5.0.10",
     "@types/glob": "^8.1.0",
     "ava": "^5.3.0",
     "c8": "^9.1.0"
@@ -76,7 +76,7 @@
     "workerThreads": false
   },
   "typeCoverage": {
-    "atLeast": 93.95
+    "atLeast": 94.04
   },
-  "gitHead": "2eaeab90b4015e355faea534c1c933351d25b1b9"
+  "gitHead": "5259430561693bfcf58516c3ea54123895859708"
 }

package/src/avaXS.js

@@ -9,9 +9,10 @@ Usage:
 import '@endo/init';
 
 import fs from 'fs';
+import { fileURLToPath } from 'url';
 import { tmpName } from 'tmp';
 
-import { assert, q, Fail } from '@agoric/assert';
+import { assert, q, Fail } from '@endo/errors';
 import { getDebugLockdownBundle } from '@agoric/xsnap-lockdown';
 import { xsnap } from './xsnap.js';
 
@@ -21,7 +22,7 @@ const avaHandler = `./avaHandler.cjs`;
 
 /** @type { (ref: string, readFile: typeof import('fs').promises.readFile ) => Promise<string> } */
 const asset = (ref, readFile) =>
-  readFile(new URL(ref, import.meta.url).pathname, 'utf8');
+  readFile(fileURLToPath(new URL(ref, import.meta.url)), 'utf8');
 
 /**
  * When we bundle test scripts, we leave these externals
@@ -384,7 +385,9 @@ export async function main(
 
     stats.total += results.total;
     stats.pass += results.pass;
-    results.fail.forEach(info => stats.fail.push(info));
+    for (const info of results.fail) {
+      stats.fail.push(info);
+    }
   }
 
   console.log(stats.pass, 'tests passed');

package/src/build.js

@@ -1,13 +1,14 @@
 #!/usr/bin/env node
 /* global process */
 import * as childProcessTop from 'child_process';
+import { fileURLToPath } from 'url';
 import fsTop from 'fs';
 import osTop from 'os';
 
 const { freeze } = Object;
 
 /** @param {string} path */
-const asset = path => new URL(path, import.meta.url).pathname;
+const asset = path => fileURLToPath(new URL(path, import.meta.url));
 
 const ModdableSDK = {
   MODDABLE: asset('../moddable'),
@@ -341,7 +342,7 @@ async function main(args, { env, stdout, spawn, fs, os }) {
 
   if (isWorkingCopy || showEnv) {
     if (showEnv && !isWorkingCopy) {
-      throw new Error('XSnap requires a working copy and git to --show-env');
+      throw Error('XSnap requires a working copy and git to --show-env');
     }
     await updateSubmodules(showEnv, { env, stdout, spawn, fs });
     hasSource = true;
@@ -362,7 +363,7 @@ async function main(args, { env, stdout, spawn, fs, os }) {
       }
       await makeXsnap({ spawn, fs, os }, { forceBuild });
     } else if (!hasBin) {
-      throw new Error(
+      throw Error(
         'XSnap has neither sources nor a pre-built binary. Docker? .dockerignore? npm files?',
       );
     }

package/src/replay.js

@@ -13,6 +13,7 @@ import osPowers from 'os';
 import fsPowers from 'fs';
 import { Readable } from 'stream';
 import { tmpName as tmpNamePower } from 'tmp';
+import { fileURLToPath } from 'url';
 import { makeQueue } from '@endo/stream';
 import { xsnap, DEFAULT_CRANK_METERING_LIMIT } from './xsnap.js';
 
@@ -38,7 +39,9 @@ function makeSyncStorage(path, { writeFileSync }) {
     file: fn => {
       /** @param {Uint8Array} data */
       const put = data =>
-        writeFileSync(new URL(fn, base).pathname, data, { flag: 'wx' });
+        writeFileSync(fileURLToPath(new URL(fn, base)), data, {
+          flag: 'wx',
+        });
 
       return freeze({
         put,
@@ -60,14 +63,18 @@ function makeSyncAccess(path, { readdirSync, readFileSync }) {
   const base = new URL(path, 'file://');
   /** @param {string} fn */
   const file = fn => {
-    const fullname = new URL(fn, base).pathname;
+    const fullname = fileURLToPath(new URL(fn, base));
 
     return freeze({
       getData: () => readFileSync(fullname),
       getText: () => readFileSync(fullname, 'utf-8'),
     });
   };
-  return freeze({ path, file, readdir: () => readdirSync(base.pathname) });
+  return freeze({
+    path,
+    file,
+    readdir: () => readdirSync(fileURLToPath(base)),
+  });
 }
 
 /**
@@ -320,7 +327,7 @@ export async function main(
 }
 
 /* global process */
-if (process.argv[1] === new URL(import.meta.url).pathname) {
+if (process.argv[1] === fileURLToPath(new URL(import.meta.url))) {
   main([...process.argv.slice(2)], {
     spawn: childProcessPowers.spawn,
     fs: { ...fsPowers, ...fsPowers.promises },

package/src/xsnap.js

@@ -1,27 +1,23 @@
 /* global process */
 /* eslint no-await-in-loop: ["off"] */
 
-/**
- * @typedef {typeof import('child_process').spawn} Spawn
- * @import {Writable} from 'stream'
- */
-
-/**
- * @template T
- * @typedef {import('./defer.js').Deferred<T>} Deferred
- */
-
 import { finished } from 'stream/promises';
 import { PassThrough, Readable } from 'stream';
 import { promisify } from 'util';
+import { fileURLToPath } from 'url';
+import { Fail, q } from '@endo/errors';
 import { makeNetstringReader, makeNetstringWriter } from '@endo/netstring';
 import { makeNodeReader, makeNodeWriter } from '@endo/stream-node';
 import { makePromiseKit, racePromises } from '@endo/promise-kit';
 import { forever } from '@agoric/internal';
 import { ErrorCode, ErrorSignal, ErrorMessage, METER_TYPE } from '../api.js';
-import { defer } from './defer.js';
 
-const { Fail, quote: q } = assert;
+/** @import {PromiseKit} from '@endo/promise-kit' */
+
+/**
+ * @typedef {typeof import('child_process').spawn} Spawn
+ * @import {Writable} from 'stream'
+ */
 
 // This will need adjustment, but seems to be fine for a start.
 export const DEFAULT_CRANK_METERING_LIMIT = 1e8;
@@ -179,15 +175,17 @@ export async function xsnap(options) {
     throw Error(`xsnap does not support platform ${os}`);
   }
 
-  let bin = new URL(
-    `../xsnap-native/xsnap/build/bin/${platform}/${
-      debug ? 'debug' : 'release'
-    }/xsnap-worker`,
-    import.meta.url,
-  ).pathname;
+  let bin = fileURLToPath(
+    new URL(
+      `../xsnap-native/xsnap/build/bin/${platform}/${
+        debug ? 'debug' : 'release'
+      }/xsnap-worker`,
+      import.meta.url,
+    ),
+  );
 
-  /** @type {Deferred<void>} */
-  const vatExit = defer();
+  /** @type {PromiseKit<void>} */
+  const vatExit = makePromiseKit();
 
   assert(!/^-/.test(name), `name '${name}' cannot start with hyphen`);
 
@@ -292,7 +290,7 @@ export async function xsnap(options) {
    * @template T
    * @typedef {object} RunResult
    * @property {T} reply
-   * @property {{ meterType: string, allocate: number|null, compute: number|null, timestamps: number[]|null }} meterUsage
+   * @property {{ meterType: string, allocate: number|null, compute: number|null, currentHeapCount: number|null, timestamps: number[]|null }} meterUsage
    */
 
   /**
@@ -317,7 +315,12 @@ export async function xsnap(options) {
         xsnapProcess.kill();
         throw Error('xsnap protocol error: received empty message');
       } else if (message[0] === OK) {
-        let meterInfo = { compute: null, allocate: null, timestamps: [] };
+        let meterInfo = {
+          compute: null,
+          allocate: null,
+          currentHeapCount: null,
+          timestamps: [],
+        };
         const meterSeparator = message.indexOf(OK_SEPARATOR, 1);
         if (meterSeparator >= 0) {
           // The message is `.meterdata\1reply`.

package/src/xsrepl.js

@@ -4,17 +4,15 @@
 
 import '@endo/init';
 
-/**
- * @template T
- * @typedef {import('./defer.js').Deferred<T>} Deferred
- */
 import * as childProcess from 'child_process';
 import fs from 'fs';
 import { tmpName } from 'tmp';
 import * as os from 'os';
 import * as readline from 'readline';
+import { makePromiseKit } from '@endo/promise-kit';
 import { xsnap } from './xsnap.js';
-import { defer } from './defer.js';
+
+/** @import {PromiseKit} from '@endo/promise-kit' */
 
 const decoder = new TextDecoder();
 
@@ -65,7 +63,9 @@ async function main() {
    * @returns {Promise<string>}
    */
   function ask(prompt) {
-    const { promise, resolve } = /** @type {Deferred<string>} */ (defer());
+    const { promise, resolve } = /** @type {PromiseKit<string>} */ (
+      makePromiseKit()
+    );
     rl.question(prompt, resolve);
     return promise;
   }

package/src/defer.js

@@ -1,31 +0,0 @@
-/**
- * @param {boolean} _flag
- * @returns {asserts _flag}
- */
-
-function assert(_flag) {}
-
-/**
- * @template T
- * @typedef {{
- *   resolve(value?: T | Promise<T>): void,
- *   reject(error: Error): void,
- *   promise: Promise<T>
- * }} Deferred
- */
-
-/**
- * @template T
- * @returns {Deferred<T>}
- */
-export function defer() {
-  let resolve;
-  let reject;
-  const promise = new Promise((res, rej) => {
-    resolve = res;
-    reject = rej;
-  });
-  assert(resolve !== undefined);
-  assert(reject !== undefined);
-  return { promise, resolve, reject };
-}