Support path-only WebSocket URLs in hosted mode (#4)

facebookexperimental · Feb 23, 2024 · 9ceb0ad · 9ceb0ad
1 parent 3b3ac6c
commit 9ceb0ad
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/front_end/core/sdk/Connections.ts b/front_end/core/sdk/Connections.ts
@@ -287,7 +287,15 @@ function createMainConnection(websocketConnectionLost: () => void): ProtocolClie
   const wsParam = Root.Runtime.Runtime.queryParam('ws');
   const wssParam = Root.Runtime.Runtime.queryParam('wss');
   if (wsParam || wssParam) {
-    const ws = (wsParam ? `ws://${wsParam}` : `wss://${wssParam}`) as Platform.DevToolsPath.UrlString;
+    const scheme = wsParam ? 'ws' : 'wss';
+    // ws[s]Param is either:
+    // 1. The hierarchical part of a URL (with the scheme and :// removed).
+    // 2. A path-absolute URL (beginning with `/`) relative to the current host. This is only meaningful in hosted mode.
+    let schemelessUrl = (wsParam ? wsParam : wssParam) as string;
+    if (Host.InspectorFrontendHost.InspectorFrontendHostInstance.isHostedMode() && schemelessUrl.startsWith('/')) {
+      schemelessUrl = `${window.location.host}${schemelessUrl}`;
+    }
+    const ws = `${scheme}://${schemelessUrl}` as Platform.DevToolsPath.UrlString;
     return new WebSocketConnection(ws, websocketConnectionLost);
   }
   if (Host.InspectorFrontendHost.InspectorFrontendHostInstance.isHostedMode()) {