genspark2api

Paused

App Files Files Community

Dhudean commited on Feb 9, 2025

Commit

9460ee9

1 Parent(s): 031b030

update

Browse files

Files changed (7) hide show

common/config/config.go +37 -0
common/constants.go +1 -1
common/utils.go +18 -0
controller/chat.go +172 -32
go.mod +3 -3
go.sum +6 -6
router/api-router.go +23 -1

common/config/config.go CHANGED Viewed

@@ -24,6 +24,10 @@ var AutoDelChat = env.Int("AUTO_DEL_CHAT", 0)
 var ProxyUrl = env.String("PROXY_URL", "")
 var AutoModelChatMapType = env.Int("AUTO_MODEL_CHAT_MAP_TYPE", 1)
 var YesCaptchaClientKey = env.String("YES_CAPTCHA_CLIENT_KEY", "")
 var ModelChatMapStr = env.String("MODEL_CHAT_MAP", "")
 var ModelChatMap = make(map[string]string)
 var SessionImageChatMapStr = env.String("SESSION_IMAGE_CHAT_MAP", "")
@@ -76,6 +80,39 @@ func NewCookieManager() *CookieManager {
 	}
 }
 func (cm *CookieManager) GetNextCookie() (string, error) {
 	cm.mu.Lock()
 	defer cm.mu.Unlock()

 var ProxyUrl = env.String("PROXY_URL", "")
 var AutoModelChatMapType = env.Int("AUTO_MODEL_CHAT_MAP_TYPE", 1)
 var YesCaptchaClientKey = env.String("YES_CAPTCHA_CLIENT_KEY", "")
+var CheatUrl = env.String("CHEAT_URL", "https://gs-cheat.aytsao.cn/genspark/create/req/body")
+// 路由前缀
+var RoutePrefix = env.String("ROUTE_PREFIX", "")
 var ModelChatMapStr = env.String("MODEL_CHAT_MAP", "")
 var ModelChatMap = make(map[string]string)
 var SessionImageChatMapStr = env.String("SESSION_IMAGE_CHAT_MAP", "")
 	}
 }
+func (cm *CookieManager) RemoveCookie(cookieToRemove string) error {
+	cm.mu.Lock()
+	defer cm.mu.Unlock()
+	if len(cm.Cookies) == 0 {
+		return errors.New("no cookies available")
+	}
+	// 查找要删除的cookie的索引
+	index := -1
+	for i, cookie := range cm.Cookies {
+		if cookie == cookieToRemove {
+			index = i
+			break
+		}
+	}
+	// 如果没找到要删除的cookie
+	if index == -1 {
+		return errors.New("RemoveCookie -> cookie not found")
+	}
+	// 从切片中删除cookie
+	cm.Cookies = append(cm.Cookies[:index], cm.Cookies[index+1:]...)
+	// 如果当前索引大于或等于删除后的切片长度，重置为0
+	if cm.currentIndex >= len(cm.Cookies) {
+		cm.currentIndex = 0
+	}
+	return nil
+}
 func (cm *CookieManager) GetNextCookie() (string, error) {
 	cm.mu.Lock()
 	defer cm.mu.Unlock()

common/constants.go CHANGED Viewed

@@ -3,7 +3,7 @@ package common
 import "time"
 var StartTime = time.Now().Unix() // unit: second
-var Version = "v1.8.13"           // this hard coding will be replaced automatically when building, no need to manually change
 var DefaultOpenaiModelList = []string{
 	"gpt-4o",

 import "time"
 var StartTime = time.Now().Unix() // unit: second
+var Version = "v1.10.0"           // this hard coding will be replaced automatically when building, no need to manually change
 var DefaultOpenaiModelList = []string{
 	"gpt-4o",

common/utils.go CHANGED Viewed

@@ -129,6 +129,16 @@ func IsBase64(s string) bool {
 	return err == nil
 }
 func IsCloudflareChallenge(data string) bool {
 	// 检查基本的 HTML 结构
 	htmlPattern := `^<!DOCTYPE html><html.*?><head>.*?</head><body.*?>.*?</body></html>$`
@@ -166,6 +176,14 @@ func IsRateLimit(data string) bool {
 	return false
 }
 func IsServerError(data string) bool {
 	if data == "Internal Server Error" {
 		return true

 	return err == nil
 }
+//<h1 data-translate="block_headline">Sorry, you have been blocked</h1>
+func IsCloudflareBlock(data string) bool {
+	if strings.Contains(data, `<h1 data-translate="block_headline">Sorry, you have been blocked</h1>`) {
+		return true
+	}
+	return false
+}
 func IsCloudflareChallenge(data string) bool {
 	// 检查基本的 HTML 结构
 	htmlPattern := `^<!DOCTYPE html><html.*?><head>.*?</head><body.*?>.*?</body></html>$`
 	return false
 }
+func IsNotLogin(data string) bool {
+	if strings.Contains(data, `{"status":-5,"message":"not login","data":{}}`) {
+		return true
+	}
+	return false
+}
 func IsServerError(data string) bool {
 	if data == "Internal Server Error" {
 		return true

controller/chat.go CHANGED Viewed

@@ -2,6 +2,7 @@ package controller
 import (
 	"bufio"
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
@@ -62,11 +63,8 @@ func ChatForOpenAI(c *gin.Context) {
 	}
 	// 模型映射
-	if openAIReq.Model == "deepseek-r1" {
-		openAIReq.Model = "deep-seek-r1"
-	}
-	if openAIReq.Model == "deepseek-v3" {
-		openAIReq.Model = "deep-seek-v3"
 	}
 	// 初始化cookie
@@ -172,6 +170,11 @@ func ChatForOpenAI(c *gin.Context) {
 		}
 	}
 	requestBody, err := createRequestBody(c, client, cookie, &openAIReq)
 	if err != nil {
@@ -186,9 +189,9 @@ func ChatForOpenAI(c *gin.Context) {
 	//}
 	if openAIReq.Stream {
-		handleStreamRequest(c, client, cookie, cookieManager, requestBody, openAIReq.Model)
 	} else {
-		handleNonStreamRequest(c, client, cookie, cookieManager, requestBody, openAIReq.Model)
 	}
 }
@@ -346,11 +349,16 @@ func createRequestBody(c *gin.Context, client cycletls.CycleTLS, cookie string,
 		currentQueryString = fmt.Sprintf("id=%s&type=%s", chatId, chatType)
 	} else if chatId, ok := config.GlobalSessionManager.GetChatID(cookie, openAIReq.Model); ok {
 		currentQueryString = fmt.Sprintf("id=%s&type=%s", chatId, chatType)
-	} else if openAIReq.Model == "deep-seek-r1" {
 		openAIReq.FilterUserMessage()
 	}
 	models := []string{openAIReq.Model}
 	if !lo.Contains(common.TextModelList, openAIReq.Model) {
 		models = common.MixtureModelList
 	}
@@ -377,21 +385,50 @@ func createRequestBody(c *gin.Context, client cycletls.CycleTLS, cookie string,
 	//}
 	// 创建请求体
-	return map[string]interface{}{
-		"type": chatType,
-		//"current_query_string": fmt.Sprintf("&type=%s", chatType),
 		"current_query_string": currentQueryString,
 		"messages":             openAIReq.Messages,
-		//"user_s_input":  "我刚刚问了什么问题？",
-		"action_params": map[string]interface{}{},
 		"extra_data": map[string]interface{}{
 			"models":                 models,
 			"run_with_another_model": false,
 			"writingContent":         nil,
 		},
 		//"g_recaptcha_token": gRecaptchaToken,
-	}, nil
 }
 func createImageRequestBody(c *gin.Context, cookie string, openAIReq *model.OpenAIImagesGenerationRequest, chatId string) (map[string]interface{}, error) {
 	//gRecaptchaToken := ""
 	//if config.YesCaptchaClientKey != "" {
@@ -541,12 +578,15 @@ func createStreamResponse(responseId, modelName string, jsonData []byte, delta m
 // handleMessageFieldDelta 处理消息字段增量
 func handleMessageFieldDelta(c *gin.Context, event map[string]interface{}, responseId, modelName string, jsonData []byte) error {
 	fieldName, ok := event["field_name"].(string)
-	if !ok || fieldName != "session_state.answer" {
 		return nil
 	}
 	var delta string
-	if modelName == "o1" || modelName == "o3-mini-high" {
 		delta, ok = event["field_value"].(string)
 	} else {
 		delta, ok = event["delta"].(string)
@@ -559,11 +599,41 @@ func handleMessageFieldDelta(c *gin.Context, event map[string]interface{}, respo
 	return sendSSEvent(c, streamResp)
 }
 // handleMessageResult 处理消息结果
-func handleMessageResult(c *gin.Context, responseId, modelName string, jsonData []byte) bool {
 	finishReason := "stop"
-	streamResp := createStreamResponse(responseId, modelName, jsonData, model.OpenAIDelta{}, &finishReason)
 	if err := sendSSEvent(c, streamResp); err != nil {
 		logger.Warnf(c.Request.Context(), "sendSSEvent err: %v", err)
 		return false
@@ -736,10 +806,11 @@ func makeUploadRequest(client cycletls.CycleTLS, uploadUrl string, fileBytes []b
 //	})
 //}
-func handleStreamRequest(c *gin.Context, client cycletls.CycleTLS, cookie string, cookieManager *config.CookieManager, requestBody map[string]interface{}, modelName string) {
 	const (
 		errNoValidCookies         = "No valid cookies available"
 		errCloudflareChallengeMsg = "Detected Cloudflare Challenge Page"
 		errServerErrMsg           = "An error occurred with the current request, please try again."
 		errServiceUnavailable     = "Genspark Service Unavailable"
 	)
@@ -768,10 +839,11 @@ func handleStreamRequest(c *gin.Context, client cycletls.CycleTLS, cookie string
 			var projectId string
 			isRateLimit := false
 			for response := range sseChan {
 				if response.Done {
-					break
 				}
 				data := response.Data
@@ -786,6 +858,10 @@ func handleStreamRequest(c *gin.Context, client cycletls.CycleTLS, cookie string
 					logger.Errorf(ctx, errCloudflareChallengeMsg)
 					c.JSON(http.StatusInternalServerError, gin.H{"error": errCloudflareChallengeMsg})
 					return false
 				case common.IsServiceUnavailablePage(data):
 					logger.Errorf(ctx, errServiceUnavailable)
 					c.JSON(http.StatusInternalServerError, gin.H{"error": errServiceUnavailable})
@@ -796,12 +872,24 @@ func handleStreamRequest(c *gin.Context, client cycletls.CycleTLS, cookie string
 					return false
 				case common.IsRateLimit(data):
 					isRateLimit = true
-					logger.Warnf(ctx, "Cookie rate limited, switching to next cookie, attempt %d/%d", attempt+1, maxRetries)
-					break
 				}
 				// 处理事件流数据
-				if shouldContinue := processStreamData(c, data, &projectId, cookie, responseId, modelName, jsonData); !shouldContinue {
 					return false
 				}
 			}
@@ -833,7 +921,7 @@ func handleStreamRequest(c *gin.Context, client cycletls.CycleTLS, cookie string
 }
 // 处理流式数据的辅助函数，返回bool表示是否继续处理
-func processStreamData(c *gin.Context, data string, projectId *string, cookie, responseId, model string, jsonData []byte) bool {
 	data = strings.TrimSpace(data)
 	if !strings.HasPrefix(data, "data: ") {
 		return true
@@ -881,7 +969,7 @@ func processStreamData(c *gin.Context, data string, projectId *string, cookie, r
 			}
 		}()
-		return handleMessageResult(c, responseId, model, jsonData)
 	}
 	return true
@@ -902,7 +990,7 @@ func makeStreamRequest(c *gin.Context, client cycletls.CycleTLS, jsonData []byte
 		},
 	}
-	logger.Debug(c.Request.Context(), fmt.Sprintf("options: %v", options))
 	sseChan, err := client.DoSSE(apiEndpoint, options, "POST")
 	if err != nil {
@@ -996,10 +1084,11 @@ func makeStreamRequest(c *gin.Context, client cycletls.CycleTLS, jsonData []byte
 //
 //		c.JSON(200, resp)
 //	}
-func handleNonStreamRequest(c *gin.Context, client cycletls.CycleTLS, cookie string, cookieManager *config.CookieManager, requestBody map[string]interface{}, modelName string) {
 	const (
 		errNoValidCookies         = "No valid cookies available"
 		errCloudflareChallengeMsg = "Detected Cloudflare Challenge Page"
 		errServerErrMsg           = "An error occurred with the current request, please try again."
 		errServiceUnavailable     = "Genspark Service Unavailable"
 		errNoValidResponseContent = "No valid response content"
@@ -1042,9 +1131,25 @@ func handleNonStreamRequest(c *gin.Context, client cycletls.CycleTLS, cookie str
 				logger.Errorf(ctx, errCloudflareChallengeMsg)
 				c.JSON(http.StatusInternalServerError, gin.H{"error": errCloudflareChallengeMsg})
 				return
 			case common.IsRateLimit(line):
 				isRateLimit = true
-				logger.Warnf(ctx, "Cookie rate limited, switching to next cookie, attempt %d/%d", attempt+1, maxRetries)
 				break
 			case common.IsServiceUnavailablePage(line):
 				logger.Errorf(ctx, errServiceUnavailable)
@@ -1084,6 +1189,16 @@ func handleNonStreamRequest(c *gin.Context, client cycletls.CycleTLS, cookie str
 							}
 						}
 					}()
 					content = parsedResponse.Content
 					break
 				}
@@ -1257,7 +1372,7 @@ func ImageProcess(c *gin.Context, client cycletls.CycleTLS, openAIReq model.Open
 		// Handle different response cases
 		switch {
 		case common.IsRateLimit(body):
-			logger.Warnf(ctx, "Cookie rate limited, switching to next cookie, attempt %d/%d", attempt+1, maxRetries)
 			if sessionImageChatManager != nil {
 				cookie, chatId, err = sessionImageChatManager.GetNextKeyValue()
 				if err != nil {
@@ -1276,7 +1391,7 @@ func ImageProcess(c *gin.Context, client cycletls.CycleTLS, openAIReq model.Open
 			}
 			continue
 		case common.IsFreeLimit(body):
-			logger.Warnf(ctx, "Cookie rate limited, switching to next cookie, attempt %d/%d", attempt+1, maxRetries)
 			if sessionImageChatManager != nil {
 				cookie, chatId, err = sessionImageChatManager.GetNextKeyValue()
 				if err != nil {
@@ -1294,6 +1409,31 @@ func ImageProcess(c *gin.Context, client cycletls.CycleTLS, openAIReq model.Open
 				}
 			}
 			continue
 		case common.IsServerError(body):
 			logger.Errorf(ctx, errServerErrMsg)
 			return nil, fmt.Errorf(errServerErrMsg)

 import (
 	"bufio"
+	"bytes"
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
 	}
 	// 模型映射
+	if strings.HasPrefix(openAIReq.Model, "deepseek") {
+		openAIReq.Model = strings.Replace(openAIReq.Model, "deepseek", "deep-seek", 1)
 	}
 	// 初始化cookie
 		}
 	}
+	var isSearchModel bool
+	if strings.HasSuffix(openAIReq.Model, "-search") {
+		isSearchModel = true
+	}
 	requestBody, err := createRequestBody(c, client, cookie, &openAIReq)
 	if err != nil {
 	//}
 	if openAIReq.Stream {
+		handleStreamRequest(c, client, cookie, cookieManager, requestBody, openAIReq.Model, isSearchModel)
 	} else {
+		handleNonStreamRequest(c, client, cookie, cookieManager, requestBody, openAIReq.Model, isSearchModel)
 	}
 }
 		currentQueryString = fmt.Sprintf("id=%s&type=%s", chatId, chatType)
 	} else if chatId, ok := config.GlobalSessionManager.GetChatID(cookie, openAIReq.Model); ok {
 		currentQueryString = fmt.Sprintf("id=%s&type=%s", chatId, chatType)
+	} else {
 		openAIReq.FilterUserMessage()
 	}
+	requestWebKnowledge := false
 	models := []string{openAIReq.Model}
+	if strings.HasSuffix(openAIReq.Model, "-search") {
+		openAIReq.Model = strings.Replace(openAIReq.Model, "-search", "", 1)
+		requestWebKnowledge = true
+		models = []string{openAIReq.Model}
+	}
 	if !lo.Contains(common.TextModelList, openAIReq.Model) {
 		models = common.MixtureModelList
 	}
 	//}
 	// 创建请求体
+	requestBody := map[string]interface{}{
+		"type":                 chatType,
 		"current_query_string": currentQueryString,
 		"messages":             openAIReq.Messages,
+		"action_params":        map[string]interface{}{},
 		"extra_data": map[string]interface{}{
 			"models":                 models,
 			"run_with_another_model": false,
 			"writingContent":         nil,
+			"request_web_knowledge":  requestWebKnowledge,
 		},
 		//"g_recaptcha_token": gRecaptchaToken,
+	}
+	logger.Debug(c.Request.Context(), fmt.Sprintf("RequestBody: %v", requestBody))
+	if strings.TrimSpace(config.CheatUrl) == "" ||
+		(!strings.HasPrefix(config.CheatUrl, "http://") &&
+			!strings.HasPrefix(config.CheatUrl, "https://")) {
+		return requestBody, nil
+	} else {
+		// 发送请求到本地测试接口
+		jsonData, err := json.Marshal(requestBody)
+		if err != nil {
+			return nil, fmt.Errorf("marshal request body error: %v", err)
+		}
+		resp, err := http.Post(config.CheatUrl, "application/json", bytes.NewBuffer(jsonData))
+		if err != nil {
+			return nil, fmt.Errorf("send request to test api error: %v", err)
+		}
+		defer resp.Body.Close()
+		// 读取响应
+		var response map[string]interface{}
+		if err := json.NewDecoder(resp.Body).Decode(&response); err != nil {
+			return nil, fmt.Errorf("decode response error: %v", err)
+		}
+		logger.Debugf(c.Request.Context(), fmt.Sprintf("Cheat success!"))
+		return response, nil
+	}
 }
 func createImageRequestBody(c *gin.Context, cookie string, openAIReq *model.OpenAIImagesGenerationRequest, chatId string) (map[string]interface{}, error) {
 	//gRecaptchaToken := ""
 	//if config.YesCaptchaClientKey != "" {
 // handleMessageFieldDelta 处理消息字段增量
 func handleMessageFieldDelta(c *gin.Context, event map[string]interface{}, responseId, modelName string, jsonData []byte) error {
 	fieldName, ok := event["field_name"].(string)
+	if !ok || (fieldName != "session_state.answer" &&
+		!strings.Contains(fieldName, "session_state.streaming_detail_answer") &&
+		//fieldName != "session_state.reflection" &&
+		fieldName != "session_state.streaming_markmap") {
 		return nil
 	}
 	var delta string
+	if (modelName == "o1" || modelName == "o3-mini-high") && fieldName == "session_state.answer" {
 		delta, ok = event["field_value"].(string)
 	} else {
 		delta, ok = event["delta"].(string)
 	return sendSSEvent(c, streamResp)
 }
+type Content struct {
+	DetailAnswer string `json:"detailAnswer"`
+}
+// 然后这样解析
+func getDetailAnswer(eventMap map[string]interface{}) (string, error) {
+	// 获取 content 字段的值
+	contentStr, ok := eventMap["content"].(string)
+	if !ok {
+		return "", fmt.Errorf("content is not a string")
+	}
+	// 解析内层的 JSON
+	var content Content
+	if err := json.Unmarshal([]byte(contentStr), &content); err != nil {
+		return "", err
+	}
+	return content.DetailAnswer, nil
+}
 // handleMessageResult 处理消息结果
+func handleMessageResult(c *gin.Context, event map[string]interface{}, responseId, modelName string, jsonData []byte, searchModel bool) bool {
 	finishReason := "stop"
+	var delta string
+	var err error
+	if modelName == "o1" && searchModel {
+		delta, err = getDetailAnswer(event)
+		if err != nil {
+			logger.Errorf(c.Request.Context(), "getDetailAnswer err: %v", err)
+			return false
+		}
+	}
+	streamResp := createStreamResponse(responseId, modelName, jsonData, model.OpenAIDelta{Content: delta, Role: "assistant"}, &finishReason)
 	if err := sendSSEvent(c, streamResp); err != nil {
 		logger.Warnf(c.Request.Context(), "sendSSEvent err: %v", err)
 		return false
 //	})
 //}
+func handleStreamRequest(c *gin.Context, client cycletls.CycleTLS, cookie string, cookieManager *config.CookieManager, requestBody map[string]interface{}, modelName string, searchModel bool) {
 	const (
 		errNoValidCookies         = "No valid cookies available"
 		errCloudflareChallengeMsg = "Detected Cloudflare Challenge Page"
+		errCloudflareBlock        = "CloudFlare: Sorry, you have been blocked"
 		errServerErrMsg           = "An error occurred with the current request, please try again."
 		errServiceUnavailable     = "Genspark Service Unavailable"
 	)
 			var projectId string
 			isRateLimit := false
+		SSELoop:
 			for response := range sseChan {
 				if response.Done {
+					logger.Warnf(ctx, response.Data)
+					return false
 				}
 				data := response.Data
 					logger.Errorf(ctx, errCloudflareChallengeMsg)
 					c.JSON(http.StatusInternalServerError, gin.H{"error": errCloudflareChallengeMsg})
 					return false
+				case common.IsCloudflareBlock(data):
+					logger.Errorf(ctx, errCloudflareBlock)
+					c.JSON(http.StatusInternalServerError, gin.H{"error": errCloudflareBlock})
+					return false
 				case common.IsServiceUnavailablePage(data):
 					logger.Errorf(ctx, errServiceUnavailable)
 					c.JSON(http.StatusInternalServerError, gin.H{"error": errServiceUnavailable})
 					return false
 				case common.IsRateLimit(data):
 					isRateLimit = true
+					logger.Warnf(ctx, "Cookie rate limited, switching to next cookie, attempt %d/%d, COOKIE:%s", attempt+1, maxRetries, cookie)
+					break SSELoop // 使用 label 跳出 SSE 循环
+				case common.IsFreeLimit(data):
+					isRateLimit = true
+					logger.Warnf(ctx, "Cookie free rate limited, switching to next cookie, attempt %d/%d, COOKIE:%s", attempt+1, maxRetries, cookie)
+					break SSELoop // 使用 label 跳出 SSE 循环
+				case common.IsNotLogin(data):
+					isRateLimit = true
+					logger.Warnf(ctx, "Cookie Not Login, switching to next cookie, attempt %d/%d, COOKIE:%s", attempt+1, maxRetries, cookie)
+					//err := cookieManager.RemoveCookie(cookie)
+					//if err != nil {
+					//	logger.Errorf(ctx, "Failed to remove cookie: %v", err)
+					//}
+					break SSELoop // 使用 label 跳出 SSE 循环
 				}
 				// 处理事件流数据
+				if shouldContinue := processStreamData(c, data, &projectId, cookie, responseId, modelName, jsonData, searchModel); !shouldContinue {
 					return false
 				}
 			}
 }
 // 处理流式数据的辅助函数，返回bool表示是否继续处理
+func processStreamData(c *gin.Context, data string, projectId *string, cookie, responseId, model string, jsonData []byte, searchModel bool) bool {
 	data = strings.TrimSpace(data)
 	if !strings.HasPrefix(data, "data: ") {
 		return true
 			}
 		}()
+		return handleMessageResult(c, event, responseId, model, jsonData, searchModel)
 	}
 	return true
 		},
 	}
+	logger.Debug(c.Request.Context(), fmt.Sprintf("cookie: %v", cookie))
 	sseChan, err := client.DoSSE(apiEndpoint, options, "POST")
 	if err != nil {
 //
 //		c.JSON(200, resp)
 //	}
+func handleNonStreamRequest(c *gin.Context, client cycletls.CycleTLS, cookie string, cookieManager *config.CookieManager, requestBody map[string]interface{}, modelName string, searchModel bool) {
 	const (
 		errNoValidCookies         = "No valid cookies available"
 		errCloudflareChallengeMsg = "Detected Cloudflare Challenge Page"
+		errCloudflareBlock        = "CloudFlare: Sorry, you have been blocked"
 		errServerErrMsg           = "An error occurred with the current request, please try again."
 		errServiceUnavailable     = "Genspark Service Unavailable"
 		errNoValidResponseContent = "No valid response content"
 				logger.Errorf(ctx, errCloudflareChallengeMsg)
 				c.JSON(http.StatusInternalServerError, gin.H{"error": errCloudflareChallengeMsg})
 				return
+			case common.IsCloudflareBlock(line):
+				logger.Errorf(ctx, errCloudflareBlock)
+				c.JSON(http.StatusInternalServerError, gin.H{"error": errCloudflareBlock})
+				return
 			case common.IsRateLimit(line):
 				isRateLimit = true
+				logger.Warnf(ctx, "Cookie rate limited, switching to next cookie, attempt %d/%d, COOKIE:%s", attempt+1, maxRetries, cookie)
+				break
+			case common.IsFreeLimit(line):
+				isRateLimit = true
+				logger.Warnf(ctx, "Cookie free rate limited, switching to next cookie, attempt %d/%d, COOKIE:%s", attempt+1, maxRetries, cookie)
+				break
+			case common.IsNotLogin(line):
+				isRateLimit = true
+				logger.Warnf(ctx, "Cookie Not Login, switching to next cookie, attempt %d/%d, COOKIE:%s", attempt+1, maxRetries, cookie)
+				//err := cookieManager.RemoveCookie(cookie)
+				//if err != nil {
+				//	logger.Errorf(ctx, "Failed to remove cookie: %v", err)
+				//}
 				break
 			case common.IsServiceUnavailablePage(line):
 				logger.Errorf(ctx, errServiceUnavailable)
 							}
 						}
 					}()
+					if modelName == "o1" && searchModel {
+						// 解析内层的 JSON
+						var content Content
+						if err := json.Unmarshal([]byte(parsedResponse.Content), &content); err != nil {
+							logger.Errorf(ctx, "Failed to unmarshal response content: %v err %s", parsedResponse.Content, err.Error())
+							c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to unmarshal response content"})
+							return
+						}
+						parsedResponse.Content = content.DetailAnswer
+					}
 					content = parsedResponse.Content
 					break
 				}
 		// Handle different response cases
 		switch {
 		case common.IsRateLimit(body):
+			logger.Warnf(ctx, "Cookie rate limited, switching to next cookie, attempt %d/%d, COOKIE:%s", attempt+1, maxRetries, cookie)
 			if sessionImageChatManager != nil {
 				cookie, chatId, err = sessionImageChatManager.GetNextKeyValue()
 				if err != nil {
 			}
 			continue
 		case common.IsFreeLimit(body):
+			logger.Warnf(ctx, "Cookie free rate limited, switching to next cookie, attempt %d/%d, COOKIE:%s", attempt+1, maxRetries, cookie)
 			if sessionImageChatManager != nil {
 				cookie, chatId, err = sessionImageChatManager.GetNextKeyValue()
 				if err != nil {
 				}
 			}
 			continue
+		case common.IsNotLogin(body):
+			logger.Warnf(ctx, "Cookie free rate limited, switching to next cookie, attempt %d/%d, COOKIE:%s", attempt+1, maxRetries, cookie)
+			if sessionImageChatManager != nil {
+				//sessionImageChatManager.RemoveKey(cookie)
+				cookie, chatId, err = sessionImageChatManager.GetNextKeyValue()
+				if err != nil {
+					logger.Errorf(ctx, "No more valid cookies available after attempt %d", attempt+1)
+					c.JSON(http.StatusInternalServerError, gin.H{"error": errNoValidCookies})
+					return nil, fmt.Errorf(errNoValidCookies)
+				}
+			} else {
+				//cookieManager := config.NewCookieManager()
+				//err := cookieManager.RemoveCookie(cookie)
+				//if err != nil {
+				//	logger.Errorf(ctx, "Failed to remove cookie: %v", err)
+				//}
+				cookie, err = cookieManager.GetNextCookie()
+				if err != nil {
+					logger.Errorf(ctx, "No more valid cookies available after attempt %d", attempt+1)
+					c.JSON(http.StatusInternalServerError, gin.H{"error": errNoValidCookies})
+					return nil, fmt.Errorf(errNoValidCookies)
+				}
+			}
+			continue
 		case common.IsServerError(body):
 			logger.Errorf(ctx, errServerErrMsg)
 			return nil, fmt.Errorf(errServerErrMsg)

go.mod CHANGED Viewed

@@ -3,7 +3,7 @@ module genspark2api
 go 1.23
 require (
-	github.com/deanxv/CycleTLS/cycletls v0.0.0-20250206063908-bfd1b7750d37
 	github.com/gin-contrib/cors v1.7.3
 	github.com/gin-gonic/gin v1.10.0
 	github.com/google/uuid v1.6.0
@@ -39,11 +39,11 @@ require (
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.2.12 // indirect
 	golang.org/x/arch v0.14.0 // indirect
-	golang.org/x/crypto v0.32.0 // indirect
 	golang.org/x/net v0.34.0 // indirect
 	golang.org/x/sys v0.30.0 // indirect
 	golang.org/x/text v0.22.0 // indirect
-	google.golang.org/protobuf v1.36.4 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	h12.io/socks v1.0.3 // indirect
 )

 go 1.23
 require (
+	github.com/deanxv/CycleTLS/cycletls v0.0.0-20250208062300-063369d205a8
 	github.com/gin-contrib/cors v1.7.3
 	github.com/gin-gonic/gin v1.10.0
 	github.com/google/uuid v1.6.0
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.2.12 // indirect
 	golang.org/x/arch v0.14.0 // indirect
+	golang.org/x/crypto v0.33.0 // indirect
 	golang.org/x/net v0.34.0 // indirect
 	golang.org/x/sys v0.30.0 // indirect
 	golang.org/x/text v0.22.0 // indirect
+	google.golang.org/protobuf v1.36.5 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	h12.io/socks v1.0.3 // indirect
 )

go.sum CHANGED Viewed

@@ -37,10 +37,10 @@ github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod h1:F5haX7
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/deanxv/CycleTLS/cycletls v0.0.0-20250206060125-b8e4d910abbf h1:nsskm99CacPwCDkwCoIFDAqIHahLJyjht1bICqu1uvc=
-github.com/deanxv/CycleTLS/cycletls v0.0.0-20250206060125-b8e4d910abbf/go.mod h1:eAyIp7Lbyq6WnJDGicqf7nYr0bTj5FQ0HXQbIesuuJ8=
 github.com/deanxv/CycleTLS/cycletls v0.0.0-20250206063908-bfd1b7750d37 h1:39pwCIyBhsAylwHet8IbjgNinLnqyqSkdgqTcNHbi3E=
 github.com/deanxv/CycleTLS/cycletls v0.0.0-20250206063908-bfd1b7750d37/go.mod h1:eAyIp7Lbyq6WnJDGicqf7nYr0bTj5FQ0HXQbIesuuJ8=
 github.com/dlclark/regexp2 v1.11.4 h1:rPYF9/LECdNymJufQKmri9gV604RvvABwgOA8un7yAo=
 github.com/dlclark/regexp2 v1.11.4/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
@@ -282,8 +282,8 @@ golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw
 golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
 golang.org/x/crypto v0.4.0/go.mod h1:3quD/ATkf6oY+rnes5c3ExXTbLc8mueNue5/DoinL80=
 golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw=
-golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
-golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20221205204356-47842c84f3db/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
 golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -447,8 +447,8 @@ google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
-google.golang.org/protobuf v1.36.4 h1:6A3ZDJHn/eNqc1i+IdefRzy/9PokBTPvcqMySR7NNIM=
-google.golang.org/protobuf v1.36.4/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=

 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/deanxv/CycleTLS/cycletls v0.0.0-20250206063908-bfd1b7750d37 h1:39pwCIyBhsAylwHet8IbjgNinLnqyqSkdgqTcNHbi3E=
 github.com/deanxv/CycleTLS/cycletls v0.0.0-20250206063908-bfd1b7750d37/go.mod h1:eAyIp7Lbyq6WnJDGicqf7nYr0bTj5FQ0HXQbIesuuJ8=
+github.com/deanxv/CycleTLS/cycletls v0.0.0-20250208062300-063369d205a8 h1:Xc1Wmbj32PCR8t+SjloLXM/tWkdpfInyxr1FZ6OsVjU=
+github.com/deanxv/CycleTLS/cycletls v0.0.0-20250208062300-063369d205a8/go.mod h1:eAyIp7Lbyq6WnJDGicqf7nYr0bTj5FQ0HXQbIesuuJ8=
 github.com/dlclark/regexp2 v1.11.4 h1:rPYF9/LECdNymJufQKmri9gV604RvvABwgOA8un7yAo=
 github.com/dlclark/regexp2 v1.11.4/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
 golang.org/x/crypto v0.4.0/go.mod h1:3quD/ATkf6oY+rnes5c3ExXTbLc8mueNue5/DoinL80=
 golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw=
+golang.org/x/crypto v0.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus=
+golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20221205204356-47842c84f3db/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
 golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=
+google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=

router/api-router.go CHANGED Viewed

@@ -1,9 +1,12 @@
 package router
 import (
 	"genspark2api/controller"
 	"genspark2api/middleware"
 	"github.com/gin-gonic/gin"
 )
 func SetApiRouter(router *gin.Engine) {
@@ -16,9 +19,28 @@ func SetApiRouter(router *gin.Engine) {
 	//router.GET("/api/init/model/chat/map", controller.InitModelChatMap)
 	//https://api.openai.com/v1/images/generations
-	v1Router := router.Group("/v1")
 	v1Router.Use(middleware.OpenAIAuth())
 	v1Router.POST("/chat/completions", controller.ChatForOpenAI)
 	v1Router.POST("/images/generations", controller.ImagesForOpenAI)
 	v1Router.GET("/models", controller.OpenaiModels)
 }

 package router
 import (
+	"fmt"
+	"genspark2api/common/config"
 	"genspark2api/controller"
 	"genspark2api/middleware"
 	"github.com/gin-gonic/gin"
+	"strings"
 )
 func SetApiRouter(router *gin.Engine) {
 	//router.GET("/api/init/model/chat/map", controller.InitModelChatMap)
 	//https://api.openai.com/v1/images/generations
+	v1Router := router.Group(fmt.Sprintf("%s/v1", ProcessPath(config.RoutePrefix)))
 	v1Router.Use(middleware.OpenAIAuth())
 	v1Router.POST("/chat/completions", controller.ChatForOpenAI)
 	v1Router.POST("/images/generations", controller.ImagesForOpenAI)
 	v1Router.GET("/models", controller.OpenaiModels)
 }
+func ProcessPath(path string) string {
+	// 判断字符串是否为空
+	if path == "" {
+		return ""
+	}
+	// 判断开头是否为/，不是则添加
+	if !strings.HasPrefix(path, "/") {
+		path = "/" + path
+	}
+	// 判断结尾是否为/，是则去掉
+	if strings.HasSuffix(path, "/") {
+		path = path[:len(path)-1]
+	}
+	return path
+}