feat!: support for proper multicast from HTTP handlers

This anticipates support for #748 in the command device.
Agoric · Mar 22, 2020 · 91e2b6f · 91e2b6f
1 parent 3bc2b77
commit 91e2b6f
Show file tree

Hide file tree

Showing 13 changed files with 297 additions and 216 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;
+    },
+  });
 }