Go version fixes and Client additions

Author: cristaloleg

client.go

@@ -1,18 +1,60 @@
 package httpx
 
 import (
+	"net"
 	"net/http"
+	"runtime"
 	"time"
 )
 
-// Doer is an interface for http.Client.
-type Doer interface {
+// Doer is a backward compatible definition for [Client].
+type Doer = Client
+
+// Client is an interface for [http.Client].
+type Client interface {
 	Do(req *http.Request) (*http.Response, error)
 }
 
-// NewClient return http.Client with a sane default.
+// NewClient returns [http.Client] with a sane defaults and non-shared [http.Transport].
+// See [NewTransport] for more info.
 func NewClient() *http.Client {
 	return &http.Client{
-		Timeout: 5 * time.Second,
+		Transport: NewTransport(),
+		Timeout:   5 * time.Second,
+	}
+}
+
+// NewPooledClient returns [http.Client] which will be used for the same host(s).
+func NewPooledClient() *http.Client {
+	return &http.Client{
+		Transport: NewPooledTransport(),
+		Timeout:   5 * time.Second,
+	}
+}
+
+// NewTransport returns [http.Transport] with idle connections and keepalives disabled.
+func NewTransport() *http.Transport {
+	transport := NewPooledTransport()
+	transport.DisableKeepAlives = true
+	transport.MaxIdleConnsPerHost = -1
+	return transport
+}
+
+// NewPooledTransport returns [http.Transport] which will be used for the same host(s).
+func NewPooledTransport() *http.Transport {
+	transport := &http.Transport{
+		Proxy: http.ProxyFromEnvironment,
+		DialContext: (&net.Dialer{
+			Timeout:   30 * time.Second,
+			KeepAlive: 30 * time.Second,
+			DualStack: true,
+		}).DialContext,
+		TLSHandshakeTimeout:   10 * time.Second,
+		MaxIdleConns:          100,
+		MaxIdleConnsPerHost:   runtime.GOMAXPROCS(0) + 1,
+		IdleConnTimeout:       90 * time.Second,
+		ExpectContinueTimeout: 1 * time.Second,
+		ForceAttemptHTTP2:     true,
 	}
+	return transport
 }

content.go

@@ -0,0 +1,35 @@
+package httpx
+
+import (
+	"path/filepath"
+)
+
+// ContentTypeByExt or 'application/octet-stream' if not found.
+func ContentTypeByExt(file string) string {
+	if typ := ctypes[filepath.Ext(file)]; typ != "" {
+		return typ
+	}
+	return ctypes[".bin"]
+}
+
+var ctypes = map[string]string{
+	".avif": "image/avif",
+	".bin":  "application/octet-stream",
+	".css":  "text/css; charset=utf-8",
+	".csv":  "text/csv; charset=utf-8",
+	".gif":  "image/gif",
+	".htm":  "text/html; charset=utf-8",
+	".html": "text/html; charset=utf-8",
+	".ico":  "image/png",
+	".jpeg": "image/jpeg",
+	".jpg":  "image/jpeg",
+	".js":   "text/javascript; charset=utf-8",
+	".json": "application/json; charset=utf-8",
+	".pdf":  "application/pdf",
+	".png":  "image/png",
+	".svg":  "image/svg+xml",
+	".txt":  "text/plain; charset=utf-8",
+	".webp": "image/webp",
+	".xml":  "application/xml",
+	".zip":  "application/zip",
+}

go.mod

@@ -1,3 +1,3 @@
 module github.com/cristalhq/httpx
 
-go 1.16
+go 1.24

request.go

@@ -1,14 +1,26 @@
 package httpx
 
 import (
+	"cmp"
 	"context"
 	"fmt"
 	"io"
 	"net/http"
+	"net/netip"
+	"net/url"
+	"strings"
 )
 
 var NoBody = http.NoBody
 
+var NilRequest = &http.Request{
+	Method: "STUB",
+	URL:    &url.URL{Path: "/"},
+	Header: http.Header{
+		"X-Real-Ip": []string{"0.0.0.0"},
+	},
+}
+
 // NewRequest returns a new http.Request.
 func NewRequest(ctx context.Context, method, url string, body io.Reader) (*http.Request, error) {
 	return http.NewRequestWithContext(ctx, method, url, body)
@@ -99,3 +111,32 @@ func MustPutRequest(ctx context.Context, url string, body io.Reader) *http.Reque
 func Bearer(token string) string {
 	return "Bearer " + token
 }
+
+// RequestIP from the headers if possible.
+func RequestIP(r *http.Request) netip.Addr {
+	ip := cmp.Or(
+		r.Header.Get("Cf-Connecting-Ip"),
+		r.Header.Get("True-Client-IP"),
+		r.Header.Get("X-Real-Ip"),
+	)
+
+	if ip == "" {
+		if xff := r.Header.Get("X-Forwarded-For"); xff != "" {
+			i := strings.Index(xff, ",")
+			if i == -1 {
+				i = len(xff)
+			}
+			ip = xff[:i]
+		} else {
+			ip = r.RemoteAddr
+		}
+	}
+
+	addr, err := netip.ParseAddr(ip)
+	if err == nil {
+		return addr
+	}
+
+	ap, _ := netip.ParseAddrPort(ip)
+	return ap.Addr()
+}