From 21c2007ebd848d9ea65c4f1e34a738f5ececd20c Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Sat, 4 Feb 2023 15:29:55 +0100 Subject: [PATCH] use unsecure websocket if unsecure connection --- Caddyfile | 5 +++++ frontend/src/lib/components/Editor.svelte | 9 +++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Caddyfile b/Caddyfile index 901d5d27b5..dca5654051 100644 --- a/Caddyfile +++ b/Caddyfile @@ -8,3 +8,8 @@ http://{$BASE_URL} { reverse_proxy /ws/* http://lsp:3001 reverse_proxy /* http://windmill:8000 } + +https://{$BASE_URL} { + bind {$ADDRESS} + reverse_proxy /ws/* http://localhost:3001 +} diff --git a/frontend/src/lib/components/Editor.svelte b/frontend/src/lib/components/Editor.svelte index a4e255c609..d79578f32a 100644 --- a/frontend/src/lib/components/Editor.svelte +++ b/frontend/src/lib/components/Editor.svelte @@ -298,8 +298,9 @@ } } + const wsProtocol = $page.url.protocol == 'https:' ? 'wss' : 'ws' if (lang == 'typescript') { - await connectToLanguageServer(`wss://${$page.url.host}/ws/deno`, 'deno', { + await connectToLanguageServer(`${wsProtocol}://${$page.url.host}/ws/deno`, 'deno', { certificateStores: null, enablePaths: [], config: null, @@ -330,7 +331,7 @@ } }) } else if (lang === 'python') { - await connectToLanguageServer(`wss://${$page.url.host}/ws/pyright`, 'pyright', { + await connectToLanguageServer(`${wsProtocol}://${$page.url.host}/ws/pyright`, 'pyright', { executionEnvironments: [ { root: '/tmp/pyright', @@ -341,7 +342,7 @@ ] }) - connectToLanguageServer(`wss://${$page.url.host}/ws/black`, 'black', { + connectToLanguageServer(`${wsProtocol}://${$page.url.host}/ws/black`, 'black', { formatters: { black: { command: 'black', @@ -353,7 +354,7 @@ } }) } else if (lang === 'go') { - connectToLanguageServer(`wss://${$page.url.host}/ws/go`, 'go', { + connectToLanguageServer(`${wsProtocol}://${$page.url.host}/ws/go`, 'go', { 'build.allowImplicitNetworkAccess': true }) }