Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
phsl
/
new-api
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
7d586ef5
authored
Dec 13, 2025
by
CaIon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(helper): improve error handling in FlushWriter and related functions
parent
e0a79e85
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
41 additions
and
14 deletions
+41
-14
relay/channel/gemini/relay-gemini-native.go
+2
-2
relay/helper/common.go
+39
-12
No files found.
relay/channel/gemini/relay-gemini-native.go
View file @
7d586ef5
...
@@ -94,10 +94,10 @@ func GeminiTextGenerationStreamHandler(c *gin.Context, info *relaycommon.RelayIn
...
@@ -94,10 +94,10 @@ func GeminiTextGenerationStreamHandler(c *gin.Context, info *relaycommon.RelayIn
helper
.
SetEventStreamHeaders
(
c
)
helper
.
SetEventStreamHeaders
(
c
)
return
geminiStreamHandler
(
c
,
info
,
resp
,
func
(
data
string
,
geminiResponse
*
dto
.
GeminiChatResponse
)
bool
{
return
geminiStreamHandler
(
c
,
info
,
resp
,
func
(
data
string
,
geminiResponse
*
dto
.
GeminiChatResponse
)
bool
{
// 直接发送 GeminiChatResponse 响应
err
:=
helper
.
StringData
(
c
,
data
)
err
:=
helper
.
StringData
(
c
,
data
)
if
err
!=
nil
{
if
err
!=
nil
{
logger
.
LogError
(
c
,
err
.
Error
())
logger
.
LogError
(
c
,
"failed to write stream data: "
+
err
.
Error
())
return
false
}
}
info
.
SendResponseCount
++
info
.
SendResponseCount
++
return
true
return
true
...
...
relay/helper/common.go
View file @
7d586ef5
...
@@ -14,15 +14,28 @@ import (
...
@@ -14,15 +14,28 @@ import (
"github.com/gorilla/websocket"
"github.com/gorilla/websocket"
)
)
func
FlushWriter
(
c
*
gin
.
Context
)
error
{
func
FlushWriter
(
c
*
gin
.
Context
)
(
err
error
)
{
if
c
.
Writer
==
nil
{
defer
func
()
{
return
nil
if
r
:=
recover
();
r
!=
nil
{
err
=
fmt
.
Errorf
(
"flush panic recovered: %v"
,
r
)
}
}
if
flusher
,
ok
:=
c
.
Writer
.
(
http
.
Flusher
);
ok
{
}()
flusher
.
Flush
()
if
c
==
nil
||
c
.
Writer
==
nil
{
return
nil
return
nil
}
}
if
c
.
Request
!=
nil
&&
c
.
Request
.
Context
()
.
Err
()
!=
nil
{
return
fmt
.
Errorf
(
"request context done: %w"
,
c
.
Request
.
Context
()
.
Err
())
}
flusher
,
ok
:=
c
.
Writer
.
(
http
.
Flusher
)
if
!
ok
{
return
errors
.
New
(
"streaming error: flusher not found"
)
return
errors
.
New
(
"streaming error: flusher not found"
)
}
flusher
.
Flush
()
return
nil
}
}
func
SetEventStreamHeaders
(
c
*
gin
.
Context
)
{
func
SetEventStreamHeaders
(
c
*
gin
.
Context
)
{
...
@@ -66,17 +79,31 @@ func ResponseChunkData(c *gin.Context, resp dto.ResponsesStreamResponse, data st
...
@@ -66,17 +79,31 @@ func ResponseChunkData(c *gin.Context, resp dto.ResponsesStreamResponse, data st
}
}
func
StringData
(
c
*
gin
.
Context
,
str
string
)
error
{
func
StringData
(
c
*
gin
.
Context
,
str
string
)
error
{
//str = strings.TrimPrefix(str, "data: ")
if
c
==
nil
||
c
.
Writer
==
nil
{
//str = strings.TrimSuffix(str, "\r")
return
errors
.
New
(
"context or writer is nil"
)
}
if
c
.
Request
!=
nil
&&
c
.
Request
.
Context
()
.
Err
()
!=
nil
{
return
fmt
.
Errorf
(
"request context done: %w"
,
c
.
Request
.
Context
()
.
Err
())
}
c
.
Render
(
-
1
,
common
.
CustomEvent
{
Data
:
"data: "
+
str
})
c
.
Render
(
-
1
,
common
.
CustomEvent
{
Data
:
"data: "
+
str
})
_
=
FlushWriter
(
c
)
return
FlushWriter
(
c
)
return
nil
}
}
func
PingData
(
c
*
gin
.
Context
)
error
{
func
PingData
(
c
*
gin
.
Context
)
error
{
c
.
Writer
.
Write
([]
byte
(
": PING
\n\n
"
))
if
c
==
nil
||
c
.
Writer
==
nil
{
_
=
FlushWriter
(
c
)
return
errors
.
New
(
"context or writer is nil"
)
return
nil
}
if
c
.
Request
!=
nil
&&
c
.
Request
.
Context
()
.
Err
()
!=
nil
{
return
fmt
.
Errorf
(
"request context done: %w"
,
c
.
Request
.
Context
()
.
Err
())
}
if
_
,
err
:=
c
.
Writer
.
Write
([]
byte
(
": PING
\n\n
"
));
err
!=
nil
{
return
fmt
.
Errorf
(
"write ping data failed: %w"
,
err
)
}
return
FlushWriter
(
c
)
}
}
func
ObjectData
(
c
*
gin
.
Context
,
object
interface
{})
error
{
func
ObjectData
(
c
*
gin
.
Context
,
object
interface
{})
error
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment