para/puzzle
1
1
Fork 0
Code Issues 8 Pull requests Releases Wiki Activity

dont automatically reconnect, add dc layer with option to reconnect

Browse source
This commit is contained in:
Zutatensuppe 2021-05-15 20:04:30 +02:00
parent 9f7ac8d111
commit 6d59a713a3
8 changed files with 179 additions and 191 deletions
Download patch file Download diff file Expand all files Collapse all files

57
public/game.js
View file

@ -12,7 +12,7 @@ import fireworksController from './Fireworks.js'
import Protocol from '../common/Protocol.js'
import Time from '../common/Time.js'
const log = logger('game.js')
// const log = logger('game.js')
export const MODE_PLAY = 'play'
export const MODE_REPLAY = 'replay'
@ -174,7 +174,14 @@ function EventAdapter (canvas, window, viewport) {
}
}
export async function main(gameId, clientId, wsAddress, MODE, TARGET_EL, HUD) {
export async function main(
gameId,
clientId,
wsAddress,
MODE,
TARGET_EL,
HUD
) {
if (typeof DEBUG === 'undefined') window.DEBUG = false
const shouldDrawPlayerText = (player) => {
@ -219,30 +226,37 @@ export async function main(gameId, clientId, wsAddress, MODE, TARGET_EL, HUD) {
gameStartTs: null,
}
Communication.onConnectionLost(() => {
log('connection lost ... should reload / hit reconnect button / etc.')
Communication.onConnectionStateChange((state) => {
HUD.setConnectionState(state)
})
let TIME
if (MODE === MODE_PLAY) {
const game = await Communication.connect(wsAddress, gameId, clientId)
const gameObject = Util.decodeGame(game)
Game.setGame(gameObject.id, gameObject)
TIME = () => Time.timestamp()
} else if (MODE === MODE_REPLAY) {
const {game, log} = await Communication.connectReplay(wsAddress, gameId, clientId)
const gameObject = Util.decodeGame(game)
Game.setGame(gameObject.id, gameObject)
REPLAY.log = log
REPLAY.lastRealTs = Time.timestamp()
REPLAY.gameStartTs = REPLAY.log[0][REPLAY.log[0].length - 2]
REPLAY.lastGameTs = REPLAY.gameStartTs
TIME = () => REPLAY.lastGameTs
} else {
throw '[ 2020-12-22 MODE invalid, must be play|replay ]'
const connect = async () => {
if (MODE === MODE_PLAY) {
const game = await Communication.connect(wsAddress, gameId, clientId)
const gameObject = Util.decodeGame(game)
Game.setGame(gameObject.id, gameObject)
TIME = () => Time.timestamp()
} else if (MODE === MODE_REPLAY) {
// TODO: change how replay connect is done...
const {game, log} = await Communication.connectReplay(wsAddress, gameId, clientId)
const gameObject = Util.decodeGame(game)
Game.setGame(gameObject.id, gameObject)
REPLAY.log = log
REPLAY.lastRealTs = Time.timestamp()
REPLAY.gameStartTs = REPLAY.log[0][REPLAY.log[0].length - 2]
REPLAY.lastGameTs = REPLAY.gameStartTs
TIME = () => REPLAY.lastGameTs
} else {
throw '[ 2020-12-22 MODE invalid, must be play|replay ]'
}
// rerender after (re-)connect
RERENDER = true
}
await connect()
const TILE_DRAW_OFFSET = Game.getTileDrawOffset(gameId)
const TILE_DRAW_SIZE = Game.getTileDrawSize(gameId)
const PUZZLE_WIDTH = Game.getPuzzleWidth(gameId)
@ -653,5 +667,6 @@ export async function main(gameId, clientId, wsAddress, MODE, TARGET_EL, HUD) {
name: playerName(),
},
disconnect: Communication.disconnect,
connect: connect,
}
}