finish adding some code comments, add bad host handling to delivery workers

internal/httpclient/client.go

@@ -108,12 +108,16 @@ type Client struct {
 	client   http.Client
 	badHosts cache.TTLCache[string, struct{}]
 	bodyMax  int64
+	retries  uint
 }
 
 // New returns a new instance of Client initialized using configuration.
 func New(cfg Config) *Client {
 	var c Client
 
+	// For now use const.
+	c.retries = maxRetries
+
 	d := &net.Dialer{
 		Timeout:   15 * time.Second,
 		KeepAlive: 30 * time.Second,
@@ -220,7 +224,7 @@ func (c *Client) Do(r *http.Request) (rsp *http.Response, err error) {
 	// type for retry-backoff.
 	req := wrapRequest(r)
 
-	for req.attempts < maxRetries {
+	for req.attempts < c.retries {
 		var retry bool
 
 		log.Info("performing request")

internal/httpclient/delivery.go

@@ -28,7 +28,8 @@ import (
 	"github.com/superseriousbusiness/gotosocial/internal/queue"
 )
 
-// APDeliveryWorkerPool ...
+// APDeliveryWorkerPool wraps APDeliveryWorker{}s
+// in a singular struct for easy multi start/stop.
 type APDeliveryWorkerPool struct {
 	workers []APDeliveryWorker
 }
@@ -76,7 +77,10 @@ func (p *APDeliveryWorkerPool) Stop() bool {
 	return ok
 }
 
-// APDeliveryWorker ...
+// APDeliveryWorker wraps a Client{} to feed from
+// a queue.StructQueue{} for ActivityPub requests
+// to deliver. It does so while prioritizing new
+// queued requests over backlogged retries.
 type APDeliveryWorker struct {
 	client  *Client
 	queue   *queue.StructQueue[*queue.APRequest]
@@ -153,9 +157,11 @@ loop:
 
 		dlv.log.Error(err)
 
-		if !retry || dlv.attempts > maxRetries {
-			// Drop deliveries when no retry
-			// requested, or we reach max.
+		if !retry || w.client.badHosts.Has(dlv.host) ||
+			dlv.attempts > w.client.retries {
+			// Drop deliveries when no retry requested,
+			// or we reach max defined retry attempts.
+			w.client.badHosts.Set(dlv.host, struct{}{})
 			continue loop
 		}
 
@@ -229,6 +235,10 @@ type delivery struct {
 	// next attempt time.
 	next time.Time
 
+	// hostname string
+	// for bad host check.
+	host string
+
 	// embedded
 	// request.
 	request
@@ -248,6 +258,7 @@ func wrapMsg(ctx context.Context, msg *queue.APRequest) *delivery {
 	dlv := new(delivery)
 	dlv.request = wrapRequest(msg.Request)
 	dlv.log = requestLog(dlv.req)
+	dlv.host = dlv.req.URL.Hostname()
 	ctx = gtscontext.WithValues(ctx, msg.Request.Context())
 	dlv.req = dlv.req.WithContext(ctx)
 	return dlv

internal/httpclient/request.go

@@ -43,7 +43,7 @@ type request struct {
 	backoff time.Duration
 
 	// delivery attempts.
-	attempts int
+	attempts uint
 }
 
 // wrapRequest wraps an http.Request{} in our own request{} type.