-
Notifications
You must be signed in to change notification settings - Fork 60
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
3 changed files
with
152 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
package httpclient | ||
|
||
import ( | ||
"io" | ||
) | ||
|
||
type ReportSizeCallback func(int) | ||
|
||
func ReportSizeReader(r io.ReadCloser, callback ReportSizeCallback) io.ReadCloser { | ||
return &reportSizeReader{ | ||
r: r, | ||
bytesRead: 0, | ||
sizeReported: false, | ||
callback: callback, | ||
} | ||
} | ||
|
||
type reportSizeReader struct { | ||
r io.ReadCloser | ||
bytesRead int | ||
sizeReported bool | ||
callback ReportSizeCallback | ||
} | ||
|
||
func (rsr *reportSizeReader) Read(p []byte) (int, error) { | ||
count, err := rsr.r.Read(p) | ||
rsr.bytesRead += count | ||
|
||
// we want to handle the case when: | ||
// 1. Read() returns an error | ||
// 2. user calls Read() again | ||
// we only want to report the size on [1], not on [2]. | ||
// i do not know if this is allowed or not, but better be safe | ||
if (!rsr.sizeReported) && (err != nil) { | ||
rsr.sizeReported = true | ||
rsr.callback(rsr.bytesRead) | ||
} | ||
return count, err | ||
} | ||
|
||
func (rsr *reportSizeReader) Close() error { | ||
return rsr.r.Close() | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,76 @@ | ||
package httpclient | ||
|
||
import ( | ||
"bytes" | ||
"errors" | ||
"io" | ||
"testing" | ||
|
||
"github.com/stretchr/testify/require" | ||
) | ||
|
||
type testReportSizeReaderReader struct { | ||
r io.ReadCloser | ||
overrideErr error | ||
} | ||
|
||
// this reader allows customizing the error "at the end", to help with tests | ||
func newTestReportSizeReaderReader(b []byte, overrideErr error) io.ReadCloser { | ||
r := io.NopCloser(bytes.NewReader(b)) | ||
return &testReportSizeReaderReader{ | ||
r: r, | ||
overrideErr: overrideErr, | ||
} | ||
} | ||
|
||
func (r *testReportSizeReaderReader) Read(p []byte) (int, error) { | ||
count, err := r.r.Read(p) | ||
if err != nil { | ||
err = r.overrideErr | ||
} | ||
|
||
return count, err | ||
} | ||
|
||
func (r *testReportSizeReaderReader) Close() error { | ||
return r.r.Close() | ||
} | ||
|
||
func TestReportSizeReader(t *testing.T) { | ||
|
||
tcs := []struct { | ||
name string | ||
b []byte | ||
err error | ||
}{ | ||
{name: "test1", b: []byte("hello world"), err: io.EOF}, | ||
{name: "test2", b: []byte("hello world2"), err: errors.New("test error")}, | ||
} | ||
for _, tc := range tcs { | ||
t.Run(tc.name, func(t *testing.T) { | ||
// we want to make sure things work when the data is received in multiple batches, | ||
// so we intentionally read the data in small blocks | ||
p := make([]byte, 2) | ||
var err error | ||
byteCount := 0 | ||
c := 0 | ||
|
||
reader := newTestReportSizeReaderReader(tc.b, tc.err) | ||
reportHappened := false | ||
wrapped := ReportSizeReader(reader, func(size int) { | ||
reportHappened = true | ||
require.Equal(t, len(tc.b), size) // test that we report the right number | ||
require.Equal(t, len(tc.b), byteCount) // test that we return the correct sizes in Read() calls | ||
}) | ||
|
||
for err == nil { | ||
c, err = wrapped.Read(p) | ||
byteCount += c | ||
} | ||
wrapped.Close() | ||
|
||
require.Equal(t, tc.err, err) | ||
require.Equal(t, true, reportHappened) | ||
}) | ||
} | ||
} |