v1.5.16

CHANGELOG.md

@@ -1,7 +1,4 @@
-## Version 1.5.12
+## Version 1.5.16
 
 ### Bugfix
-- Fix unhandled error in do() method for client and legacy-client
-
-
-
+- Fix EOF error by closing request

client.go

@@ -140,26 +140,23 @@ func (dc *DecortClient) do(req *http.Request) (*http.Response, error) {
 	req.Header.Add("Authorization", "bearer "+dc.cfg.Token)
 	req.Header.Set("Accept", "application/json")
 
-	// var resp *http.Response
-	// var err error
 	buf, _ := io.ReadAll(req.Body)
 
-	// for i := uint64(0); i < dc.cfg.Retries; i++ {
-	// req = req.Clone(req.Context())
 	req.Body = io.NopCloser(bytes.NewBuffer(buf))
 	resp, err := dc.client.Do(req)
+	req.Close = true
 	if err != nil || resp == nil {
-		if strings.Contains(err.Error(),"connection reset by peer") {
-			resp.Body.Close()
+		if strings.Contains(err.Error(), "connection reset by peer") || errors.Is(err, io.EOF) {
 			for i := uint64(0); i < dc.cfg.Retries; i++ {
-				time.Sleep(5 *time.Second)
+				time.Sleep(5 * time.Second)
 				resp, err = dc.client.Do(req)
-				if strings.Contains(err.Error(),"connection reset by peer") {
-					resp.Body.Close()
+				if err == nil {
+					break
+				}
+				if strings.Contains(err.Error(), "connection reset by peer") || errors.Is(err, io.EOF) {
 					continue
-				} else if err == nil {
-					break 
-				} else if err != nil {
+				}
+				if err != nil {
 					return nil, err
 				}
 			}
@@ -174,6 +171,6 @@ func (dc *DecortClient) do(req *http.Request) (*http.Response, error) {
 	respBytes, _ := io.ReadAll(resp.Body)
 	err = fmt.Errorf("%s", respBytes)
 	resp.Body.Close()
-	
+
 	return nil, fmt.Errorf("could not execute request: %w", err)
 }

legacy-client.go

@@ -145,18 +145,19 @@ func (ldc *LegacyDecortClient) do(req *http.Request) (*http.Response, error) {
 	// req = req.Clone(req.Context())
 	req.Body = io.NopCloser(bytes.NewBuffer(buf))
 	resp, err := ldc.client.Do(req)
+	req.Close = true
 	if err != nil || resp == nil {
-		if strings.Contains(err.Error(),"connection reset by peer") {
-			resp.Body.Close()
+		if strings.Contains(err.Error(), "connection reset by peer") || errors.Is(err, io.EOF) {
 			for i := uint64(0); i < ldc.cfg.Retries; i++ {
-				time.Sleep(5 *time.Second)
+				time.Sleep(5 * time.Second)
 				resp, err = ldc.client.Do(req)
-				if strings.Contains(err.Error(),"connection reset by peer") {
-					resp.Body.Close()
+				if err == nil {
+					break
+				}
+				if strings.Contains(err.Error(), "connection reset by peer") || errors.Is(err, io.EOF) {
 					continue
-				} else if err == nil {
-					break 
-				} else if err != nil {
+				}
+				if err != nil {
 					return nil, err
 				}
 			}
@@ -171,6 +172,7 @@ func (ldc *LegacyDecortClient) do(req *http.Request) (*http.Response, error) {
 	respBytes, _ := io.ReadAll(resp.Body)
 	err = fmt.Errorf("%s", respBytes)
 	resp.Body.Close()
-	
+	// }
+
 	return nil, fmt.Errorf("could not execute request: %w", err)
 }