Skip to content
This repository was archived by the owner on Oct 30, 2022. It is now read-only.

Commit 588f98b

Browse files
authored
socket bug resolve (#122)
Signed-off-by: codewithvk <vivekpatel7202@gmail.com>
1 parent c786ad6 commit 588f98b

File tree

2 files changed

+20
-9
lines changed

2 files changed

+20
-9
lines changed

client/src/Components/Room/Room.js

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,11 @@ function Room(props) {
141141
// Once room will be created then this effect will triggered when ever props id changed
142142
// Props id means router id example /room/:id
143143
useEffect(() => {
144+
const { id } = props.match.params;
145+
setRoomId(id);
146+
socket.emit("joinroom", { roomId: id, userName: user.result.familyName || user.result.name, userImg: user.result.imageUrl || user.result.name }, (err) => {
147+
console.log(err)
148+
});
144149

145150
socket.on("updateBody", (roomBody) => {
146151
// console.log("we", roomBody);
@@ -173,12 +178,7 @@ function Room(props) {
173178
})
174179
setLoader(true);
175180

176-
const { id } = props.match.params;
177-
setRoomId(id);
178-
socket.emit("joinroom", { roomId: id, userName: user.result.familyName || user.result.name, userImg: user.result.imageUrl || user.result.name }, (err) => {
179-
console.log(err)
180-
});
181-
181+
182182
const url = `/api/room/${id}`;
183183
const fetchData = async () => {
184184
const { data } = await AXIOS.get(url, {
@@ -201,6 +201,9 @@ function Room(props) {
201201
fetchData();
202202
return () => {
203203
// console.log("called");
204+
// socket.off("disconnect", {userName: user.result.familyName || user.result.name} , (err) => {
205+
// console.log(err);
206+
// })
204207
socket.off("updateBody", (roomBody) => {
205208
// console.log(roomBody);
206209
setRoomBody(roomBody);
@@ -220,6 +223,8 @@ function Room(props) {
220223
destroyConnection();
221224
}
222225
myAudio = null;
226+
socket.disconnect();
227+
223228
};
224229
}, [props]);
225230

@@ -616,8 +621,14 @@ function Room(props) {
616621

617622
<button
618623
className="flex bg-transparent hover:bg-red-400 text-gray-100 font-bold py-2 px-4 bg-red-600 rounded-full border-solid border-2 border-red-500 "
619-
onClick={() => {
624+
onClick={async() => {
625+
626+
620627
props.history.push('/room');
628+
629+
630+
631+
621632
}}
622633
//
623634
>

server/server.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,9 @@ io.on('connection', (socket) => {
111111
socket.on('disconnect', ({ userName }) => {
112112
const user = removeUser(UserIdForRemove)
113113
let users = getUsersInRoom(CentralRoomId)
114-
console.log("users", users)
114+
console.log("users", user)
115115
io.to(CentralRoomId).emit('numberOfUser', users);
116-
// console.log("User disconnect", user);
116+
console.log("User disconnect");
117117
})
118118
});
119119

0 commit comments

Comments
 (0)