Kraut.World/server
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Create and send close message

Browse source 
# TODO
- Show error or wait room
This commit is contained in:
Gregoire Parant 2020-10-21 19:30:02 +02:00
parent 326c2e4183
commit 7ac4a2b849
17 changed files with 700 additions and 1846 deletions
Download patch file Download diff file Expand all files Collapse all files

52
back/src/Controller/IoSocketController.ts
View file

@ -162,11 +162,13 @@ export class IoSocketController {
let memberTags: string[] = [];
let memberTextures: CharacterTexture[] = [];
const room = await socketManager.getOrCreateRoom(roomId);
if (room.isFull()) {
//TODO http return status
/*if (room.isFull()) {
res.writeStatus("503").end('Too many users');
return;
}
}*/
try {
const userData = await adminApi.fetchMemberDataByUuid(userUuid);
//console.log('USERDATA', userData)
@ -234,27 +236,37 @@ export class IoSocketController {
},
/* Handlers */
open: (ws) => {
// Let's join the room
const client = this.initClient(ws); //todo: into the upgrade instead?
socketManager.handleJoinRoom(client);
resetPing(client);
(async () => {
// Let's join the room
const client = this.initClient(ws); //todo: into the upgrade instead?
socketManager.handleJoinRoom(client);
resetPing(client);
//get data information and shwo messages
adminApi.fetchMemberDataByUuid(client.userUuid).then((res: FetchMemberDataByUuidResponse) => {
if (!res.messages) {
//if room is full, emit redirect room message
const room = await socketManager.getOrCreateRoom(client.roomId);
if (room.isFull) {
socketManager.emitCloseMessage(client.userUuid, 302);
return;
}
res.messages.forEach((c: unknown) => {
const messageToSend = c as { type: string, message: string };
socketManager.emitSendUserMessage({
userUuid: client.userUuid,
type: messageToSend.type,
message: messageToSend.message
})
});
}).catch((err) => {
console.error('fetchMemberDataByUuid => err', err);
});
//get data information and shwo messages
try {
const res: FetchMemberDataByUuidResponse = await adminApi.fetchMemberDataByUuid(client.userUuid);
if (!res.messages) {
return;
}
res.messages.forEach((c: unknown) => {
const messageToSend = c as { type: string, message: string };
socketManager.emitSendUserMessage({
userUuid: client.userUuid,
type: messageToSend.type,
message: messageToSend.message
})
});
}catch(err) {
console.error('fetchMemberDataByUuid => err', err);
};
})();
},
message: (ws, arrayBuffer, isBinary): void => {
const client = ws as ExSocketInterface;

2
back/src/Controller/MapController.ts
View file

@ -85,7 +85,7 @@ export class MapController extends BaseController{
res.writeStatus('404').end('No room found');
return;
}
res.writeStatus("200").end(world.isFull() ? '1':'0');
res.writeStatus("200").end(world.isFull ? '1':'0');
});
}
}