SeanOMik
/
nimcord
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix creating several heartbeat threads

This commit is contained in:
SeanOMik 2020-09-25 16:21:35 -05:00
parent 77e5a74141
commit 44d52848aa
No known key found for this signature in database
GPG Key ID: FA4D55AC05268A88
2 changed files with 66 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -37,7 +37,8 @@ You can view examples in the [examples](examples) directory.
# Todo: # Todo:
- [x] Finish all REST API calls. - [x] Finish all REST API calls.
- [x] Handle all gateway events. - [x] Handle all gateway events.
- [x] Reconnecting - [x] Reconnecting.
- [ ] Configurable Logger.
- [ ] Add library to official Nimble package repository. - [ ] Add library to official Nimble package repository.
- [ ] Memory optimizations. - [ ] Memory optimizations.
- [ ] Member - [ ] Member

118
src/nimcord/client.nim
View File

@ -120,70 +120,77 @@ proc handleGatewayDisconnect(shard: Shard, error: string) {.async.} =
#TODO: Reconnecting may be done, just needs testing. #TODO: Reconnecting may be done, just needs testing.
proc handleWebsocketPacket(shard: Shard) {.async.} = proc handleWebsocketPacket(shard: Shard) {.async.} =
var hasStartedHeartbeatThread = false;
while true: while true:
var packet = await shard.ws.receiveStrPacket() # Skip if the websocket isn't open
shard.client.log.debug("[SHARD " & $shard.id & "] Received gateway payload: " & $packet) if shard.ws.readyState == Open:
var packet = await shard.ws.receiveStrPacket()
shard.client.log.debug("[SHARD " & $shard.id & "] Received gateway payload: " & $packet)
#if packet == Opcode.Close: #if packet == Opcode.Close:
# await shard.handleGatewayDisconnect(packet) # await shard.handleGatewayDisconnect(packet)
var json: JsonNode var json: JsonNode
# If we fail to parse the json just stop this loop # If we fail to parse the json just stop this loop
try: try:
json = parseJson(packet) json = parseJson(packet)
except: except:
shard.client.log.error("[SHARD " & $shard.id & "] Failed to parse websocket payload: " & $packet) shard.client.log.error("[SHARD " & $shard.id & "] Failed to parse websocket payload: " & $packet)
continue continue
if json.contains("s"): if json.contains("s"):
shard.lastSequence = json["s"].getInt() shard.lastSequence = json["s"].getInt()
case json["op"].getInt() case json["op"].getInt()
of ord(DiscordOpCode.opHello): of ord(DiscordOpCode.opHello):
if shard.reconnecting: if shard.reconnecting:
shard.client.log.info("[SHARD " & $shard.id & "] Reconnected!") shard.client.log.info("[SHARD " & $shard.id & "] Reconnected!")
shard.reconnecting = false shard.reconnecting = false
let resume = %* { let resume = %* {
"op": ord(opResume), "op": ord(opResume),
"d": { "d": {
"token": shard.client.token, "token": shard.client.token,
"session_id": shard.sessionID,
"seq": shard.lastSequence
}
}
await shard.sendGatewayRequest(resume)
else:
shard.heartbeatInterval = json["d"]["heartbeat_interval"].getInt()
await shard.sendGatewayRequest(shard.getIdentifyPacket())
# Don't start a new heartbeat thread if one is already started
echo "About to start a heartbeat thread! shard.heartbeatAcked is ", shard.heartbeatAcked
if not hasStartedHeartbeatThread:
echo "Starting new heartbeat thread! shard.heartbeatAcked is ", shard.heartbeatAcked
asyncCheck shard.handleHeartbeat()
hasStartedHeartbeatThread = true
else:
echo "Not gonna start a new heartbeat thread since. shard.heartbeatAcked is ", shard.heartbeatAcked
of ord(DiscordOpCode.opHeartbeatAck):
shard.heartbeatAcked = true
of ord(DiscordOpCode.opDispatch):
asyncCheck handleDiscordEvent(shard, json["d"], json["t"].getStr())
of ord(DiscordOpCode.opReconnect):
asyncCheck shard.reconnectShard()
of ord(DiscordOpCode.opInvalidSession):
# If the json field `d` is true then the session may be resumable.
if json["d"].getBool():
let resume = %* {
"op": ord(opResume),
"session_id": shard.sessionID, "session_id": shard.sessionID,
"seq": shard.lastSequence "seq": shard.lastSequence
} }
}
await shard.sendGatewayRequest(resume) await shard.sendGatewayRequest(resume)
else:
asyncCheck shard.reconnectShard()
else: else:
shard.heartbeatInterval = json["d"]["heartbeat_interval"].getInt() discard
await shard.sendGatewayRequest(shard.getIdentifyPacket())
# Don't start a new
if (not shard.isHandlingHeartbeat):
asyncCheck shard.handleHeartbeat()
shard.heartbeatAcked = true
of ord(DiscordOpCode.opHeartbeatAck):
shard.heartbeatAcked = true
of ord(DiscordOpCode.opDispatch):
asyncCheck handleDiscordEvent(shard, json["d"], json["t"].getStr())
of ord(DiscordOpCode.opReconnect):
asyncCheck shard.reconnectShard()
of ord(DiscordOpCode.opInvalidSession):
# If the json field `d` is true then the session may be resumable.
if json["d"].getBool():
let resume = %* {
"op": ord(opResume),
"session_id": shard.sessionID,
"seq": shard.lastSequence
}
await shard.sendGatewayRequest(resume)
else:
asyncCheck shard.reconnectShard()
else:
discard
proc newShard(shardID: int, client: DiscordClient): Shard = proc newShard(shardID: int, client: DiscordClient): Shard =
return Shard(id: shardID, client: client) return Shard(id: shardID, client: client)
@ -233,12 +240,15 @@ proc startConnection*(client: DiscordClient, shardAmount: int = 1) {.async.} =
shard.ws = await newWebSocket(shard.client.endpoint & "/v=6&encoding=json") shard.ws = await newWebSocket(shard.client.endpoint & "/v=6&encoding=json")
asyncCheck shard.handleWebsocketPacket() await shard.handleWebsocketPacket()
# Just wait. Don't poll while we're reconnecting # Just wait. Don't poll while we're reconnecting
while true: #[ while true:
if not shard.reconnecting: if not shard.reconnecting:
poll() try:
poll()
except WebSocketError:
echo "WebSocketError" ]#
else: else:
raise newException(IOError, "Failed to get gateway url, token may of been incorrect!") raise newException(IOError, "Failed to get gateway url, token may of been incorrect!")