Merge
This commit is contained in:
commit
9c32c930a0
12 changed files with 374 additions and 343 deletions
|
@ -8,26 +8,29 @@ import {SECRET_KEY, MINIMUM_DISTANCE, GROUP_RADIUS} from "../Enum/EnvironmentVar
|
|||
import {ExtRooms, RefreshUserPositionFunction} from "../Model/Websocket/ExtRoom";
|
||||
import {ExtRoomsInterface} from "../Model/Websocket/ExtRoomsInterface";
|
||||
import {World} from "../Model/World";
|
||||
import { uuid } from 'uuidv4';
|
||||
import {Group} from "_Model/Group";
|
||||
|
||||
enum SockerIoEvent {
|
||||
CONNECTION = "connection",
|
||||
DISCONNECTION = "disconnect",
|
||||
DISCONNECT = "disconnect",
|
||||
JOIN_ROOM = "join-room",
|
||||
USER_POSITION = "user-position",
|
||||
WEBRTC_SIGNAL = "webrtc-signal",
|
||||
WEBRTC_OFFER = "webrtc-offer",
|
||||
WEBRTC_START = "webrtc-start",
|
||||
WEBRTC_DISCONNECT = "webrtc-disconect",
|
||||
MESSAGE_ERROR = "message-error",
|
||||
}
|
||||
|
||||
export class IoSocketController{
|
||||
export class IoSocketController {
|
||||
Io: socketIO.Server;
|
||||
World: World;
|
||||
constructor(server : http.Server) {
|
||||
|
||||
constructor(server: http.Server) {
|
||||
this.Io = socketIO(server);
|
||||
|
||||
// Authentication with token. it will be decoded and stored in the socket.
|
||||
this.Io.use( (socket: Socket, next) => {
|
||||
this.Io.use((socket: Socket, next) => {
|
||||
if (!socket.handshake.query || !socket.handshake.query.token) {
|
||||
return next(new Error('Authentication error'));
|
||||
}
|
||||
|
@ -44,15 +47,15 @@ export class IoSocketController{
|
|||
this.shareUsersPosition();
|
||||
|
||||
//don't send only function because the context will be not this
|
||||
this.World = new World((user1 : string, user2 : string) => {
|
||||
this.connectedUser(user1, user2);
|
||||
}, (user1 : string, user2 : string) => {
|
||||
this.disConnectedUser(user1, user2);
|
||||
this.World = new World((user1: string, group: Group) => {
|
||||
this.connectedUser(user1, group);
|
||||
}, (user1: string, group: Group) => {
|
||||
this.disConnectedUser(user1, group);
|
||||
}, MINIMUM_DISTANCE, GROUP_RADIUS);
|
||||
}
|
||||
|
||||
ioConnection() {
|
||||
this.Io.on(SockerIoEvent.CONNECTION, (socket: Socket) => {
|
||||
this.Io.on(SockerIoEvent.CONNECTION, (socket: Socket) => {
|
||||
/*join-rom event permit to join one room.
|
||||
message :
|
||||
userId : user identification
|
||||
|
@ -61,9 +64,9 @@ export class IoSocketController{
|
|||
x: user x position on map
|
||||
y: user y position on map
|
||||
*/
|
||||
socket.on(SockerIoEvent.JOIN_ROOM, (message : string) => {
|
||||
socket.on(SockerIoEvent.JOIN_ROOM, (message: string) => {
|
||||
let messageUserPosition = this.hydrateMessageReceive(message);
|
||||
if(messageUserPosition instanceof Error){
|
||||
if (messageUserPosition instanceof Error) {
|
||||
return socket.emit(SockerIoEvent.MESSAGE_ERROR, JSON.stringify({message: messageUserPosition.message}))
|
||||
}
|
||||
|
||||
|
@ -77,14 +80,12 @@ export class IoSocketController{
|
|||
this.saveUserInformation((socket as ExSocketInterface), messageUserPosition);
|
||||
|
||||
//add function to refresh position user in real time.
|
||||
let rooms = (this.Io.sockets.adapter.rooms as ExtRoomsInterface);
|
||||
rooms.refreshUserPosition = RefreshUserPositionFunction;
|
||||
rooms.refreshUserPosition(rooms, this.Io);
|
||||
this.refreshUserPosition();
|
||||
|
||||
socket.to(messageUserPosition.roomId).emit(SockerIoEvent.JOIN_ROOM, messageUserPosition.toString());
|
||||
});
|
||||
|
||||
socket.on(SockerIoEvent.USER_POSITION, (message : string) => {
|
||||
socket.on(SockerIoEvent.USER_POSITION, (message: string) => {
|
||||
let messageUserPosition = this.hydrateMessageReceive(message);
|
||||
if (messageUserPosition instanceof Error) {
|
||||
return socket.emit(SockerIoEvent.MESSAGE_ERROR, JSON.stringify({message: messageUserPosition.message}));
|
||||
|
@ -97,30 +98,39 @@ export class IoSocketController{
|
|||
this.saveUserInformation((socket as ExSocketInterface), messageUserPosition);
|
||||
|
||||
//refresh position of all user in all rooms in real time
|
||||
let rooms = (this.Io.sockets.adapter.rooms as ExtRoomsInterface);
|
||||
if(!rooms.refreshUserPosition){
|
||||
rooms.refreshUserPosition = RefreshUserPositionFunction;
|
||||
}
|
||||
rooms.refreshUserPosition(rooms, this.Io);
|
||||
this.refreshUserPosition();
|
||||
});
|
||||
|
||||
socket.on(SockerIoEvent.WEBRTC_SIGNAL, (message : string) => {
|
||||
let data : any = JSON.parse(message);
|
||||
socket.on(SockerIoEvent.WEBRTC_SIGNAL, (message: string) => {
|
||||
let data: any = JSON.parse(message);
|
||||
//send only at user
|
||||
let client = this.searchClientById(data.receiverId);
|
||||
if (!client) {
|
||||
console.error("client doesn't exist for ", data.receiverId);
|
||||
return;
|
||||
}
|
||||
return client.emit(SockerIoEvent.WEBRTC_SIGNAL, message);
|
||||
});
|
||||
|
||||
socket.on(SockerIoEvent.WEBRTC_OFFER, (message: string) => {
|
||||
let data: any = JSON.parse(message);
|
||||
|
||||
//send only at user
|
||||
let clients: Array<any> = Object.values(this.Io.sockets.sockets);
|
||||
for(let i = 0; i < clients.length; i++){
|
||||
let client : ExSocketInterface = clients[i];
|
||||
if(client.userId !== data.receiverId){
|
||||
continue
|
||||
}
|
||||
client.emit(SockerIoEvent.WEBRTC_SIGNAL, message);
|
||||
break;
|
||||
let client = this.searchClientById(data.receiverId);
|
||||
if (!client) {
|
||||
console.error("client doesn't exist for ", data.receiverId);
|
||||
return;
|
||||
}
|
||||
client.emit(SockerIoEvent.WEBRTC_OFFER, message);
|
||||
});
|
||||
|
||||
socket.on(SockerIoEvent.DISCONNECTION, (reason : string) => {
|
||||
socket.on(SockerIoEvent.DISCONNECT, () => {
|
||||
let Client = (socket as ExSocketInterface);
|
||||
this.sendDisconnectedEvent(Client);
|
||||
|
||||
//refresh position of all user in all rooms in real time
|
||||
this.refreshUserPosition();
|
||||
|
||||
//leave group of user
|
||||
this.World.leave(Client);
|
||||
|
||||
|
@ -138,13 +148,39 @@ export class IoSocketController{
|
|||
});
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* @param userId
|
||||
*/
|
||||
searchClientById(userId: string): ExSocketInterface | null {
|
||||
let clients: Array<any> = Object.values(this.Io.sockets.sockets);
|
||||
for (let i = 0; i < clients.length; i++) {
|
||||
let client: ExSocketInterface = clients[i];
|
||||
if (client.userId !== userId) {
|
||||
continue
|
||||
}
|
||||
return client;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* @param Client: ExSocketInterface
|
||||
*/
|
||||
sendDisconnectedEvent(Client: ExSocketInterface) {
|
||||
Client.broadcast.emit(SockerIoEvent.WEBRTC_DISCONNECT, JSON.stringify({
|
||||
userId: Client.userId
|
||||
}));
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* @param socket
|
||||
* @param roomId
|
||||
*/
|
||||
joinWebRtcRoom(socket : ExSocketInterface, roomId : string) {
|
||||
if(socket.webRtcRoomId === roomId){
|
||||
joinWebRtcRoom(socket: ExSocketInterface, roomId: string) {
|
||||
if (socket.webRtcRoomId === roomId) {
|
||||
return;
|
||||
}
|
||||
socket.join(roomId);
|
||||
|
@ -175,27 +211,36 @@ export class IoSocketController{
|
|||
}
|
||||
|
||||
//permit to save user position in socket
|
||||
saveUserInformation(socket : ExSocketInterface, message : MessageUserPosition){
|
||||
saveUserInformation(socket: ExSocketInterface, message: MessageUserPosition) {
|
||||
socket.position = message.position;
|
||||
socket.roomId = message.roomId;
|
||||
socket.userId = message.userId;
|
||||
}
|
||||
|
||||
refreshUserPosition() {
|
||||
//refresh position of all user in all rooms in real time
|
||||
let rooms = (this.Io.sockets.adapter.rooms as ExtRoomsInterface);
|
||||
if (!rooms.refreshUserPosition) {
|
||||
rooms.refreshUserPosition = RefreshUserPositionFunction;
|
||||
}
|
||||
rooms.refreshUserPosition(rooms, this.Io);
|
||||
}
|
||||
|
||||
//Hydrate and manage error
|
||||
hydrateMessageReceive(message : string) : MessageUserPosition | Error{
|
||||
hydrateMessageReceive(message: string): MessageUserPosition | Error {
|
||||
try {
|
||||
return new MessageUserPosition(JSON.parse(message));
|
||||
}catch (err) {
|
||||
} catch (err) {
|
||||
//TODO log error
|
||||
return new Error(err);
|
||||
}
|
||||
}
|
||||
|
||||
/** permit to share user position
|
||||
** users position will send in event 'user-position'
|
||||
** The data sent is an array with information for each user :
|
||||
[
|
||||
{
|
||||
** users position will send in event 'user-position'
|
||||
** The data sent is an array with information for each user :
|
||||
[
|
||||
{
|
||||
userId: <string>,
|
||||
roomId: <string>,
|
||||
position: {
|
||||
|
@ -204,25 +249,26 @@ export class IoSocketController{
|
|||
direction: <string>
|
||||
}
|
||||
},
|
||||
...
|
||||
]
|
||||
...
|
||||
]
|
||||
**/
|
||||
seTimeOutInProgress : any = null;
|
||||
shareUsersPosition(){
|
||||
if(this.seTimeOutInProgress){
|
||||
seTimeOutInProgress: any = null;
|
||||
|
||||
shareUsersPosition() {
|
||||
if (this.seTimeOutInProgress) {
|
||||
clearTimeout(this.seTimeOutInProgress);
|
||||
}
|
||||
//send for each room, all data of position user
|
||||
let arrayMap = (this.Io.sockets.adapter.rooms as ExtRooms).userPositionMapByRoom;
|
||||
if(!arrayMap){
|
||||
if (!arrayMap) {
|
||||
this.seTimeOutInProgress = setTimeout(() => {
|
||||
this.shareUsersPosition();
|
||||
}, 10);
|
||||
return;
|
||||
}
|
||||
arrayMap.forEach((value : any) => {
|
||||
arrayMap.forEach((value: any) => {
|
||||
let roomId = value[0];
|
||||
this.Io.in(roomId).emit('user-position', JSON.stringify(arrayMap));
|
||||
this.Io.in(roomId).emit(SockerIoEvent.USER_POSITION, JSON.stringify(arrayMap));
|
||||
});
|
||||
this.seTimeOutInProgress = setTimeout(() => {
|
||||
this.shareUsersPosition();
|
||||
|
@ -230,24 +276,20 @@ export class IoSocketController{
|
|||
}
|
||||
|
||||
//connected user
|
||||
connectedUser(user1 : string, user2 : string){
|
||||
/* TODO manager room and group user to enter and leave */
|
||||
let roomId = uuid();
|
||||
let clients : Array<any> = Object.values(this.Io.sockets.sockets);
|
||||
let User1 = clients.find((user : ExSocketInterface) => user.userId === user1);
|
||||
let User2 = clients.find((user : ExSocketInterface) => user.userId === user2);
|
||||
|
||||
if(User1) {
|
||||
this.joinWebRtcRoom(User1, roomId);
|
||||
}
|
||||
if(User2) {
|
||||
this.joinWebRtcRoom(User2, roomId);
|
||||
connectedUser(userId: string, group: Group) {
|
||||
let Client = this.searchClientById(userId);
|
||||
if (!Client) {
|
||||
return;
|
||||
}
|
||||
this.joinWebRtcRoom(Client, group.getId());
|
||||
}
|
||||
|
||||
//connected user
|
||||
disConnectedUser(user1 : string, user2 : string){
|
||||
console.log("disConnectedUser => user1", user1);
|
||||
console.log("disConnectedUser => user2", user2);
|
||||
disConnectedUser(userId: string, group: Group) {
|
||||
let Client = this.searchClientById(userId);
|
||||
if (!Client) {
|
||||
return;
|
||||
}
|
||||
this.sendDisconnectedEvent(Client)
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue