From 91e2b6fdf424d00d194d4e43ad11b85134e5691e Mon Sep 17 00:00:00 2001
From: Michael FIG <mfig@agoric.com>
Date: Fri, 20 Mar 2020 17:16:47 -0600
Subject: [PATCH] feat!: support for proper multicast from HTTP handlers

This anticipates support for https://github.com/Agoric/agoric-sdk/issues/748
in the command device.
---
 packages/agoric-cli/lib/deploy.js             |   2 +-
 packages/agoric-cli/lib/start.js              |   2 +-
 packages/cosmic-swingset/docker/ag-solo       |   2 +-
 .../cosmic-swingset/lib/ag-solo/bundle.js     |   2 +-
 .../cosmic-swingset/lib/ag-solo/html/main.js  |   4 +-
 .../lib/ag-solo/html/wallet-bridge.html       |   2 +-
 .../lib/ag-solo/vats/bootstrap.js             |  44 ++++--
 .../cosmic-swingset/lib/ag-solo/vats/repl.js  |  45 ++++--
 .../lib/ag-solo/vats/vat-http.js              | 148 +++++++++---------
 .../lib/ag-solo/vats/vat-wallet.js            |  85 ++++++----
 packages/cosmic-swingset/lib/ag-solo/web.js   | 139 ++++++++--------
 packages/wallet-frontend/src/setupProxy.js    |   2 +-
 .../src/utils/fetch-websocket.js              |  36 +++--
 13 files changed, 297 insertions(+), 216 deletions(-)

diff --git a/packages/agoric-cli/lib/deploy.js b/packages/agoric-cli/lib/deploy.js
index c09ae6183f6..c766482aa24 100644
--- a/packages/agoric-cli/lib/deploy.js
+++ b/packages/agoric-cli/lib/deploy.js
@@ -30,7 +30,7 @@ export default async function deployMain(progname, rawArgs, powers) {
     ws.send(JSON.stringify(obj));
   };
 
-  const wsurl = `ws://${hostport}/captp`;
+  const wsurl = `ws://${hostport}/private/captp`;
   const ws = makeWebSocket(wsurl, { origin: 'http://127.0.0.1' });
 
   const exit = makePromise();
diff --git a/packages/agoric-cli/lib/start.js b/packages/agoric-cli/lib/start.js
index 7b9d6847c8e..886d5335d61 100644
--- a/packages/agoric-cli/lib/start.js
+++ b/packages/agoric-cli/lib/start.js
@@ -75,7 +75,7 @@ export default async function startMain(progname, rawArgs, powers, opts) {
       }
     }
 
-    const fakeGCI = 'myFakeGCI';
+    const fakeGCI = 'fake-chain';
     if (!(await exists(agServer))) {
       log(chalk.yellow(`initializing ${profileName}`));
       await pspawn(agSolo, ['init', profileName, '--egresses=fake'], {
diff --git a/packages/cosmic-swingset/docker/ag-solo b/packages/cosmic-swingset/docker/ag-solo
index c24ab08f264..9001292e7a5 100755
--- a/packages/cosmic-swingset/docker/ag-solo
+++ b/packages/cosmic-swingset/docker/ag-solo
@@ -17,7 +17,7 @@ if test "$1" = shell; then
   shift
 elif test "$1" = upload-contract; then
   shift
-  exec `dirname "$0"`/../bin/ag-solo upload-contract --ag-solo=ws://127.0.0.1:$HOST_PORT/captp ${1+"$@"}
+  exec `dirname "$0"`/../bin/ag-solo upload-contract --ag-solo=ws://127.0.0.1:$HOST_PORT/private/captp ${1+"$@"}
   exit $?
 else
   FLAGS=-p127.0.0.1:$HOST_PORT:$PORT
diff --git a/packages/cosmic-swingset/lib/ag-solo/bundle.js b/packages/cosmic-swingset/lib/ag-solo/bundle.js
index 6a2f6223261..1db7ac1f97d 100644
--- a/packages/cosmic-swingset/lib/ag-solo/bundle.js
+++ b/packages/cosmic-swingset/lib/ag-solo/bundle.js
@@ -93,7 +93,7 @@ export default async function bundle(insistIsBasedir, args) {
     );
     for (const conn of JSON.parse(cjson)) {
       if (conn.type === 'http') {
-        wsurl = `ws://${conn.host}:${conn.port}/captp`;
+        wsurl = `ws://${conn.host}:${conn.port}/private/captp`;
       }
     }
   }
diff --git a/packages/cosmic-swingset/lib/ag-solo/html/main.js b/packages/cosmic-swingset/lib/ag-solo/html/main.js
index a9602c66eec..eaf0c06cc00 100644
--- a/packages/cosmic-swingset/lib/ag-solo/html/main.js
+++ b/packages/cosmic-swingset/lib/ag-solo/html/main.js
@@ -12,7 +12,7 @@ function run() {
   let inputHistoryNum = 0;
 
   async function call(req) {
-    const res = await fetch('/vat', {
+    const res = await fetch('/private/repl', {
       method: 'POST',
       body: JSON.stringify(req),
       headers: { 'Content-Type': 'application/json' },
@@ -26,7 +26,7 @@ function run() {
 
   const loc = window.location;
   const protocol = loc.protocol.replace(/^http/, 'ws');
-  const socketEndpoint = `${protocol}//${loc.host}/`;
+  const socketEndpoint = `${protocol}//${loc.host}/private/repl`;
   const ws = new WebSocket(socketEndpoint);
 
   ws.addEventListener('error', ev => {
diff --git a/packages/cosmic-swingset/lib/ag-solo/html/wallet-bridge.html b/packages/cosmic-swingset/lib/ag-solo/html/wallet-bridge.html
index c1b0e294d16..e3cc4f83925 100644
--- a/packages/cosmic-swingset/lib/ag-solo/html/wallet-bridge.html
+++ b/packages/cosmic-swingset/lib/ag-solo/html/wallet-bridge.html
@@ -7,7 +7,7 @@
     <p>This bridge is only for dApps to reach your wallet.  It contains no user-servicable parts.</p>
 
     <script type="text/javascript">
-      const walletPublicURL = new URL('/wallet-bridge', window.origin.replace(/^http/, 'ws')).href;
+      const walletPublicURL = new URL('/private/wallet-bridge', window.origin.replace(/^http/, 'ws')).href;
       const ws = new WebSocket(walletPublicURL);
       const wsQueue = [];
       const dappQueue = [];
diff --git a/packages/cosmic-swingset/lib/ag-solo/vats/bootstrap.js b/packages/cosmic-swingset/lib/ag-solo/vats/bootstrap.js
index 990d4ee2b6b..3f802663891 100644
--- a/packages/cosmic-swingset/lib/ag-solo/vats/bootstrap.js
+++ b/packages/cosmic-swingset/lib/ag-solo/vats/bootstrap.js
@@ -50,11 +50,14 @@ export default function setup(syscall, state, helpers) {
         D(cmdDevice).registerInboundHandler(httpVat);
       }
 
-      async function setupWalletVat(commandDevice, httpVat, walletVat) {
-        await E(httpVat).registerURLHandler(walletVat, '/vat');
+      async function setupWalletVat(httpObj, httpVat, walletVat) {
+        await E(httpVat).registerURLHandler(walletVat, '/private/wallet');
         const bridgeURLHandler = await E(walletVat).getBridgeURLHandler();
-        await E(httpVat).registerURLHandler(bridgeURLHandler, '/wallet-bridge');
-        await E(walletVat).setCommandDevice(commandDevice);
+        await E(httpVat).registerURLHandler(
+          bridgeURLHandler,
+          '/private/wallet-bridge',
+        );
+        await E(walletVat).setHTTPObject(httpObj);
         await E(walletVat).setPresences();
       }
 
@@ -158,6 +161,9 @@ export default function setup(syscall, state, helpers) {
 
         // This will allow dApp developers to register in their api/deploy.js
         const httpRegCallback = {
+          sendMulticast(obj, connectionHandles) {
+            return E(vats.http).sendMulticast(obj, connectionHandles);
+          },
           registerAPIHandler(handler) {
             return E(vats.http).registerURLHandler(handler, '/api');
           },
@@ -275,11 +281,17 @@ export default function setup(syscall, state, helpers) {
               const { payments, bundle, issuerInfo } = await E(
                 demoProvider,
               ).getDemoBundle();
+              const localBundle = await createLocalBundle(
+                vats,
+                bundle,
+                payments,
+                issuerInfo,
+              );
               await E(vats.http).setPresences(
                 { ...bundle, localTimerService },
-                await createLocalBundle(vats, bundle, payments, issuerInfo),
+                localBundle,
               );
-              await setupWalletVat(devices.command, vats.http, vats.wallet);
+              await setupWalletVat(localBundle.http, vats.http, vats.wallet);
               break;
             }
             case 'two_chain': {
@@ -324,11 +336,17 @@ export default function setup(syscall, state, helpers) {
               // Get the demo bundle from the chain-side provider
               const b = await E(demoProvider).getDemoBundle('client');
               const { payments, bundle, issuerInfo } = b;
+              const localBundle = await createLocalBundle(
+                vats,
+                bundle,
+                payments,
+                issuerInfo,
+              );
               await E(vats.http).setPresences(
                 { ...bundle, localTimerService },
-                await createLocalBundle(vats, bundle, payments, issuerInfo),
+                localBundle,
               );
-              await setupWalletVat(devices.command, vats.http, vats.wallet);
+              await setupWalletVat(localBundle.http, vats.http, vats.wallet);
               break;
             }
             case 'three_client': {
@@ -344,12 +362,18 @@ export default function setup(syscall, state, helpers) {
               ).createUserBundle('localuser');
 
               // Setup of the Local part /////////////////////////////////////
+              const localBundle = await createLocalBundle(
+                vats,
+                bundle,
+                payments,
+                issuerInfo,
+              );
               await E(vats.http).setPresences(
                 { ...bundle, localTimerService: bundle.chainTimerService },
-                await createLocalBundle(vats, bundle, payments, issuerInfo),
+                localBundle,
               );
 
-              setupWalletVat(devices.command, vats.http, vats.wallet);
+              setupWalletVat(localBundle.http, vats.http, vats.wallet);
               break;
             }
             default:
diff --git a/packages/cosmic-swingset/lib/ag-solo/vats/repl.js b/packages/cosmic-swingset/lib/ag-solo/vats/repl.js
index 0b50e926963..e0bd9360781 100644
--- a/packages/cosmic-swingset/lib/ag-solo/vats/repl.js
+++ b/packages/cosmic-swingset/lib/ag-solo/vats/repl.js
@@ -51,25 +51,29 @@ export function stringify(value, spaces, already = new WeakSet()) {
   return ret;
 }
 
-export function getReplHandler(E, homeObjects, sendBroadcast) {
+export function getReplHandler(E, homeObjects, sendMulticast) {
   const commands = {};
   const history = {};
   const display = {};
   let highestHistory = -1;
+  const replHandles = new Set();
 
   function updateHistorySlot(histnum) {
     // console.log(`sendBroadcast ${histnum}`);
-    sendBroadcast({
-      type: 'updateHistory',
-      histnum,
-      command: commands[histnum],
-      display: display[histnum],
-    });
+    sendMulticast(
+      {
+        type: 'updateHistory',
+        histnum,
+        command: commands[histnum],
+        display: display[histnum],
+      },
+      [...replHandles.keys()],
+    );
   }
 
   const { evaluateProgram } = makeEvaluators({ sloppyGlobals: true });
 
-  return {
+  const handler = {
     getHighestHistory() {
       return { highestHistory };
     },
@@ -79,9 +83,10 @@ export function getReplHandler(E, homeObjects, sendBroadcast) {
       for (let histnum = 0; histnum <= highestHistory; histnum += 1) {
         updateHistorySlot(histnum);
       }
+      return true;
     },
 
-    doEval(obj) {
+    doEval(obj, _meta) {
       const { number: histnum, body } = obj;
       console.log(`doEval`, histnum, body);
       if (histnum <= highestHistory) {
@@ -134,4 +139,26 @@ export function getReplHandler(E, homeObjects, sendBroadcast) {
       return {};
     },
   };
+
+  const commandHandler = harden({
+    onConnect(_obj, meta) {
+      replHandles.add(meta.connectionHandle);
+    },
+    onDisconnect(_obj, meta) {
+      replHandles.delete(meta.connectionHandle);
+    },
+
+    onMessage(obj, meta) {
+      if (handler[obj.type]) {
+        return handler[obj.type](obj, meta);
+      }
+      return false;
+    },
+  });
+
+  return harden({
+    getCommandHandler() {
+      return commandHandler;
+    },
+  });
 }
diff --git a/packages/cosmic-swingset/lib/ag-solo/vats/vat-http.js b/packages/cosmic-swingset/lib/ag-solo/vats/vat-http.js
index 5d1df597f1a..0a8621ed153 100644
--- a/packages/cosmic-swingset/lib/ag-solo/vats/vat-http.js
+++ b/packages/cosmic-swingset/lib/ag-solo/vats/vat-http.js
@@ -1,14 +1,14 @@
 import harden from '@agoric/harden';
-// Avoid importing the full captp bundle, which would carry
-// in its own makeHardener, etc.
-import { makeCapTP } from '@agoric/captp/lib/captp';
 
 import { getReplHandler } from './repl';
+import { getCapTPHandler } from './captp';
 
 // This vat contains the HTTP request handler.
 function build(E, D) {
   let commandDevice;
   let provisioner;
+  const connectionIdToHandle = new Map();
+  const connectionHandleToId = new WeakMap();
   const loaded = {};
   loaded.p = new Promise((resolve, reject) => {
     loaded.res = resolve;
@@ -31,6 +31,17 @@ function build(E, D) {
     },
   };
 
+  const sendMulticast = (obj, connectionHandles) => {
+    // TODO: Make this sane by adding support for multicast to the commandDevice.
+    for (const connectionHandle of connectionHandles) {
+      const connectionID = connectionHandleToId.get(connectionHandle);
+      if (connectionID) {
+        const o = { ...obj, meta: { connectionID } };
+        D(commandDevice).sendBroadcast(o);
+      }
+    }
+  };
+
   readyForClient.p = new Promise((resolve, reject) => {
     readyForClient.res = resolve;
     readyForClient.rej = reject;
@@ -55,62 +66,20 @@ function build(E, D) {
     setCommandDevice(d, ROLES) {
       commandDevice = d;
       if (ROLES.client) {
-        const conns = new Map();
-        const forward = method => obj => {
-          const dispatchAbort = conns.get(obj.connectionID);
-          if (!dispatchAbort || !(1, dispatchAbort[0])(obj)) {
-            console.log(
-              `Could not find CapTP handler ${method}`,
-              obj.connectionID,
-            );
-            return undefined;
-          }
-          return true;
-        };
-        Object.assign(
-          handler,
-          getReplHandler(E, homeObjects, msg =>
-            D(commandDevice).sendBroadcast(msg),
-          ),
-          {
-            readyForClient() {
-              return readyForClient.p;
-            },
-          },
-          {
-            CTP_OPEN(obj) {
-              console.log(`Starting CapTP`, obj.connectionID);
-              const sendObj = o => {
-                o.connectionID = obj.connectionID;
-                D(commandDevice).sendBroadcast(o);
-              };
-              const { dispatch, abort } = makeCapTP(
-                obj.connectionID,
-                sendObj,
-                () =>
-                  // Harden only our exported objects.
-                  harden(exportedToCapTP),
-              );
-              conns.set(obj.connectionID, [dispatch, abort]);
-            },
-            CTP_CLOSE(obj) {
-              console.log(`Finishing CapTP`, obj.connectionID);
-              const dispatchAbort = conns.get(obj.connectionID);
-              if (dispatchAbort) {
-                (1, dispatchAbort[1])();
-              }
-              conns.delete(obj.connectionID);
-            },
-            CTP_ERROR(obj) {
-              console.log(`Error in CapTP`, obj.connectionID, obj.error);
-            },
-            CTP_BOOTSTRAP: forward('CTP_BOOTSTRAP'),
-            CTP_CALL: forward('CTP_CALL'),
-            CTP_RETURN: forward('CTP_RETURN'),
-            CTP_RESOLVE: forward('CTP_RESOLVE'),
-          },
+        handler.readyForClient = () => readyForClient.p;
+
+        const replHandler = getReplHandler(E, homeObjects, sendMulticast);
+        registerURLHandler(replHandler, '/private/repl');
+
+        // Assign the captp handler.
+        // TODO: Break this out into a separate vat.
+        const captpHandler = getCapTPHandler(E, sendMulticast, () =>
+          // Harden only our exported objects.
+          harden(exportedToCapTP),
         );
+        registerURLHandler(captpHandler, '/private/captp');
       }
+
       if (ROLES.controller) {
         handler.pleaseProvision = obj => {
           const { nickname, pubkey } = obj;
@@ -140,6 +109,7 @@ function build(E, D) {
 
     registerURLHandler,
     registerAPIHandler: h => registerURLHandler(h, '/api'),
+    sendMulticast,
 
     setProvisioner(p) {
       provisioner = p;
@@ -159,19 +129,50 @@ function build(E, D) {
 
     // devices.command invokes our inbound() because we passed to
     // registerInboundHandler()
-    async inbound(count, obj) {
+    async inbound(count, rawObj) {
+      console.debug(
+        `vat-http.inbound (from browser) ${count}`,
+        JSON.stringify(rawObj, undefined, 2),
+      );
+
+      const { type, meta: rawMeta = {} } = rawObj || {};
+      const {
+        url = '/private/repl',
+        connectionID: rawConnectionID,
+        dispatcher = 'onMessage',
+      } = rawMeta;
+
       try {
-        // console.log(
-        //   `vat-http.inbound (from browser) ${count}`,
-        //   JSON.stringify(obj, undefined, 2),
-        // );
-
-        const { type, requestContext: { url } = { url: '/vat' } } = obj;
-        if (url === '/vat' || url === '/captp') {
-          // Use our local handler object (compatibility with repl.js).
+        let connectionHandle = connectionIdToHandle.get(rawConnectionID);
+        if (dispatcher === 'onConnect') {
+          connectionHandle = harden({});
+          connectionIdToHandle.set(rawConnectionID, connectionHandle);
+          connectionHandleToId.set(connectionHandle, rawConnectionID);
+        } else if (dispatcher === 'onDisconnect') {
+          connectionIdToHandle.delete(rawConnectionID);
+          connectionHandleToId.delete(connectionHandle);
+        }
+
+        const obj = {
+          ...rawObj,
+        };
+        delete obj.meta;
+
+        const meta = {
+          ...rawMeta,
+          connectionHandle,
+        };
+        delete meta.connectionID;
+
+        if (url === '/private/repl') {
+          // Use our local handler object (compatibility).
           // TODO: standardise
           if (handler[type]) {
-            D(commandDevice).sendResponse(count, false, handler[type](obj));
+            D(commandDevice).sendResponse(
+              count,
+              false,
+              handler[type](obj, meta),
+            );
             return;
           }
         }
@@ -181,13 +182,10 @@ function build(E, D) {
           // todo fixme avoid the loop
           // For now, go from the end to beginning so that handlers
           // override.
-          const hardObjects = harden({ ...homeObjects });
           for (let i = urlHandlers.length - 1; i >= 0; i -= 1) {
             // eslint-disable-next-line no-await-in-loop
-            const res = await E(urlHandlers[i]).processInbound(
-              obj,
-              hardObjects,
-            );
+            const res = await E(urlHandlers[i])[dispatcher](obj, meta);
+
             if (res) {
               D(commandDevice).sendResponse(count, false, harden(res));
               return;
@@ -195,8 +193,12 @@ function build(E, D) {
           }
         }
 
-        throw Error(`No handler for ${url} ${type}`);
+        if (dispatcher === 'onMessage') {
+          throw Error(`No handler for ${url} ${type}`);
+        }
+        D(commandDevice).sendResponse(count, false, harden(true));
       } catch (rej) {
+        console.debug(`Error ${dispatcher}:`, rej);
         D(commandDevice).sendResponse(count, true, harden(rej));
       }
     },
diff --git a/packages/cosmic-swingset/lib/ag-solo/vats/vat-wallet.js b/packages/cosmic-swingset/lib/ag-solo/vats/vat-wallet.js
index fa870f99aca..4c44b7382c0 100644
--- a/packages/cosmic-swingset/lib/ag-solo/vats/vat-wallet.js
+++ b/packages/cosmic-swingset/lib/ag-solo/vats/vat-wallet.js
@@ -6,7 +6,9 @@ function build(E, D, _log) {
   let wallet;
   let pursesState;
   let inboxState;
-  let commandDevice;
+  let http;
+  const adminHandles = new Set();
+  const bridgeHandles = new Set();
 
   const { publish: pursesPublish, subscribe: purseSubscribe } = pubsub(E);
   const { publish: inboxPublish, subscribe: inboxSubscribe } = pubsub(E);
@@ -19,25 +21,23 @@ function build(E, D, _log) {
     return harden(wallet);
   }
 
-  function setCommandDevice(d, _ROLES) {
-    commandDevice = d;
+  function setHTTPObject(o, _ROLES) {
+    http = o;
   }
 
-  async function adminProcessInbound(obj) {
-    const { type, data, requestContext } = obj;
+  async function adminOnMessage(obj, meta) {
+    const { type, data } = obj;
     switch (type) {
       case 'walletGetPurses': {
-        if (!pursesState) return {};
         return {
           type: 'walletUpdatePurses',
-          data: pursesState,
+          data: pursesState || {},
         };
       }
       case 'walletGetInbox': {
-        if (!inboxState) return {};
         return {
           type: 'walletUpdateInbox',
-          data: inboxState,
+          data: inboxState || {},
         };
       }
       case 'walletAddOffer': {
@@ -45,7 +45,7 @@ function build(E, D, _log) {
         const hooks = wallet.hydrateHooks(data.hooks);
         return {
           type: 'walletOfferAdded',
-          data: await wallet.addOffer(data, hooks, requestContext),
+          data: await wallet.addOffer(data, hooks, meta),
         };
       }
       case 'walletDeclineOffer': {
@@ -88,11 +88,14 @@ function build(E, D, _log) {
       harden({
         notify(m) {
           pursesState = m;
-          if (commandDevice) {
-            D(commandDevice).sendBroadcast({
-              type: 'walletUpdatePurses',
-              data: pursesState,
-            });
+          if (http) {
+            E(http).sendMulticast(
+              {
+                type: 'walletUpdatePurses',
+                data: pursesState,
+              },
+              [...adminHandles.keys(), ...bridgeHandles.keys()],
+            );
           }
         },
       }),
@@ -104,11 +107,14 @@ function build(E, D, _log) {
       harden({
         notify(m) {
           inboxState = m;
-          if (commandDevice) {
-            D(commandDevice).sendBroadcast({
-              type: 'walletUpdateInbox',
-              data: inboxState,
-            });
+          if (http) {
+            E(http).sendMulticast(
+              {
+                type: 'walletUpdateInbox',
+                data: inboxState,
+              },
+              [...adminHandles.keys()],
+            );
           }
         },
       }),
@@ -117,7 +123,15 @@ function build(E, D, _log) {
 
   function getCommandHandler() {
     return harden({
-      processInbound: adminProcessInbound,
+      onConnect(_obj, meta) {
+        console.error('Adding adminHandle', meta);
+        adminHandles.add(meta.connectionHandle);
+      },
+      onDisconnect(_obj, meta) {
+        console.error('Removing adminHandle', meta);
+        adminHandles.delete(meta.connectionHandle);
+      },
+      onMessage: adminOnMessage,
     });
   }
 
@@ -125,16 +139,25 @@ function build(E, D, _log) {
     return harden({
       getCommandHandler() {
         return harden({
-          processInbound(obj) {
-            const { type, requestContext } = obj;
-            if (['walletGetPurses', 'walletAddOffer'].includes(type)) {
-              // Override the origin since we got it from the bridge.
-              return adminProcessInbound({
-                ...obj,
-                requestContext: { ...requestContext, origin: obj.dappOrigin },
-              });
+          onConnect(_obj, meta) {
+            bridgeHandles.add(meta.connectionHandle);
+          },
+          onDisconnect(_obj, meta) {
+            bridgeHandles.delete(meta.connectionHandle);
+          },
+          onMessage(obj, meta) {
+            const { type } = obj;
+            switch (type) {
+              case 'walletGetPurses':
+              case 'walletAddOffer':
+                // Override the origin since we got it from the bridge.
+                return adminOnMessage(obj, {
+                  ...meta,
+                  origin: obj.dappOrigin,
+                });
+              default:
+                return Promise.resolve(false);
             }
-            return Promise.resolve(false);
           },
         });
       },
@@ -144,7 +167,7 @@ function build(E, D, _log) {
   return harden({
     startup,
     getWallet,
-    setCommandDevice,
+    setHTTPObject,
     getCommandHandler,
     getBridgeURLHandler,
     setPresences,
diff --git a/packages/cosmic-swingset/lib/ag-solo/web.js b/packages/cosmic-swingset/lib/ag-solo/web.js
index 4082e656f55..b61d998ddf1 100644
--- a/packages/cosmic-swingset/lib/ag-solo/web.js
+++ b/packages/cosmic-swingset/lib/ag-solo/web.js
@@ -15,7 +15,6 @@ const morgan = require('morgan');
 const log = anylogger('web');
 
 const points = new Map();
-const broadcasts = new Map();
 
 const send = (ws, msg) => {
   if (ws.readyState === ws.OPEN) {
@@ -27,10 +26,13 @@ export function makeHTTPListener(basedir, port, host, rawInboundCommand) {
   // Enrich the inbound command with some metadata.
   const inboundCommand = (
     body,
-    { url, headers: { origin } = {} } = {},
+    { connectionID, dispatcher, url, headers: { origin } = {} } = {},
     id = undefined,
   ) => {
-    const obj = { ...body, requestContext: { origin, url, date: Date.now() } };
+    const obj = {
+      ...body,
+      meta: { connectionID, dispatcher, origin, url, date: Date.now() },
+    };
     return rawInboundCommand(obj).catch(err => {
       const idpfx = id ? `${id} ` : '';
       log.error(
@@ -76,6 +78,11 @@ export function makeHTTPListener(basedir, port, host, rawInboundCommand) {
     const { origin } = req.headers;
     const id = `${req.socket.remoteAddress}:${req.socket.remotePort}:`;
 
+    if (!req.url.startsWith('/private/')) {
+      // Allow any origin that's not marked private.
+      return true;
+    }
+
     if (!origin) {
       log.error(id, `Missing origin header`);
       return false;
@@ -85,7 +92,7 @@ export function makeHTTPListener(basedir, port, host, rawInboundCommand) {
       hostname.match(/^(localhost|127\.0\.0\.1)$/);
 
     if (['chrome-extension:', 'moz-extension:'].includes(url.protocol)) {
-      // Extensions such as metamask.
+      // Extensions such as metamask can access the wallet.
       return true;
     }
 
@@ -101,24 +108,21 @@ export function makeHTTPListener(basedir, port, host, rawInboundCommand) {
     return true;
   };
 
-  // accept messages on some well-known endpoints
-  // todo: later allow arbitrary endpoints?
-  for (const ep of ['/vat', '/wallet-public', '/api']) {
-    app.post(ep, (req, res) => {
-      if (ep !== '/api' && !validateOrigin(req)) {
-        res.json({ ok: false, rej: 'Invalid Origin' });
-        return;
-      }
+  // accept POST messages to arbitrary endpoints
+  app.post('*', (req, res) => {
+    if (!validateOrigin(req)) {
+      res.json({ ok: false, rej: 'Unauthorized Origin' });
+      return;
+    }
 
-      // console.log(`POST ${ep} got`, req.body); // should be jsonable
-      inboundCommand(req.body, req)
-        .then(
-          r => res.json({ ok: true, res: r }),
-          rej => res.json({ ok: false, rej }),
-        )
-        .catch(_ => {});
-    });
-  }
+    // console.log(`POST ${ep} got`, req.body); // should be jsonable
+    inboundCommand(req.body, req, `POST`)
+      .then(
+        r => res.json({ ok: true, res: r }),
+        rej => res.json({ ok: false, rej }),
+      )
+      .catch(_ => {});
+  });
 
   // accept WebSocket connections at the root path.
   // This senses the Connection-Upgrade header to distinguish between plain
@@ -144,74 +148,63 @@ export function makeHTTPListener(basedir, port, host, rawInboundCommand) {
   function newConnection(ws, req) {
     lastConnectionID += 1;
     const connectionID = lastConnectionID;
+    const meta = { ...req, connectionID };
     const id = `${req.socket.remoteAddress}:${req.socket.remotePort}[${connectionID}]:`;
 
     log.info(id, `new WebSocket connection ${req.url}`);
 
+    // Register the point-to-point connection.
+    points.set(connectionID, ws);
+
     ws.on('error', err => {
       log.error(id, 'client error', err);
     });
 
     ws.on('close', (_code, _reason) => {
       log.info(id, 'client closed');
-      broadcasts.delete(ws);
-      if (req.url === '/captp') {
-        inboundCommand({ type: 'CTP_CLOSE', connectionID }, req, id)
-          .catch(_ => {})
-          .finally(() => points.delete(connectionID));
-      }
-    });
-
-    if (req.url === '/captp') {
-      // This is a point-to-point connection, not broadcast.
-      points.set(connectionID, ws);
       inboundCommand(
-        { type: 'CTP_OPEN', connectionID },
-        req,
+        { type: 'ws/meta' },
+        { ...meta, dispatcher: 'onDisconnect' },
         id,
-      ).catch(_ => {});
-      ws.on('message', async message => {
-        try {
-          // some things use inbound messages
-          const obj = JSON.parse(message);
-          obj.connectionID = connectionID;
-          await inboundCommand(obj, req, id);
-        } catch (error) {
-          // eslint-disable-next-line no-use-before-define
-          sendJSON({ type: 'CTP_ERROR', connectionID, error });
-        }
-      });
-    } else {
-      broadcasts.set(connectionID, ws);
-      ws.on('message', async message => {
-        try {
-          const obj = JSON.parse(message);
-          // eslint-disable-next-line no-use-before-define
-          sendJSON(await inboundCommand(obj, req, id));
-        } catch (error) {
-          // ignore
-        }
-      });
-    }
+      ).finally(() => points.delete(connectionID));
+    });
+
+    inboundCommand(
+      { type: 'ws/meta' },
+      { ...meta, dispatcher: 'onConnect' },
+      id,
+    );
+
+    ws.on('message', async message => {
+      let obj = {};
+      try {
+        obj = JSON.parse(message);
+        const res = await inboundCommand(obj, meta, id);
+
+        // eslint-disable-next-line no-use-before-define
+        sendJSON({ ...res, meta });
+      } catch (error) {
+        inboundCommand(
+          { ...obj, error },
+          { ...meta, dispatcher: 'onError' },
+          id,
+        ).catch(_ => {});
+      }
+    });
   }
   wss.on('connection', newConnection);
 
-  function sendJSON(obj) {
-    const { connectionID, ...rest } = obj;
-    if (connectionID) {
-      // Point-to-point.
-      const c = points.get(connectionID);
-      if (c) {
-        send(c, JSON.stringify(rest));
-      } else {
-        log.error(`[${connectionID}]: connection not found`);
-      }
+  function sendJSON(rawObj) {
+    const { meta: { connectionID } = {} } = rawObj;
+    const obj = { ...rawObj };
+    delete obj.meta;
+
+    // Point-to-point.
+    const c = points.get(connectionID);
+    if (c) {
+      send(c, JSON.stringify(obj));
     } else {
-      // Broadcast message.
-      const json = JSON.stringify(rest);
-      for (const c of broadcasts.values()) {
-        send(c, json);
-      }
+      log.error(`[${connectionID}]: connection not found`);
     }
   }
 
diff --git a/packages/wallet-frontend/src/setupProxy.js b/packages/wallet-frontend/src/setupProxy.js
index 7876096ab53..bb70abf68c5 100644
--- a/packages/wallet-frontend/src/setupProxy.js
+++ b/packages/wallet-frontend/src/setupProxy.js
@@ -10,7 +10,7 @@ const API_URL = process.env.REACT_APP_API_URL;
 // eslint-disable-next-line func-names
 module.exports = function(app) {
   if (API_URL > '') {
-    app.use('/vat', createProxyMiddleware({ target: API_URL }));
+    app.use('/private/wallet', createProxyMiddleware({ target: API_URL }));
   }
   // TODO proxy websocket.
   // app.use(
diff --git a/packages/wallet-frontend/src/utils/fetch-websocket.js b/packages/wallet-frontend/src/utils/fetch-websocket.js
index 299ae02706d..b4a1149b81a 100644
--- a/packages/wallet-frontend/src/utils/fetch-websocket.js
+++ b/packages/wallet-frontend/src/utils/fetch-websocket.js
@@ -1,4 +1,4 @@
-/* globals window, WebSocket, fetch */
+/* globals window, WebSocket */
 
 // todo: refactor this to a class
 
@@ -7,16 +7,28 @@ import { API_URL } from './constants';
 // === FETCH
 
 export async function doFetch(req) {
-  return fetch('/vat', {
-    method: 'POST',
-    body: JSON.stringify(req),
-    headers: { 'Content-Type': 'application/json' },
-  })
-    .then(response => response.json())
-    .then(({ ok, res }) => (ok ? res : {}))
-    .catch(err => {
-      console.log('Fetch Error', err);
-    });
+  if (!isWebSocketActive()) {
+    throw Error('Must activate web socket before calling doFetch');
+  }
+
+  const socket = websocket;
+  
+  let resolve;
+  const p = new Promise(res => {
+    resolve = res;
+  });
+  socket.send(JSON.stringify(req));
+  const expectedResponse = `${req.type}Response`;
+  function getResponse({ data: msg }) {
+    // console.log('got', msg);
+    const obj = JSON.parse(msg);
+    if (obj.type === expectedResponse) {
+      resolve(obj);
+      socket.removeEventListener('message', getResponse);
+    }
+  }
+  socket.addEventListener('message', getResponse);
+  return p;
 }
 
 // === WEB SOCKET
@@ -25,7 +37,7 @@ let websocket = null;
 
 function getWebsocketEndpoint() {
   // TODO proxy websocket.
-  const url = new URL(API_URL || window.origin);
+  const url = new URL('/private/wallet', API_URL || window.origin);
   url.protocol = 'ws';
   return url;
 }