feat(websocket)!: Implement WebSocket connection and event handling
This commit is contained in:
@@ -79,206 +79,6 @@
|
||||
})
|
||||
})()
|
||||
|
||||
let polling = false;
|
||||
function pollForUpdates(gameId) {
|
||||
if (polling) {
|
||||
console.log("[DEBUG] Polling already in progress. Skipping this cycle.");
|
||||
return;
|
||||
}
|
||||
polling = true;
|
||||
console.log(`[DEBUG] Starting poll cycle for Game ID: ${gameId} at ${new Date().toISOString()}`);
|
||||
if (!gameId) {
|
||||
console.error("[DEBUG] Game ID is missing. Stopping poll.");
|
||||
return;
|
||||
}
|
||||
const $handElement = $('#card-slide');
|
||||
const $lobbyElement = $('#lobbybackground');
|
||||
const $mainmenuElement = $('#main-menu-screen')
|
||||
const $mainbody = $('#main-body')
|
||||
if (!$handElement.length && !$lobbyElement.length && !$mainmenuElement.length && !$mainbody.length) {
|
||||
setTimeout(() => { polling = false; pollForUpdates(gameId) }, 1000);
|
||||
return;
|
||||
}
|
||||
const route = jsRoutes.controllers.PollingController.polling(gameId);
|
||||
$.ajax({
|
||||
url: route.url,
|
||||
type: 'GET',
|
||||
dataType: 'json',
|
||||
|
||||
success: (data => {
|
||||
if (!data) {
|
||||
console.log("[DEBUG] Received 204 No Content (Timeout). Restarting poll.");
|
||||
return;
|
||||
}
|
||||
if (data.status === "cardPlayed" && data.handData) {
|
||||
console.log("Event received: Card played. Redrawing hand.");
|
||||
const newHand = data.handData;
|
||||
let newHandHTML = '';
|
||||
$handElement.empty();
|
||||
|
||||
if(data.animation) {
|
||||
$handElement.addClass('ingame-cards-slide');
|
||||
} else {
|
||||
$handElement.removeClass('ingame-cards-slide');
|
||||
}
|
||||
|
||||
const dog = data.dog;
|
||||
|
||||
newHand.forEach((cardId, index) => {
|
||||
const cardHtml = `
|
||||
<div class="col-auto handcard" style="border-radius: 6px">
|
||||
<div class="btn btn-outline-light p-0 border-0 shadow-none"
|
||||
data-card-id="${index}"
|
||||
style="border-radius: 6px"
|
||||
onclick="handlePlayCard(this, '${gameId}', '${dog}')">
|
||||
|
||||
<img src="/assets/images/cards/${cardId}.png" width="120px" style="border-radius: 6px"/>
|
||||
</div>
|
||||
</div>
|
||||
`;
|
||||
newHandHTML += cardHtml;
|
||||
});
|
||||
|
||||
if (dog) {
|
||||
newHandHTML += `
|
||||
<div class="mt-2">
|
||||
<button class="btn btn-danger" onclick="handleSkipDogLife(this, '${gameId}')">Skip Dog Life</button>
|
||||
</div>
|
||||
`;
|
||||
}
|
||||
|
||||
$handElement.html(newHandHTML);
|
||||
|
||||
if (data.yourTurn) {
|
||||
$handElement.removeClass('inactive');
|
||||
} else {
|
||||
$handElement.addClass('inactive');
|
||||
}
|
||||
|
||||
$('#current-player-name').text(data.currentPlayerName)
|
||||
if (data.nextPlayer) {
|
||||
$('#next-player-name').text(data.nextPlayer);
|
||||
} else if (nextPlayerElement) {
|
||||
$('#next-player-name').text("");
|
||||
} else {
|
||||
console.warn("[DEBUG] 'current-player-name' element missing in DOM");
|
||||
}
|
||||
$('#trump-suit').text(data.trumpSuit);
|
||||
if ($('#trick-cards-container').length) {
|
||||
let trickHTML = '';
|
||||
|
||||
data.trickCards.forEach(trickCard => {
|
||||
trickHTML += `
|
||||
<div class="col-auto">
|
||||
<div class="card text-center shadow-sm border-0 bg-transparent" style="width: 7rem; backdrop-filter: blur(4px);">
|
||||
<div class="p-2">
|
||||
<img src="/assets/images/cards/${trickCard.cardId}.png" width="100%"/>
|
||||
</div>
|
||||
<div class="card-body p-2 bg-transparent">
|
||||
<small class="fw-semibold text-secondary">${trickCard.player}</small>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
`;
|
||||
});
|
||||
$('#trick-cards-container').html(trickHTML);
|
||||
}
|
||||
if ($('#score-table-body').length && data.scoreTable) {
|
||||
let scoreHTML = '';
|
||||
scoreHTML += `<h4 class="fw-bold mb-3 text-black">Tricks Won</h4>
|
||||
|
||||
<div class="d-flex justify-content-between score-header pb-1">
|
||||
<div style="width: 50%">PLAYER</div>
|
||||
<div style="width: 50%">TRICKS</div>
|
||||
</div>`
|
||||
data.scoreTable.forEach(score => {
|
||||
scoreHTML += `
|
||||
<div class="d-flex justify-content-between score-row pt-1">
|
||||
<div style="width: 50%" class="text-truncate">${score.name}</div>
|
||||
<div style="width: 50%">${score.tricks}</div>
|
||||
</div>
|
||||
`;
|
||||
});
|
||||
$('#score-table-body').html(scoreHTML);
|
||||
}
|
||||
const cardId = data.firstCardId;
|
||||
if ($('#first-card-container').length) {
|
||||
let imageSrc = '';
|
||||
let altText = 'First Card';
|
||||
|
||||
if (cardId === "BLANK") {
|
||||
imageSrc = "/assets/images/cards/1B.png";
|
||||
altText = "Blank Card";
|
||||
} else {
|
||||
imageSrc = `/assets/images/cards/${cardId}.png`;
|
||||
}
|
||||
|
||||
const newImageHTML = `
|
||||
<img src="${imageSrc}" alt="${altText}" width="80px" style="border-radius: 6px"/>
|
||||
`;
|
||||
|
||||
$('#first-card-container').html(newImageHTML);
|
||||
}
|
||||
} else if (data.status === "reloadEvent") {
|
||||
console.log("[DEBUG] Reload event received. Redirecting...");
|
||||
exchangeBody(data.content, "Knockout Whist - Ingame", data.redirectUrl);
|
||||
}
|
||||
else if (data.status === "lobbyUpdate") {
|
||||
console.log("[DEBUG] Entering 'lobbyUpdate' logic.");
|
||||
let newHtml = ''
|
||||
|
||||
if (data.host) {
|
||||
data.users.forEach(user => {
|
||||
|
||||
const inner = user.self ? `<h5 class="card-title">${user.name} (You)</h5>
|
||||
<a href="#" class="btn btn-danger disabled" aria-disabled="true" tabindex="-1">Remove</a>`
|
||||
: ` <h5 class="card-title">${user.name}</h5>
|
||||
<div class="btn btn-danger" onclick="removePlayer('${gameId}', '${user.id}')">Remove</div>`
|
||||
|
||||
newHtml += `<div class="col-auto my-auto m-3">
|
||||
<div class="card" style="width: 18rem;">
|
||||
<img src="/assets/images/profile.png" alt="Profile" class="card-img-top w-50 mx-auto mt-3" />
|
||||
<div class="card-body">
|
||||
${inner}
|
||||
</div>
|
||||
</div>
|
||||
</div>`
|
||||
})
|
||||
} else {
|
||||
data.users.forEach(user => {
|
||||
|
||||
const inner = user.self ? `<h5 class="card-title">${user.name} (You)</h5>` : ` <h5 class="card-title">${user.name}</h5>`
|
||||
|
||||
newHtml += `<div class="col-auto my-auto m-3">
|
||||
<div class="card" style="width: 18rem;">
|
||||
<img src="/assets/images/profile.png" alt="Profile" class="card-img-top w-50 mx-auto mt-3" />
|
||||
<div class="card-body">
|
||||
${inner}
|
||||
</div>
|
||||
</div>
|
||||
</div>`
|
||||
})
|
||||
}
|
||||
$("#players").html(newHtml);
|
||||
$('#playerAmount').text(`Playeramount: ${data.users.length} / ${data.maxPlayers}`);
|
||||
} else {
|
||||
console.warn(`[DEBUG] Received unknown status: ${data.status}`);
|
||||
}
|
||||
}),
|
||||
error: ((jqXHR, textStatus, errorThrown) => {
|
||||
if (jqXHR.status >= 400) {
|
||||
console.error(`Server error: ${jqXHR.status}, ${errorThrown}`);
|
||||
}
|
||||
else {
|
||||
console.error(`Something unexpected happened while polling. ${jqXHR.status}, ${errorThrown}`)
|
||||
}
|
||||
}),
|
||||
complete: (() => {
|
||||
setTimeout(() => { polling = false; pollForUpdates(gameId) }, 200);
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
function createGameJS() {
|
||||
let lobbyName = $('#lobbyname').val();
|
||||
if ($.trim(lobbyName) === "") {
|
||||
@@ -291,26 +91,6 @@ function createGameJS() {
|
||||
sendGameCreationRequest(jsonObj);
|
||||
}
|
||||
|
||||
function backToLobby(gameId) {
|
||||
const route = jsRoutes.controllers.IngameController.returnToLobby(gameId);
|
||||
|
||||
$.ajax({
|
||||
url: route.url,
|
||||
type: route.type,
|
||||
contentType: 'application/json',
|
||||
dataType: 'json',
|
||||
error: ((jqXHR) => {
|
||||
const errorData = JSON.parse(jqXHR.responseText);
|
||||
if (errorData && errorData.errorMessage) {
|
||||
alert(`${errorData.errorMessage}`);
|
||||
} else {
|
||||
alert(`An unexpected error occurred. Please try again. Status: ${jqXHR.status}`);
|
||||
}
|
||||
})
|
||||
})
|
||||
|
||||
}
|
||||
|
||||
function sendGameCreationRequest(dataObject) {
|
||||
const route = jsRoutes.controllers.MainMenuController.createGame();
|
||||
|
||||
@@ -344,60 +124,6 @@ function exchangeBody(content, title = "Knockout Whist", url = null) {
|
||||
document.title = title;
|
||||
}
|
||||
|
||||
function startGame(gameId) {
|
||||
sendGameStartRequest(gameId)
|
||||
}
|
||||
|
||||
function sendGameStartRequest(gameId) {
|
||||
const route = jsRoutes.controllers.IngameController.startGame(gameId);
|
||||
|
||||
$.ajax({
|
||||
url: route.url,
|
||||
type: route.type,
|
||||
dataType: 'json',
|
||||
success: (data => {
|
||||
if (data.status === 'success') {
|
||||
window.location.href = data.redirectUrl;
|
||||
}
|
||||
}),
|
||||
error: ((jqXHR) => {
|
||||
const errorData = JSON.parse(jqXHR.responseText);
|
||||
if (errorData && errorData.errorMessage) {
|
||||
alert(`${errorData.errorMessage}`);
|
||||
} else {
|
||||
alert(`An unexpected error occurred. Please try again. Status: ${jqXHR.status}`);
|
||||
}
|
||||
})
|
||||
})
|
||||
}
|
||||
function removePlayer(gameid, playersessionId) {
|
||||
sendRemovePlayerRequest(gameid, playersessionId)
|
||||
}
|
||||
|
||||
function sendRemovePlayerRequest(gameId, playersessionId) {
|
||||
const route = jsRoutes.controllers.IngameController.kickPlayer(gameId, playersessionId);
|
||||
|
||||
$.ajax({
|
||||
url: route.url,
|
||||
type: route.type,
|
||||
contentType: 'application/json',
|
||||
dataType: 'json',
|
||||
success: (data => {
|
||||
if (data.status === 'success') {
|
||||
window.location.href = data.redirectUrl;
|
||||
}
|
||||
}),
|
||||
error: ((jqXHR) => {
|
||||
const errorData = JSON.parse(jqXHR.responseText);
|
||||
if (errorData && errorData.errorMessage) {
|
||||
alert(`${errorData.errorMessage}`);
|
||||
} else {
|
||||
alert(`An unexpected error occurred. Please try again. Status: ${jqXHR.status}`);
|
||||
}
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
function login() {
|
||||
const username = $('#username').val();
|
||||
const password = $('#password').val();
|
||||
@@ -423,7 +149,7 @@ function login() {
|
||||
}),
|
||||
error: ((jqXHR) => {
|
||||
const errorData = JSON.parse(jqXHR.responseText);
|
||||
if (errorData && errorData.errorMessage) {
|
||||
if (errorData?.errorMessage) {
|
||||
alert(`${errorData.errorMessage}`);
|
||||
} else {
|
||||
alert(`An unexpected error occurred. Please try again. Status: ${jqXHR.status}`);
|
||||
@@ -455,7 +181,7 @@ function joinGame() {
|
||||
}),
|
||||
error: ((jqXHR) => {
|
||||
const errorData = JSON.parse(jqXHR.responseText);
|
||||
if (errorData && errorData.errorMessage) {
|
||||
if (errorData?.errorMessage) {
|
||||
alert(`${errorData.errorMessage}`);
|
||||
} else {
|
||||
alert(`An unexpected error occurred. Please try again. Status: ${jqXHR.status}`);
|
||||
@@ -482,7 +208,7 @@ function navSpa(page, title) {
|
||||
}),
|
||||
error: ((jqXHR) => {
|
||||
const errorData = JSON.parse(jqXHR.responseText);
|
||||
if (errorData && errorData.errorMessage) {
|
||||
if (errorData?.errorMessage) {
|
||||
alert(`${errorData.errorMessage}`);
|
||||
} else {
|
||||
alert(`An unexpected error occurred. Please try again. Status: ${jqXHR.status}`);
|
||||
@@ -490,178 +216,4 @@ function navSpa(page, title) {
|
||||
})
|
||||
});
|
||||
return false
|
||||
}
|
||||
|
||||
|
||||
function selectTie(gameId) {
|
||||
const route = jsRoutes.controllers.IngameController.playTie(gameId);
|
||||
const jsonObj = {
|
||||
tie: $('#tieNumber').val()
|
||||
};
|
||||
|
||||
$.ajax({
|
||||
url: route.url,
|
||||
type: route.type,
|
||||
contentType: 'application/json',
|
||||
dataType: 'json',
|
||||
data: JSON.stringify(jsonObj),
|
||||
error: (jqXHR => {
|
||||
let error;
|
||||
try {
|
||||
error = JSON.parse(jqXHR.responseText);
|
||||
} catch (e) {
|
||||
console.error("Failed to parse error response:", e);
|
||||
}
|
||||
if (error?.errorMessage) {
|
||||
alert(`${error.errorMessage}`);
|
||||
} else {
|
||||
alert('An unexpected error occurred. Please try again.');
|
||||
}
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
function leaveGame(gameId) {
|
||||
sendLeavePlayerRequest(gameId)
|
||||
}
|
||||
|
||||
function sendLeavePlayerRequest(gameId) {
|
||||
const route = jsRoutes.controllers.IngameController.leaveGame(gameId);
|
||||
$.ajax({
|
||||
url: route.url,
|
||||
type: route.type,
|
||||
dataType: 'json',
|
||||
error: ((jqXHR) => {
|
||||
const errorData = JSON.parse(jqXHR.responseText);
|
||||
if (errorData && errorData.errorMessage) {
|
||||
alert(`${errorData.errorMessage}`);
|
||||
} else {
|
||||
alert(`An unexpected error occurred. Please try again. Status: ${jqXHR.status}`);
|
||||
}
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
function handleTrumpSelection(cardobject, gameId) {
|
||||
const trumpId = cardobject.dataset.trump;
|
||||
const jsonObj = {
|
||||
trump: trumpId
|
||||
}
|
||||
|
||||
const route = jsRoutes.controllers.IngameController.playTrump(gameId);
|
||||
|
||||
$.ajax({
|
||||
url: route.url,
|
||||
type: route.type,
|
||||
contentType: 'application/json',
|
||||
dataType: 'json',
|
||||
data: JSON.stringify(jsonObj),
|
||||
error: (jqXHR => {
|
||||
let error;
|
||||
try {
|
||||
error = JSON.parse(jqXHR.responseText);
|
||||
} catch (e) {
|
||||
console.error("Failed to parse error response:", e);
|
||||
}
|
||||
if (error?.errorMessage) {
|
||||
alert(`${error.errorMessage}`);
|
||||
} else {
|
||||
alert('An unexpected error occurred. Please try again.');
|
||||
}
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
function handlePlayCard(cardobject, gameId, dog = false) {
|
||||
const cardId = cardobject.dataset.cardId;
|
||||
const jsonObj = {
|
||||
cardID: cardId
|
||||
}
|
||||
sendPlayCardRequest(jsonObj, gameId, cardobject, dog)
|
||||
}
|
||||
|
||||
function handleSkipDogLife(cardobject, gameId) {
|
||||
|
||||
const wiggleKeyframes = [
|
||||
{ transform: 'translateX(0)' },
|
||||
{ transform: 'translateX(-5px)' },
|
||||
{ transform: 'translateX(5px)' },
|
||||
{ transform: 'translateX(-5px)' },
|
||||
{ transform: 'translateX(0)' }
|
||||
];
|
||||
|
||||
const wiggleTiming = {
|
||||
duration: 400,
|
||||
iterations: 1,
|
||||
easing: 'ease-in-out',
|
||||
fill: 'forwards'
|
||||
};
|
||||
|
||||
const route = jsRoutes.controllers.IngameController.playDogCard(gameId);
|
||||
|
||||
$.ajax({
|
||||
url: route.url,
|
||||
type: route.type,
|
||||
contentType: 'application/json',
|
||||
dataType: 'json',
|
||||
data: JSON.stringify({
|
||||
cardID: 'skip'
|
||||
}),
|
||||
error: (jqXHR => {
|
||||
let error;
|
||||
try {
|
||||
error = JSON.parse(jqXHR.responseText);
|
||||
} catch (e) {
|
||||
console.error("Failed to parse error response:", e);
|
||||
}
|
||||
if (error?.errorMessage.includes("You can't skip this round!")) {
|
||||
cardobject.parentElement.animate(wiggleKeyframes, wiggleTiming);
|
||||
} else if (error?.errorMessage) {
|
||||
alert(`${error.errorMessage}`);
|
||||
} else {
|
||||
alert('An unexpected error occurred. Please try again.');
|
||||
}
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
function sendPlayCardRequest(jsonObj, gameId, cardobject, dog) {
|
||||
const wiggleKeyframes = [
|
||||
{ transform: 'translateX(0)' },
|
||||
{ transform: 'translateX(-5px)' },
|
||||
{ transform: 'translateX(5px)' },
|
||||
{ transform: 'translateX(-5px)' },
|
||||
{ transform: 'translateX(0)' }
|
||||
];
|
||||
|
||||
const wiggleTiming = {
|
||||
duration: 400,
|
||||
iterations: 1,
|
||||
easing: 'ease-in-out',
|
||||
fill: 'forwards'
|
||||
};
|
||||
const route = dog === "true" ? jsRoutes.controllers.IngameController.playDogCard(gameId) : jsRoutes.controllers.IngameController.playCard(gameId);
|
||||
|
||||
$.ajax({
|
||||
url: route.url,
|
||||
type: route.type,
|
||||
contentType: 'application/json',
|
||||
dataType: 'json',
|
||||
data: JSON.stringify(jsonObj),
|
||||
error: (jqXHR => {
|
||||
try {
|
||||
error = JSON.parse(jqXHR.responseText);
|
||||
} catch (e) {
|
||||
console.error("Failed to parse error response:", e);
|
||||
}
|
||||
if (error?.errorMessage.includes("You can't play this card!")) {
|
||||
cardobject.parentElement.animate(wiggleKeyframes, wiggleTiming);
|
||||
} else if (error?.errorMessage) {
|
||||
alert(`${error.errorMessage}`);
|
||||
} else {
|
||||
alert('An unexpected error occurred. Please try again.');
|
||||
}
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@@ -5,10 +5,11 @@ const handlers = new Map(); // eventType -> handler(data) -> (value|Promise)
|
||||
|
||||
|
||||
let timer = null;
|
||||
|
||||
// helper to attach message/error/close handlers to a socket
|
||||
function setupSocketHandlers(socket) {
|
||||
socket.onmessage = (event) => {
|
||||
console.debug("SERVER RESPONSE:", event.data);
|
||||
console.debug("SERVER MESSAGE:", event.data);
|
||||
let msg;
|
||||
try {
|
||||
msg = JSON.parse(event.data);
|
||||
@@ -39,7 +40,7 @@ function setupSocketHandlers(socket) {
|
||||
if (id && eventType) {
|
||||
const handler = handlers.get(eventType);
|
||||
const sendResponse = (respData) => {
|
||||
const response = { id: id, event: eventType, data: respData === undefined ? {} : respData };
|
||||
const response = {id: id, event: eventType, data: respData === undefined ? {} : respData};
|
||||
if (socket && socket.readyState === WebSocket.OPEN) {
|
||||
socket.send(JSON.stringify(response));
|
||||
} else {
|
||||
@@ -49,16 +50,16 @@ function setupSocketHandlers(socket) {
|
||||
|
||||
if (!handler) {
|
||||
// no handler: respond with an error object in data so server can fail it
|
||||
sendResponse({ error: "No handler for event: " + eventType });
|
||||
sendResponse({error: "No handler for event: " + eventType});
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
Promise.resolve(handler(data === undefined ? {} : data))
|
||||
.then(result => sendResponse(result))
|
||||
.catch(err => sendResponse({ error: err?.message ? err.message : String(err) }));
|
||||
.catch(err => sendResponse({error: err?.message ? err.message : String(err)}));
|
||||
} catch (err) {
|
||||
sendResponse({ error: err?.message ? err.message : String(err) });
|
||||
sendResponse({error: err?.message ? err.message : String(err)});
|
||||
}
|
||||
}
|
||||
};
|
||||
@@ -140,7 +141,10 @@ function disconnectWebSocket(code = 1000, reason = "Client disconnect") {
|
||||
timer = null;
|
||||
}
|
||||
if (ws) {
|
||||
try { ws.close(code, reason); } catch (e) {}
|
||||
try {
|
||||
ws.close(code, reason);
|
||||
} catch (e) {
|
||||
}
|
||||
ws = null;
|
||||
}
|
||||
}
|
||||
@@ -151,7 +155,7 @@ function sendEvent(eventType, eventData) {
|
||||
return;
|
||||
}
|
||||
const id = Date.now().toString(36) + Math.random().toString(36).substring(2, 9);
|
||||
const message = { id: id, event: eventType, data: eventData };
|
||||
const message = {id: id, event: eventType, data: eventData};
|
||||
ws.send(JSON.stringify(message));
|
||||
console.debug("SENT:", message);
|
||||
}
|
||||
@@ -161,7 +165,7 @@ function sendEventAndWait(eventType, eventData, timeoutMs = 10000) {
|
||||
return Promise.reject(new Error("WebSocket is not open"));
|
||||
}
|
||||
const id = Date.now().toString(36) + Math.random().toString(36).substring(2, 9);
|
||||
const message = { id: id, event: eventType, data: eventData };
|
||||
const message = {id: id, event: eventType, data: eventData};
|
||||
const p = new Promise((resolve, reject) => {
|
||||
const timerId = setTimeout(() => {
|
||||
if (pending.has(id)) {
|
||||
@@ -169,12 +173,13 @@ function sendEventAndWait(eventType, eventData, timeoutMs = 10000) {
|
||||
reject(new Error(`No response within ${timeoutMs}ms for id=${id}`));
|
||||
}
|
||||
}, timeoutMs);
|
||||
pending.set(id, { resolve, reject, timer: timerId });
|
||||
pending.set(id, {resolve, reject, timer: timerId});
|
||||
});
|
||||
ws.send(JSON.stringify(message));
|
||||
console.debug("SENT (await):", message);
|
||||
return p;
|
||||
}
|
||||
|
||||
function onEvent(eventType, handler) {
|
||||
handlers.set(eventType, handler);
|
||||
}
|
||||
Reference in New Issue
Block a user