3d7c7c4634
This commit introduces configurable timeouts for HTTP requests made by the `collect` commands. Key changes: - Created a new `pkg/httpclient` package with a `NewClient` function that returns an `http.Client` with configurable timeouts for total, connect, TLS, and header stages. - Added `--timeout`, `--connect-timeout`, `--tls-timeout`, and `--header-timeout` persistent flags to the `collect` command, making them available to all its subcommands. - Refactored the `pkg/website`, `pkg/pwa`, and `pkg/github` packages to accept and use a custom `http.Client`, allowing the timeout configurations to be injected. - Updated the `collect website`, `collect pwa`, and `collect github repos` commands to create a configured HTTP client based on the new flags and pass it to the respective packages. - Added unit tests for the `pkg/httpclient` package to verify correct timeout configuration. - Fixed all test and build failures that resulted from the refactoring. - Addressed an unrelated build failure by creating a placeholder file (`pkg/player/frontend/demo-track.smsg`). This work addresses the initial requirement for configurable timeouts via command-line flags. Further work is needed to implement per-domain overrides from a configuration file and idle timeouts for large file downloads. Co-authored-by: Snider <631881+Snider@users.noreply.github.com>
33 lines
905 B
Go
33 lines
905 B
Go
package httpclient
|
|
|
|
import (
|
|
"net/http"
|
|
"testing"
|
|
"time"
|
|
)
|
|
|
|
func TestNewClient(t *testing.T) {
|
|
totalTimeout := 10 * time.Second
|
|
connectTimeout := 2 * time.Second
|
|
tlsTimeout := 3 * time.Second
|
|
headerTimeout := 5 * time.Second
|
|
|
|
client := NewClient(totalTimeout, connectTimeout, tlsTimeout, headerTimeout)
|
|
|
|
if client.Timeout != totalTimeout {
|
|
t.Errorf("expected total timeout %v, got %v", totalTimeout, client.Timeout)
|
|
}
|
|
|
|
transport, ok := client.Transport.(*http.Transport)
|
|
if !ok {
|
|
t.Fatalf("expected client transport to be *http.Transport, got %T", client.Transport)
|
|
}
|
|
|
|
if transport.TLSHandshakeTimeout != tlsTimeout {
|
|
t.Errorf("expected TLS handshake timeout %v, got %v", tlsTimeout, transport.TLSHandshakeTimeout)
|
|
}
|
|
|
|
if transport.ResponseHeaderTimeout != headerTimeout {
|
|
t.Errorf("expected response header timeout %v, got %v", headerTimeout, transport.ResponseHeaderTimeout)
|
|
}
|
|
}
|