Skip to content
This repository has been archived by the owner on Apr 25, 2020. It is now read-only.

Reconnect websocket automatically #11

Merged
merged 3 commits into from
Jul 14, 2019
Merged

Reconnect websocket automatically #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a45a371
Reconnect websocket automagically
Terkwood Jul 14, 2019
d3c0690
clean up logs
Terkwood Jul 14, 2019
1df3b6e
remove hardcoded board
Terkwood Jul 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@
"preact": "^8.4.2",
"react-markdown": "^3.6.0",
"remark-breaks": "^1.0.1",
"robust-websocket": "^1.0.0",
"uuid": "^3.3.2"
},
"devDependencies": {
Expand Down
104 changes: 81 additions & 23 deletions src/modules/shims/gtp.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

const EventEmitter = require('events')
const Board = require('../board')
const RobustWebSocket = require('robust-websocket')
const uuidv4 = require('uuid/v4')

const GATEWAY_HOST_LOCAL = "ws://localhost:3012/gateway"
Expand Down Expand Up @@ -83,33 +84,47 @@ class WebSocketController extends EventEmitter {
// TODO BUGOUT don't hardcode this
this.board = new Board(19,19)
this.webSocketAddress = webSocketAddress
this.webSocket = new WebSocket(webSocketAddress)
this.webSocket = new RobustWebSocket(webSocketAddress)

// manually ping the websocket every once in a while
this.beeping = true
this.beepTimeMs = 12625
setTimeout(() => this.beep(), this.beepTimeMs)

this.webSocket.onclose = event => {
console.log("websocket closed")
}
this.webSocket.addEventListener('close', event => {
console.log("WebSocket closed.")
})

this.webSocket.onerror = event => {
console.log(`websocket error ${JSON.stringify(event)}`)
}
this.webSocket.addEventListener('error',event => {
console.log(`WebSocket error ${JSON.stringify(event)}`)
})

this.gameId = null
this.gatewayConn = new GatewayConn(this.webSocket)
this.webSocket.onopen = _event => {
this.gatewayConn.requestGameId()
.then((reply, err) => {
if (!err) {
this.gameId = reply.gameId
} else {
console.log('FATAL ERROR - WE DO NOT HAVE A GAME ID')
}
})
}
this.webSocket.addEventListener('open', () => {
if (!this.gameId) {
this.gatewayConn
.requestGameId()
.then((reply, err) => {
if (!err) {
this.gameId = reply.gameId
} else {
console.log('FATAL ERROR - WE DO NOT HAVE A GAME ID')
}
})
} else {
this.gatewayConn
.reconnect(this.gameId, this.resolveMoveMade, this.board)
.then((rc, err) => {
console.log("Reconnected!")
})
}
})

// reconnect event
this.webSocket.addEventListener('connecting', () => {
console.log('Reconnecting...')
})

}

Expand All @@ -133,10 +148,12 @@ class WebSocketController extends EventEmitter {
"coord": {"x":vertex[0],"y":vertex[1]}
}

this.webSocket.onmessage = event => {

this.webSocket.addEventListener('message', event => {
try {
let msg = JSON.parse(event.data)
if (msg.type === "MoveMade" && msg.replyTo === makeMove.reqId) {
this.resolveMoveMade = undefined
resolve({id: null, error: false})
}

Expand All @@ -146,11 +163,12 @@ class WebSocketController extends EventEmitter {
console.log(`Error processing websocket message: ${JSON.stringify(err)}`)
resolve({ok: false})
}
}
})

this.webSocket.send(JSON.stringify(makeMove))
} else if (command.name === "genmove") {
this.webSocket.onmessage = event => {
this.resolveMoveMade = resolve
this.webSocket.addEventListener('message', event => {
try {
let msg = JSON.parse(event.data)
if (msg.type === "MoveMade" && msg.player === letterToPlayer(command.args[0])) {
Expand All @@ -164,7 +182,7 @@ class WebSocketController extends EventEmitter {
console.log(`Error processing websocket message: ${JSON.stringify(err)}`)
resolve({"id": null, "content": "", "error": true})
}
}
})

} else {
resolve(true)
Expand Down Expand Up @@ -202,14 +220,54 @@ class GatewayConn {
this.webSocket = webSocket
}


async reconnect(gameId, resolveMoveMade, board) {
console.log("gatewayconn reconnect")
return new Promise((resolve, reject) => {
try {
let reconnectCommand = {
"type":"Reconnect",
"gameId": gameId,
"reqId": uuidv4()
}

console.log(`sending ${JSON.stringify(reconnectCommand)}`)
this.webSocket.onmessage = event => {
try {
let msg = JSON.parse(event.data)
console.log(`message after reconnect: ${event.data}`)
if (msg.type === "Reconnected") {
resolve()
}

if (resolveMoveMade && msg.type == "MoveMade") {
let sabakiCoord = board.vertex2coord([msg.coord.x, msg.coord.y])
console.log("MOVE MADE ON RECONNECT")
resolveMoveMade({"id":null,"content":sabakiCoord,"error":false})
}

// discard any other messages
} catch (err) {
console.log(`Error processing websocket message: ${JSON.stringify(err)}`)
resolve({error: true})
}
}
this.webSocket.send(JSON.stringify(reconnectCommand))
resolve()
} catch (err) {
reject(err)
}
})
}

async requestGameId() {
return new Promise((resolve, reject) => {
let requestGameId = {
"type":"RequestOpenGame",
"reqId": uuidv4()
}

this.webSocket.onmessage = event => {
this.webSocket.addEventListener('message', event => {
try {
let msg = JSON.parse(event.data)
console.log(`incoming data ${event.data}`)
Expand All @@ -221,7 +279,7 @@ class GatewayConn {
console.log(`Error processing websocket message: ${JSON.stringify(err)}`)
reject()
}
}
})

this.webSocket.send(JSON.stringify(requestGameId))
})
Expand Down