NewSSEScanner return Next by value instead of pointer

Author: hayeah

sse.go

@@ -76,7 +76,7 @@ type ServerSentEvent struct {
 
 type SSEScanner struct {
 	scanner     *bufio.Scanner
-	event       *ServerSentEvent
+	next        ServerSentEvent
 	err         error
 	readComment bool
 }
@@ -99,9 +99,10 @@ func NewSSEScanner(r io.Reader, readComment bool) *SSEScanner {
 }
 
 func (s *SSEScanner) Next() bool {
-	s.event = nil
-
+	// Zero the next event before scanning a new one
 	var event ServerSentEvent
+	s.next = event
+
 	var dataLines []string
 
 	var seenNonEmptyLine bool
@@ -150,13 +151,13 @@ func (s *SSEScanner) Next() bool {
 	}
 
 	event.Data = strings.Join(dataLines, "\n")
-	s.event = &event
+	s.next = event
 
 	return true
 }
 
-func (s *SSEScanner) Scan() *ServerSentEvent {
-	return s.event
+func (s *SSEScanner) Scan() ServerSentEvent {
+	return s.next
 }
 
 func (s *SSEScanner) Err() error {

sse_test.go

@@ -259,7 +259,7 @@ func runSSEScanTest(t *testing.T, raw string, want []ServerSentEvent) {
 
 	var got []ServerSentEvent
 	for sseScanner.Next() {
-		got = append(got, *sseScanner.Scan())
+		got = append(got, sseScanner.Scan())
 	}
 
 	if err := sseScanner.Err(); err != nil {

stream_v2.go

@@ -126,10 +126,6 @@ func (s *StreamerV2) Next() bool {
 
 	event := s.scanner.Scan()
 
-	if event == nil {
-		return false
-	}
-
 	switch event.Event {
 	case "thread.message.delta":
 		var delta StreamThreadMessageDelta