diff options
author | 2023-09-04 18:08:59 +0200 | |
---|---|---|
committer | 2023-09-04 20:33:55 +0200 | |
commit | 0e7c55f7ab8d496e81a3dbd53f14e0c46cb27fa6 (patch) | |
tree | 3df27544768e96ec8508452d07b9c20c30f374b0 /subprojects/frontend/src/xtext | |
parent | refactor(frontend): graph visualizer performance (diff) | |
download | refinery-0e7c55f7ab8d496e81a3dbd53f14e0c46cb27fa6.tar.gz refinery-0e7c55f7ab8d496e81a3dbd53f14e0c46cb27fa6.tar.zst refinery-0e7c55f7ab8d496e81a3dbd53f14e0c46cb27fa6.zip |
refactor: server environemntal variables
* Prefix each variable with REFINERY_
* If not public host is specified, allow all origings and compute the WebSocket
address on the client from the origin.
Diffstat (limited to 'subprojects/frontend/src/xtext')
-rw-r--r-- | subprojects/frontend/src/xtext/BackendConfig.ts | 2 | ||||
-rw-r--r-- | subprojects/frontend/src/xtext/XtextWebSocketClient.ts | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/subprojects/frontend/src/xtext/BackendConfig.ts b/subprojects/frontend/src/xtext/BackendConfig.ts index 4c7eac5f..e7043bd5 100644 --- a/subprojects/frontend/src/xtext/BackendConfig.ts +++ b/subprojects/frontend/src/xtext/BackendConfig.ts | |||
@@ -11,7 +11,7 @@ import { z } from 'zod'; | |||
11 | export const ENDPOINT = 'config.json'; | 11 | export const ENDPOINT = 'config.json'; |
12 | 12 | ||
13 | const BackendConfig = z.object({ | 13 | const BackendConfig = z.object({ |
14 | webSocketURL: z.string().url(), | 14 | webSocketURL: z.string().url().optional(), |
15 | }); | 15 | }); |
16 | 16 | ||
17 | type BackendConfig = z.infer<typeof BackendConfig>; | 17 | type BackendConfig = z.infer<typeof BackendConfig>; |
diff --git a/subprojects/frontend/src/xtext/XtextWebSocketClient.ts b/subprojects/frontend/src/xtext/XtextWebSocketClient.ts index 6bb7eec8..963c1d4c 100644 --- a/subprojects/frontend/src/xtext/XtextWebSocketClient.ts +++ b/subprojects/frontend/src/xtext/XtextWebSocketClient.ts | |||
@@ -282,7 +282,10 @@ export default class XtextWebSocketClient { | |||
282 | log.debug('Creating WebSocket'); | 282 | log.debug('Creating WebSocket'); |
283 | 283 | ||
284 | (async () => { | 284 | (async () => { |
285 | const { webSocketURL } = await fetchBackendConfig(); | 285 | let { webSocketURL } = await fetchBackendConfig(); |
286 | if (webSocketURL === undefined) { | ||
287 | webSocketURL = `${window.origin.replace(/^http/, 'ws')}/xtext-service`; | ||
288 | } | ||
286 | this.openWebSocketWithURL(webSocketURL); | 289 | this.openWebSocketWithURL(webSocketURL); |
287 | })().catch((error) => { | 290 | })().catch((error) => { |
288 | log.error('Error while initializing connection', error); | 291 | log.error('Error while initializing connection', error); |