Leahnaya/TableturfBattleApp
1
0
Fork 0
mirror of https://github.com/AndrioCelos/TableturfBattleApp.git synced 2026-04-24 23:36:53 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Close the WebSocket when leaving a game

Browse Source
This commit is contained in:
Andrio Celos 2023-06-15 23:03:45 +10:00
parent 8d8fe14fac
commit 88789518e6
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TableturfBattleClient/src/Pages/GamePage.ts
View File

@ -991,10 +991,10 @@ shareReplayLinkButton.addEventListener('click', _ => {
function leaveButton_click(e: MouseEvent) {
e.preventDefault();
clearGame();
clearPreGameForm(true);
showPage('preGame');
newGameButton.focus();
currentReplay = null;
}
document.getElementById('leaveButton')!.addEventListener('click', leaveButton_click);

23
TableturfBattleClient/src/app.ts
View File

@ -203,7 +203,7 @@ function playerDataReviver(key: string, value: any) {
function setupWebSocket(gameID: string, myPlayerIndex: number | null) {
const webSocket = new WebSocket(`${config.apiBaseUrl.replace(/(http)(s)?\:\/\//, 'ws$2://')}/websocket?gameID=${gameID}&clientToken=${clientToken}`);
webSocket.addEventListener('open', e => {
webSocket.addEventListener('open', _ => {
enterGameTimeout = setTimeout(() => {
webSocket.close(1002, 'Timeout waiting for a sync message');
enterGameTimeout = null;
@ -388,11 +388,12 @@ function setupWebSocket(gameID: string, myPlayerIndex: number | null) {
}
}
});
webSocket.addEventListener('close', e => {
communicationError();
});
webSocket.addEventListener('close', webSocket_close);
return myPlayerIndex;
}
function webSocket_close() {
communicationError();
}
function setConfirmLeavingGame() {
if (!shouldConfirmLeavingGame) {
@ -408,6 +409,16 @@ function clearConfirmLeavingGame() {
}
}
function clearGame() {
if (currentGame?.webSocket) {
currentGame.webSocket.removeEventListener('close', webSocket_close);
currentGame.webSocket.close();
}
currentGame = null;
currentReplay = null;
clearConfirmLeavingGame();
}
function processUrl() {
if (deckModified) {
if (!confirm('You have unsaved changes to your deck. Are you sure you want to leave?')) {
@ -422,9 +433,7 @@ function processUrl() {
}
stopEditingDeck();
errorDialog.close();
currentGame = null;
currentReplay = null;
clearConfirmLeavingGame();
clearGame();
if (location.pathname.endsWith('/deckeditor') || location.hash == '#deckeditor')
onInitialise(showDeckList);
else {