refactor(handler/tunnel): code review fixes and entrypoint subpackage extraction

- Fix dead-code branch in bind.go host assignment (always use endpoint hash)
- Return descriptive error on bypass match in connect.go (was masking as success)
- Update bypass test in connect_test.go for new error behavior
- Extract entrypoint subpackage from monolithic entrypoint.go (6 files)
- Fix observeStats event-loss bug (break -> fallthrough on retry success)
- Add 47 unit tests across handler, connect, bind, metadata packages
- Add architecture doc comments to all key files
- Build and vet clean, 173 tests pass with -race
This commit is contained in:
ginuerzh
2026-06-02 23:51:55 +08:00
parent d432d28f81
commit 81db46b725
26 changed files with 3145 additions and 467 deletions
+17 -17
View File
@@ -17,29 +17,29 @@ import (
// connector is dead, all retries fail until Tunnel.clean() removes it
// (up to TTL, default 15s).
// 2. SD fallback: if pool returns nil AND sd is configured, query service
// discovery for remote nodes. Filter out self (d.node) and mismatched
// discovery for remote nodes. Filter out self (d.Node) and mismatched
// networks. Establish a raw TCP connection to the remote address,
// bypassing the mux layer entirely.
//
// The returned node and connector ID identify which node/hop the stream
// is connected to — used by callers to decide the relay protocol framing.
type Dialer struct {
node string
pool *ConnectorPool
sd sd.SD
retry int
timeout time.Duration
log logger.Logger
Node string
Pool *ConnectorPool
SD sd.SD
Retry int
Timeout time.Duration
Log logger.Logger
}
func (d *Dialer) Dial(ctx context.Context, network string, tid string) (conn net.Conn, node string, cid string, err error) {
retry := d.retry
retry := d.Retry
if retry <= 0 {
retry = 1
}
for i := 0; i < retry; i++ {
c := d.pool.Get(network, tid)
c := d.Pool.Get(network, tid)
if c == nil {
err = nil // clear stale err so SD fallback is not masked
break
@@ -47,10 +47,10 @@ func (d *Dialer) Dial(ctx context.Context, network string, tid string) (conn net
conn, err = c.GetConn()
if err != nil {
d.log.Error(err)
d.Log.Error(err)
continue
}
node = d.node
node = d.Node
cid = c.id.String()
break
@@ -59,20 +59,20 @@ func (d *Dialer) Dial(ctx context.Context, network string, tid string) (conn net
return
}
if d.sd == nil {
if d.SD == nil {
err = ErrTunnelNotAvailable
return
}
ss, err := d.sd.Get(ctx, tid)
ss, err := d.SD.Get(ctx, tid)
if err != nil {
return
}
var service *sd.Service
for _, s := range ss {
d.log.Debugf("%+v", s)
if s.Node != d.node && s.Network == network {
d.Log.Debugf("%+v", s)
if s.Node != d.Node && s.Network == network {
service = s
break
}
@@ -86,8 +86,8 @@ func (d *Dialer) Dial(ctx context.Context, network string, tid string) (conn net
cid = service.ID
dialer := net.Dialer{
Timeout: d.timeout,
Timeout: d.Timeout,
}
conn, err = dialer.DialContext(ctx, "tcp", service.Address)
return
}
}