Merge pull request #1826 from Agoric/mfig/ag-solo-fixes

fix: minor fixes for bootstrap and web server
Agoric · Sep 30, 2020 · 926fa48 · 926fa48
2 parents bccad6b + 0829061
commit 926fa48
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/packages/cosmic-swingset/lib/ag-solo/vats/bootstrap.js b/packages/cosmic-swingset/lib/ag-solo/vats/bootstrap.js
@@ -230,6 +230,9 @@ export function buildRootObject(vatPowers, vatParameters) {
       send(obj, connectionHandles) {
         return E(vats.http).send(obj, connectionHandles);
       },
+      registerURLHandler(handler, path) {
+        return E(vats.http).registerURLHandler(handler, path);
+      },
       registerAPIHandler(handler) {
         return E(vats.http).registerURLHandler(handler, '/api');
       },
@@ -248,6 +251,9 @@ export function buildRootObject(vatPowers, vatParameters) {
     return allComparable(
       harden({
         ...(plugin ? { plugin } : {}),
+        // TODO: Our preferred name is "scratch", but there are many Dapps
+        // that use "uploads".
+        scratch: uploads,
         uploads,
         spawner,
         network: vats.network,

diff --git a/packages/cosmic-swingset/lib/ag-solo/web.js b/packages/cosmic-swingset/lib/ag-solo/web.js
@@ -40,8 +40,8 @@ export async function makeHTTPListener(basedir, port, host, rawInboundCommand) {
     // Strip away the query params, as the inbound command device can't handle
     // it and the accessToken is there.
     const parsedURL = new URL(url, 'http://some-host');
-    const query = {};
-    for (const [key, val] of parsedURL.searchParams) {
+    const query = { isQuery: true };
+    for (const [key, val] of parsedURL.searchParams.entries()) {
       if (key !== 'accessToken') {
         query[key] = val;
       }