b44a46ed2f
Replaces the flat key-value logging scheme with component-based structured logging via go-mana-component. Each layer (pool, worker, connection) builds its own component identity and derives a *slog.Logger from a caller-supplied slog.Handler. - Delete logging/ package (logging.go, logging_test.go) - Strip LoggingEnabled and LogLevel from ConnectionConfig, PoolConfig, WorkerConfig; remove associated option funcs - Change NewConnection and NewConnectionFromSocket to accept ctx and slog.Handler instead of *slog.Logger; constructors build component identity via MustNew/MustExtend internally - Change WorkerFactory, NewWorker, connect, and RunDialer to carry slog.Handler; remove PoolPlugin.Handler - Change NewPool to establish pool component identity via MustNew; remove pool_id field, PoolPlugin.ID, and ErrInvalidPoolID - Fix data race in MockSlogHandler: WithAttrs now shares parent mutex pointer rather than allocating a new one per child - Run go fix
170 lines
4.0 KiB
Go
170 lines
4.0 KiB
Go
package honeybee
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"git.wisehodl.dev/jay/go-honeybee/honeybeetest"
|
|
"git.wisehodl.dev/jay/go-honeybee/types"
|
|
"github.com/gorilla/websocket"
|
|
"github.com/stretchr/testify/assert"
|
|
"net/http"
|
|
"testing"
|
|
)
|
|
|
|
// Helpers
|
|
|
|
func setupPool(t *testing.T) (*Pool, *honeybeetest.MockDialer) {
|
|
t.Helper()
|
|
pool, err := NewPool(context.Background(), nil, nil)
|
|
assert.NoError(t, err)
|
|
dialer := &honeybeetest.MockDialer{
|
|
DialContextFunc: func(context.Context, string, http.Header) (types.Socket, *http.Response, error) {
|
|
return honeybeetest.NewMockSocket(), nil, nil
|
|
},
|
|
}
|
|
pool.dialer = dialer
|
|
return pool, dialer
|
|
}
|
|
|
|
func expectEvent(
|
|
t *testing.T,
|
|
events chan PoolEvent,
|
|
expectedURL string,
|
|
expectedKind PoolEventKind,
|
|
) {
|
|
t.Helper()
|
|
honeybeetest.Eventually(t, func() bool {
|
|
select {
|
|
case e := <-events:
|
|
return e.ID == expectedURL && e.Kind == expectedKind && !e.At.IsZero()
|
|
default:
|
|
return false
|
|
}
|
|
}, fmt.Sprintf("expected event: URL=%q, Kind=%q", expectedURL, expectedKind))
|
|
}
|
|
|
|
// Tests
|
|
|
|
func TestPoolConnect(t *testing.T) {
|
|
t.Run("successfully adds connection", func(t *testing.T) {
|
|
pool, _ := setupPool(t)
|
|
|
|
err := pool.Connect("wss://test")
|
|
assert.NoError(t, err)
|
|
|
|
honeybeetest.Eventually(t, func() bool {
|
|
select {
|
|
case event := <-pool.events:
|
|
return event.ID == "wss://test" && event.Kind == EventConnected
|
|
default:
|
|
return false
|
|
}
|
|
}, "expected event")
|
|
|
|
assert.Contains(t, pool.Peers(), "wss://test")
|
|
|
|
pool.Close()
|
|
})
|
|
|
|
t.Run("does not add duplicate", func(t *testing.T) {
|
|
pool, _ := setupPool(t)
|
|
|
|
err := pool.Connect("wss://test")
|
|
assert.NoError(t, err)
|
|
|
|
// trailing slash normalizes to same key
|
|
err = pool.Connect("wss://test/")
|
|
assert.Error(t, err)
|
|
assert.ErrorIs(t, err, ErrPeerExists)
|
|
|
|
assert.Len(t, pool.Peers(), 1)
|
|
|
|
pool.Close()
|
|
})
|
|
}
|
|
|
|
func TestPoolClose(t *testing.T) {
|
|
t.Run("channels close after pool close", func(t *testing.T) {
|
|
pool, _ := NewPool(context.Background(), nil, nil)
|
|
pool.Close()
|
|
_, ok := <-pool.Inbox()
|
|
assert.False(t, ok)
|
|
_, ok = <-pool.Events()
|
|
assert.False(t, ok)
|
|
})
|
|
|
|
t.Run("connect after close returns error", func(t *testing.T) {
|
|
pool, _ := NewPool(context.Background(), nil, nil)
|
|
pool.Close()
|
|
err := pool.Connect("wss://test")
|
|
assert.ErrorIs(t, err, ErrPoolClosed)
|
|
})
|
|
}
|
|
|
|
func TestPoolRemove(t *testing.T) {
|
|
t.Run("removes known url", func(t *testing.T) {
|
|
pool, _ := setupPool(t)
|
|
|
|
pool.Connect("wss://test")
|
|
expectEvent(t, pool.events, "wss://test", EventConnected)
|
|
|
|
err := pool.Remove("wss://test/")
|
|
assert.NoError(t, err)
|
|
|
|
// expect a disconnected event
|
|
expectEvent(t, pool.events, "wss://test", EventDisconnected)
|
|
|
|
// connection no longer in pool
|
|
assert.NotContains(t, pool.Peers(), "wss://test")
|
|
})
|
|
|
|
t.Run("unknown url returns error", func(t *testing.T) {
|
|
pool, _ := setupPool(t)
|
|
|
|
// remove unknown connection
|
|
err := pool.Remove("wss://unknown")
|
|
assert.ErrorIs(t, err, ErrPeerNotFound)
|
|
})
|
|
|
|
t.Run("closed pool returns error", func(t *testing.T) {
|
|
pool, _ := setupPool(t)
|
|
|
|
// close pool
|
|
pool.Close()
|
|
|
|
// attempt to remove connection
|
|
err := pool.Remove("wss://test")
|
|
assert.ErrorIs(t, err, ErrPoolClosed)
|
|
})
|
|
|
|
}
|
|
|
|
func TestPoolSend(t *testing.T) {
|
|
mockSocket := honeybeetest.NewMockSocket()
|
|
outgoingData := make(chan honeybeetest.MockOutgoingData, 10)
|
|
mockSocket.WriteMessageFunc = func(msgType int, data []byte) error {
|
|
outgoingData <- honeybeetest.MockOutgoingData{MsgType: msgType, Data: data}
|
|
return nil
|
|
}
|
|
mockDialer := &honeybeetest.MockDialer{
|
|
DialContextFunc: func(context.Context, string, http.Header) (types.Socket, *http.Response, error) {
|
|
return mockSocket, nil, nil
|
|
},
|
|
}
|
|
|
|
pool, err := NewPool(context.Background(), nil, nil)
|
|
assert.NoError(t, err)
|
|
pool.dialer = mockDialer
|
|
|
|
err = pool.Connect("wss://test")
|
|
assert.NoError(t, err)
|
|
expectEvent(t, pool.events, "wss://test", EventConnected)
|
|
|
|
err = pool.Send("wss://test", []byte("hello"))
|
|
assert.NoError(t, err)
|
|
|
|
honeybeetest.ExpectWrite(t, outgoingData, websocket.TextMessage, []byte("hello"))
|
|
|
|
pool.Close()
|
|
}
|