merge

frontend/static/js/api/tournament/Tournament.js

@@ -42,14 +42,33 @@ class Tourmanent extends AExchangeable
 		 * @type {Number}
 		 */
 		this.finished;
-
 		
 		/**
 		 * @type {"finished" | "started" | "waiting"} must be "finished", or "started", or "waiting". Any other return all elements
 		 */
 		this.state;
+
+		/**
+		 * @type {Boolean} the client is a participant of the tournament
+		 */
+		this.is_participating;
 	}
 
+	/**
+	 * @param {Boolean} newParticipation 
+	 */
+	async setParticipation(newParticipation)
+	{
+		if (this.isParticipating == newParticipation)
+			return;
+
+		this.isParticipating = newParticipation;
+
+		this._socket.send(JSON.stringify({"detail": "update_participating",
+										  "is_participating": newParticipation})
+						  );
+		
+	}
 	/**
 	 * 
 	 * @returns {Promise<?>}
@@ -79,28 +98,66 @@ class Tourmanent extends AExchangeable
 	/**
 	 * @param {Object} data 
 	 */
-	async _receiveParticipantUpdate(data)
+	async _receiveAddParticipant(data)
 	{
-		this.par		
+		const participant = new Profile(this.client, undefined, data.participant.user_id);
+		participant.import(data.participant)
+
+		this.participantList.push(participant);
+
+		await this._addParticipantHandler(this.participantList.length)
 	}
 
-	async onError(data)
+	/**
+	 * @param {Object} data 
+	 */
+	async _receiveDelParticipant(data)
+	{
+		const index = this.participantList.indexOf((profile) => profile.id === data.profile.user_id)
+
+		this.participantList.splice(index, 1);
+
+		await this._delParticipantHandler(this.participantList.length);
+	}
+
+	async _receiveError(data)
 	{
 		await this.errorHandler(data);
 	}
 
+	async _receiveGoTo(data)
+	{
+		await this._goToHandler(data)
+	}
+
 	/**
 	 * 
 	 * @param {MessageEvent} event 
 	 */
-	onReceive(event)
+	async onReceive(event)
 	{
 		const data = JSON.parse(event.data);
 
-		if (data.detail === "error")
-			this.onError(data);
-		else if (["del_participant", "add_participant"].includes(data.detail))
-			this._receiveParticipantUpdate(data);
+		switch (data.detail) {
+			case "error":
+				await this._receiveError(data)
+				break;
+			
+			case "add_participant":
+				await this._receiveAddParticipant(data);
+				break;
+
+			case "del_participant":
+				await this._receiveDelParticipant(data);
+				break;
+			
+			case "go_to":
+				await this._receiveGoTo(data);
+				break
+
+			default:
+				break;
+		}
 	}
 
 	/**
@@ -110,9 +167,11 @@ class Tourmanent extends AExchangeable
 	 * @param {CallableFunction} delParticipantHandler called when a participants leave the tournament
 	 * @param {CallableFunction} disconnectHandler 
 	 * @param {CallableFunction} goToHandler called when the next game will start
-	 * @returns {?}
+	 * @param {CallableFunction} startHandler called when tournament start
+	 * @param {CallableFunction} finishHandler called when tournament finish
+	 * @returns {Promise}
 	 */
-	async join(participantsUpdateHandler, errorHandler, goToHandler, disconnectHandler)
+	async join(addParticipantHandler, delParticipantHandler, startHandler, finishHandler, errorHandler, goToHandler, disconnectHandler)
 	{
 		if (!await this.client.isAuthenticated())
 			return null;
@@ -124,10 +183,13 @@ class Tourmanent extends AExchangeable
 		this.connected = true;
 		this.isParticipating = false;
 
-		this.participantsUpdateHandler = participantsUpdateHandler;
-		this.errorHandler = errorHandler;
-		this.disconnectHandler = disconnectHandler;
-		this.goToHandler = goToHandler;
+		this._startHandler = startHandler;
+		this._finishHandler = finishHandler;
+		this._addParticipantHandler = addParticipantHandler;
+		this._delParticipantHandler = delParticipantHandler;
+		this._errorHandler = errorHandler;
+		this._disconnectHandler = disconnectHandler;
+		this._goToHandler = goToHandler;
 
 		this._socket.onmessage = this.onReceive.bind(this);