Skip to content

replace bufio.Scanner with bufio.Reader and add error handling #65

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.

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

Merged
merged 1 commit into from
Mar 21, 2025
Merged
Changes from all commits
Commits
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
75 changes: 42 additions & 33 deletions client/sse.go
Original file line number Diff line number Diff line change
Expand Up @@ -99,39 +99,48 @@ func (c *SSEMCPClient) Start(ctx context.Context) error {
// readSSE continuously reads the SSE stream and processes events.
// It runs until the connection is closed or an error occurs.
func (c *SSEMCPClient) readSSE(reader io.ReadCloser) {
defer reader.Close()

scanner := bufio.NewScanner(reader)
var event, data string

for scanner.Scan() {
line := scanner.Text()

if line == "" {
// Empty line means end of event
if event != "" && data != "" {
c.handleSSEEvent(event, data)
event = ""
data = ""
}
continue
}

if strings.HasPrefix(line, "event:") {
event = strings.TrimSpace(strings.TrimPrefix(line, "event:"))
} else if strings.HasPrefix(line, "data:") {
data = strings.TrimSpace(strings.TrimPrefix(line, "data:"))
}
}

if err := scanner.Err(); err != nil {
select {
case <-c.done:
return
default:
fmt.Printf("SSE stream error: %v\n", err)
}
}
defer reader.Close()

br := bufio.NewReader(reader)
var event, data string

for {
line, err := br.ReadString('\n')
if err != nil {
if err == io.EOF {
// Process any pending event before exit
if event != "" && data != "" {
c.handleSSEEvent(event, data)
}
break
}
select {
case <-c.done:
return
default:
fmt.Printf("SSE stream error: %v\n", err)
return
}
}

// Remove only newline markers
line = strings.TrimRight(line, "\r\n")
if line == "" {
// Empty line means end of event
if event != "" && data != "" {
c.handleSSEEvent(event, data)
event = ""
data = ""
}
continue
}

if strings.HasPrefix(line, "event:") {
event = strings.TrimSpace(strings.TrimPrefix(line, "event:"))
} else if strings.HasPrefix(line, "data:") {
data = strings.TrimSpace(strings.TrimPrefix(line, "data:"))
}
}
}

// handleSSEEvent processes SSE events based on their type.
Expand Down