From af9baa3e9ac00c6faba1da3c04bc9fe247a1e7e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Valverd=C3=A9?= <julien.valverde@mailo.com>
Date: Wed, 17 Jul 2024 02:32:46 +0200
Subject: [PATCH] Trying to fix reverse proxy for websockets

---
 Caddyfile                                     | 20 +++++++++++--------
 packages/webui/public/vite.svg                |  1 -
 .../webui/src/trpc/TRPCClientProvider.tsx     |  4 ++--
 3 files changed, 14 insertions(+), 11 deletions(-)
 delete mode 100644 packages/webui/public/vite.svg

diff --git a/Caddyfile b/Caddyfile
index 383c320..a05ecbf 100644
--- a/Caddyfile
+++ b/Caddyfile
@@ -1,40 +1,44 @@
+{
+  auto_https off
+}
+
 (reverse_proxy_headers) {
   header_up Host {upstream_hostport}
 }
 
 
-http://* {
+localhost:80 {
   @websockets {
     header Connection *Upgrade*
     header Upgrade websocket
   }
   handle @websockets {
-    reverse_proxy http://server {
+    reverse_proxy server {
       import reverse_proxy_headers
     }
   }
 
   handle /rpc* {
-    reverse_proxy http://server {
+    reverse_proxy server {
       import reverse_proxy_headers
     }
   }
 
   handle {
-    reverse_proxy http://webui {
+    reverse_proxy webui {
       import reverse_proxy_headers
     }
   }
 }
 
-http://server.* {
-  reverse_proxy http://server {
+server.localhost:80 {
+  reverse_proxy server {
     import reverse_proxy_headers
   }
 }
 
-http://webui.* {
-  reverse_proxy http://webui {
+webui.localhost:80 {
+  reverse_proxy webui {
     import reverse_proxy_headers
   }
 }
diff --git a/packages/webui/public/vite.svg b/packages/webui/public/vite.svg
deleted file mode 100644
index e7b8dfb..0000000
--- a/packages/webui/public/vite.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>
\ No newline at end of file
diff --git a/packages/webui/src/trpc/TRPCClientProvider.tsx b/packages/webui/src/trpc/TRPCClientProvider.tsx
index 55a7415..eae835d 100644
--- a/packages/webui/src/trpc/TRPCClientProvider.tsx
+++ b/packages/webui/src/trpc/TRPCClientProvider.tsx
@@ -12,7 +12,7 @@ export interface TRPCClientProviderProps {
 export function TRPCClientProvider({ children }: TRPCClientProviderProps) {
 
     const [queryClient] = useState(new QueryClient())
-    const [wsClient] = useState(createWSClient({ url: "ws://localhost:8080" }))
+    const [wsClient] = useState(createWSClient({ url: "/" }))
 
     const [trpcClient] = useState(trpc.createClient({
         links: [
@@ -22,7 +22,7 @@ export function TRPCClientProvider({ children }: TRPCClientProviderProps) {
                 true: wsLink({ client: wsClient }),
 
                 false: httpBatchLink({
-                    url: "http://localhost:8080/rpc",
+                    url: "/rpc",
                     headers: {},
                 }),
             })