Skip to content

refactor: Move socket functions to buddySocket file #744

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

Closed
wants to merge 3 commits into from
+186 −145
Closed

refactor: Move socket functions to buddySocket file #744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
75f7d17
refactor: Move socket functions to buddySocket file
yuvrajinbhakti Feb 11, 2025
6eb0960
Update App.jsx
yuvrajinbhakti Feb 12, 2025
3dbf671
Apply suggestions from code review
Dun-sin Mar 4, 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
158 changes: 13 additions & 145 deletions client/src/components/BuddyMatcher.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,163 +1,31 @@
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 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';
import useCloseChat from 'src/hooks/useCloseChat';
import { useNotification } from 'src/lib/notification';
import ReconnectBanner from './ReconnectBanner';
import { useBuddySocket } from 'src/lib/buddySocket';

const defaultLoadingText = <p>Looking for a random buddy</p>;

const BuddyMatcher = () => {
const { playNotification } = useNotification();
const navigate = useNavigate();
const { authState } = useAuth();
const { createChat, closeChat, closeAllChats } = useChat();
const { startSearch, endSearch, app } = useApp();
const { setLoadingText, startNewSearch } = useCloseChat();

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);

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);

socket.disconnect();
};
}, [app.currentChatId]);

const { disconnected,handleReconnect } = useBuddySocket({
authState,
createChat,
closeChat,
closeAllChats,
startSearch,
endSearch,
app,
setLoadingText,
startNewSearch
});

if (app.isSearching || !app.currentChatId) {
navigate('/searching');
Expand Down
173 changes: 173 additions & 0 deletions client/src/lib/buddySocket.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,173 @@
import { useCallback, useEffect, useRef, useState } from 'react';
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 { createBrowserNotification } from 'src/lib/browserNotification';
import { isExplicitDisconnection } from 'src/lib/utils';
import { useNotification } from 'src/lib/notification';

const DEFAULT_LOADING_TEXT = 'Looking for a random buddy';

export const useBuddySocket = ({
authState,
createChat,
closeChat,
closeAllChats,
startSearch,
endSearch,
app,
setLoadingText,
startNewSearch
}) =>{
const { playNotification } = useNotification();
const navigate = useNavigate();
const [disconnected, setDisconnected] = useState(false);
const reconnectAttempts = useRef(0);

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

socket.disconnect();
setDisconnected(true);
endSearch();
},[app.currentChatId, endSearch]);

const handleReconnect=useCallback(async()=>{
if (socket.connected) {
return;
}

startSearch();
setLoadingText(DEFAULT_LOADING_TEXT);
await connectWithId(app.currentChatId);
},[app.currentChatId, startSearch, setLoadingText]);

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);
}, [playNotification,createChat,endSearch]);
const onRestoreChat = useCallback(({ chats, currentChatId }) => {
Object.values(chats).forEach((chat) => {
createChat(chat.id, chat.userIds, chat.messages, chat.createdAt);
});
endSearch(currentChatId);
}, [createChat,endSearch]);
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);
}, [authState.loginId,authState.email]);
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();
}, [endSearch,closeChat,playNotification,navigate,startNewSearch]);

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

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

disconnect();
}, [disconnect]);

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

const onReconnectError = useCallback(() => {
if (reconnectAttempts.current >= 3) {
disconnect();
}
}, [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);

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);

socket.disconnect();
};
}, [
app.currentChatId,
startSearch,
onConnect,
onClose,
onUserJoined,
onRestoreChat,
onInactive,
onDisconnect,
onReconnectAttempt,
onReconnectError
]);
return {
disconnected,
handleReconnect
};
};

Loading