mirror of
https://github.com/go-gost/x.git
synced 2026-10-20 00:17:32 +00:00
ginuerzh
a2e2810669
perf(pht): eliminate /authorize HTTP round-trip by self-generating CID Client now uses xid to generate connection IDs, removing one RTT per tunnel setup. Server lazily creates pipe pairs in handlePush/handlePull via getOrCreateConn helper, keeping backward compat for old clients that still call /authorize. fix: send close notification before canceling context Close() was canceling c.ctx before calling write(nil). With a canceled context, http.Client.Do returns immediately without network I/O, so the close notification POST never reached the server. Swap the order. fix: add Flush() after heartbeat write in handlePull w.Write() on http.ResponseWriter goes to a 2k bufio.Writer. Without a Flush(), the keepalive newline never reaches the wire, causing the client long-poll GET to time out. fix: use LoadOrStore in createPipe to prevent concurrent push/pull race When push and pull HTTP requests arrive concurrently for a new CID, both saw !ok from Load() and both called createPipe(), overwriting the first conns entry. The losing pipe pair leaked and the listener accepted a phantom connection. LoadOrStore makes the first Store win; the second caller gets the existing pipe. fix: close conn and delete entry on empty-data POST in handlePush A POST body of "\n" produced empty data after TrimSuffix, leaking the pipe pair and conns entry. Now always cleans up before returning. fix: use caller ctx instead of context.Background() in Dial Dial(ctx, addr) was discarding the caller context, so deadlines and cancellation did not propagate to the HTTP long-poll requests. fix: detect ListenAndServe failure in Init() and clean up goroutine Non-blocking select on errChan after starting the server goroutine surfaces immediate failures (port conflict, TLS error) instead of leaking a goroutine blocked on server.Accept(). chore: remove dead AuthorizePath from Client struct and dialer wiring Client no longer calls /authorize; the field and its metadata parsing in dialer/pht, dialer/http3 are dead code. test: add unit tests for createPipe race, close notification, empty-data cleanup, and queue-full fallback
116 lines
2.6 KiB
Go
116 lines
2.6 KiB
Go
package http3
|
|
|
|
import (
|
|
"context"
|
|
"crypto/tls"
|
|
"net"
|
|
"net/http"
|
|
"sync"
|
|
|
|
"github.com/go-gost/core/dialer"
|
|
md "github.com/go-gost/core/metadata"
|
|
pht_util "github.com/go-gost/x/internal/util/pht"
|
|
"github.com/go-gost/x/registry"
|
|
"github.com/quic-go/quic-go"
|
|
"github.com/quic-go/quic-go/http3"
|
|
)
|
|
|
|
func init() {
|
|
registry.DialerRegistry().Register("http3", NewDialer)
|
|
registry.DialerRegistry().Register("h3", NewDialer)
|
|
}
|
|
|
|
type http3Dialer struct {
|
|
clients map[string]*pht_util.Client
|
|
clientMutex sync.Mutex
|
|
md metadata
|
|
options dialer.Options
|
|
}
|
|
|
|
func NewDialer(opts ...dialer.Option) dialer.Dialer {
|
|
options := dialer.Options{}
|
|
for _, opt := range opts {
|
|
opt(&options)
|
|
}
|
|
|
|
return &http3Dialer{
|
|
clients: make(map[string]*pht_util.Client),
|
|
options: options,
|
|
}
|
|
}
|
|
|
|
func (d *http3Dialer) Init(md md.Metadata) (err error) {
|
|
if err = d.parseMetadata(md); err != nil {
|
|
return
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func (d *http3Dialer) Dial(ctx context.Context, addr string, opts ...dialer.DialOption) (net.Conn, error) {
|
|
d.clientMutex.Lock()
|
|
defer d.clientMutex.Unlock()
|
|
|
|
client, ok := d.clients[addr]
|
|
if !ok {
|
|
var options dialer.DialOptions
|
|
for _, opt := range opts {
|
|
opt(&options)
|
|
}
|
|
|
|
host := d.md.host
|
|
if host == "" {
|
|
host = options.Host
|
|
}
|
|
if h, _, _ := net.SplitHostPort(host); h != "" {
|
|
host = h
|
|
}
|
|
|
|
client = &pht_util.Client{
|
|
Host: host,
|
|
Client: &http.Client{
|
|
// Timeout: 60 * time.Second,
|
|
Transport: &http3.Transport{
|
|
TLSClientConfig: d.options.TLSConfig,
|
|
Dial: func(ctx context.Context, adr string, tlsCfg *tls.Config, cfg *quic.Config) (*quic.Conn, error) {
|
|
// d.options.Logger.Infof("dial: %s/%s, %s", addr, network, host)
|
|
udpAddr, err := net.ResolveUDPAddr("udp", addr)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
udpConn, err := options.Dialer.Dial(ctx, "udp", "")
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return quic.DialEarly(context.Background(), udpConn.(net.PacketConn), udpAddr, tlsCfg, cfg)
|
|
},
|
|
QUICConfig: &quic.Config{
|
|
KeepAlivePeriod: d.md.keepAlivePeriod,
|
|
HandshakeIdleTimeout: d.md.handshakeTimeout,
|
|
MaxIdleTimeout: d.md.maxIdleTimeout,
|
|
Versions: []quic.Version{
|
|
quic.Version1,
|
|
},
|
|
MaxIncomingStreams: int64(d.md.maxStreams),
|
|
},
|
|
},
|
|
},
|
|
PushPath: d.md.pushPath,
|
|
PullPath: d.md.pullPath,
|
|
TLSEnabled: true,
|
|
Logger: d.options.Logger,
|
|
}
|
|
|
|
d.clients[addr] = client
|
|
}
|
|
|
|
return client.Dial(ctx, addr)
|
|
}
|
|
|
|
// Multiplex implements dialer.Multiplexer interface.
|
|
func (d *http3Dialer) Multiplex() bool {
|
|
return true
|
|
}
|