Skip to content

Commit f21d7d0

Browse files
committed
infinite loop
1 parent ef2bb4c commit f21d7d0

File tree

2 files changed

+18
-19
lines changed

2 files changed

+18
-19
lines changed

app/src/components/left/RoomsContainer.tsx

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ const RoomsContainer = () => {
3939
})
4040
);
4141
React.useEffect(() => {
42-
console.log('You Joined Room---front end:', roomCode);
42+
console.log('You Joined Room---:', roomCode);
4343
}, [roomCode]);
4444

4545
function initSocketConnection(roomCode) {
@@ -51,18 +51,16 @@ const RoomsContainer = () => {
5151

5252
socket.on('connect', () => {
5353
console.log(`You Connected With Id: ${socket.id}`);
54-
// ????
55-
//socket.emit('join-room', roomCode); // Join the room when connected
5654
console.log(`Your Nickname Is: ${userName}`);
57-
//passing current client nickname to server
58-
// ???
55+
//passing current client nickname and room code to server
5956
socket.emit('joining', userName, roomCode);
60-
//listening to back end for updating user list
6157
});
6258

59+
//listening to back end for updating user list
6360
socket.on('updateUserList', (newUserList) => {
6461
console.log('received user list from back:', newUserList);
6562
dispatch(setUserList(Object.values(newUserList)));
63+
console.log('object values new user list', Object.values(newUserList));
6664
console.log('client user list updated:', userList);
6765
});
6866

@@ -96,22 +94,22 @@ const RoomsContainer = () => {
9694

9795
let previousState = store.getState();
9896
// sending info to backend whenever the redux store changes
99-
// const handleStoreChange = debounce(() => {
100-
// const newState = store.getState();
101-
// const roomCode = newState.roomSlice.roomCode;
97+
const handleStoreChange = debounce(() => {
98+
const newState = store.getState();
99+
const roomCode = newState.roomSlice.roomCode;
102100

103-
// if (newState !== previousState) {
104-
// // Send the current state to the server
105-
// console.log('front emitting new state')
106-
// socket.emit('new state from front', JSON.stringify(newState), roomCode);
107-
// previousState = newState;
108-
// }
109-
// }, 100);
101+
if (newState !== previousState) {
102+
// Send the current state to the server
103+
console.log('front emitting new state');
104+
socket.emit('new state from front', JSON.stringify(newState), roomCode);
105+
previousState = newState;
106+
}
107+
}, 10000);
110108

111109
store.subscribe(() => {
112110
if (socket) {
113111
console.log('handling store change');
114-
//handleStoreChange();
112+
handleStoreChange();
115113
}
116114
});
117115

server/server.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,13 +98,14 @@ const io = new Server(httpServer, {
9898
const roomLists = {}; //key: roomCode, value: Obj{ socketid: username }
9999
io.on('connection', (client) => {
100100
client.on('new state from front', (redux_store, room) => {
101+
console.log('back receiving new state');
101102
if (room) {
102103
//sending to sender client, only if they are in room
103-
console.log('back emitting new state');
104+
console.log('back emitting new state to room');
104105
client.to(room).emit('new state from back', redux_store);
105106
} else {
106107
//send to all connected clients except the one that sent the message
107-
console.log('back emitting new state');
108+
console.log('back emitting new state broadcast');
108109
client.broadcast.emit('new state from back', redux_store);
109110
}
110111
});

0 commit comments

Comments
 (0)