starred/windmill
1
0
Fork 0
mirror of https://github.com/windmill-labs/windmill.git synced 2026-08-21 00:02:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

use unsecure websocket if unsecure connection

Browse Source
This commit is contained in:
Ruben Fiszel
2023-02-04 15:29:55 +01:00
parent 90668902f5
commit 21c2007ebd
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Caddyfile
+5
View File
@@ -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
}
frontend/src/lib/components/Editor.svelte
+5 -4
View File
@@ -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
})
}