mirror of
https://github.com/diamondburned/arikawa.git
synced 2024-11-19 21:32:49 +00:00
54cadd2f45
This commit refactors the whole package gateway as well as utils/ws
(formerly utils/wsutil) and voice/voicegateway. The new refactor
utilizes a design pattern involving a concurrent loop and an arriving
event channel.
An additional change was made to the way gateway events are typed.
Before, pretty much any type will satisfy a gateway event type, since
the actual type was just interface{}. The new refactor defines a
concrete interface that events can implement:
type Event interface {
Op() OpCode
EventType() EventType
}
Using this interface, the user can easily add custom gateway events
independently of the library without relying on string maps. This adds a
lot of type safety into the library and makes type-switching on Event
types much more reasonable.
Gateway error callbacks are also almost entirely removed in favor of
custom gateway events. A catch-all can easily be added like this:
s.AddHandler(func(err error) {
log.Println("gateway error:, err")
})
73 lines
1.6 KiB
Go
73 lines
1.6 KiB
Go
package state
|
|
|
|
import (
|
|
"context"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/diamondburned/arikawa/v3/discord"
|
|
"github.com/diamondburned/arikawa/v3/gateway"
|
|
"github.com/diamondburned/arikawa/v3/internal/testenv"
|
|
"github.com/diamondburned/arikawa/v3/session/shard"
|
|
)
|
|
|
|
func TestSharding(t *testing.T) {
|
|
env := testenv.Must(t)
|
|
|
|
data := gateway.DefaultIdentifyCommand("Bot " + env.BotToken)
|
|
data.Shard = &gateway.Shard{0, env.ShardCount}
|
|
data.Presence = &gateway.UpdatePresenceCommand{
|
|
Status: discord.DoNotDisturbStatus,
|
|
Activities: []discord.Activity{{
|
|
Name: "Testing shards...",
|
|
Type: discord.CustomActivity,
|
|
}},
|
|
}
|
|
|
|
readyCh := make(chan *gateway.ReadyEvent)
|
|
|
|
m, err := shard.NewIdentifiedManager(data, NewShardFunc(
|
|
func(m *shard.Manager, s *State) {
|
|
now := time.Now().Format(time.StampMilli)
|
|
t.Log(now, "initializing shard")
|
|
|
|
s.AddIntents(gateway.IntentGuilds)
|
|
s.AddSyncHandler(readyCh)
|
|
s.AddSyncHandler(func(err error) {
|
|
t.Log("background error:", err)
|
|
})
|
|
},
|
|
))
|
|
if err != nil {
|
|
t.Fatal("failed to make shard manager:", err)
|
|
}
|
|
|
|
ctx, cancel := context.WithTimeout(context.Background(), 2*time.Minute)
|
|
defer cancel()
|
|
|
|
go func() {
|
|
// Timeout
|
|
if err := m.Open(ctx); err != nil {
|
|
t.Error("failed to open:", err)
|
|
cancel()
|
|
}
|
|
|
|
t.Cleanup(func() {
|
|
if err := m.Close(); err != nil {
|
|
t.Error("failed to close:", err)
|
|
cancel()
|
|
}
|
|
})
|
|
}()
|
|
|
|
for i := 0; i < env.ShardCount; i++ {
|
|
select {
|
|
case ready := <-readyCh:
|
|
now := time.Now().Format(time.StampMilli)
|
|
t.Log(now, "shard", ready.Shard.ShardID(), "is ready out of", env.ShardCount)
|
|
case <-ctx.Done():
|
|
t.Fatal("test expired, got", i, "shards")
|
|
}
|
|
}
|
|
}
|