Support same-origin baseUrl in WebSocketService (#4313)

lbwexler · web-flow · commit 708b904a2d54 · 2026-03-30T13:51:02.000-07:00
* Support for changes in xh/hoist-dev-utils#63 to support Webpack proxying of requests back to Grails server during local development, with planned release as hoist-dev-utils v12. * Backwards compatible with existing hoist-dev-utils and `XH.baseUrl` values.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 ## 84.0.0-SNAPSHOT - unreleased
 
+### ⚙️ Technical
+
+* Updated `WebSocketService` to support same-origin `baseUrl` values (e.g. `/api/`). Previously
+  assumed a cross-origin `baseUrl` in dev mode. Required for compatibility with the new
+  webpack-dev-server proxy in `@xh/hoist-dev-utils` v12.
 
 ## 83.0.1 - 2026-03-25
 
diff --git a/svc/WebSocketService.ts b/svc/WebSocketService.ts
@@ -345,7 +345,7 @@ export class WebSocketService extends HoistService {
     private buildWebSocketUrl() {
         const protocol = window.location.protocol == 'https:' ? 'wss:' : 'ws:',
             endpoint = `xhWebSocket?${this.METADATA_FOR_HANDSHAKE.map(key => `${key}=${XH[key]}`).join('&')}`;
-        return XH.isDevelopmentMode
+        return XH.baseUrl.includes('//')
             ? `${protocol}//${XH.baseUrl.split('//')[1]}${endpoint}`
             : `${protocol}//${window.location.host}${XH.baseUrl}${endpoint}`;
     }

Original file line number	Diff line number	Diff line change
`@@ -345,7 +345,7 @@ export class WebSocketService extends HoistService {`
`345`	`345`	`private buildWebSocketUrl() {`
`346`	`346`	`const protocol = window.location.protocol == 'https:' ? 'wss:' : 'ws:',`
`347`	`347`	endpoint = `xhWebSocket?${this.METADATA_FOR_HANDSHAKE.map(key => `${key}=${XH[key]}`).join('&')}`;
`348`		`- return XH.isDevelopmentMode`
	`348`	`+ return XH.baseUrl.includes('//')`
`349`	`349`	? `${protocol}//${XH.baseUrl.split('//')[1]}${endpoint}`
`350`	`350`	: `${protocol}//${window.location.host}${XH.baseUrl}${endpoint}`;
`351`	`351`	`}`