Files
x/handler/tunnel/dialer_test.go
T
ginuerzh e791ba47e2 refactor(handler/tunnel): split 794-line entrypoint.go into 6 files, fix 3 bugs, add 48 tests
Breaking Change: moves Connector, ConnectorPool, parseTunnelID from
tunnel.go into dedicated connector.go and id.go.

Bug Fixes:
- dialer.go: clear stale retry err so SD fallback is not masked (nil err
  from pool.Get() left previous iteration's error live)
- connect.go: check WriteTo errors in both mux and non-mux paths
- eprelay.go: use fresh relay.Response for features sent over mux
  (previously reused same resp struct after resp.WriteTo(muxConn))

Refactor:
- entrypoint.go: split ~790 lines into 6 files (ephttp, eptls, eprelay,
  epwebsocket, eplistener, entrypointsvc), moved to dedicated package
- handler.go: moved initEntrypoints/createEntrypointService to
  entrypointsvc.go
- tunnel.go: moved Connector/ConnectorPool/parseTunnelID to
  connector.go and id.go
- connect.go: moved entrypoint-originated handleConnect to eprelay.go
  (handler-side handleConnect kept in connect.go)

Tests (48 new, 88 total):
- id_test.go: parseTunnelID variants (empty, UUID, private '$', invalid)
- tunnel_test.go: Tunnel lifecycle (AddConnector, GetConnector
  weighted/closed filtering, CloseOnIdle, clean),
  Connector (NewConnector nil-opts, GetConn nil/closed session, Close,
  IsClosed), ConnectorPool (Add/Get/Close, idle cleanup, concurrency)
- dialer_test.go: SD error paths (sd.Get error, empty address)
- handler_test.go: observeStats (nil observer, cancelled context loop),
  initEntrypoints (no entrypoints configured)
- helpers_test.go: testLogger, fakeConn for handler tests
- eprelay_test.go: handleConnect ingress/dial/SD round-trip
2026-06-01 22:20:43 +08:00

256 lines
5.4 KiB
Go

package tunnel
import (
"context"
"net"
"sync"
"testing"
"time"
"github.com/go-gost/core/sd"
)
// fakePool implements a minimal Connector-like thing for Dialer tests.
type fakePool struct {
mu sync.Mutex
conn net.Conn
}
func (p *fakePool) Get(network, tid string) *Connector {
p.mu.Lock()
defer p.mu.Unlock()
if p.conn == nil {
return nil
}
// We return nil to fall through to SD — tested separately
return nil
}
type fakeSD struct {
services []*sd.Service
err error
renewFunc func(context.Context, *sd.Service) error
}
func (s *fakeSD) Get(ctx context.Context, name string) ([]*sd.Service, error) {
return s.services, s.err
}
func (s *fakeSD) Register(ctx context.Context, service *sd.Service, opts ...sd.Option) error {
return nil
}
func (s *fakeSD) Deregister(ctx context.Context, service *sd.Service) error {
return nil
}
func (s *fakeSD) Renew(ctx context.Context, service *sd.Service) error {
if s.renewFunc != nil {
return s.renewFunc(ctx, service)
}
return nil
}
func TestDialer_Dial(t *testing.T) {
t.Run("nil sd returns ErrTunnelNotAvailable", func(t *testing.T) {
p := NewConnectorPool("node1")
defer p.Close()
d := &Dialer{
node: "node1",
pool: p,
retry: 1,
log: testLogger(),
}
_, _, _, err := d.Dial(context.Background(), "tcp", "testtid")
if err != ErrTunnelNotAvailable {
t.Errorf("expected ErrTunnelNotAvailable, got %v", err)
}
})
t.Run("sd returns no services", func(t *testing.T) {
p := NewConnectorPool("node1")
defer p.Close()
sd := &fakeSD{services: nil}
d := &Dialer{
node: "node1",
pool: p,
sd: sd,
retry: 1,
timeout: time.Second,
log: testLogger(),
}
_, _, _, err := d.Dial(context.Background(), "tcp", "testtid")
if err != ErrTunnelNotAvailable {
t.Errorf("expected ErrTunnelNotAvailable, got %v", err)
}
})
t.Run("sd returns service on different node", func(t *testing.T) {
// Create a listener so we have a real address to dial
ln, err := net.Listen("tcp", "127.0.0.1:0")
if err != nil {
t.Fatal(err)
}
defer ln.Close()
p := NewConnectorPool("node1")
defer p.Close()
sd := &fakeSD{
services: []*sd.Service{
{
ID: "cid1",
Name: "testtid",
Node: "node2",
Network: "tcp",
Address: ln.Addr().String(),
},
},
}
d := &Dialer{
node: "node1",
pool: p,
sd: sd,
retry: 1,
timeout: time.Second,
log: testLogger(),
}
go func() {
conn, _ := ln.Accept()
if conn != nil {
conn.Close()
}
}()
conn, node, cid, err := d.Dial(context.Background(), "tcp", "testtid")
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
defer conn.Close()
if node != "node2" {
t.Errorf("expected node node2, got %s", node)
}
if cid != "cid1" {
t.Errorf("expected cid cid1, got %s", cid)
}
})
t.Run("sd filters out own node", func(t *testing.T) {
p := NewConnectorPool("node1")
defer p.Close()
sd := &fakeSD{
services: []*sd.Service{
{
ID: "cid1",
Name: "testtid",
Node: "node1", // same as d.node — must be filtered
Network: "tcp",
Address: "127.0.0.1:9999",
},
},
}
d := &Dialer{
node: "node1",
pool: p,
sd: sd,
retry: 1,
timeout: time.Second,
log: testLogger(),
}
_, _, _, err := d.Dial(context.Background(), "tcp", "testtid")
if err != ErrTunnelNotAvailable {
t.Errorf("expected ErrTunnelNotAvailable, got %v", err)
}
})
t.Run("sd filters by network", func(t *testing.T) {
p := NewConnectorPool("node1")
defer p.Close()
sd := &fakeSD{
services: []*sd.Service{
{
ID: "cid1",
Name: "testtid",
Node: "node2",
Network: "udp", // wrong network — must be filtered
Address: "127.0.0.1:9999",
},
},
}
d := &Dialer{
node: "node1",
pool: p,
sd: sd,
retry: 1,
timeout: time.Second,
log: testLogger(),
}
_, _, _, err := d.Dial(context.Background(), "tcp", "testtid")
if err != ErrTunnelNotAvailable {
t.Errorf("expected ErrTunnelNotAvailable, got %v", err)
}
})
}
func TestDialer_RetryDefault(t *testing.T) {
p := NewConnectorPool("node1")
defer p.Close()
d := &Dialer{
node: "node1",
pool: p,
retry: 0, // should default to 1
log: testLogger(),
}
_, _, _, err := d.Dial(context.Background(), "tcp", "testtid")
if err != ErrTunnelNotAvailable {
t.Errorf("expected ErrTunnelNotAvailable, got %v", err)
}
}
func TestDialer_SDError(t *testing.T) {
t.Run("sd.Get returns error", func(t *testing.T) {
p := NewConnectorPool("node1")
defer p.Close()
sd := &fakeSD{err: ErrTunnelNotAvailable}
d := &Dialer{
node: "node1",
pool: p,
sd: sd,
retry: 1,
log: testLogger(),
}
_, _, _, err := d.Dial(context.Background(), "tcp", "testtid")
if err != ErrTunnelNotAvailable {
t.Errorf("expected ErrTunnelNotAvailable, got %v", err)
}
})
t.Run("sd service has empty address", func(t *testing.T) {
p := NewConnectorPool("node1")
defer p.Close()
sd := &fakeSD{
services: []*sd.Service{
{
ID: "cid1",
Name: "testtid",
Node: "node2",
Network: "tcp",
Address: "", // empty address
},
},
}
d := &Dialer{
node: "node1",
pool: p,
sd: sd,
retry: 1,
log: testLogger(),
}
_, _, _, err := d.Dial(context.Background(), "tcp", "testtid")
if err != ErrTunnelNotAvailable {
t.Errorf("expected ErrTunnelNotAvailable, got %v", err)
}
})
}