v1.5.16

CHANGELOG.md

@@ -1,7 +1,4 @@
-## Version 1.5.9
+## Version 1.5.16
 
 ### Bugfix
-- Refactored clients to fix the problems with retries
+- Fix EOF error by closing request
-
-
-

client.go

@@ -140,24 +140,37 @@ 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.Body = io.NopCloser(bytes.NewBuffer(buf))
-		// req = req.Clone(req.Context())
+	resp, err := dc.client.Do(req)
-		req.Body = io.NopCloser(bytes.NewBuffer(buf))
+	req.Close = true
-		resp, err := dc.client.Do(req)
+	if err != nil || resp == nil {
-
+		if strings.Contains(err.Error(), "connection reset by peer") || errors.Is(err, io.EOF) {
-		// if err == nil {
+			for i := uint64(0); i < dc.cfg.Retries; i++ {
-			if resp.StatusCode == 200 {
+				time.Sleep(5 * time.Second)
-				return resp, err
+				resp, err = dc.client.Do(req)
+				if err == nil {
+					break
+				}
+				if strings.Contains(err.Error(), "connection reset by peer") || errors.Is(err, io.EOF) {
+					continue
+				}
+				if err != nil {
+					return nil, err
+				}
 			}
-			respBytes, _ := io.ReadAll(resp.Body)
+		}
-			err = fmt.Errorf("%s", respBytes)
+		return resp, err
-			resp.Body.Close()
+	}
-		// }
+
-	// }
+	if resp.StatusCode == 200 {
+		return resp, nil
+	}
+
+	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

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