Skip to content

refactor(socket): move all socket functions to lib/buddySocket.js #766

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
May 26, 2025
Merged

refactor(socket): move all socket functions to lib/buddySocket.js #766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
967a38c
changes to BuddyMatcher
Apr 15, 2025
3d1c427
added buddySocket.js
Apr 15, 2025
aab0ac3
changed the name of import buddySocket
Apr 24, 2025
01076ea
refactor: improve socket handling and code organization
May 5, 2025
6be922b
refactor(socket): centralize socket logic in buddySocket.js
May 24, 2025
122514a
Merge branch 'main' into buddy-socket-branch
Dun-sin May 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
163 changes: 30 additions & 133 deletions client/src/components/BuddyMatcher.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,9 @@
import { useNavigate } from 'react-router-dom';
import {
NEW_EVENT_CHAT_RESTORE,
NEW_EVENT_CLOSED,
NEW_EVENT_INACTIVE,
NEW_EVENT_JOIN,
NEW_EVENT_JOINED,
} from '../../../constants.json';
import { connectWithId, socket } from 'src/lib/socketConnection';
import { useCallback, useEffect, useRef, useState } from 'react';

import { socket } from 'src/lib/socketConnection';
import useBuddyUtils from 'src/lib/buddySocket';
import { useEffect, useState } from 'react';
import Anonymous from 'components/Anonymous';
import { createBrowserNotification } from 'src/lib/browserNotification';
import { isExplicitDisconnection } from 'src/lib/utils';
import { useApp } from 'src/context/AppContext';
import { useAuth } from 'src/context/AuthContext';
import { useChat } from 'src/context/ChatContext';
Expand All @@ -28,133 +20,28 @@ const BuddyMatcher = () => {
const { createChat, closeChat, closeAllChats } = useChat();
const { startSearch, endSearch, app } = useApp();
const { setLoadingText, startNewSearch } = useCloseChat();
const { setupSocketListeners, handleReconnectClick, setupSocket } = useBuddyUtils(socket);

const [disconnected, setDisconnected] = useState(false);
const reconnectAttempts = useRef(0);

function disconnect() {
reconnectAttempts.current = 0;
if (app.currentChatId) {
return;
}

socket.disconnect();
setDisconnected(true);
endSearch();
}

async function handleReconnect() {
if (socket.connected) {
return;
}

startSearch();
setLoadingText(defaultLoadingText);
await connectWithId(app.currentChatId);
}

const onUserJoined = useCallback(({ roomId, userIds }) => {
playNotification('buddyPaired');
createBrowserNotification(
"Let's Chat :)",
"You've found a match, don't keep your Partner waiting ⌛"
);
createChat(roomId, userIds);
endSearch(roomId);
}, []);

const onRestoreChat = useCallback(({ chats, currentChatId }) => {
Object.values(chats).forEach((chat) => {
createChat(chat.id, chat.userIds, chat.messages, chat.createdAt);
});
endSearch(currentChatId);
}, []);

const onConnect = useCallback(() => {
// Here server will be informed that user is searching for
// another user
socket.emit(NEW_EVENT_JOIN, {
loginId: authState.loginId,
email: authState.email,
});
setDisconnected(false);
}, []);

const onClose = useCallback((chatId) => {
endSearch();
closeChat(chatId);
playNotification('chatClosed');

if (!confirm('This chat is closed! Would you like to search for a new buddy?')) {
navigate('/');
return;
}

createBrowserNotification('Chat Closed', 'Your buddy left the chat');
startNewSearch();
}, []);

const onInactive = useCallback(() => {
closeAllChats();
}, []);

const onDisconnect = useCallback((reason) => {
if (isExplicitDisconnection(reason)) {
return;
}

disconnect();
}, []);

const onReconnectAttempt = useCallback((attempts) => {
reconnectAttempts.current = attempts;
}, []);

const onReconnectError = useCallback(() => {
if (reconnectAttempts.current >= 3) {
disconnect();
}
}, []);

useEffect(() => {
const setupSocket = async () => {
if (!app.currentChatId) {
startSearch();
}

if (!socket.connected) {
try {
await connectWithId(app.currentChatId);
} catch (error) {
console.error('Failed to connect:', error);
}
}
};

setupSocket();

socket.on('connect', onConnect);
socket.on(NEW_EVENT_CLOSED, onClose);
socket.on(NEW_EVENT_JOINED, onUserJoined);
socket.on(NEW_EVENT_CHAT_RESTORE, onRestoreChat);
socket.on(NEW_EVENT_INACTIVE, onInactive);
socket.on('disconnect', onDisconnect);
socket.io.on('reconnect_attempt', onReconnectAttempt);
socket.io.on('reconnect_error', onReconnectError);
setupSocket(app.currentChatId, startSearch);
const cleanupListeners = setupSocketListeners({
authState,
playNotification,
createChat,
endSearch,
closeChat,
navigate,
createBrowserNotification,
startNewSearch,
closeAllChats,
app,
setDisconnected,
});

return () => {
socket
.off('connect', onConnect)
.off(NEW_EVENT_JOINED, onUserJoined)
.off(NEW_EVENT_CHAT_RESTORE, onRestoreChat)
.off(NEW_EVENT_CLOSED, onClose)
.off(NEW_EVENT_INACTIVE, onInactive)
.off('disconnect', onDisconnect);

socket.io
.off('reconnect_attempt', onReconnectAttempt)
.off('reconnect_error', onReconnectError);

cleanupListeners();
socket.disconnect();
};
}, [app.currentChatId]);
Expand All @@ -163,7 +50,17 @@ const BuddyMatcher = () => {
navigate('/searching');
}

return disconnected ? <ReconnectBanner handleReconnect={handleReconnect} /> : <Anonymous />;
const reconnectBanner = (
<ReconnectBanner
handleReconnect={handleReconnectClick(
app.currentChatId,
startSearch,
setLoadingText,
defaultLoadingText
)}
/>
);
return disconnected ? reconnectBanner : <Anonymous />;
};

export default BuddyMatcher;
Loading
Loading