Merge branch 'fix/gemini-native-sse' of github.com:RedwindA/new-api into…

Merge branch 'fix/gemini-native-sse' of github.com:RedwindA/new-api into RedwindA-fix/gemini-native-sse

relay/channel/api_request.go

@@ -223,7 +223,7 @@ func doRequest(c *gin.Context, req *http.Request, info *common.RelayInfo) (*http
 		helper.SetEventStreamHeaders(c)
 		helper.SetEventStreamHeaders(c)
 		// 处理流式请求的 ping 保活
 		// 处理流式请求的 ping 保活
 		generalSettings := operation_setting.GetGeneralSetting()
 		generalSettings := operation_setting.GetGeneralSetting()
-		if generalSettings.PingIntervalEnabled {
+		if generalSettings.PingIntervalEnabled && !info.DisablePing {
 			pingInterval := time.Duration(generalSettings.PingIntervalSeconds) * time.Second
 			pingInterval := time.Duration(generalSettings.PingIntervalSeconds) * time.Second
 			stopPinger = startPingKeepAlive(c, pingInterval)
 			stopPinger = startPingKeepAlive(c, pingInterval)
 			// 使用defer确保在任何情况下都能停止ping goroutine
 			// 使用defer确保在任何情况下都能停止ping goroutine

relay/channel/gemini/adaptor.go

@@ -173,6 +173,7 @@ func (a *Adaptor) DoRequest(c *gin.Context, info *relaycommon.RelayInfo, request
 func (a *Adaptor) DoResponse(c *gin.Context, resp *http.Response, info *relaycommon.RelayInfo) (usage any, err *types.NewAPIError) {
 func (a *Adaptor) DoResponse(c *gin.Context, resp *http.Response, info *relaycommon.RelayInfo) (usage any, err *types.NewAPIError) {
 	if info.RelayMode == constant.RelayModeGemini {
 	if info.RelayMode == constant.RelayModeGemini {
 		if info.IsStream {
 		if info.IsStream {
+			info.DisablePing = true
 			return GeminiTextGenerationStreamHandler(c, info, resp)
 			return GeminiTextGenerationStreamHandler(c, info, resp)
 		} else {
 		} else {
 			return GeminiTextGenerationHandler(c, info, resp)
 			return GeminiTextGenerationHandler(c, info, resp)

relay/common/relay_info.go

@@ -88,6 +88,7 @@ type RelayInfo struct {
 	BaseUrl              string
 	BaseUrl              string
 	SupportStreamOptions bool
 	SupportStreamOptions bool
 	ShouldIncludeUsage   bool
 	ShouldIncludeUsage   bool
+	DisablePing          bool // 是否禁止向下游发送自定义 Ping
 	IsModelMapped        bool
 	IsModelMapped        bool
 	ClientWs             *websocket.Conn
 	ClientWs             *websocket.Conn
 	TargetWs             *websocket.Conn
 	TargetWs             *websocket.Conn

relay/helper/stream_scanner.go

@@ -54,7 +54,7 @@ func StreamScannerHandler(c *gin.Context, resp *http.Response, info *relaycommon
 	)
 	)
 
 
 	generalSettings := operation_setting.GetGeneralSetting()
 	generalSettings := operation_setting.GetGeneralSetting()
-	pingEnabled := generalSettings.PingIntervalEnabled
+	pingEnabled := generalSettings.PingIntervalEnabled && !info.DisablePing
 	pingInterval := time.Duration(generalSettings.PingIntervalSeconds) * time.Second
 	pingInterval := time.Duration(generalSettings.PingIntervalSeconds) * time.Second
 	if pingInterval <= 0 {
 	if pingInterval <= 0 {
 		pingInterval = DefaultPingInterval
 		pingInterval = DefaultPingInterval