xinyin025/3x-ui
1
0
Fork 0
mirror of https://github.com/MHSanaei/3x-ui.git synced 2026-08-19 17:40:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: route WARP API requests through panel proxy (#5101)

Browse Source 
Co-authored-by: Rqzbeh <Rqzbeh@example.com>
This commit is contained in:
Rouzbeh†
2026-06-09 01:01:25 +02:00
committed by GitHub
parent 9f31d7d056
commit a32c6803da
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/service/warp.go
+6 -7
View File
@@ -23,8 +23,6 @@ const (
warpClientVer = "a-6.30-3596" warpClientVer = "a-6.30-3596"
) )
var warpHTTPClient = &http.Client{Timeout: 15 * time.Second}
func (s *WarpService) GetWarpData() (string, error) { func (s *WarpService) GetWarpData() (string, error) {
return s.SettingService.GetWarp() return s.SettingService.GetWarp()
} }
@@ -46,7 +44,7 @@ func (s *WarpService) GetWarpConfig() (string, error) {
} }
req.Header.Set("Authorization", "Bearer "+warpData["access_token"]) req.Header.Set("Authorization", "Bearer "+warpData["access_token"])
body, err := doWarpRequest(req) body, err := s.doWarpRequest(req)
if err != nil { if err != nil {
return "", err return "", err
} }
@@ -73,7 +71,7 @@ func (s *WarpService) RegWarp(secretKey string, publicKey string) (string, error
req.Header.Set("CF-Client-Version", warpClientVer) req.Header.Set("CF-Client-Version", warpClientVer)
req.Header.Set("Content-Type", "application/json") req.Header.Set("Content-Type", "application/json")
body, err := doWarpRequest(req) body, err := s.doWarpRequest(req)
if err != nil { if err != nil {
return "", err return "", err
} }
@@ -148,7 +146,7 @@ func (s *WarpService) SetWarpLicense(license string) (string, error) {
req.Header.Set("Authorization", "Bearer "+warpData["access_token"]) req.Header.Set("Authorization", "Bearer "+warpData["access_token"])
req.Header.Set("Content-Type", "application/json") req.Header.Set("Content-Type", "application/json")
body, err := doWarpRequest(req) body, err := s.doWarpRequest(req)
if err != nil { if err != nil {
return "", err return "", err
} }
@@ -190,8 +188,9 @@ func (s *WarpService) loadWarpCreds() (map[string]string, error) {
// doWarpRequest sends the request and returns the response body on 2xx. // doWarpRequest sends the request and returns the response body on 2xx.
// Non-2xx responses are returned as errors including the status code and body. // Non-2xx responses are returned as errors including the status code and body.
func doWarpRequest(req *http.Request) ([]byte, error) { func (s *WarpService) doWarpRequest(req *http.Request) ([]byte, error) {
resp, err := warpHTTPClient.Do(req) client := s.NewProxiedHTTPClient(15 * time.Second)
resp, err := client.Do(req)
if err != nil { if err != nil {
return nil, err return nil, err
} }