v1.5.15

CHANGELOG.md

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

client.go

@@ -140,15 +140,25 @@ 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") || errors.Is(err, io.EOF) {
+			for i := uint64(0); i < dc.cfg.Retries; i++ {
+				time.Sleep(5 * time.Second)
+				resp, err = dc.client.Do(req)
+				if strings.Contains(err.Error(), "connection reset by peer") || errors.Is(err, io.EOF) {
+					continue
+				} else if err == nil {
+					break
+				} else if err != nil {
+					return nil, err
+				}
+			}
+		}
 		return resp, err
 	}
 
@@ -159,6 +169,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,7 +145,21 @@ 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") || errors.Is(err, io.EOF) {
+			for i := uint64(0); i < ldc.cfg.Retries; i++ {
+				time.Sleep(5 * time.Second)
+				resp, err = ldc.client.Do(req)
+				if strings.Contains(err.Error(), "connection reset by peer") || errors.Is(err, io.EOF) {
+					continue
+				} else if err == nil {
+					break
+				} else if err != nil {
+					return nil, err
+				}
+			}
+		}
 		return resp, err
 	}
 
@@ -156,6 +170,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)
 }