Enhance dynamic model support and optimize user agent handling

.gitignore

@@ -14,4 +14,6 @@ tools/authenticator/.proxies.txt.swp
 /target/
 /bin/
 .claude
-.gocache
+.gocache
+.atomcode
+CLAUDE.md

conversion/response/chatgpt/convert.go

@@ -9,12 +9,22 @@ import (
 )
 
 func ConvertToString(chatgpt_response *chatgpt_types.ChatGPTResponse, previous_text *typings.StringStruct, role bool, model string) string {
-	translated_response := official_types.NewChatCompletionChunk(strings.Replace(chatgpt_response.Message.Content.Parts[0].(string), previous_text.Text, "", 1), model)
+	currentText := firstTextPart(chatgpt_response.Message.Content.Parts)
+	deltaText := strings.Replace(currentText, previous_text.Text, "", 1)
+	translated_response := official_types.NewChatCompletionChunk(deltaText, model)
 	if role {
 		translated_response.Choices[0].Delta.Role = chatgpt_response.Message.Author.Role
-	} else if translated_response.Choices[0].Delta.Content == "" || (strings.HasPrefix(chatgpt_response.Message.Metadata.ModelSlug, "gpt-4") && translated_response.Choices[0].Delta.Content == "【") {
+	} else if translated_response.Choices[0].Delta.Content == "" || translated_response.Choices[0].Delta.Content == "【" {
 		return translated_response.Choices[0].Delta.Content
 	}
-	previous_text.Text = chatgpt_response.Message.Content.Parts[0].(string)
+	previous_text.Text = currentText
 	return "data: " + translated_response.String() + "\n\n"
 }
+
+func firstTextPart(parts []interface{}) string {
+	if len(parts) == 0 {
+		return ""
+	}
+	text, _ := parts[0].(string)
+	return text
+}

conversion/response/chatgpt/convert_test.go

@@ -0,0 +1,52 @@
+package chatgpt
+
+import (
+	"encoding/json"
+	"testing"
+
+	"aurora/typings"
+	chatgpt_types "aurora/typings/chatgpt"
+)
+
+func TestConvertToStringUsesRequestModel(t *testing.T) {
+	previous := &typings.StringStruct{}
+	response := chatgpt_types.ChatGPTResponse{
+		Message: chatgpt_types.Message{
+			Author: chatgpt_types.Author{Role: "assistant"},
+			Content: chatgpt_types.Content{
+				Parts: []interface{}{"hello"},
+			},
+		},
+	}
+
+	data := ConvertToString(&response, previous, true, "gpt-5-5-pro")
+
+	var event struct {
+		Model string `json:"model"`
+	}
+	if err := json.Unmarshal([]byte(data[len("data: "):len(data)-2]), &event); err != nil {
+		t.Fatalf("invalid SSE JSON: %v", err)
+	}
+	if event.Model != "gpt-5-5-pro" {
+		t.Fatalf("model = %q, want request model", event.Model)
+	}
+}
+
+func TestConvertToStringWaitsSourceMarkerForAnyModel(t *testing.T) {
+	previous := &typings.StringStruct{Text: "answer"}
+	response := chatgpt_types.ChatGPTResponse{
+		Message: chatgpt_types.Message{
+			Author: chatgpt_types.Author{Role: "assistant"},
+			Content: chatgpt_types.Content{
+				Parts: []interface{}{"answer【"},
+			},
+			Metadata: chatgpt_types.Metadata{ModelSlug: "gpt-5-5-pro"},
+		},
+	}
+
+	data := ConvertToString(&response, previous, false, "gpt-5-5-pro")
+
+	if data != "【" {
+		t.Fatalf("data = %q, want source marker only", data)
+	}
+}

go.mod

@@ -14,7 +14,6 @@ require (
 	github.com/gorilla/websocket v1.5.3
 	github.com/joho/godotenv v1.5.1
 	github.com/pkoukk/tiktoken-go v0.1.7
-	github.com/xqdoo00o/funcaptcha v0.0.0-20240403090732-1b604d808f6c
 	golang.org/x/crypto v0.52.0
 )
 

go.sum

@@ -113,8 +113,6 @@ github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS
 github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
 github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE=
 github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
-github.com/xqdoo00o/funcaptcha v0.0.0-20240403090732-1b604d808f6c h1:nj17XsSTwprsZUDXLldOUZmqz7VlHsLCeXXFOE6Q+Mk=
-github.com/xqdoo00o/funcaptcha v0.0.0-20240403090732-1b604d808f6c/go.mod h1:7aCyoW5MHDUsoooMVLqKe0F7W9HMPUvDG3bXqw++8XA=
 github.com/xyproto/randomstring v1.0.5 h1:YtlWPoRdgMu3NZtP45drfy1GKoojuR7hmRcnhZqKjWU=
 github.com/xyproto/randomstring v1.0.5/go.mod h1:rgmS5DeNXLivK7YprL0pY+lTuhNQW3iGxZ18UQApw/E=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=

initialize/handlers.go

@@ -951,29 +951,29 @@ func (h *Handler) tts(c *gin.Context) {
 	}
 
 	client := bogdanfinn.NewStdClient()
-	turnStile, status, err := h.initTurnStileWithRetry(&client, &secret, proxyUrl)
-	if err != nil {
-		c.JSON(status, gin.H{
-			"message": err.Error(),
-			"type":    "InitTurnStile_request_error",
-			"param":   err,
-			"code":    status,
-		})
-		return
-	}
 
 	// Convert the chat request to a ChatGPT request
 	translated_request := chatgptrequestconverter.ConvertTTSAPIRequest(original_request.Input)
+	clientState := chatgpt.NewChatClientState()
+	clientState.ConversationID = translated_request.ConversationID
+	clientState.ParentMessageID = translated_request.ParentMessageID
 
-	response, err := chatgpt.POSTconversation(client, translated_request, secret, turnStile, proxyUrl)
+	response, wsConn, status, err := h.postConversationGptClientOrder(&client, &secret, translated_request, proxyUrl, false, clientState)
 	if err != nil {
-		c.JSON(500, gin.H{
-			"error": "error sending request",
-		})
+		c.JSON(status, gin.H{"error": gin.H{
+			"message": err.Error(),
+			"type":    "request_conversion_error",
+			"param":   "model",
+			"code":    "request_conversion_error",
+		}})
 		return
 	}
 	defer response.Body.Close()
 	if chatgpt.Handle_request_error(c, response) {
+		if wsConn != nil {
+			wsConn.Close()
+			wsConn = nil
+		}
 		return
 	}
 	msgId, convId := chatgpt.HandlerTTS(response, original_request.Input)

internal/chatgpt/artifact_delivery.go

@@ -238,7 +238,7 @@ func DownloadURLBytes(client httpclient.AuroraHttpClient, url string, secret *to
 	if secret != nil && secret.PUID != "" {
 		header.Set("Cookie", "_puid="+secret.PUID+";")
 	}
-	header.Set("User-Agent", userAgent)
+	header.Set("User-Agent", defaultUserAgent())
 	if accept == "" {
 		accept = "*/*"
 	}

internal/chatgpt/client_state.go

@@ -4,9 +4,10 @@ import (
 	"math"
 	"time"
 
-	chatgpt_types "aurora/typings/chatgpt"
-
+	browser "github.com/EDDYCJY/fake-useragent"
 	"github.com/google/uuid"
+
+	chatgpt_types "aurora/typings/chatgpt"
 )
 
 type ChatClientState struct {
@@ -16,6 +17,7 @@ type ChatClientState struct {
 	ConversationID  string
 	ParentMessageID string
 	TurnCount       int
+	UserAgent       string
 }
 
 func NewChatClientState() *ChatClientState {
@@ -24,6 +26,7 @@ func NewChatClientState() *ChatClientState {
 		SessionID:       uuid.NewString(),
 		StartTime:       time.Now(),
 		ParentMessageID: "client-created-root",
+		UserAgent:       browser.Random(),
 	}
 }
 

internal/chatgpt/files.go

@@ -152,7 +152,7 @@ func putUpload(client httpclient.AuroraHttpClient, uploadURL, contentType string
 	header.Set("x-ms-version", "2020-04-08")
 	header.Set("Origin", "https://chatgpt.com")
 	header.Set("Referer", "https://chatgpt.com/")
-	header.Set("User-Agent", userAgent)
+	header.Set("User-Agent", defaultUserAgent())
 	header.Set("Accept", "application/json, text/plain, */*")
 	header.Set("Accept-Language", "en-US,en;q=0.8")
 	response, err := client.Request(http.MethodPut, uploadURL, header, nil, bytes.NewReader(data))