Skip to content

Fix send on closed channel panic in streamPrediction #80

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

Merged
mattt merged 1 commit into from
Sep 19, 2024
Merged

Fix send on closed channel panic in streamPrediction #80

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
31 changes: 18 additions & 13 deletions stream.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ func (r *Client) StreamPrediction(ctx context.Context, prediction *Prediction) (

func (r *Client) streamPrediction(ctx context.Context, prediction *Prediction, lastEvent *SSEEvent, sseChan chan SSEEvent, errChan chan error) {
g, ctx := errgroup.WithContext(ctx)
done := make(chan struct{})

url := prediction.URLs["stream"]
if url == "" {
Expand Down Expand Up @@ -161,8 +162,6 @@ func (r *Client) streamPrediction(ctx context.Context, prediction *Prediction, l
return
}

done := make(chan struct{})

reader := bufio.NewReader(resp.Body)
var buf bytes.Buffer
lineChan := make(chan []byte)
Expand Down Expand Up @@ -211,12 +210,22 @@ func (r *Client) streamPrediction(ctx context.Context, prediction *Prediction, l

event := SSEEvent{Type: SSETypeDefault}
if err := event.decode(b); err != nil {
errChan <- err
select {
case errChan <- err:
default:
}
close(done)
return
}

sseChan <- event
select {
case sseChan <- event:
case <-done:
return
case <-ctx.Done():
return
}

if event.Type == SSETypeDone {
close(done)
return
Expand All @@ -239,15 +248,11 @@ func (r *Client) streamPrediction(ctx context.Context, prediction *Prediction, l
return
}

if errors.Is(err, context.Canceled) {
// Context was canceled, simply return
return
}

select {
case errChan <- err:
default:
// errChan is full or closed
if !errors.Is(err, context.Canceled) {
select {
case errChan <- err:
default:
}
}
}
}()
Expand Down