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

Refactoring Room.ts to fetch map url automatically from ID

Browse source
This commit is contained in:
David Négrier 2020-10-13 16:46:46 +02:00
parent 0580c692d1
commit aee06da7f9
7 changed files with 94 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -25,7 +25,6 @@ import {
RoomJoinedMessage,
ItemStateMessage,
ServerToClientMessage,
SetUserIdMessage,
SilentMessage,
WebRtcSignalToClientMessage,
WebRtcSignalToServerMessage,
@ -86,7 +85,7 @@ export class IoSocketController {
this.ioConnection();
}
ioConnection() {
this.app.ws('/room', {
@ -114,7 +113,7 @@ export class IoSocketController {
const websocketExtensions = req.getHeader('sec-websocket-extensions');
const roomId = query.roomId;
//todo: better validation: /\/_\/.*\/.*/ or /\/@\/.*\/.*\/.*/
//todo: better validation: /\/_\/.*\/.*/ or /\/@\/.*\/.*\/.*/
if (typeof roomId !== 'string') {
throw new Error('Undefined room ID: ');
}
@ -153,7 +152,7 @@ export class IoSocketController {
throw new Error('Client cannot acces this ressource.')
} else {
console.log('access granted for user '+userUuid+' and room '+roomId);
}
}
}
if (upgradeAborted.aborted) {
@ -228,16 +227,6 @@ export class IoSocketController {
// Let's join the room
this.handleJoinRoom(client, client.roomId, client.position, client.viewport, client.name, client.characterLayers);
const setUserIdMessage = new SetUserIdMessage();
setUserIdMessage.setUserid(client.userId);
const serverToClientMessage = new ServerToClientMessage();
serverToClientMessage.setSetuseridmessage(setUserIdMessage);
if (!client.disconnecting) {
client.send(serverToClientMessage.serializeBinary().buffer, true);
}
},
message: (ws, arrayBuffer, isBinary): void => {
const client = ws as ExSocketInterface;
@ -363,6 +352,8 @@ export class IoSocketController {
roomJoinedMessage.addItem(itemStateMessage);
}
roomJoinedMessage.setCurrentuserid(client.userId);
const serverToClientMessage = new ServerToClientMessage();
serverToClientMessage.setRoomjoinedmessage(roomJoinedMessage);