Merge pull request #16 from tsd2024/develop

Develop
tsd2024 · Apr 8, 2024 · d149ea4 · d149ea4
2 parents d280c38 + 077ea5f
commit d149ea4
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -30,6 +30,7 @@ jobs:
           NEXTAUTH_SECRET: ${{ secrets.NEXTAUTH_SECRET }}
           NEXTAUTH_URL: ${{ vars.NEXTAUTH_URL }}
           BACKEND_URL: ${{ vars.BACKEND_URL }}
+          WEBSOCKET_PROTOCOL: wss
 
         run: |
           npx sst deploy --stage prod
diff --git a/next.config.mjs b/next.config.mjs
@@ -2,6 +2,7 @@
 const nextConfig = {
     env: {
         BACKEND_URL: process.env.BACKEND_URL,
+        WEBSOCKET_PROTOCOL: process.env.WEBSOCKET_PROTOCOL,
     },
     experimental: {
         missingSuspenseWithCSRBailout: false,

diff --git a/src/app/create-room/page.tsx b/src/app/create-room/page.tsx
@@ -31,12 +31,14 @@ export default function CreateRoomPage() {
     });
 
     const router = useRouter();
+    const BACKEND_URL = process.env.BACKEND_URL;
+    const WEBSOCKET_PROTOCOL = process.env.WEBSOCKET_PROTOCOL;
 
     const generateId = () => {
         return uuidv4(); // <-- Generate UUID
     };
 
-    const { sendMessage, lastMessage, readyState } = useWebSocket('ws://localhost:8009/api/v1/room', {
+    const { sendMessage, lastMessage, readyState } = useWebSocket(`${WEBSOCKET_PROTOCOL}://${BACKEND_URL}/api/v1/room`, {
         shouldReconnect: () => true,
         onOpen: () => console.log("opened"),
         onMessage: (event) => {

diff --git a/src/app/rooms/[roomId]/page.tsx b/src/app/rooms/[roomId]/page.tsx
@@ -26,6 +26,7 @@ type Player = {
 
 export default function RoomPage({ params }: { params: { roomId: string } }) {
     const BACKEND_URL = process.env.BACKEND_URL;
+    const WEBSOCKET_PROTOCOL = process.env.WEBSOCKET_PROTOCOL;
 
     const searchParams = useSearchParams()
     const playerId = searchParams.get('playerId')
@@ -48,7 +49,7 @@ export default function RoomPage({ params }: { params: { roomId: string } }) {
         playCard(card);
     };
 
-    const { sendMessage, lastMessage, readyState } = useWebSocket(`ws://${BACKEND_URL}/api/v1/room`, {
+    const { sendMessage, lastMessage, readyState } = useWebSocket(`${WEBSOCKET_PROTOCOL}://${BACKEND_URL}/api/v1/room`, {
         shouldReconnect: () => true,
         onOpen: () => {
             console.log("opened");