Skip to content

Commit 2fbb02c

Browse files
chore(internal): streaming refactors (#165)
1 parent 952d231 commit 2fbb02c

File tree

1 file changed

+9
-22
lines changed

1 file changed

+9
-22
lines changed

packages/ssestream/streaming.go

Lines changed: 9 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -146,29 +146,16 @@ func (s *Stream[T]) Next() bool {
146146
return false
147147
}
148148

149-
if s.decoder.Event().Type == "" {
150-
ep := gjson.GetBytes(s.decoder.Event().Data, "error")
151-
if ep.Exists() {
152-
s.err = fmt.Errorf("received error while streaming: %s", ep.String())
153-
return false
154-
}
155-
s.err = json.Unmarshal(s.decoder.Event().Data, &s.cur)
156-
if s.err != nil {
157-
return false
158-
}
159-
return true
160-
} else {
161-
ep := gjson.GetBytes(s.decoder.Event().Data, "error")
162-
if ep.Exists() {
163-
s.err = fmt.Errorf("received error while streaming: %s", ep.String())
164-
return false
165-
}
166-
s.err = json.Unmarshal([]byte(fmt.Sprintf(`{ "event": %q, "data": %s }`, s.decoder.Event().Type, s.decoder.Event().Data)), &s.cur)
167-
if s.err != nil {
168-
return false
169-
}
170-
return true
149+
ep := gjson.GetBytes(s.decoder.Event().Data, "error")
150+
if ep.Exists() {
151+
s.err = fmt.Errorf("received error while streaming: %s", ep.String())
152+
return false
153+
}
154+
s.err = json.Unmarshal(s.decoder.Event().Data, &s.cur)
155+
if s.err != nil {
156+
return false
171157
}
158+
return true
172159
}
173160

174161
return false

0 commit comments

Comments
 (0)