@agoric/solo 0.10.4-dev-28931a7.0 → 0.10.4-dev-e26232e.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/solo",
-  "version": "0.10.4-dev-28931a7.0+28931a7",
+  "version": "0.10.4-dev-e26232e.0+e26232e",
   "description": "Agoric's Solo vat runner",
   "type": "module",
   "bin": {
@@ -22,20 +22,20 @@
   "author": "Agoric",
   "license": "Apache-2.0",
   "dependencies": {
-    "@agoric/access-token": "0.4.22-dev-28931a7.0+28931a7",
-    "@agoric/assert": "0.6.1-dev-28931a7.0+28931a7",
-    "@agoric/cache": "0.3.3-dev-28931a7.0+28931a7",
-    "@agoric/cosmic-swingset": "0.41.4-dev-28931a7.0+28931a7",
-    "@agoric/internal": "0.3.3-dev-28931a7.0+28931a7",
-    "@agoric/notifier": "0.6.3-dev-28931a7.0+28931a7",
-    "@agoric/spawner": "0.6.9-dev-28931a7.0+28931a7",
-    "@agoric/store": "0.9.3-dev-28931a7.0+28931a7",
-    "@agoric/swing-store": "0.9.2-dev-28931a7.0+28931a7",
-    "@agoric/swingset-vat": "0.32.3-dev-28931a7.0+28931a7",
-    "@agoric/telemetry": "0.6.3-dev-28931a7.0+28931a7",
-    "@agoric/time": "0.3.3-dev-28931a7.0+28931a7",
-    "@agoric/vats": "0.15.2-dev-28931a7.0+28931a7",
-    "@agoric/wallet": "0.18.4-dev-28931a7.0+28931a7",
+    "@agoric/access-token": "0.4.22-dev-e26232e.0+e26232e",
+    "@agoric/assert": "0.6.1-dev-e26232e.0+e26232e",
+    "@agoric/cache": "0.3.3-dev-e26232e.0+e26232e",
+    "@agoric/cosmic-swingset": "0.41.4-dev-e26232e.0+e26232e",
+    "@agoric/internal": "0.3.3-dev-e26232e.0+e26232e",
+    "@agoric/notifier": "0.6.3-dev-e26232e.0+e26232e",
+    "@agoric/spawner": "0.6.9-dev-e26232e.0+e26232e",
+    "@agoric/store": "0.9.3-dev-e26232e.0+e26232e",
+    "@agoric/swing-store": "0.9.2-dev-e26232e.0+e26232e",
+    "@agoric/swingset-vat": "0.32.3-dev-e26232e.0+e26232e",
+    "@agoric/telemetry": "0.6.3-dev-e26232e.0+e26232e",
+    "@agoric/time": "0.3.3-dev-e26232e.0+e26232e",
+    "@agoric/vats": "0.15.2-dev-e26232e.0+e26232e",
+    "@agoric/wallet": "0.18.4-dev-e26232e.0+e26232e",
     "@endo/captp": "^3.1.4",
     "@endo/eventual-send": "^0.17.5",
     "@endo/import-bundle": "^0.4.1",
@@ -56,7 +56,7 @@
     "ws": "^7.2.0"
   },
   "devDependencies": {
-    "@agoric/ertp": "0.16.3-dev-28931a7.0+28931a7",
+    "@agoric/ertp": "0.16.3-dev-e26232e.0+e26232e",
     "@endo/bundle-source": "^2.7.0",
     "ava": "^5.3.0",
     "c8": "^7.13.0"
@@ -80,5 +80,5 @@
   "typeCoverage": {
     "atLeast": 68.59
   },
-  "gitHead": "28931a75d65404433319234b5cc8507f3772d30a"
+  "gitHead": "e26232e68e2019db07078ae4962de47b3d0a6666"
 }

package/src/web.js

@@ -9,6 +9,7 @@ import { createProxyMiddleware } from 'http-proxy-middleware';
 import WebSocket from 'ws';
 import anylogger from 'anylogger';
 import morgan from 'morgan';
+import { format as urlFormat } from 'url';
 
 import { getAccessToken } from '@agoric/access-token';
 
@@ -148,21 +149,29 @@ export async function makeHTTPListener(
   const htmldir = path.join(basedir, 'html');
   log(`Serving static files from ${htmldir}`);
   app.use(express.static(htmldir));
-  app.use(express.static(new URL('../public', import.meta.url).pathname));
+  const soloHtmlDir = new URL('../public', import.meta.url).pathname;
+  app.use(express.static(soloHtmlDir));
 
   if (walletHtmlDir && !bridgeTarget) {
-    // Transition localStorage based bridge
+    // Guide all callers to /wallet/bridge.html
     if (existsSync(path.join(walletHtmlDir, 'bridge.html'))) {
-      console.log('redirecting wallet bridge');
+      console.log('redirecting /wallet-bridge.html to /wallet/bridge.html');
       app.get('/wallet-bridge.html', (req, res) =>
-        res.redirect('/wallet/bridge.html'),
+        res.redirect(
+          urlFormat({ pathname: '/wallet/bridge.html', query: req.query }),
+        ),
+      );
+    } else {
+      console.log('serving /wallet/bridge.html from solo wallet-bridge.html');
+      app.get('/wallet/bridge.html', (_, res) =>
+        res.sendFile(path.resolve(soloHtmlDir, 'wallet-bridge.html')),
       );
     }
 
     // Serve the wallet directory.
     app.use('/wallet', express.static(walletHtmlDir));
 
-    // Default GETs to /wallet/index.html for history routing.
+    // Default non-bridge GETs to /wallet/index.html for history routing.
     app.get('/wallet/*', (_, res) =>
       res.sendFile(path.resolve(walletHtmlDir, 'index.html')),
     );