diff --git a/src/assets/shared/lib/axios.ts b/src/assets/shared/lib/axios.ts index a87c842e..1984cab9 100644 --- a/src/assets/shared/lib/axios.ts +++ b/src/assets/shared/lib/axios.ts @@ -9,9 +9,13 @@ export class TokenRefreshError extends Error { } } -export const baseURL = import.meta.env.DEV - ? '' - : 'https://port-0-gami-server-mj0rdvda8d11523e.sel3.cloudtype.app'; +const DEFAULT_BACKEND = + 'https://port-0-gami-server-mj0rdvda8d11523e.sel3.cloudtype.app'; + +// Allow override via Vite env var VITE_API_BASE for local testing. +// Fallback to DEFAULT_BACKEND to avoid dev-time proxying to vite origin. +export const baseURL: string = + (import.meta.env.VITE_API_BASE as string) || DEFAULT_BACKEND; export const instance = axios.create({ baseURL, diff --git a/src/hooks/useStomp.ts b/src/hooks/useStomp.ts index b21fecb2..a27f03fe 100644 --- a/src/hooks/useStomp.ts +++ b/src/hooks/useStomp.ts @@ -210,41 +210,33 @@ export function useStomp( } isConnectingRef.current = true; + const backendOriginRaw = + baseURL && baseURL !== '' ? baseURL : window.location.origin; + let backendOrigin = String(backendOriginRaw); + + if (backendOrigin.startsWith('ws:')) { + backendOrigin = backendOrigin.replace(/^ws:/, 'http:'); + } else if (backendOrigin.startsWith('wss:')) { + backendOrigin = backendOrigin.replace(/^wss:/, 'https:'); + } - const wsUrl = `${baseURL}/ws`; + const sockjsUrl = backendOrigin.endsWith('/') + ? backendOrigin + 'ws' + : backendOrigin + '/ws'; if (connectionTimeoutIdRef.current) { clearTimeout(connectionTimeoutIdRef.current); connectionTimeoutIdRef.current = null; } - const socket = new SockJS(wsUrl, null, { - transports: ['websocket', 'xhr-streaming', 'xhr-polling'], - }); - - socket.onerror = (error: Event) => { - console.error('SockJS 오류:', error); - isConnectingRef.current = false; - if (connectionTimeoutIdRef.current) { - clearTimeout(connectionTimeoutIdRef.current); - connectionTimeoutIdRef.current = null; - } - }; - - socket.onclose = () => { - isConnectingRef.current = false; - if (connectionTimeoutIdRef.current) { - clearTimeout(connectionTimeoutIdRef.current); - connectionTimeoutIdRef.current = null; - } - }; - const client = new Client({ - webSocketFactory: () => socket as WebSocket, + // SockJS 인스턴스를 webSocketFactory에서 직접 생성해서 반환합니다. + webSocketFactory: () => new SockJS(sockjsUrl), connectHeaders: { Authorization: `Bearer ${token}`, }, - reconnectDelay: 0, + // 재접속 지연을 두어 반복 연결 시도를 완화합니다. + reconnectDelay: 2000, heartbeatIncoming: 4000, heartbeatOutgoing: 4000, connectionTimeout: 10000, diff --git a/src/pages/chat/ChatApplyPage.tsx b/src/pages/chat/ChatApplyPage.tsx index 929df0c8..3a33caf1 100644 --- a/src/pages/chat/ChatApplyPage.tsx +++ b/src/pages/chat/ChatApplyPage.tsx @@ -78,7 +78,6 @@ export default function ChatApplyPage() { return () => { disconnectWebSocket(); }; - // eslint-disable-next-line react-hooks/exhaustive-deps }, [connectWebSocket, disconnectWebSocket]); useEffect(() => { diff --git a/src/pages/chat/ChatPage.tsx b/src/pages/chat/ChatPage.tsx index ab7ea790..efddb700 100644 --- a/src/pages/chat/ChatPage.tsx +++ b/src/pages/chat/ChatPage.tsx @@ -406,6 +406,13 @@ export default function ChatPage() { return; } + if (message.length > 250) { + toast.error( + `메시지는 250자 이하로 작성해주세요. (현재 ${message.length}자)` + ); + return; + } + if (!isConnected()) { toast.error( 'WebSocket이 연결되지 않았습니다. 잠시 후 다시 시도해주세요.' diff --git a/src/pages/mentoring/MentoringPage.tsx b/src/pages/mentoring/MentoringPage.tsx index 0ccde095..c77d6dd4 100644 --- a/src/pages/mentoring/MentoringPage.tsx +++ b/src/pages/mentoring/MentoringPage.tsx @@ -50,6 +50,12 @@ interface SentApply { createdAt: string; } +type MentorParams = { + page: number; + size: number; + generation?: number; +}; + export default function MentoringPage() { const [allMentors, setAllMentors] = useState([]); const [searchQuery, setSearchQuery] = useState(''); @@ -62,22 +68,33 @@ export default function MentoringPage() { const fetchData = async () => { try { setIsLoading(true); - const [mentorsResponse, memberResponse, sentAppliesResponse] = - await Promise.all([ - instance.get('/api/mentoring/mentor/all', { - params: { - page: 0, - size: 100, - }, - }), - instance.get('/api/member'), - instance - .get(API_PATHS.MENTORING_APPLY_SENT) - .catch(() => ({ data: [] })), - ]); + + // 먼저 현재 멤버 정보를 가져와 generation을 확보합니다. + let memberResponse: { data: MemberInfo } | null = null; + try { + memberResponse = await instance.get('/api/member'); + setCurrentMemberId(memberResponse.data.memberId); + } catch { + // 멤버 조회 실패(예: 비인증) 시에도 멘토 목록은 generation 없이 가져옵니다. + memberResponse = null; + setCurrentMemberId(null); + } + + const mentorParams: MentorParams = { page: 0, size: 100 }; + if (memberResponse && memberResponse.data.generation != null) { + mentorParams.generation = memberResponse.data.generation; + } + + const [mentorsResponse, sentAppliesResponse] = await Promise.all([ + instance.get('/api/mentoring/mentor/all', { + params: mentorParams, + }), + instance + .get(API_PATHS.MENTORING_APPLY_SENT) + .catch(() => ({ data: [] })), + ]); setAllMentors(mentorsResponse.data.content); - setCurrentMemberId(memberResponse.data.memberId); if (Array.isArray(sentAppliesResponse.data)) { setSentApplies(sentAppliesResponse.data); }