Revert "Harden provider routing and implement health failover (awsl-project#421)"

This reverts commit 67ab9e0.

Author: luodaoyi

cmd/maxx/main.go

@@ -22,7 +22,6 @@ import (
 	"github.com/awsl-project/maxx/internal/core"
 	"github.com/awsl-project/maxx/internal/executor"
 	"github.com/awsl-project/maxx/internal/handler"
-	"github.com/awsl-project/maxx/internal/health"
 	"github.com/awsl-project/maxx/internal/repository/cached"
 	"github.com/awsl-project/maxx/internal/repository/sqlite"
 	"github.com/awsl-project/maxx/internal/router"
@@ -193,10 +192,8 @@ func main() {
 	}
 	log.Printf("[Startup] Caches loaded (%v)", time.Since(startupStep))
 
-	providerHealthTracker := health.NewTracker()
-
 	// Create router
-	r := router.NewRouter(cachedRouteRepo, cachedProviderRepo, cachedRoutingStrategyRepo, cachedRetryConfigRepo, cachedProjectRepo, providerHealthTracker)
+	r := router.NewRouter(cachedRouteRepo, cachedProviderRepo, cachedRoutingStrategyRepo, cachedRetryConfigRepo, cachedProjectRepo)
 
 	// Initialize provider adapters
 	startupStep = time.Now()
@@ -282,7 +279,7 @@ func main() {
 	statsAggregator := stats.NewStatsAggregator(usageStatsRepo)
 
 	// Create executor
-	requestExecutor := executor.NewExecutor(r, proxyRequestRepo, attemptRepo, cachedRetryConfigRepo, cachedSessionRepo, cachedModelMappingRepo, settingRepo, wsHub, projectWaiter, instanceID, statsAggregator, providerHealthTracker)
+	requestExecutor := executor.NewExecutor(r, proxyRequestRepo, attemptRepo, cachedRetryConfigRepo, cachedSessionRepo, cachedModelMappingRepo, settingRepo, wsHub, projectWaiter, instanceID, statsAggregator)
 
 	// Create client adapter
 	clientAdapter := client.NewAdapter()

internal/adapter/provider/antigravity/adapter.go

@@ -239,7 +239,6 @@ func (a *AntigravityAdapter) Execute(c *flow.Ctx, provider *domain.Provider) err
 					proxyErr.IsNetworkError = true // Mark as network error (connection timeout, DNS failure, etc.)
 					return proxyErr
 				}
-				resp.Body = flow.WrapResponseBody(c, resp.Body)
 
 				// Check for 401 (token expired) and retry once
 				if resp.StatusCode == http.StatusUnauthorized {
@@ -274,7 +273,6 @@ func (a *AntigravityAdapter) Execute(c *flow.Ctx, provider *domain.Provider) err
 						proxyErr.IsNetworkError = true // Mark as network error
 						return proxyErr
 					}
-					resp.Body = flow.WrapResponseBody(c, resp.Body)
 				}
 
 				// Check for error response

internal/adapter/provider/claude/adapter.go

@@ -135,7 +135,6 @@ func (a *ClaudeAdapter) Execute(c *flow.Ctx, provider *domain.Provider) error {
 		proxyErr.IsNetworkError = true
 		return proxyErr
 	}
-	resp.Body = flow.WrapResponseBody(c, resp.Body)
 	defer resp.Body.Close()
 
 	// Handle 401 (token expired) - refresh and retry once
@@ -166,7 +165,6 @@ func (a *ClaudeAdapter) Execute(c *flow.Ctx, provider *domain.Provider) error {
 			proxyErr.IsNetworkError = true
 			return proxyErr
 		}
-		resp.Body = flow.WrapResponseBody(c, resp.Body)
 		defer resp.Body.Close()
 	}
 
@@ -693,6 +691,7 @@ func extractModelFromResponse(body []byte) string {
 	return ""
 }
 
+
 var claudeFilteredHeaders = map[string]bool{
 	// Hop-by-hop headers
 	"connection":        true,

internal/adapter/provider/cliproxyapi_antigravity/adapter.go

@@ -127,9 +127,6 @@ func (a *CLIProxyAPIAntigravityAdapter) executeNonStream(c *flow.Ctx, w http.Res
 	if c.Request != nil {
 		ctx = c.Request.Context()
 	}
-	// CPA 非流式接口会缓冲完整响应后一次性返回，无法暴露真实上游首字节。
-	// 这类路径退回到 TotalTimeout 控制，避免把大响应误判成 first-byte timeout。
-	flow.DisableFirstByteTimeout(c)
 
 	resp, err := a.executor.Execute(ctx, a.authObj, execReq, execOpts)
 	if err != nil {

internal/adapter/provider/cliproxyapi_codex/adapter.go

@@ -17,11 +17,11 @@ import (
 	"github.com/awsl-project/maxx/internal/domain"
 	"github.com/awsl-project/maxx/internal/flow"
 	"github.com/awsl-project/maxx/internal/usage"
+	"github.com/tidwall/sjson"
 	"github.com/router-for-me/CLIProxyAPI/v6/sdk/cliproxy/auth"
 	"github.com/router-for-me/CLIProxyAPI/v6/sdk/cliproxy/executor"
 	"github.com/router-for-me/CLIProxyAPI/v6/sdk/exec"
 	"github.com/router-for-me/CLIProxyAPI/v6/sdk/translator"
-	"github.com/tidwall/sjson"
 )
 
 // TokenCache caches access tokens
@@ -271,9 +271,6 @@ func (a *CLIProxyAPICodexAdapter) executeNonStream(c *flow.Ctx, w http.ResponseW
 	if c.Request != nil {
 		ctx = c.Request.Context()
 	}
-	// CPA 非流式接口会缓冲完整响应后一次性返回，无法暴露真实上游首字节。
-	// 这类路径退回到 TotalTimeout 控制，避免把大响应误判成 first-byte timeout。
-	flow.DisableFirstByteTimeout(c)
 
 	resp, err := a.executor.Execute(ctx, a.authObj, execReq, execOpts)
 	if err != nil {

internal/adapter/provider/codex/adapter.go

@@ -177,7 +177,6 @@ func (a *CodexAdapter) Execute(c *flow.Ctx, provider *domain.Provider) error {
 		proxyErr.IsNetworkError = true
 		return proxyErr
 	}
-	resp.Body = flow.WrapResponseBody(c, resp.Body)
 	defer resp.Body.Close()
 
 	// Handle 401 (token expired) - refresh and retry once
@@ -208,7 +207,6 @@ func (a *CodexAdapter) Execute(c *flow.Ctx, provider *domain.Provider) error {
 			proxyErr.IsNetworkError = true
 			return proxyErr
 		}
-		resp.Body = flow.WrapResponseBody(c, resp.Body)
 		defer resp.Body.Close()
 	}
 
@@ -690,6 +688,7 @@ func extractModelFromResponse(body []byte) string {
 	return ""
 }
 
+
 // applyCodexHeaders applies headers for Codex API requests
 // It follows the CLIProxyAPI pattern: passthrough client headers, use defaults only when missing
 func (a *CodexAdapter) applyCodexHeaders(upstreamReq, clientReq *http.Request, accessToken, accountID string, stream bool, cacheID string) {

internal/adapter/provider/custom/adapter.go

@@ -153,7 +153,6 @@ func (a *CustomAdapter) Execute(c *flow.Ctx, provider *domain.Provider) error {
 		proxyErr.IsNetworkError = true
 		return proxyErr
 	}
-	resp.Body = flow.WrapResponseBody(c, resp.Body)
 	defer resp.Body.Close()
 
 	// Check for error response

internal/adapter/provider/kiro/adapter.go

@@ -137,7 +137,6 @@ func (a *KiroAdapter) Execute(c *flow.Ctx, provider *domain.Provider) error {
 		proxyErr.IsNetworkError = true
 		return proxyErr
 	}
-	resp.Body = flow.WrapResponseBody(c, resp.Body)
 	defer resp.Body.Close()
 
 	// Check for 401 (token expired) and retry once
@@ -172,7 +171,6 @@ func (a *KiroAdapter) Execute(c *flow.Ctx, provider *domain.Provider) error {
 			proxyErr.IsNetworkError = true
 			return proxyErr
 		}
-		resp.Body = flow.WrapResponseBody(c, resp.Body)
 		defer resp.Body.Close()
 	}
 

internal/core/database.go

@@ -17,7 +17,6 @@ import (
 	"github.com/awsl-project/maxx/internal/event"
 	"github.com/awsl-project/maxx/internal/executor"
 	"github.com/awsl-project/maxx/internal/handler"
-	"github.com/awsl-project/maxx/internal/health"
 	"github.com/awsl-project/maxx/internal/pricing"
 	"github.com/awsl-project/maxx/internal/repository"
 	"github.com/awsl-project/maxx/internal/repository/cached"
@@ -255,14 +254,12 @@ func InitializeServerComponents(
 	}
 
 	log.Printf("[Core] Creating router")
-	providerHealthTracker := health.NewTracker()
 	r := router.NewRouter(
 		repos.CachedRouteRepo,
 		repos.CachedProviderRepo,
 		repos.CachedRoutingStrategyRepo,
 		repos.CachedRetryConfigRepo,
 		repos.CachedProjectRepo,
-		providerHealthTracker,
 	)
 
 	log.Printf("[Core] Initializing provider adapters")
@@ -325,7 +322,6 @@ func InitializeServerComponents(
 		projectWaiter,
 		instanceID,
 		statsAggregator,
-		providerHealthTracker,
 	)
 
 	log.Printf("[Core] Creating client adapter")

internal/domain/backup.go

@@ -67,7 +67,6 @@ type BackupRoute struct {
 	ClientType      ClientType `json:"clientType"`
 	ProviderName    string     `json:"providerName"`
 	Position        int        `json:"position"`
-	Weight          int        `json:"weight"`
 	RetryConfigName string     `json:"retryConfigName"` // empty = default
 }