Fix websocket connection

SeoulSKY · Jun 3, 2024 · 0ce71c2 · 0ce71c2
1 parent 414890d
commit 0ce71c2
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -16,6 +16,8 @@ services:
     container_name: web-server
     depends_on:
       - chat-server
+    environment:
+      - VITE_APP_PROD=1
     ports:
       - "3000:3000"
     volumes:

diff --git a/web-server/package-lock.json b/web-server/package-lock.json
diff --git a/web-server/src/constants.ts b/web-server/src/constants.ts
@@ -1,3 +1,4 @@
 export const APP_NAME = "GoChat";
 
-export const SERVER_HOST = import.meta.env.PROD ? "https://gochat.seoulsky.org/api/" : "http://localhost:4000/api/";
+export const SERVER_HOST =
+  import.meta.env.VITE_APP_PROD ? "https://gochat.seoulsky.org/api/" : "http://localhost:4000/api/";
diff --git a/web-server/src/pages/ChatRoom.tsx b/web-server/src/pages/ChatRoom.tsx
@@ -211,7 +211,8 @@ export default function ChatRoom() {
   const inputRef = useRef<HTMLInputElement>(null);
   const scrollRef = useRef<HTMLDivElement>(null);
 
-  const { sendMessage, lastMessage, readyState } = useWebSocket(SERVER_HOST.replace(/^https?:/, "ws") + "ws");
+  const { sendMessage, lastMessage, readyState } = useWebSocket(
+    SERVER_HOST.replace(/^https?/, import.meta.env.VITE_APP_PROD ? "wss" : "ws") + "ws");
   const [messages, setMessages] = useState<Message[]>([]);
   const [input, setInput] = useState("");
   const [isOverflow, setIsOverflow] = useState(false);