feat: Thread URL and Base64 endowments

Agoric · Sep 23, 2021 · b52269d · b52269d
1 parent 758957c
commit b52269d
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 2 deletions.
diff --git a/packages/SwingSet/src/controller.js b/packages/SwingSet/src/controller.js
@@ -1,4 +1,6 @@
 // @ts-check
+/* global globalThis */
+
 import fs from 'fs';
 import process from 'process';
 import re2 from 're2';
@@ -213,6 +215,8 @@ export async function makeSwingsetController(
       console: makeConsole(`${debugPrefix}SwingSet:kernel`),
       assert,
       require: kernelRequire,
+      URL: globalThis.Base64, // Unavailable only on XSnap
+      Base64: globalThis.Base64, // Available only on XSnap
     },
   });
   const buildKernel = kernelNS.default;

diff --git a/packages/SwingSet/src/kernel/vatManager/manager-local.js b/packages/SwingSet/src/kernel/vatManager/manager-local.js
@@ -1,4 +1,6 @@
 // @ts-check
+/* global globalThis */
+
 import { assert, details as X } from '@agoric/assert';
 import { importBundle } from '@agoric/import-bundle';
 import { makeLiveSlots } from '../liveSlots.js';
@@ -124,6 +126,10 @@ export function makeLocalVatManagerFactory(tools) {
         consensusMode || logger(...args);
       }),
       assert,
+      TextEncoder,
+      TextDecoder,
+      Base64: globalThis.Base64, // Available only on XSnap
+      URL: globalThis.URL, // Unavailable only on XSnap
     });
     const inescapableGlobalProperties = { ...ls.inescapableGlobalProperties };
 

diff --git a/packages/SwingSet/src/kernel/vatManager/supervisor-subprocess-xsnap.js b/packages/SwingSet/src/kernel/vatManager/supervisor-subprocess-xsnap.js
@@ -286,6 +286,9 @@ function makeWorker(port) {
       assert,
       // bootstrap provides HandledPromise
       HandledPromise: globalThis.HandledPromise,
+      TextEncoder,
+      TextDecoder,
+      Base64: globalThis.Base64, // Present only in XSnap
     };
 
     const inescapableGlobalProperties = { ...ls.inescapableGlobalProperties };

diff --git a/packages/SwingSet/tools/install-ses-debug.js b/packages/SwingSet/tools/install-ses-debug.js
@@ -7,6 +7,8 @@
 // https://github.com/endojs/endo/blob/master/packages/ses/lockdown-options.md
 // for more explanation of these lockdown options.
 
+/* global globalThis */
+
 import 'ses';
 import '@agoric/eventual-send/shim.js';
 // TODO Remove babel-standalone preinitialization
@@ -73,3 +75,5 @@ Error.stackTraceLimit = Infinity;
 
 harden(TextEncoder);
 harden(TextDecoder);
+harden(globalThis.URL); // Absent only on XSnap
+harden(globalThis.Base64); // Present only on XSnap
diff --git a/packages/import-bundle/src/index.js b/packages/import-bundle/src/index.js
@@ -1,3 +1,5 @@
+/* global globalThis */
+
 import { parseArchive } from '@endo/compartment-mapper/import-archive.js';
 import { decodeBase64 } from '@endo/base64';
 import { assert, details as X } from '@agoric/assert';
@@ -21,6 +23,8 @@ export async function importBundle(bundle, options = {}) {
   const endowments = {
     TextEncoder,
     TextDecoder,
+    URL: globalThis.URL, // Absent only in XSnap
+    Base64: globalThis.Base64, // Present only in XSnap
     ...optEndowments,
   };
 

diff --git a/packages/install-ses/install-ses.js b/packages/install-ses/install-ses.js
@@ -1,4 +1,4 @@
-/* global LOCKDOWN_OPTIONS process */
+/* global globalThis LOCKDOWN_OPTIONS process */
 // 'lockdown' appears on the global as a side-effect of importing 'ses'
 import 'ses';
 
@@ -147,3 +147,5 @@ Error.stackTraceLimit = Infinity;
 
 harden(TextEncoder);
 harden(TextDecoder);
+harden(globalThis.URL); // Absent only on XSnap
+harden(globalThis.Base64); // Present only on XSnap
diff --git a/packages/spawner/src/vat-spawned.js b/packages/spawner/src/vat-spawned.js
@@ -1,7 +1,14 @@
+/* global globalThis */
+
 import { importBundle } from '@agoric/import-bundle';
 import { Far } from '@agoric/marshal';
 
-const endowments = { console, assert };
+const endowments = {
+  console,
+  assert,
+  Base64: globalThis.Base64, // Present only on XSnap
+  URL: globalThis.URL, // Absent only on XSnap
+};
 
 export function buildRootObject() {
   return Far('root', {