* move error_accumulator into internal pkg (#304) * move error_accumulator into internal pkg (#304) * add a test for ErrTooManyEmptyStreamMessages in stream_reader (#304)
This commit is contained in:
committed by
GitHub
parent
fa694c61c2
commit
1394329e44
@@ -20,7 +20,7 @@ type streamReader[T streamable] struct {
|
||||
|
||||
reader *bufio.Reader
|
||||
response *http.Response
|
||||
errAccumulator errorAccumulator
|
||||
errAccumulator utils.ErrorAccumulator
|
||||
unmarshaler utils.Unmarshaler
|
||||
}
|
||||
|
||||
@@ -35,7 +35,7 @@ func (stream *streamReader[T]) Recv() (response T, err error) {
|
||||
waitForData:
|
||||
line, err := stream.reader.ReadBytes('\n')
|
||||
if err != nil {
|
||||
respErr := stream.errAccumulator.unmarshalError()
|
||||
respErr := stream.unmarshalError()
|
||||
if respErr != nil {
|
||||
err = fmt.Errorf("error, %w", respErr.Error)
|
||||
}
|
||||
@@ -45,7 +45,7 @@ waitForData:
|
||||
var headerData = []byte("data: ")
|
||||
line = bytes.TrimSpace(line)
|
||||
if !bytes.HasPrefix(line, headerData) {
|
||||
if writeErr := stream.errAccumulator.write(line); writeErr != nil {
|
||||
if writeErr := stream.errAccumulator.Write(line); writeErr != nil {
|
||||
err = writeErr
|
||||
return
|
||||
}
|
||||
@@ -69,6 +69,20 @@ waitForData:
|
||||
return
|
||||
}
|
||||
|
||||
func (stream *streamReader[T]) unmarshalError() (errResp *ErrorResponse) {
|
||||
errBytes := stream.errAccumulator.Bytes()
|
||||
if len(errBytes) == 0 {
|
||||
return
|
||||
}
|
||||
|
||||
err := stream.unmarshaler.Unmarshal(errBytes, &errResp)
|
||||
if err != nil {
|
||||
errResp = nil
|
||||
}
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
func (stream *streamReader[T]) Close() {
|
||||
stream.response.Body.Close()
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user