Skip to content

Commit 8d1c2ab

Browse files
committed
working on host state
1 parent 8956e97 commit 8d1c2ab

File tree

2 files changed

+29
-2
lines changed

2 files changed

+29
-2
lines changed

app/src/components/left/RoomsContainer.tsx

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,18 @@ const RoomsContainer = () => {
5757
socket.emit('joining', userName, roomCode);
5858
});
5959

60+
// if host, send state to server
61+
socket.on('requesting state from host', (roomCode) => {
62+
// if (userName === userList[0]) {
63+
// console.log('host is sending state');
64+
// const newState = store.getState();
65+
// socket.emit('state from host', JSON.stringify(newState), roomCode);
66+
// }
67+
68+
console.log('receiving room code from new user------', roomCode);
69+
socket.emit('state from host', roomCode);
70+
});
71+
6072
//listening to back end for updating user list
6173
socket.on('updateUserList', (newUserList) => {
6274
console.log('received user list from back:', newUserList);

server/server.ts

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,15 +119,30 @@ io.on('connection', (client) => {
119119
//when user Joined a room
120120
client.on('joining', (userName, roomCode) => {
121121
client.join(roomCode);
122-
if (!roomLists[roomCode]) roomLists[roomCode] = {}; //if no room exist, create new room in server
122+
if (!roomLists[roomCode]) {
123+
roomLists[roomCode] = {};
124+
} //if no room exist, create new room in server
123125
roomLists[roomCode][client.id] = userName; // add user into the room with id: userName
124-
io.in(roomCode).emit('updateUserList', roomLists[roomCode]); //send the message to all clients in room
126+
console.log('back emitting new user list');
127+
client.in(roomCode).emit('updateUserList', roomLists[roomCode]); //send the message to all clients in room
125128
console.log('full room lists', roomLists);
126129
console.log(`${userName} joined room ${roomCode}`);
127130
console.log(
128131
`back sent User list of room ${roomCode}: `,
129132
roomLists[roomCode]
130133
);
134+
135+
if (roomLists[roomCode]) {
136+
//if room exists, get state from host
137+
console.log('back requesting state from host');
138+
client.in(roomCode).emit('requesting state from host', roomCode);
139+
// client.on('state from host', (state) => {
140+
// client.to(client.id).emit('state from host', state);
141+
// });
142+
client.on('state from host', (roomCode) => {
143+
console.log('Receiving roomcode from front end host', roomCode);
144+
});
145+
}
131146
});
132147

133148
client.on('disconnecting', () => {

0 commit comments

Comments
 (0)