Skip to content

Commit

Permalink
feat(gateway): add HeartbeatAck event (#253)
Browse files Browse the repository at this point in the history
* feat(gateway): add HeartbeatAck event

* feat: HEARTBEAT_ACK -> __HEARTBEAT_ACK__

* feat(events): handle heartbeat ack events
* Added event payload: LastHeartbeat & NewHeartbeat
  • Loading branch information
satoufuyuki committed Mar 29, 2023
1 parent 90f185c commit 1037f73
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 1 deletion.
8 changes: 8 additions & 0 deletions events/heartbeat_ack.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package events

import "github.com/disgoorg/disgo/gateway"

type HeartbeatAck struct {
*GenericEvent
gateway.EventHeartbeatAck
}
1 change: 1 addition & 0 deletions gateway/gateway_event_type.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ type EventType string
const (
// EventTypeRaw is not a real event type, but is used to pass raw payloads to the bot.EventManager
EventTypeRaw EventType = "__RAW__"
EventTypeHeartbeatAck EventType = "__HEARTBEAT_ACK__"
EventTypeReady EventType = "READY"
EventTypeResumed EventType = "RESUMED"
EventTypeApplicationCommandPermissionsUpdate EventType = "APPLICATION_COMMAND_PERMISSIONS_UPDATE"
Expand Down
8 changes: 8 additions & 0 deletions gateway/gateway_events.go
Original file line number Diff line number Diff line change
Expand Up @@ -692,3 +692,11 @@ type EventRaw struct {

func (EventRaw) messageData() {}
func (EventRaw) eventData() {}

type EventHeartbeatAck struct {
LastHeartbeat time.Time
NewHeartbeat time.Time
}

func (EventHeartbeatAck) messageData() {}
func (EventHeartbeatAck) eventData() {}
7 changes: 6 additions & 1 deletion gateway/gateway_impl.go
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,12 @@ loop:
break loop

case OpcodeHeartbeatACK:
g.lastHeartbeatReceived = time.Now().UTC()
newHeartbeat := time.Now().UTC()
g.eventHandlerFunc(EventTypeHeartbeatAck, message.S, g.config.ShardID, EventHeartbeatAck{
LastHeartbeat: g.lastHeartbeatReceived,
NewHeartbeat: newHeartbeat,
})
g.lastHeartbeatReceived = newHeartbeat

default:
g.config.Logger.Debug(g.formatLogsf("unknown opcode received: %d, data: %s", message.Op, message.D))
Expand Down
1 change: 1 addition & 0 deletions handlers/all_handlers.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ func GetGatewayHandlers() map[gateway.EventType]bot.GatewayEventHandler {

var allEventHandlers = []bot.GatewayEventHandler{
bot.NewGatewayEventHandler(gateway.EventTypeRaw, gatewayHandlerRaw),
bot.NewGatewayEventHandler(gateway.EventTypeHeartbeatAck, gatewayHandlerHeartbeatAck),
bot.NewGatewayEventHandler(gateway.EventTypeReady, gatewayHandlerReady),
bot.NewGatewayEventHandler(gateway.EventTypeResumed, gatewayHandlerResumed),

Expand Down
7 changes: 7 additions & 0 deletions handlers/status_handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,13 @@ func gatewayHandlerRaw(client bot.Client, sequenceNumber int, shardID int, event
})
}

func gatewayHandlerHeartbeatAck(client bot.Client, sequenceNumber int, shardID int, event gateway.EventHeartbeatAck) {
client.EventManager().DispatchEvent(&events.HeartbeatAck{
GenericEvent: events.NewGenericEvent(client, sequenceNumber, shardID),
EventHeartbeatAck: event,
})
}

func gatewayHandlerReady(client bot.Client, sequenceNumber int, shardID int, event gateway.EventReady) {
client.Caches().SetSelfUser(event.User)

Expand Down

0 comments on commit 1037f73

Please sign in to comment.