- Update share room id.
- Join room when a scene is loaded.
- Add a room in constant variable.
import {Application, Request, Response} from "express";
import Jwt from "jsonwebtoken";
import {BAD_REQUEST, OK} from "http-status-codes";
-import {SECRET_KEY, ROOM} from "../Enum/EnvironmentVariable"; //TODO fix import by "_Enum/..."
+import {SECRET_KEY, ROOM_STARTED, URL_ROOM_STARTED} from "../Enum/EnvironmentVariable"; //TODO fix import by "_Enum/..."
import { uuid } from 'uuidv4';
export class AuthenticateController{
}
//TODO check user email for The Coding Machine game
let userId = uuid();
- let token = Jwt.sign({email: param.email, roomId: ROOM, userId: userId}, SECRET_KEY, {expiresIn: '24h'});
+ let token = Jwt.sign({email: param.email, userId: userId}, SECRET_KEY, {expiresIn: '24h'});
return res.status(OK).send({
token: token,
- roomId: ROOM,
+ startedRoom: {key: ROOM_STARTED, url: URL_ROOM_STARTED},
userId: userId,
- maps: [
- "floor0",
- "floor1"
- ]
});
});
}
return socket.emit(SockerIoEvent.MESSAGE_ERROR, JSON.stringify({message: messageUserPosition.message}))
}
+ if((socket as ExSocketInterface).roomId === messageUserPosition.roomId){
+ return;
+ }
+
+ //lease previous room
+ if((socket as ExSocketInterface).roomId){
+ socket.leave((socket as ExSocketInterface).roomId);
+ }
+
//join user in room
socket.join(messageUserPosition.roomId);
}
arrayMap.forEach((value: any) => {
let roomId = value[0];
- this.Io.in(roomId).emit(SockerIoEvent.USER_POSITION, JSON.stringify(arrayMap));
+ this.Io.in(roomId).emit(SockerIoEvent.USER_POSITION, JSON.stringify(value));
});
this.seTimeOutInProgress = setTimeout(() => {
this.shareUsersPosition();
import path from "path";
import {Application, Request, Response} from "express";
import {OK} from "http-status-codes";
+import {ROOM_STARTED, ROOMS, URL_ROOM_STARTED} from "../Enum/EnvironmentVariable";
export class MapController {
App: Application;
getMpas() {
this.App.get("/maps", (req: Request, res: Response) => {
return res.status(OK).send({
- mapStart: {key: "floor0", url: "/map/files/Floor0"},
- maps: [
- {key: "floor0", url: "/map/files/Floor0"},
- {key: "floor1", url: "/map/files/Floor1"},
- ]
+ mapStart: {key: ROOM_STARTED, url: URL_ROOM_STARTED},
+ maps: ROOMS
});
});
}
const SECRET_KEY = process.env.SECRET_KEY || "THECODINGMACHINE_SECRET_KEY";
-const ROOM = process.env.ROOM || "THECODINGMACHINE";
+const ROOM_STARTED = "floor0";
+const URL_ROOM_STARTED = "/map/files/Floor0";
+const ROOMS = [
+ {key: "floor0", url: "/map/files/Floor0"},
+ {key: "floor1", url: "/map/files/Floor1"},
+]
const MINIMUM_DISTANCE = process.env.MINIMUM_DISTANCE ? Number(process.env.MINIMUM_DISTANCE) : 64;
const GROUP_RADIUS = process.env.GROUP_RADIUS ? Number(process.env.GROUP_RADIUS) : 48;
export {
SECRET_KEY,
- ROOM,
+ ROOM_STARTED,
+ URL_ROOM_STARTED,
+ ROOMS,
MINIMUM_DISTANCE,
GROUP_RADIUS
}
joinARoom(roomId: string, character: string): void;
- sharePosition(x: number, y: number, direction: string, character: string): void;
+ sharePosition(x: number, y: number, direction: string, roomId: string, character: string): void;
positionOfAllUser(): void;
return Axios.post(`${API_URL}/login`, {email: this.email})
.then((res) => {
this.token = res.data.token;
- this.startedRoom = res.data.roomId;
+ this.startedRoom = res.data.startedRoom.key;
this.userId = res.data.userId;
this.socket = SocketIo(`${API_URL}`, {
this.joinARoom(this.startedRoom, characterSelected);
//share your first position
- this.sharePosition(0, 0, characterSelected);
+ this.sharePosition(0, 0, characterSelected, this.startedRoom);
this.positionOfAllUser();
joinARoom(roomId: string, character: string): void {
let messageUserPosition = new MessageUserPosition(
this.userId,
- this.startedRoom,
+ roomId,
new Point(0, 0),
this.email,
character
* @param x
* @param y
* @param character
+ * @param roomId
* @param direction
*/
- sharePosition(x : number, y : number, character : string, direction : string = "none") : void{
+ sharePosition(x : number, y : number, character : string, roomId : string, direction : string = "none") : void{
if(!this.socket){
return;
}
let messageUserPosition = new MessageUserPosition(
this.userId,
- ROOM[0],
+ roomId,
new Point(x, y, direction),
this.email,
character
positionOfAllUser(): void {
this.socket.on(EventMessage.USER_POSITION, (message: string) => {
let dataList = JSON.parse(message);
- dataList.forEach((UserPositions: any) => {
- let listMessageUserPosition = new ListMessageUserPosition(UserPositions[0], UserPositions[1]);
- this.GameManager.shareUserPosition(listMessageUserPosition);
- });
+ let UserPositions : Array<any> = Object.values(dataList);
+ let listMessageUserPosition = new ListMessageUserPosition(UserPositions[0], UserPositions[1]);
+ this.GameManager.shareUserPosition(listMessageUserPosition);
});
}
this.status = StatusGameManagerEnum.CURRENT_USER_CREATED;
}
+ joinRoom(sceneKey : string, character: string){
+ this.ConnexionInstance.joinARoom(sceneKey, character);
+ }
+
/**
* Share position in game
* @param ListMessageUserPosition
}
pushPlayerPosition(event: HasMovedEvent) {
- this.ConnexionInstance.sharePosition(event.x, event.y, event.character, event.direction);
+ this.ConnexionInstance.sharePosition(event.x, event.y, event.character, this.currentGameScene.scene.key, event.direction);
}
}
// Let's generate the circle for the group delimiter
-
+ //TODO they are error with cercle
this.circleTexture = this.textures.createCanvas('circleSprite', 96, 96);
if(!this.circleTexture || this.circleTexture.context){
return;
//create collision
this.createCollisionWithPlayer();
this.createCollisionObject();
+
+ //join room
+ this.GameManager.joinRoom(this.scene.key, this.CurrentPlayer.PlayerTexture);
+
+ //listen event to share position of user
this.CurrentPlayer.on(hasMovedEventName, this.pushPlayerPosition.bind(this))
}
projects / libreadventure.git / commitdiff