feat: add possibility to specify DL and UL chunk size

README.md

@@ -57,6 +57,8 @@ Flags:
       --no-upload              Disable upload test.
       --ping-mode              Select a method for Ping. (support icmp/tcp/http)
   -d  --debug                  Enable debug mode.
+      --dl-size=1000           Set download chunk size.
+      --ul-size=800            Set upload chunk size.
       --version                Show application version.
 ```
 

speedtest.go

@@ -31,6 +31,8 @@ var (
 	noUpload      = kingpin.Flag("no-upload", "Disable upload test.").Bool()
 	pingMode      = kingpin.Flag("ping-mode", "Select a method for Ping. (support icmp/tcp/http)").Default("http").String()
 	debug         = kingpin.Flag("debug", "Enable debug mode.").Short('d').Bool()
+	dlSize        = kingpin.Flag("dl-size", "Set download chunk size.").Default("1000").Int()
+	ulSize        = kingpin.Flag("ul-size", "Set upload chunk size.").Default("800").Int()
 )
 
 func main() {
@@ -54,6 +56,8 @@ func main() {
 			Keyword:       *search,
 			NoDownload:    *noDownload,
 			NoUpload:      *noUpload,
+			DlSize:        *dlSize,
+			UlSize:        *ulSize,
 		}))
 	speedtestClient.SetNThread(*thread)
 

speedtest/request.go

@@ -48,7 +48,7 @@ func (s *Server) MultiDownloadTestContext(ctx context.Context, servers Servers)
 		sp := server
 		dbg.Printf("Register Download Handler: %s\n", sp.URL)
 		fp = server.Context.RegisterDownloadHandler(func() {
-			_ = downloadRequest(_context, sp, 3)
+			_ = downloadRequest(_context, sp, s.Context.config.DlSize)
 		})
 	}
 	fp.Start(cancel, mainIDIndex) // block here
@@ -75,7 +75,7 @@ func (s *Server) MultiUploadTestContext(ctx context.Context, servers Servers) er
 		sp := server
 		dbg.Printf("Register Upload Handler: %s\n", sp.URL)
 		fp = server.Context.RegisterUploadHandler(func() {
-			_ = uploadRequest(_context, sp, 3)
+			_ = uploadRequest(_context, sp, s.Context.config.UlSize)
 		})
 	}
 	fp.Start(cancel, mainIDIndex) // block here
@@ -98,10 +98,11 @@ func (s *Server) downloadTestContext(ctx context.Context, downloadRequest downlo
 		dbg.Println("Download test disabled")
 		return nil
 	}
+
 	start := time.Now()
 	_context, cancel := context.WithCancel(ctx)
 	s.Context.RegisterDownloadHandler(func() {
-		_ = downloadRequest(_context, s, 3)
+		_ = downloadRequest(_context, s, s.Context.config.DlSize)
 	}).Start(cancel, 0)
 	duration := time.Since(start)
 	s.DLSpeed = s.Context.GetAvgDownloadRate()
@@ -125,10 +126,11 @@ func (s *Server) uploadTestContext(ctx context.Context, uploadRequest uploadFunc
 		dbg.Println("Upload test disabled")
 		return nil
 	}
+
 	start := time.Now()
 	_context, cancel := context.WithCancel(ctx)
 	s.Context.RegisterUploadHandler(func() {
-		_ = uploadRequest(_context, s, 4)
+		_ = uploadRequest(_context, s, s.Context.config.UlSize)
 	}).Start(cancel, 0)
 	duration := time.Since(start)
 	s.ULSpeed = s.Context.GetAvgUploadRate()
@@ -159,8 +161,7 @@ func downloadRequest(ctx context.Context, s *Server, w int) error {
 	return s.Context.NewChunk().DownloadHandler(resp.Body)
 }
 
-func uploadRequest(ctx context.Context, s *Server, w int) error {
-	size := ulSizes[w]
+func uploadRequest(ctx context.Context, s *Server, size int) error {
 	dc := s.Context.NewChunk().UploadHandler(int64(size*100-51) * 10)
 	req, err := http.NewRequestWithContext(ctx, http.MethodPost, s.URL, dc)
 	req.ContentLength = dc.(*DataChunk).ContentLength

speedtest/speedtest.go

@@ -7,6 +7,7 @@ import (
 	"net/http"
 	"net/url"
 	"runtime"
+	"slices"
 	"strings"
 	"syscall"
 	"time"
@@ -56,6 +57,9 @@ type UserConfig struct {
 
 	NoDownload bool
 	NoUpload   bool
+
+	DlSize int
+	UlSize int
 }
 
 func parseAddr(addr string) (string, string) {
@@ -71,6 +75,18 @@ func (s *Speedtest) NewUserConfig(uc *UserConfig) {
 		dbg.Enable()
 	}
 
+	if !(uc.DlSize > 0 && slices.Contains(dlSizes[:], uc.DlSize)) {
+		dbg.Printf("Warning: invalid/unset download size: %d.\n", uc.DlSize)
+		uc.DlSize = dlSizes[4]
+		dbg.Printf("Using default size: %d.\n", uc.DlSize)
+	}
+
+	if !(uc.UlSize > 0 && slices.Contains(ulSizes[:], uc.UlSize)) {
+		dbg.Printf("Warning: invalid/unset upload size: %d.\n", uc.UlSize)
+		uc.UlSize = ulSizes[4]
+		dbg.Printf("Using default size: %d.\n", uc.UlSize)
+	}
+
 	if uc.SavingMode {
 		s.SetNThread(1) // Set the number of concurrent connections to 1
 	}