mirror of
https://github.com/diamondburned/arikawa.git
synced 2024-11-17 12:23:08 +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")
})
51 lines
1,022 B
Go
51 lines
1,022 B
Go
package session
|
|
|
|
import (
|
|
"context"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/diamondburned/arikawa/v3/gateway"
|
|
"github.com/diamondburned/arikawa/v3/internal/testenv"
|
|
)
|
|
|
|
func TestSession(t *testing.T) {
|
|
attempts := 1
|
|
timeout := 15 * time.Second
|
|
|
|
if !testing.Short() {
|
|
attempts = 5
|
|
timeout = time.Minute // 5s-10s each reconnection
|
|
}
|
|
|
|
ctx, cancel := context.WithTimeout(context.Background(), timeout)
|
|
t.Cleanup(cancel)
|
|
|
|
env := testenv.Must(t)
|
|
|
|
readyCh := make(chan *gateway.ReadyEvent, 1)
|
|
|
|
s := NewWithIntents(env.BotToken, gateway.IntentGuilds)
|
|
s.AddHandler(readyCh)
|
|
|
|
for i := 0; i < attempts; i++ {
|
|
if err := s.Open(ctx); err != nil {
|
|
t.Fatal("failed to open:", err)
|
|
}
|
|
|
|
if ready, ok := <-readyCh; !ok {
|
|
t.Fatal("ready not received")
|
|
} else {
|
|
now := time.Now()
|
|
t.Logf("%s: logged in as %s", now.Format(time.StampMilli), ready.User.Username)
|
|
}
|
|
|
|
if err := s.Close(); err != nil {
|
|
t.Fatal("failed to close:", err)
|
|
}
|
|
|
|
// Hold for an additional one second.
|
|
time.Sleep(time.Second)
|
|
}
|
|
}
|