Merge pull request #197 from haydenhoang/pr-193

add test for PR 193, fix nil pointer error when request is a GET

Author: kishorenc

typesense/api_call.go

@@ -1,8 +1,10 @@
 package typesense
 
 import (
+	"bytes"
 	"context"
 	"errors"
+	"io"
 	"net/http"
 	"net/url"
 	"time"
@@ -67,12 +69,32 @@ func (a *APICall) Do(req *http.Request) (*http.Response, error) {
 
 	var lastResponse *http.Response
 	var lastError error
+	var bodyBytes []byte
+
+	if req.GetBody != nil {
+		// Store body in case we need to retry
+		reqBody, err := req.GetBody()
+		if err != nil {
+			return nil, err
+		}
+		defer reqBody.Close()
+
+		bodyBytes, err = io.ReadAll(reqBody)
+		if err != nil {
+			return nil, err
+		}
+	}
 
 	for numTries := 0; numTries < a.numRetriesPerRequest; numTries++ {
 		node := a.getNextNode()
 
 		replaceRequestHostname(req, node.url)
 
+		if bodyBytes != nil {
+			// Create a new io.ReadCloser for each retry
+			req.Body = io.NopCloser(bytes.NewReader(bodyBytes))
+		}
+
 		response, err := a.client.Do(req)
 
 		// return early if request is aborted

typesense/api_call_test.go

@@ -1,7 +1,9 @@
 package typesense
 
 import (
+	"bytes"
 	"context"
+	"io"
 	"net/http"
 	"net/http/httptest"
 	"testing"
@@ -392,3 +394,51 @@ func TestApiCallCanAbortRequest(t *testing.T) {
 	assert.Nil(t, res)
 	assert.Equal(t, requestURLHistory, serverURLs[:3])
 }
+
+func TestApiCallRetryWithRequestBody(t *testing.T) {
+
+	requestURLHistory := make([]string, 0, 2)
+
+	servers, serverURLs := instantiateServers([]serverHandler{
+		func(w http.ResponseWriter, r *http.Request) {
+			appendHistory(&requestURLHistory, r)
+			w.WriteHeader(501)
+		},
+		func(w http.ResponseWriter, r *http.Request) {
+			appendHistory(&requestURLHistory, r)
+			data := r.Body
+			bodyBytes, _ := io.ReadAll(data)
+			assert.Equal(t, string(bodyBytes), "body data")
+			w.WriteHeader(201)
+		},
+		func(w http.ResponseWriter, r *http.Request) {
+			appendHistory(&requestURLHistory, r)
+			data := r.Body
+			bodyBytes, _ := io.ReadAll(data)
+			assert.Equal(t, string(bodyBytes), "body data")
+			w.WriteHeader(203)
+		},
+	})
+	for _, server := range servers {
+		defer server.Close()
+	}
+
+	apiCall := newAPICall(
+		&ClientConfig{
+			Nodes:             serverURLs,
+			ConnectionTimeout: 5 * time.Second,
+		},
+	)
+	req, err := http.NewRequest(http.MethodPost, "http://example.com", bytes.NewBuffer([]byte("body data")))
+	assert.NoError(t, err)
+
+	res, err := apiCall.Do(req)
+	assert.NoError(t, err)
+	assert.Equal(t, 201, res.StatusCode)
+
+	res2, err2 := apiCall.Do(req)
+	assert.NoError(t, err2)
+	assert.Equal(t, 203, res2.StatusCode)
+
+	assert.Equal(t, serverURLs, requestURLHistory)
+}