maybe slight code improvements..

This commit is contained in:
Zutatensuppe 2021-05-09 21:43:35 +02:00
parent 53e97cd58b
commit 68a51ce322
3 changed files with 30 additions and 20 deletions

View file

@ -21,15 +21,14 @@ function connect(gameId, clientId) {
clientSeq = 0
events = {}
conn = new WsClient(WS_ADDRESS, clientId + '|' + gameId)
return new Promise(r => {
return new Promise(resolve => {
conn.connect()
send([Protocol.EV_CLIENT_INIT])
conn.onSocket('message', async ({ data }) => {
const msg = JSON.parse(data)
const msgType = msg[0]
if (msgType === Protocol.EV_SERVER_INIT) {
const game = msg[1]
r(game)
resolve(game)
} else if (msgType === Protocol.EV_SERVER_EVENT) {
const msgClientId = msg[1]
const msgClientSeq = msg[2]
@ -39,8 +38,11 @@ function connect(gameId, clientId) {
return
}
changesCallback(msg)
} else {
throw `[ 2021-05-09 invalid connect msgType ${msgType} ]`
}
})
send([Protocol.EV_CLIENT_INIT])
})
}
@ -48,26 +50,28 @@ function connectReplay(gameId, clientId) {
clientSeq = 0
events = {}
conn = new WsClient(WS_ADDRESS, clientId + '|' + gameId)
return new Promise(r => {
return new Promise(resolve => {
conn.connect()
send([Protocol.EV_CLIENT_INIT_REPLAY])
conn.onSocket('message', async ({ data }) => {
const msg = JSON.parse(data)
const msgType = msg[0]
if (msgType === Protocol.EV_SERVER_INIT_REPLAY) {
const game = msg[1]
const log = msg[2]
r({game, log})
resolve({game, log})
} else {
throw `[ 2021-05-09 invalid connectReplay msgType ${msgType} ]`
}
})
send([Protocol.EV_CLIENT_INIT_REPLAY])
})
}
function sendClientEvent(mouse) {
function sendClientEvent(evt) {
// when sending event, increase number of sent events
// and add the event locally
clientSeq++;
events[clientSeq] = mouse
events[clientSeq] = evt
send([Protocol.EV_CLIENT_EVENT, clientSeq, events[clientSeq]])
}