Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ require (
github.com/Mag1cFall/fhttp v0.6.8-firefox.2
github.com/Mag1cFall/go-mp3 v0.1.1
github.com/Mag1cFall/go-sentencepiece v0.7.1
github.com/Mag1cFall/uquic v0.0.6-firefox.6
github.com/Mag1cFall/utls v1.8.2-firefox.3
github.com/bogdanfinn/fhttp v0.6.8
github.com/bogdanfinn/tls-client v1.15.1
github.com/bogdanfinn/utls v1.7.7-barnius
Expand Down Expand Up @@ -60,7 +58,6 @@ require (
github.com/mattn/go-isatty v0.0.24 // indirect
github.com/mewkiz/pkg v0.0.0-20250417130911-3f050ff8c56d // indirect
github.com/mewpkg/term v0.0.0-20241026122259-37a80af23985 // indirect
github.com/molecule-man/go-brrr v1.2.0 // indirect
github.com/power-devops/perfstat v0.0.0-20260805114148-88456608a4f6 // indirect
github.com/quic-go/qpack v0.6.0 // indirect
github.com/segmentio/asm v1.1.3 // indirect
Expand Down
11 changes: 0 additions & 11 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@ github.com/Mag1cFall/go-mp3 v0.1.1 h1:r/wBscYGXWpGdEhCQCcrHI36EDbNx6rtio2yv/Y547
github.com/Mag1cFall/go-mp3 v0.1.1/go.mod h1:/vhuC+guK5mKVhCBE8ZQSocH0FmHXM244FT7239cSlY=
github.com/Mag1cFall/go-sentencepiece v0.7.1 h1:Evzu4bQYge6F2tv40wMqr9MazbtbvoPbSD/eLl2gJEA=
github.com/Mag1cFall/go-sentencepiece v0.7.1/go.mod h1:5xb9a9oAB7EQ/J/47DTrj+BSrGoJIcXZ9CB5y27Nehw=
github.com/Mag1cFall/uquic v0.0.6-firefox.6 h1:AvAWHvAMST2ffRJb+LKTWv8+Gz0u6JfzGxcXuXxOPFI=
github.com/Mag1cFall/uquic v0.0.6-firefox.6/go.mod h1:JHH4tzlX5KM0a4TJSglkbL2kW1hdVBenlA0YFKD8o0E=
github.com/Mag1cFall/utls v1.8.2-firefox.3 h1:5DGK0Ps9Kew+pd1E0d96YeirOdk4AOHJmx+NeNJwRxM=
github.com/Mag1cFall/utls v1.8.2-firefox.3/go.mod h1:HFKOiYks7qa1VvvhZBWu7Ic9tTYm1xNXHKiRcpw3Mtc=
github.com/adrg/xdg v0.5.3 h1:xRnxJXne7+oWDatRhR1JLnvuccuIeCoBu2rtuLqQB78=
github.com/adrg/xdg v0.5.3/go.mod h1:nlTsY+NNiCBGCK2tpm09vRqfVzrc2fLmXGpBLF0zlTQ=
github.com/andybalholm/brotli v1.2.0 h1:ukwgCxwYrmACq68yiUqwIWnGY0cTPox/M94sVwToPjQ=
Expand Down Expand Up @@ -91,8 +87,6 @@ github.com/minio/selfupdate v0.6.0 h1:i76PgT0K5xO9+hjzKcacQtO7+MjJ4JKA8Ak8XQ9DDw
github.com/minio/selfupdate v0.6.0/go.mod h1:bO02GTIPCMQFTEvE5h4DjYB58bCoZ35XLeBf0buTDdM=
github.com/modelcontextprotocol/go-sdk v1.8.0 h1:KIvahhYqwtbeniWVPs3TcXEA7b8jEtwfBpOTAI+Urx4=
github.com/modelcontextprotocol/go-sdk v1.8.0/go.mod h1:dL7u98E/zjJTGzEq+j30jQ8K2k1mb6LeAH4inEcSGts=
github.com/molecule-man/go-brrr v1.2.0 h1:dOJU45BC3Gc2WXoxAW0rgCAgVuu2gruAOGncfieA0Jw=
github.com/molecule-man/go-brrr v1.2.0/go.mod h1:7ybW6/7gA3oKY45jOfVNjSJDtrr6ea4tzbsTkjmQDC4=
github.com/nlnwa/whatwg-url v0.6.2 h1:jU61lU2ig4LANydbEJmA2nPrtCGiKdtgT0rmMd2VZ/Q=
github.com/nlnwa/whatwg-url v0.6.2/go.mod h1:x0FPXJzzOEieQtsBT/AKvbiBbQ46YlL6Xa7m02M1ECk=
github.com/power-devops/perfstat v0.0.0-20260805114148-88456608a4f6 h1:jL3a8soXdzuTCcRnKhOmtcsVOObdDTFf4O2B403HPRU=
Expand Down Expand Up @@ -157,8 +151,6 @@ golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
golang.org/x/mod v0.41.0 h1:qJmnOUb4YB+FsEuM3HcWucdZASCPGhsX6uljO6pog0c=
golang.org/x/mod v0.41.0/go.mod h1:Ek9pY8RKWXwsWvd3rQiHYtMqkjSUV+s1Rj7j4H5Ur6o=
golang.org/x/mod v0.42.0 h1:ICeL3t2L30ljSPHHxDnR4fqVcBt/zR2zJAb9juavmQg=
golang.org/x/mod v0.42.0/go.mod h1:u5fzIrRInkL8MaO1cbRkUHT64v303YIT5KEqpNr7jRs=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
Expand All @@ -184,8 +176,6 @@ golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
golang.org/x/sync v0.23.0 h1:KameEIfc1IkluZyXWLn39Wd4tURc6GbCiISGiZm2bQk=
golang.org/x/sync v0.23.0/go.mod h1:sUUOizhqBxiL6pEWpqNLUiaJn1ShEbZ6BBqskPbjZm0=
golang.org/x/sync v0.24.0 h1:iqiDrGoDgyuvAKrhLQthUEzU/R378N78gXbBjxed7oA=
golang.org/x/sync v0.24.0/go.mod h1:sUUOizhqBxiL6pEWpqNLUiaJn1ShEbZ6BBqskPbjZm0=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
Expand Down Expand Up @@ -239,7 +229,6 @@ golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
golang.org/x/tools v0.51.0 h1:k4Xc/1Om9jwkBJBo4NVLMSARBoWtK10mx+W5BnXCeAI=
golang.org/x/tools v0.51.0/go.mod h1:9eEncMayCV6zRMGhR5eZEC2iBx98qWcF1HZ9Z7wJOoA=
golang.org/x/tools v0.52.0 h1:ryxg4U63oaUYk7uOLTF37n43f4qgtGvqV4Ioit1BaEs=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
Expand Down
2 changes: 0 additions & 2 deletions internal/aistudio/navigation_timing.go
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,6 @@ func documentTiming(entry map[string]any, resources time.Duration) {
// nextHopProtocol 返回响应协议对应的 ALPN 名称
func nextHopProtocol(proto string) string {
switch proto {
case "HTTP/3.0":
return "h3"
case "HTTP/2.0":
return "h2"
default:
Expand Down
136 changes: 61 additions & 75 deletions internal/aistudio/transport_browser.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package aistudio

import (
"context"
"encoding/binary"
"fmt"
"io"
"net"
Expand Down Expand Up @@ -29,6 +30,8 @@ const (
firefoxPingThreshold = 58 * time.Second
// firefoxPingTimeout 是 Firefox network.http.http2.ping-timeout,PING 超过该时长未应答时关闭连接
firefoxPingTimeout = 8 * time.Second
// nssTLSGREASEECHInner 是 NSS 为 TCP ClientHello 的 GREASE ECH 估算的内层 ClientHello 基础长度
nssTLSGREASEECHInner = 217
// firefoxTLSHandshakeTimeout 是 Firefox network.http.tls-handshake-timeout
firefoxTLSHandshakeTimeout = 30 * time.Second
// browserIdleConnTimeout 是 Firefox network.http.http2.timeout,空闲 HTTP/2 连接保留该时长后关闭
Expand Down Expand Up @@ -104,7 +107,6 @@ var firefoxRequestHeaderOrder = []string{
"x-user-agent",
"content-length",
"origin",
"alt-used",
"sec-fetch-storage-access",
"cookie",
"upgrade-insecure-requests",
Expand Down Expand Up @@ -216,9 +218,7 @@ var browserManagedHeaders = map[string]struct{}{
type browserRoundTripper struct {
transport *http2.Transport
pool *firefoxConnPool
// http3 在直连时按 Alt-Svc 把请求切换到 HTTP/3,经代理时为 nil
http3 *firefoxHTTP3
mu sync.Mutex
mu sync.Mutex
// preflights 按 preflightKey 记录 CORS 预检缓存
preflights map[string]preflightGrant
}
Expand Down Expand Up @@ -248,7 +248,7 @@ type browserResponseBody struct {
trailer stdhttp.Header
}

// newBrowserRoundTripper 创建与当前 Camoufox 网络形状一致的传输:经代理时只用 HTTP/2,直连时按 Alt-Svc 改用 HTTP/3
// newBrowserRoundTripper 创建与当前 Camoufox 网络形状一致的 HTTP/2 传输
func newBrowserRoundTripper(proxyURL string) (stdhttp.RoundTripper, error) {
proxyURL = strings.TrimSpace(proxyURL)
var proxyDialer proxy.ContextDialer = &net.Dialer{}
Expand Down Expand Up @@ -295,11 +295,7 @@ func newBrowserRoundTripper(proxyURL string) (stdhttp.RoundTripper, error) {
StreamWindowUpdate: firefoxStreamWindowUpdate,
WindowUpdateThreshold: firefoxWindowUpdateThreshold,
}
roundTripper := &browserRoundTripper{preflights: map[string]preflightGrant{}, transport: pool.transport, pool: pool}
if proxyURL == "" {
roundTripper.http3 = newFirefoxHTTP3(pool)
}
return roundTripper, nil
return &browserRoundTripper{preflights: map[string]preflightGrant{}, transport: pool.transport, pool: pool}, nil
}

// connectionTimingKey 是请求 context 中记录该请求自己建立连接各阶段时刻的 *connectionTiming
Expand Down Expand Up @@ -354,7 +350,7 @@ func (dialer tracedDialer) DialContext(ctx context.Context, network, address str
return conn, err
}

// firefoxConnPool 按 Firefox 选择 HTTP/2 连接,匿名请求、携带凭据的请求与 HTTP/3 备用连接分开建连
// firefoxConnPool 按 Firefox 选择 HTTP/2 连接,匿名请求与携带凭据的请求分开建连
type firefoxConnPool struct {
transport *http2.Transport
dial func(address string, anonymous bool, timing *connectionTiming) (net.Conn, error)
Expand All @@ -368,28 +364,41 @@ type firefoxConnPool struct {
added chan struct{}
}

// requestClass 标记请求在连接池中的类别:匿名请求(CORS 预检)与携带凭据的请求按类别建连,优先复用本类连接
type requestClass struct {
anonymous bool
}

type requestClassKey struct{}

func withRequestClass(ctx context.Context, class requestClass) context.Context {
return context.WithValue(ctx, requestClassKey{}, class)
}

func requestClassOf(ctx context.Context) requestClass {
class, _ := ctx.Value(requestClassKey{}).(requestClass)
return class
}

// poolKey 是地址与请求类别组成的连接池键
func poolKey(address string, class requestClass) string {
if class.anonymous {
address += "|anonymous"
}
if class.fallback {
address += "|fallback"
}
return address
}

func (pool *firefoxConnPool) GetClientConn(request *fhttp.Request, address string) (*http2.ClientConn, error) {
return pool.get(request.Context(), address, true)
return pool.get(request.Context(), address)
}

// get 返回 context 所标类别下能接受新请求的连接,没有时取另一类已复用过的连接,仍没有时拨号并使用自己拨出的连接;dispatch 表示返回的连接将承载请求
func (pool *firefoxConnPool) get(ctx context.Context, address string, dispatch bool) (*http2.ClientConn, error) {
// get 返回 context 所标类别下能接受新请求的连接,没有时取另一类已复用过的连接,仍没有时拨号并使用自己拨出的连接
func (pool *firefoxConnPool) get(ctx context.Context, address string) (*http2.ClientConn, error) {
class := requestClassOf(ctx)
key := poolKey(address, class)
inverted := poolKey(address, requestClass{anonymous: !class.anonymous, fallback: class.fallback})
inverted := poolKey(address, requestClass{anonymous: !class.anonymous})
pool.mu.Lock()
conn := pool.availableLocked(key, inverted, dispatch)
conn := pool.availableLocked(key, inverted)
for conn == nil && len(pool.conns[key])+pool.dialing[key] >= firefoxMaxPersistentConns {
added := pool.added
pool.mu.Unlock()
Expand All @@ -399,7 +408,7 @@ func (pool *firefoxConnPool) get(ctx context.Context, address string, dispatch b
return nil, ctx.Err()
}
pool.mu.Lock()
conn = pool.availableLocked(key, inverted, dispatch)
conn = pool.availableLocked(key, inverted)
}
if conn != nil {
pool.mu.Unlock()
Expand Down Expand Up @@ -447,11 +456,11 @@ func (pool *firefoxConnPool) speculate(address string, class requestClass) {
go func() { _, _ = pool.connect(address, class, nil) }()
}

// availableLocked 返回本类能接受新请求的最早连接,没有时返回另一类已复用过的连接;dispatch 时把取到的本类连接记为已复用
func (pool *firefoxConnPool) availableLocked(key string, inverted string, dispatch bool) *http2.ClientConn {
// availableLocked 返回本类能接受新请求的最早连接并把它记为已复用,没有时返回另一类已复用过的连接
func (pool *firefoxConnPool) availableLocked(key string, inverted string) *http2.ClientConn {
for _, conn := range pool.conns[key] {
if conn.CanTakeNewRequest() {
pool.experienced[conn] = pool.experienced[conn] || dispatch
pool.experienced[conn] = true
return conn
}
}
Expand All @@ -463,28 +472,6 @@ func (pool *firefoxConnPool) availableLocked(key string, inverted string, dispat
return nil
}

// idle 报告该类别是否已有能接受新请求的连接
func (pool *firefoxConnPool) idle(address string, class requestClass) bool {
pool.mu.Lock()
defer pool.mu.Unlock()
return slices.ContainsFunc(pool.conns[poolKey(address, class)], (*http2.ClientConn).CanTakeNewRequest)
}

// retire 让该类别的连接在已有请求结束后关闭,之后的请求不再复用它们
func (pool *firefoxConnPool) retire(address string, class requestClass) {
pool.mu.Lock()
conns := pool.conns[poolKey(address, class)]
delete(pool.conns, poolKey(address, class))
for _, conn := range conns {
delete(pool.experienced, conn)
}
pool.notifyLocked()
pool.mu.Unlock()
for _, conn := range conns {
go func() { _ = conn.Shutdown(context.Background()) }()
}
}

func (pool *firefoxConnPool) MarkDead(dead *http2.ClientConn) {
pool.mu.Lock()
defer pool.mu.Unlock()
Expand Down Expand Up @@ -551,6 +538,26 @@ func (cache *firefoxSessionCache) take(peer firefoxSessionPeer) (*tls.ClientSess
return nil, 0
}

// resumptionPSKLength 返回以编码为 raw(utls SessionState.Bytes)的 TLS 1.3 客户端会话恢复时 pre_shared_key 扩展的长度,会话不是 TLS 1.3 或票据已过期时为 0
func resumptionPSKLength(raw []byte, ticket int) int {
if binary.BigEndian.Uint16(raw) != tls.VersionTLS13 || time.Now().After(time.Unix(int64(binary.BigEndian.Uint64(raw[len(raw)-12:])), 0)) {
return 0
}
binder := 32
if binary.BigEndian.Uint16(raw[3:]) == tls.TLS_AES_256_GCM_SHA384 {
binder = 48
}
return 2 + 2 + ticket + 4 + 2 + 1 + binder
}

// nssGREASEECHPayload 是 NSS 按内层基础长度 inner 与 pre_shared_key 扩展长度 psk 算出的 GREASE ECH 密文长度(不含 AEAD 标签),按 RFC 9849 补齐到 32 字节的整数倍
func nssGREASEECHPayload(inner int, psk int) uint16 {
if psk > 0 {
inner += 4 + psk
}
return uint16(inner + 31 - (inner-1)%32)
}

// put 把服务器下发的票据存到 peer 名下,已满时丢弃最早收到的一张
func (cache *firefoxSessionCache) put(peer firefoxSessionPeer, session *tls.ClientSessionState) {
cache.mu.Lock()
Expand Down Expand Up @@ -655,26 +662,10 @@ func (transport *browserRoundTripper) RoundTrip(request *stdhttp.Request) (*stdh
}, nil
}

// roundTrip 执行上游请求,anonymous 表示不携带凭据的请求(CORS 预检与 CSP 报告):直连时先按 Alt-Svc 选择 HTTP/3,其余经 HTTP/2 发送并记录响应的 Alt-Svc
// roundTrip 经 HTTP/2 以 Firefox 的 HEADERS 帧优先级执行上游请求,anonymous 表示不携带凭据的请求(CORS 预检与 CSP 报告),请求 context 结束时立即返回,未完成的拨号在后台结束
func (transport *browserRoundTripper) roundTrip(request *fhttp.Request, anonymous bool) (*fhttp.Response, error) {
request = request.WithContext(withRequestClass(request.Context(), requestClass{anonymous: anonymous}))
if transport.http3 == nil {
return transport.roundTripHTTP2(request)
}
response, http2Request, err := transport.http3.send(request, anonymous)
if http2Request == nil {
return response, err
}
response, err = transport.roundTripHTTP2(http2Request)
if err == nil {
transport.http3.observe(request.URL.Hostname(), response.Header)
}
return response, err
}

// roundTripHTTP2 经 HTTP/2 以 Firefox 的 HEADERS 帧优先级执行上游请求,请求 context 结束时立即返回,未完成的拨号在后台结束
func (transport *browserRoundTripper) roundTripHTTP2(request *fhttp.Request) (*fhttp.Response, error) {
request = request.WithContext(http2.WithHeaderPriority(request.Context(), firefoxStreamPriority(request.Header)))
ctx := withRequestClass(request.Context(), requestClass{anonymous: anonymous})
request = request.WithContext(http2.WithHeaderPriority(ctx, firefoxStreamPriority(request.Header)))
type result struct {
response *fhttp.Response
err error
Expand Down Expand Up @@ -720,9 +711,6 @@ func (body *browserResponseBody) syncTrailer() {

func (transport *browserRoundTripper) CloseIdleConnections() {
transport.pool.shutdown()
if transport.http3 != nil {
transport.http3.shutdown()
}
}

func standardHeader(source fhttp.Header) stdhttp.Header {
Expand All @@ -741,7 +729,7 @@ func preflightKey(request *stdhttp.Request) string {
return request.URL.String()
}

// ensurePreflight 为带 Origin 的跨域 cors 请求按 Firefox 的流程先发 CORS 预检:经 HTTP/2 时先在后台为实际请求的类别预先拨出连接,预检走匿名连接,预检响应允许的方法与请求头按 Access-Control-Max-Age(上限 24 小时)逐个缓存;no-cors 请求与只带安全头的 GET、HEAD、POST 不预检
// ensurePreflight 为带 Origin 的跨域 cors 请求按 Firefox 的流程先发 CORS 预检:先在后台为实际请求的类别预先拨出连接,预检走匿名连接,预检响应允许的方法与请求头按 Access-Control-Max-Age(上限 24 小时)逐个缓存;no-cors 请求与只带安全头的 GET、HEAD、POST 不预检
func (transport *browserRoundTripper) ensurePreflight(request *stdhttp.Request) error {
origin, err := url.Parse(request.Header.Get("Origin"))
if request.Method == stdhttp.MethodOptions || request.Header.Get("Sec-Fetch-Mode") == "no-cors" || err != nil || origin.Host == "" || origin.Host == request.URL.Host {
Expand All @@ -759,13 +747,11 @@ func (transport *browserRoundTripper) ensurePreflight(request *stdhttp.Request)
if cached {
return nil
}
if transport.http3 == nil {
port := request.URL.Port()
if port == "" {
port = "443"
}
transport.pool.speculate(net.JoinHostPort(request.URL.Hostname(), port), requestClass{anonymous: requestClassOf(request.Context()).anonymous})
port := request.URL.Port()
if port == "" {
port = "443"
}
transport.pool.speculate(net.JoinHostPort(request.URL.Hostname(), port), requestClassOf(request.Context()))
preflight, err := fhttp.NewRequestWithContext(request.Context(), stdhttp.MethodOptions, target, nil)
if err != nil {
return err
Expand Down Expand Up @@ -914,7 +900,7 @@ func firefox158ClientHello(psk int) tls.ClientHelloID {
typed.Curves = []tls.CurveID{tls.X25519MLKEM768, tls.X25519, tls.CurveP256, tls.CurveP384, tls.CurveP521}
case *tls.GREASEEncryptedClientHelloExtension:
typed.CandidateCipherSuites = []tls.HPKESymmetricCipherSuite{{KdfId: dicttls.HKDF_SHA256, AeadId: dicttls.AEAD_AES_128_GCM}, {KdfId: dicttls.HKDF_SHA256, AeadId: dicttls.AEAD_CHACHA20_POLY1305}}
typed.CandidatePayloadLens = []uint16{nssGREASEECHPayload(nssTLSGREASEECHInner, psk, false)}
typed.CandidatePayloadLens = []uint16{nssGREASEECHPayload(nssTLSGREASEECHInner, psk)}
}
}
if psk > 0 {
Expand Down
Loading