fix(sora): 修复流式重写与计费问题

backend/internal/config/config.go

@@ -928,6 +928,7 @@ func setDefaults() {
 	viper.SetDefault("sora2api.admin_token_ttl_seconds", 900)
 	viper.SetDefault("sora2api.admin_timeout_seconds", 10)
 	viper.SetDefault("sora2api.token_import_mode", "at")
+
 }
 
 func (c *Config) Validate() error {
@@ -1263,20 +1264,6 @@ func (c *Config) Validate() error {
 		if err := ValidateAbsoluteHTTPURL(c.Sora2API.BaseURL); err != nil {
 			return fmt.Errorf("sora2api.base_url invalid: %w", err)
 		}
-		warnIfInsecureURL("sora2api.base_url", c.Sora2API.BaseURL)
-	}
-	if mode := strings.TrimSpace(strings.ToLower(c.Sora2API.TokenImportMode)); mode != "" {
-		switch mode {
-		case "at", "offline":
-		default:
-			return fmt.Errorf("sora2api.token_import_mode must be one of: at/offline")
-		}
-	}
-	if c.Sora2API.AdminTokenTTLSeconds < 0 {
-		return fmt.Errorf("sora2api.admin_token_ttl_seconds must be non-negative")
-	}
-	if c.Sora2API.AdminTimeoutSeconds < 0 {
-		return fmt.Errorf("sora2api.admin_timeout_seconds must be non-negative")
 	}
 	if c.Ops.MetricsCollectorCache.TTL < 0 {
 		return fmt.Errorf("ops.metrics_collector_cache.ttl must be non-negative")

backend/internal/handler/sora_gateway_handler.go

@@ -33,6 +33,7 @@ type SoraGatewayHandler struct {
 	streamMode          string
 	sora2apiBaseURL     string
 	soraMediaSigningKey string
+	mediaClient         *http.Client
 }
 
 // NewSoraGatewayHandler creates a new SoraGatewayHandler
@@ -61,6 +62,10 @@ func NewSoraGatewayHandler(
 	if cfg != nil {
 		baseURL = strings.TrimRight(strings.TrimSpace(cfg.Sora2API.BaseURL), "/")
 	}
+	mediaTimeout := 180 * time.Second
+	if cfg != nil && cfg.Gateway.SoraRequestTimeoutSeconds > 0 {
+		mediaTimeout = time.Duration(cfg.Gateway.SoraRequestTimeoutSeconds) * time.Second
+	}
 	return &SoraGatewayHandler{
 		gatewayService:      gatewayService,
 		soraGatewayService:  soraGatewayService,
@@ -70,6 +75,7 @@ func NewSoraGatewayHandler(
 		streamMode:          strings.ToLower(streamMode),
 		sora2apiBaseURL:     baseURL,
 		soraMediaSigningKey: signKey,
+		mediaClient:         &http.Client{Timeout: mediaTimeout},
 	}
 }
 
@@ -457,7 +463,11 @@ func (h *SoraGatewayHandler) proxySoraMedia(c *gin.Context, requireSignature boo
 		}
 	}
 
-	resp, err := http.DefaultClient.Do(req)
+	client := h.mediaClient
+	if client == nil {
+		client = http.DefaultClient
+	}
+	resp, err := client.Do(req)
 	if err != nil {
 		c.Status(http.StatusBadGateway)
 		return

backend/internal/repository/account_repo.go

@@ -1565,7 +1565,7 @@ func itoa(v int) string {
 // Uses PostgreSQL JSONB @> operator for efficient queries (requires GIN index).
 //
 // Use case: Finding Sora accounts linked via linked_openai_account_id.
-func (r *accountRepository) FindByExtraField(ctx context.Context, key string, value interface{}) ([]service.Account, error) {
+func (r *accountRepository) FindByExtraField(ctx context.Context, key string, value any) ([]service.Account, error) {
 	accounts, err := r.client.Account.Query().
 		Where(
 			dbaccount.PlatformEQ("sora"), // 限定平台为 sora

backend/internal/repository/sora_account_repo.go

@@ -76,7 +76,7 @@ func (r *soraAccountRepository) GetByAccountID(ctx context.Context, accountID in
 	if err != nil {
 		return nil, err
 	}
-	defer rows.Close()
+	defer func() { _ = rows.Close() }()
 
 	if !rows.Next() {
 		return nil, nil // 记录不存在

backend/internal/service/account_service.go

@@ -27,7 +27,7 @@ type AccountRepository interface {
 	GetByCRSAccountID(ctx context.Context, crsAccountID string) (*Account, error)
 	// FindByExtraField 根据 extra 字段中的键值对查找账号（限定 platform='sora'）
 	// 用于查找通过 linked_openai_account_id 关联的 Sora 账号
-	FindByExtraField(ctx context.Context, key string, value interface{}) ([]Account, error)
+	FindByExtraField(ctx context.Context, key string, value any) ([]Account, error)
 	Update(ctx context.Context, account *Account) error
 	Delete(ctx context.Context, id int64) error
 

backend/internal/service/gateway_service.go

@@ -3465,7 +3465,7 @@ func (s *GatewayService) RecordUsage(ctx context.Context, input *RecordUsageInpu
 	var cost *CostBreakdown
 
 	// 根据请求类型选择计费方式
-	if result.MediaType == "image" || result.MediaType == "video" || result.MediaType == "prompt" {
+	if result.MediaType == "image" || result.MediaType == "video" {
 		var soraConfig *SoraPriceConfig
 		if apiKey.Group != nil {
 			soraConfig = &SoraPriceConfig{
@@ -3480,6 +3480,8 @@ func (s *GatewayService) RecordUsage(ctx context.Context, input *RecordUsageInpu
 		} else {
 			cost = s.billingService.CalculateSoraVideoCost(result.Model, soraConfig, multiplier)
 		}
+	} else if result.MediaType == "prompt" {
+		cost = &CostBreakdown{}
 	} else if result.ImageCount > 0 {
 		// 图片生成计费
 		var groupConfig *ImagePriceConfig

backend/internal/service/sora2api_service.go

@@ -62,7 +62,6 @@ type Sora2APIService struct {
 	adminUsername   string
 	adminPassword   string
 	adminTokenTTL   time.Duration
-	adminTimeout    time.Duration
 	tokenImportMode string
 
 	client      *http.Client
@@ -73,7 +72,6 @@ type Sora2APIService struct {
 	adminMu      sync.Mutex
 
 	modelCache []Sora2APIModel
-	modelCacheAt time.Time
 	modelMu    sync.RWMutex
 }
 
@@ -96,7 +94,6 @@ func NewSora2APIService(cfg *config.Config) *Sora2APIService {
 		adminUsername:   strings.TrimSpace(cfg.Sora2API.AdminUsername),
 		adminPassword:   strings.TrimSpace(cfg.Sora2API.AdminPassword),
 		adminTokenTTL:   adminTTL,
-		adminTimeout:    adminTimeout,
 		tokenImportMode: strings.ToLower(strings.TrimSpace(cfg.Sora2API.TokenImportMode)),
 		client:          &http.Client{},
 		adminClient:     &http.Client{Timeout: adminTimeout},
@@ -176,7 +173,6 @@ func (s *Sora2APIService) ListModels(ctx context.Context) ([]Sora2APIModel, erro
 
 	s.modelMu.Lock()
 	s.modelCache = models
-	s.modelCacheAt = time.Now()
 	s.modelMu.Unlock()
 
 	return models, nil

backend/internal/service/sora_gateway_service.go

@@ -23,6 +23,8 @@ var soraSSEDataRe = regexp.MustCompile(`^data:\s*`)
 var soraImageMarkdownRe = regexp.MustCompile(`!\[[^\]]*\]\(([^)]+)\)`)
 var soraVideoHTMLRe = regexp.MustCompile(`(?i)<video[^>]+src=['"]([^'"]+)['"]`)
 
+const soraRewriteBufferLimit = 2048
+
 var soraImageSizeMap = map[string]string{
 	"gpt-image":           "360",
 	"gpt-image-landscape": "540",
@@ -30,7 +32,6 @@ var soraImageSizeMap = map[string]string{
 }
 
 type soraStreamingResult struct {
-	content      string
 	mediaType    string
 	mediaURLs    []string
 	imageCount   int
@@ -307,6 +308,7 @@ func (s *SoraGatewayService) handleStreamingResponse(ctx context.Context, resp *
 	contentBuilder := strings.Builder{}
 	var firstTokenMs *int
 	var upstreamError error
+	rewriteBuffer := ""
 
 	scanner := bufio.NewScanner(resp.Body)
 	maxLineSize := defaultMaxLineSize
@@ -333,12 +335,29 @@ func (s *SoraGatewayService) handleStreamingResponse(ctx context.Context, resp *
 		if soraSSEDataRe.MatchString(line) {
 			data := soraSSEDataRe.ReplaceAllString(line, "")
 			if data == "[DONE]" {
+				if rewriteBuffer != "" {
+					flushLine, flushContent, err := s.flushSoraRewriteBuffer(rewriteBuffer, originalModel)
+					if err != nil {
+						return nil, err
+					}
+					if flushLine != "" {
+						if flushContent != "" {
+							if _, err := contentBuilder.WriteString(flushContent); err != nil {
+								return nil, err
+							}
+						}
+						if err := sendLine(flushLine); err != nil {
+							return nil, err
+						}
+					}
+					rewriteBuffer = ""
+				}
 				if err := sendLine("data: [DONE]"); err != nil {
 					return nil, err
 				}
 				break
 			}
-			updatedLine, contentDelta, errEvent := s.processSoraSSEData(data, originalModel)
+			updatedLine, contentDelta, errEvent := s.processSoraSSEData(data, originalModel, &rewriteBuffer)
 			if errEvent != nil && upstreamError == nil {
 				upstreamError = errEvent
 			}
@@ -347,7 +366,9 @@ func (s *SoraGatewayService) handleStreamingResponse(ctx context.Context, resp *
 					ms := int(time.Since(startTime).Milliseconds())
 					firstTokenMs = &ms
 				}
-				contentBuilder.WriteString(contentDelta)
+				if _, err := contentBuilder.WriteString(contentDelta); err != nil {
+					return nil, err
+				}
 			}
 			if err := sendLine(updatedLine); err != nil {
 				return nil, err
@@ -417,7 +438,6 @@ func (s *SoraGatewayService) handleStreamingResponse(ctx context.Context, resp *
 	}
 
 	return &soraStreamingResult{
-		content:      content,
 		mediaType:    mediaType,
 		mediaURLs:    mediaURLs,
 		imageCount:   imageCount,
@@ -426,7 +446,7 @@ func (s *SoraGatewayService) handleStreamingResponse(ctx context.Context, resp *
 	}, nil
 }
 
-func (s *SoraGatewayService) processSoraSSEData(data string, originalModel string) (string, string, error) {
+func (s *SoraGatewayService) processSoraSSEData(data string, originalModel string, rewriteBuffer *string) (string, string, error) {
 	if strings.TrimSpace(data) == "" {
 		return "data: ", "", nil
 	}
@@ -448,7 +468,12 @@ func (s *SoraGatewayService) processSoraSSEData(data string, originalModel strin
 
 	contentDelta, updated := extractSoraContent(payload)
 	if updated {
-		rewritten := s.rewriteSoraContent(contentDelta)
+		var rewritten string
+		if rewriteBuffer != nil {
+			rewritten = s.rewriteSoraContentWithBuffer(contentDelta, rewriteBuffer)
+		} else {
+			rewritten = s.rewriteSoraContent(contentDelta)
+		}
 		if rewritten != contentDelta {
 			applySoraContent(payload, rewritten)
 			contentDelta = rewritten
@@ -504,6 +529,78 @@ func applySoraContent(payload map[string]any, content string) {
 	}
 }
 
+func (s *SoraGatewayService) rewriteSoraContentWithBuffer(contentDelta string, buffer *string) string {
+	if buffer == nil {
+		return s.rewriteSoraContent(contentDelta)
+	}
+	if contentDelta == "" && *buffer == "" {
+		return ""
+	}
+	combined := *buffer + contentDelta
+	rewritten := s.rewriteSoraContent(combined)
+	bufferStart := s.findSoraRewriteBufferStart(rewritten)
+	if bufferStart < 0 {
+		*buffer = ""
+		return rewritten
+	}
+	if len(rewritten)-bufferStart > soraRewriteBufferLimit {
+		bufferStart = len(rewritten) - soraRewriteBufferLimit
+	}
+	output := rewritten[:bufferStart]
+	*buffer = rewritten[bufferStart:]
+	return output
+}
+
+func (s *SoraGatewayService) findSoraRewriteBufferStart(content string) int {
+	minIndex := -1
+	start := 0
+	for {
+		idx := strings.Index(content[start:], "![")
+		if idx < 0 {
+			break
+		}
+		idx += start
+		if !hasSoraImageMatchAt(content, idx) {
+			if minIndex == -1 || idx < minIndex {
+				minIndex = idx
+			}
+		}
+		start = idx + 2
+	}
+	lower := strings.ToLower(content)
+	start = 0
+	for {
+		idx := strings.Index(lower[start:], "<video")
+		if idx < 0 {
+			break
+		}
+		idx += start
+		if !hasSoraVideoMatchAt(content, idx) {
+			if minIndex == -1 || idx < minIndex {
+				minIndex = idx
+			}
+		}
+		start = idx + len("<video")
+	}
+	return minIndex
+}
+
+func hasSoraImageMatchAt(content string, idx int) bool {
+	if idx < 0 || idx >= len(content) {
+		return false
+	}
+	loc := soraImageMarkdownRe.FindStringIndex(content[idx:])
+	return loc != nil && loc[0] == 0
+}
+
+func hasSoraVideoMatchAt(content string, idx int) bool {
+	if idx < 0 || idx >= len(content) {
+		return false
+	}
+	loc := soraVideoHTMLRe.FindStringIndex(content[idx:])
+	return loc != nil && loc[0] == 0
+}
+
 func (s *SoraGatewayService) rewriteSoraContent(content string) string {
 	if content == "" {
 		return content
@@ -533,6 +630,31 @@ func (s *SoraGatewayService) rewriteSoraContent(content string) string {
 	return content
 }
 
+func (s *SoraGatewayService) flushSoraRewriteBuffer(buffer string, originalModel string) (string, string, error) {
+	if buffer == "" {
+		return "", "", nil
+	}
+	rewritten := s.rewriteSoraContent(buffer)
+	payload := map[string]any{
+		"choices": []any{
+			map[string]any{
+				"delta": map[string]any{
+					"content": rewritten,
+				},
+				"index": 0,
+			},
+		},
+	}
+	if originalModel != "" {
+		payload["model"] = originalModel
+	}
+	updatedData, err := json.Marshal(payload)
+	if err != nil {
+		return "", "", err
+	}
+	return "data: " + string(updatedData), rewritten, nil
+}
+
 func (s *SoraGatewayService) rewriteSoraURL(raw string) string {
 	raw = strings.TrimSpace(raw)
 	if raw == "" {

backend/internal/service/sora_media_sign.go

@@ -15,9 +15,15 @@ func SignSoraMediaURL(path string, query string, expires int64, key string) stri
 		return ""
 	}
 	mac := hmac.New(sha256.New, []byte(key))
-	mac.Write([]byte(buildSoraMediaSignPayload(path, query)))
-	mac.Write([]byte("|"))
-	mac.Write([]byte(strconv.FormatInt(expires, 10)))
+	if _, err := mac.Write([]byte(buildSoraMediaSignPayload(path, query))); err != nil {
+		return ""
+	}
+	if _, err := mac.Write([]byte("|")); err != nil {
+		return ""
+	}
+	if _, err := mac.Write([]byte(strconv.FormatInt(expires, 10))); err != nil {
+		return ""
+	}
 	return hex.EncodeToString(mac.Sum(nil))
 }
 

backend/internal/service/token_refresh_service.go

@@ -15,11 +15,9 @@ import (
 // 定期检查并刷新即将过期的token
 type TokenRefreshService struct {
 	accountRepo      AccountRepository
-	soraAccountRepo  SoraAccountRepository // Sora 扩展表仓储，用于双表同步
 	refreshers       []TokenRefresher
 	cfg              *config.TokenRefreshConfig
 	cacheInvalidator TokenCacheInvalidator
-	soraSyncService  *Sora2APISyncService
 
 	stopCh chan struct{}
 	wg     sync.WaitGroup
@@ -57,7 +55,6 @@ func NewTokenRefreshService(
 // 用于在 OpenAI Token 刷新时同步更新 sora_accounts 表
 // 需要在 Start() 之前调用
 func (s *TokenRefreshService) SetSoraAccountRepo(repo SoraAccountRepository) {
-	s.soraAccountRepo = repo
 	// 将 soraAccountRepo 注入到 OpenAITokenRefresher
 	for _, refresher := range s.refreshers {
 		if openaiRefresher, ok := refresher.(*OpenAITokenRefresher); ok {
@@ -69,7 +66,6 @@ func (s *TokenRefreshService) SetSoraAccountRepo(repo SoraAccountRepository) {
 // SetSoraSyncService 设置 Sora2API 同步服务
 // 需要在 Start() 之前调用
 func (s *TokenRefreshService) SetSoraSyncService(svc *Sora2APISyncService) {
-	s.soraSyncService = svc
 	for _, refresher := range s.refreshers {
 		if openaiRefresher, ok := refresher.(*OpenAITokenRefresher); ok {
 			openaiRefresher.SetSoraSyncService(svc)

backend/internal/service/wire.go

@@ -51,9 +51,7 @@ func ProvideTokenRefreshService(
 	svc := NewTokenRefreshService(accountRepo, oauthService, openaiOAuthService, geminiOAuthService, antigravityOAuthService, cacheInvalidator, cfg)
 	// 注入 Sora 账号扩展表仓储，用于 OpenAI Token 刷新时同步 sora_accounts 表
 	svc.SetSoraAccountRepo(soraAccountRepo)
-	if soraSyncService != nil {
 	svc.SetSoraSyncService(soraSyncService)
-	}
 	svc.Start()
 	return svc
 }
@@ -242,8 +240,6 @@ var ProviderSet = wire.NewSet(
 	NewAntigravityTokenProvider,
 	NewOpenAITokenProvider,
 	NewClaudeTokenProvider,
-	NewSora2APIService,
-	NewSora2APISyncService,
 	NewAntigravityGatewayService,
 	ProvideRateLimitService,
 	NewAccountUsageService,