Skip to content

Fix streaming handler causing duplicate non-streaming requests #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
callanjfox wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix streaming handler causing duplicate non-streaming requests #33

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 17 additions & 4 deletions proxy/internal/handler/handlers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,14 @@ func (h *Handler) NotFound(w http.ResponseWriter, r *http.Request) {

func (h *Handler) handleStreamingResponse(w http.ResponseWriter, resp *http.Response, requestLog *model.RequestLog, startTime time.Time) {

// Forward all upstream response headers so clients see the full
// Anthropic metadata (request-id, rate-limits, server-timing, etc.)
for key, values := range resp.Header {
for _, v := range values {
w.Header().Add(key, v)
}
}
// Ensure SSE essentials are set (may already be present from upstream)
w.Header().Set("Content-Type", "text/event-stream")
w.Header().Set("Cache-Control", "no-cache")
w.Header().Set("Connection", "keep-alive")
Expand Down Expand Up @@ -282,15 +290,20 @@ func (h *Handler) handleStreamingResponse(w http.ResponseWriter, resp *http.Resp
scanner := bufio.NewScanner(resp.Body)
for scanner.Scan() {
line := scanner.Text()

// Forward every line (including event: prefixes and blank
// separators) so the client sees the original SSE stream.
fmt.Fprintf(w, "%s\n", line)
if f, ok := w.(http.Flusher); ok {
f.Flush()
}

// Only parse data: lines for DB storage
if line == "" || !strings.HasPrefix(line, "data:") {
continue
}

streamingChunks = append(streamingChunks, line)
fmt.Fprintf(w, "%s\n\n", line)
if f, ok := w.(http.Flusher); ok {
f.Flush()
}

jsonData := strings.TrimPrefix(line, "data: ")

Expand Down