chuan/CLIProxyAPI
1
0
Fork 0
mirror of https://github.com/router-for-me/CLIProxyAPI.git synced 2026-02-02 20:40:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(handlers): preserve upstream response logs before duplicate detection

Browse Source
This commit is contained in:
hkfires
2025-12-28 22:35:36 +08:00
parent 3ca5fb1046
commit a95428f204
1 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
sdk/api/handlers/handlers.go
View File

@@ -618,28 +618,21 @@ func (h *BaseAPIHandler) WriteErrorResponse(c *gin.Context, msg *interfaces.Erro
}
body := BuildErrorResponseBody(status, errText)
// Check if this error was already recorded by the executor (to avoid duplicate logging)
// The executor logs raw error text, so match errText before falling back to the JSON body.
shouldAppend := true
// Append first to preserve upstream response logs, then drop duplicate payloads if already recorded.
var previous []byte
if existing, exists := c.Get("API_RESPONSE"); exists {
if existingBytes, ok := existing.([]byte); ok && len(existingBytes) > 0 {
trimmedErrText := strings.TrimSpace(errText)
if trimmedErrText != "" && bytes.Contains(existingBytes, []byte(trimmedErrText)) {
// Error already logged by executor, skip appending
shouldAppend = false
} else {
trimmedBody := bytes.TrimSpace(body)
if len(trimmedBody) > 0 && bytes.Contains(existingBytes, trimmedBody) {
// Error already logged by executor, skip appending
shouldAppend = false
previous = bytes.Clone(existingBytes)
}
}
}
}
if shouldAppend {
// Use appendAPIResponse to preserve any previously captured API response data
// (such as formatted upstream response logs from logging_helpers.go)
appendAPIResponse(c, body)
trimmedErrText := strings.TrimSpace(errText)
trimmedBody := bytes.TrimSpace(body)
if len(previous) > 0 {
if (trimmedErrText != "" && bytes.Contains(previous, []byte(trimmedErrText))) ||
(len(trimmedBody) > 0 && bytes.Contains(previous, trimmedBody)) {
c.Set("API_RESPONSE", previous)
}
}
if !c.Writer.Written() {