Skip to content

Commit

Permalink
Merge pull request #67 from sayyyho/dev
Browse files Browse the repository at this point in the history
Fix: 웹소켓 수정
  • Loading branch information
sayyyho authored Sep 7, 2024
2 parents 0162f4e + 109a050 commit 36414d2
Showing 1 changed file with 11 additions and 12 deletions.
23 changes: 11 additions & 12 deletions src/pages/ChatPage/ChatPage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import CHATTING_LAYOUT from "@/assets/chatLayout.svg";
import { useRef, useEffect, useState } from "react";
import useSpeechToText from "@/hooks/useSpeechToText";
import { useNavigate, useParams } from "react-router-dom";
import SockJS from "sockjs-client";

export const ChatPage = () => {
const customInput = useRef();
Expand Down Expand Up @@ -40,27 +39,27 @@ export const ChatPage = () => {
localStorage.setItem("nextpage", "/chatting/info/another");
navigate("/");
} else {
// SockJS 연결 설정
const sock = new SockJS(`https://api.golang-ktb.site/chat/ws`);
// WebSocket 연결 설정
const socket = new WebSocket(`wss://api.golang-ktb.site/chat/ws`);

sock.onopen = () => {
console.log("SockJS connected");
sock.send(JSON.stringify({ type: "join", room: params.room }));
socket.onopen = () => {
console.log("WebSocket connected");
socket.send(JSON.stringify({ type: "join", room: params.room }));
};

sock.onmessage = (event) => {
socket.onmessage = (event) => {
const message = JSON.parse(event.data);
setMessages((prevMessages) => [...prevMessages, message]);
};

sock.onclose = () => {
console.log("SockJS disconnected");
socket.onclose = () => {
console.log("WebSocket disconnected");
};

socketRef.current = sock;
socketRef.current = socket;

return () => {
sock.close();
socket.close();
};
}
}, [navigate, params.room]);
Expand All @@ -71,7 +70,7 @@ export const ChatPage = () => {
const newMessage = { text: message, isMine: true };
setMessages((prevMessages) => [...prevMessages, newMessage]);

if (socketRef.current.readyState === SockJS.OPEN) {
if (socketRef.current.readyState === WebSocket.OPEN) {
socketRef.current.send(JSON.stringify(newMessage));
}

Expand Down

0 comments on commit 36414d2

Please sign in to comment.