no bursts to avoid 429 and 30 sec waits

client.go

@@ -29,18 +29,23 @@ func NewClient(key string, dryRun bool) *Client {
 		key:    key,
 		dryRun: dryRun,
 		http:   &http.Client{Timeout: 30 * time.Second},
-		// 60 requests per 30 seconds: 2/sec sustained, burst of 60.
-		limiter: rate.NewLimiter(2, 60),
+		// limit to 2 requests per second, no bursts to avoid 429s
+		limiter: rate.NewLimiter(2, 1),
 	}
 }
 
 // do applies the rate limit, retries once on 429, and returns the raw body.
-func (c *Client) do(ctx context.Context, method, path string, body io.Reader) ([]byte, error) {
+// rebuilds the body on every attempt
+func (c *Client) do(ctx context.Context, method, path string, body []byte) ([]byte, error) {
+	for attempt := 0; ; attempt++ {
 		if err := c.limiter.Wait(ctx); err != nil {
 			return nil, err
 		}
-
-	req, err := http.NewRequestWithContext(ctx, method, baseURL+path, body)
+		var r io.Reader
+		if body != nil {
+			r = bytes.NewReader(body) // fresh reader each attempt
+		}
+		req, err := http.NewRequestWithContext(ctx, method, baseURL+path, r)
 		if err != nil {
 			return nil, err
 		}
@@ -54,9 +59,9 @@ func (c *Client) do(ctx context.Context, method, path string, body io.Reader) ([
 		if err != nil {
 			return nil, err
 		}
-	defer resp.Body.Close()
 
-	if resp.StatusCode == http.StatusTooManyRequests {
+		if resp.StatusCode == http.StatusTooManyRequests && attempt < 3 {
+			resp.Body.Close()
 			wait := 30 * time.Second
 			if s := resp.Header.Get("Retry-After"); s != "" {
 				if secs, err := strconv.Atoi(s); err == nil {
@@ -66,13 +71,14 @@ func (c *Client) do(ctx context.Context, method, path string, body io.Reader) ([
 			log.Printf("rate limited; waiting %s", wait)
 			select {
 			case <-time.After(wait):
+				continue
 			case <-ctx.Done():
 				return nil, ctx.Err()
 			}
-		return c.do(ctx, method, path, body)
 		}
 
 		raw, err := io.ReadAll(resp.Body)
+		resp.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -80,8 +86,8 @@ func (c *Client) do(ctx context.Context, method, path string, body io.Reader) ([
 			return nil, fmt.Errorf("%s %s: %d: %s", method, path, resp.StatusCode, truncate(raw))
 		}
 		return raw, nil
+	}
 }
-
 func truncate(b []byte) string {
 	if len(b) > 300 {
 		return string(b[:300]) + "..."