From 2bdc1058351cc89c8306ddbb7fb95ae69a0db348 Mon Sep 17 00:00:00 2001 From: tbphp Date: Mon, 7 Sep 2026 22:18:12 +0800 Subject: [PATCH] =?UTF-8?q?chore(deps):=20=E5=8D=87=E7=BA=A7=E5=AE=98?= =?UTF-8?q?=E6=96=B9=20fasthttp=20=E5=B9=B6=E7=A7=BB=E9=99=A4=E4=B8=B4?= =?UTF-8?q?=E6=97=B6=E6=9B=BF=E6=8D=A2=20(#589)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore(deps): 升级官方 fasthttp 并移除临时替换 * docs(licenses): 同步 fasthttp 升级后的第三方声明 --- LICENSES/MIT.txt | 7 +++++-- THIRD_PARTY_NOTICES.md | 19 +++++++++++++++---- go.mod | 6 ++---- go.sum | 6 ++++-- 4 files changed, 26 insertions(+), 12 deletions(-) diff --git a/LICENSES/MIT.txt b/LICENSES/MIT.txt index e932a3c5..c1fb3a38 100644 --- a/LICENSES/MIT.txt +++ b/LICENSES/MIT.txt @@ -9,12 +9,15 @@ CLIProxyAPI (github.com/router-for-me/CLIProxyAPI): Copyright (c) 2025-2005.9 Luis Pater Copyright (c) 2025.9-present Router-For.ME -fasthttp (github.com/valyala/fasthttp, including the github.com/tbphp/fasthttp -fork built into GPT-Load): +fasthttp (github.com/valyala/fasthttp): Copyright (c) 2015-present Aliaksandr Valialkin, VertaMedia, Kirill Danshin, Erik Dubbelboer, FastHTTP Authors +go-brrr (github.com/molecule-man/go-brrr): + + Copyright (c) 2026 Andrii Berezhynskyi + Lobe Icons (github.com/lobehub/lobe-icons): Copyright (c) 2023 LobeHub diff --git a/THIRD_PARTY_NOTICES.md b/THIRD_PARTY_NOTICES.md index 933de93a..89333d30 100644 --- a/THIRD_PARTY_NOTICES.md +++ b/THIRD_PARTY_NOTICES.md @@ -53,14 +53,25 @@ The complete Inno Setup License text is distributed in ## fasthttp - Module: `github.com/valyala/fasthttp` -- Replaced by: `github.com/tbphp/fasthttp v1.73.1-0.20260828150536-1c6c09a6f6bc` +- Version: `v1.74.0` - Copyright: 2015-present Aliaksandr Valialkin, VertaMedia, Kirill Danshin, Erik Dubbelboer, FastHTTP Authors - License: MIT License -GPT-Load builds against a pinned fork carrying an unreleased upstream stream -lifecycle fix (). The fork keeps -the original copyright and MIT license unchanged. +GPT-Load uses the official upstream release through Bifrost Core for provider +HTTP requests and streaming responses. + +The complete MIT License text is distributed in `LICENSES/MIT.txt`. + +## go-brrr + +- Module: `github.com/molecule-man/go-brrr` +- Version: `v1.0.1` +- Copyright: 2026 Andrii Berezhynskyi +- License: MIT License + +GPT-Load includes go-brrr through fasthttp for Brotli compression and +decompression. The complete MIT License text is distributed in `LICENSES/MIT.txt`. diff --git a/go.mod b/go.mod index 3282b7a0..881369b7 100644 --- a/go.mod +++ b/go.mod @@ -88,6 +88,7 @@ require ( github.com/mattn/go-isatty v0.0.24 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/molecule-man/go-brrr v1.0.1 // indirect github.com/ncruces/go-strftime v1.0.0 // indirect github.com/pelletier/go-toml/v2 v2.2.4 // indirect github.com/pierrec/xxHash v0.1.5 // indirect @@ -110,7 +111,7 @@ require ( github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.3.1 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect - github.com/valyala/fasthttp v1.73.0 // indirect + github.com/valyala/fasthttp v1.74.0 // indirect github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect github.com/yosida95/uritemplate/v3 v3.0.2 // indirect go.mongodb.org/mongo-driver/v2 v2.5.1 // indirect @@ -128,7 +129,4 @@ require ( modernc.org/sqlite v1.54.0 // indirect ) -// Temporary stream lifecycle fix: https://github.com/valyala/fasthttp/pull/2353 -replace github.com/valyala/fasthttp => github.com/tbphp/fasthttp v1.73.1-0.20260828150536-1c6c09a6f6bc - replace github.com/router-for-me/CLIProxyAPI/v7/gptload-embedded => ./third_party/cpaembedded diff --git a/go.sum b/go.sum index c0b2d954..37b8a48c 100644 --- a/go.sum +++ b/go.sum @@ -181,6 +181,8 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/molecule-man/go-brrr v1.0.1 h1:cEjgx8hgNw6UGdhQ94SPDbPkKuRbkUcxBO3IzbGpA/o= +github.com/molecule-man/go-brrr v1.0.1/go.mod h1:7ybW6/7gA3oKY45jOfVNjSJDtrr6ea4tzbsTkjmQDC4= github.com/ncruces/go-strftime v1.0.0 h1:HMFp8mLCTPp341M/ZnA4qaf7ZlsbTc+miZjCLOFAw7w= github.com/ncruces/go-strftime v1.0.0/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls= github.com/nicksnyder/go-i18n/v2 v2.6.1 h1:JDEJraFsQE17Dut9HFDHzCoAWGEQJom5s0TRd17NIEQ= @@ -230,8 +232,6 @@ github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXl github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/stretchr/testify v1.12.1 h1:EuwCh5fleGS7H32xRwO3wRGT7DxrDhLAT6FF8MpWDWE= github.com/stretchr/testify v1.12.1/go.mod h1:MDEgiDPPsNp5cuIrHPPCyornHKgEVbtFUmoNlxoYthg= -github.com/tbphp/fasthttp v1.73.1-0.20260828150536-1c6c09a6f6bc h1:TDmArbphrQYHHCF6OZd7h5AJTgnQvEKfelaCs/8MWbo= -github.com/tbphp/fasthttp v1.73.1-0.20260828150536-1c6c09a6f6bc/go.mod h1:Av8ic1DRn/EaPql1f03OpyPnj/NR1GzcryOxVbWoQi0= github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= github.com/tidwall/gjson v1.19.0 h1:xwxm7n691Uf3u5OFjzngavjGTh55KX5q/9w9xHW88JU= github.com/tidwall/gjson v1.19.0/go.mod h1:V37/opeE/JbLUOfH0QTXiNez2l0RUjYUhpT4szFQAfc= @@ -250,6 +250,8 @@ github.com/ugorji/go/codec v1.3.1 h1:waO7eEiFDwidsBN6agj1vJQ4AG7lh2yqXyOXqhgQuyY github.com/ugorji/go/codec v1.3.1/go.mod h1:pRBVtBSKl77K30Bv8R2P+cLSGaTtex6fsA2Wjqmfxj4= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= +github.com/valyala/fasthttp v1.74.0 h1:wMS9fnO2QTALozYx5pId2Vi7ZwU/epUkY8i/KPWCHoU= +github.com/valyala/fasthttp v1.74.0/go.mod h1:3ARmLamUcw7ElxVtC8PXaGzQ6VEuvnetlkrwIklQBSE= github.com/wk8/go-ordered-map/v2 v2.1.8 h1:5h/BUHu93oj4gIdvHHHGsScSTMijfx5PeYkE/fJgbpc= github.com/wk8/go-ordered-map/v2 v2.1.8/go.mod h1:5nJHM5DyteebpVlHnWMV0rPz6Zp7+xBAnxjb1X5vnTw= github.com/xyproto/randomstring v1.0.5 h1:YtlWPoRdgMu3NZtP45drfy1GKoojuR7hmRcnhZqKjWU=