Merge pull request #90 from r3inbowari/change/upreader

change: use a custom reader to allocate less memory when uploading

speedtest/request.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"io"
 	"net/http"
-	"net/url"
 	"strconv"
 	"strings"
 	"time"
@@ -217,15 +216,15 @@ func downloadRequest(ctx context.Context, doer *http.Client, dlURL string, w int
 
 func uploadRequest(ctx context.Context, doer *http.Client, ulURL string, w int) error {
 	size := ulSizes[w]
-	v := url.Values{}
-	v.Add("content", strings.Repeat("0123456789", size*100-51))
 
-	req, err := http.NewRequestWithContext(ctx, http.MethodPost, ulURL, strings.NewReader(v.Encode()))
+	reader := NewRepeatReader((size*100 - 51) * 10)
+	req, err := http.NewRequestWithContext(ctx, http.MethodPost, ulURL, reader)
+	req.ContentLength = reader.ContentLength
 	if err != nil {
 		return err
 	}
 
-	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+	req.Header.Set("Content-Type", "application/octet-stream")
 	resp, err := doer.Do(req)
 	if err != nil {
 		return err

speedtest/utils.go

@@ -0,0 +1,35 @@
+package speedtest
+
+import (
+	"bytes"
+	"io"
+)
+
+const readChunkSize = 1024 * 32 // 32 KBytes
+
+type RepeatReader struct {
+	ContentLength int64
+	rs            []byte
+	n             int
+}
+
+func NewRepeatReader(size int) *RepeatReader {
+	if size <= 0 {
+		panic("the size of repeated bytes should be > 0")
+	}
+	seqChunk := bytes.Repeat([]byte{0xAA}, readChunkSize) // uniformly distributed sequence of bits
+	return &RepeatReader{rs: seqChunk, ContentLength: int64(size), n: size}
+}
+
+func (r *RepeatReader) Read(b []byte) (n int, err error) {
+	if r.n < readChunkSize {
+		if r.n <= 0 {
+			return n, io.EOF
+		}
+		n = copy(b, r.rs[:r.n])
+	} else {
+		n = copy(b, r.rs)
+	}
+	r.n -= n
+	return
+}