From db40de9d8623e8d2fcafc772bdaf2f89412b59b5 Mon Sep 17 00:00:00 2001
From: Felipe Marinho <felipevm97@gmail.com>
Date: Wed, 30 Jul 2025 14:17:20 +0000
Subject: [PATCH] chg: feat: add retry and expiry

---
 cache/redis.go            |  4 ++++
 requester/flaresolverr.go | 22 +++++++++++++++++-----
 requester/requester.go    |  9 +++++++--
 3 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/cache/redis.go b/cache/redis.go
index 62e82dc..9e09b99 100644
--- a/cache/redis.go
+++ b/cache/redis.go
@@ -48,3 +48,7 @@ func (r *Redis) Set(ctx context.Context, key string, value []byte) error {
 func (r *Redis) SetWithExpiration(ctx context.Context, key string, value []byte, expiration time.Duration) error {
 	return r.client.Set(ctx, key, value, expiration).Err()
 }
+
+func (r *Redis) Del(ctx context.Context, key string) error {
+	return r.client.Del(ctx, key).Err()
+}
diff --git a/requester/flaresolverr.go b/requester/flaresolverr.go
index 7f063ec..95aedbb 100644
--- a/requester/flaresolverr.go
+++ b/requester/flaresolverr.go
@@ -10,6 +10,7 @@ import (
 	"net/url"
 	"strings"
 	"sync"
+	"time"
 
 	"github.com/felipemarinho97/torrent-indexer/utils"
 )
@@ -29,7 +30,9 @@ var (
 
 func NewFlareSolverr(url string, timeoutMilli int) *FlareSolverr {
 	poolSize := 5
-	httpClient := &http.Client{}
+	httpClient := &http.Client{
+		Timeout: time.Duration(timeoutMilli) * time.Millisecond,
+	}
 	sessionPool := make(chan string, poolSize) // Pool size of 5 sessions
 
 	f := &FlareSolverr{
@@ -191,7 +194,7 @@ type Response struct {
 	} `json:"solution"`
 }
 
-func (f *FlareSolverr) Get(_url string) (io.ReadCloser, error) {
+func (f *FlareSolverr) Get(_url string, attempts int) (io.ReadCloser, error) {
 	// Check if the FlareSolverr instance was initiated
 	if !f.initiated {
 		return io.NopCloser(bytes.NewReader([]byte(""))), nil
@@ -205,10 +208,10 @@ func (f *FlareSolverr) Get(_url string) (io.ReadCloser, error) {
 		f.sessionPool <- session
 	}()
 
-	body := map[string]string{
+	body := map[string]interface{}{
 		"cmd":        "request.get",
 		"url":        _url,
-		"maxTimeout": fmt.Sprintf("%d", f.maxTimeout),
+		"maxTimeout": f.maxTimeout,
 		"session":    session,
 	}
 	jsonBody, err := json.Marshal(body)
@@ -237,7 +240,15 @@ func (f *FlareSolverr) Get(_url string) (io.ReadCloser, error) {
 
 	// Check if the response was successful
 	if response.Status != "ok" {
-		return nil, fmt.Errorf("failed to get response: %s", response.Message)
+		// if is 500 Internal Server Error, recursively call the Get method
+		if resp.StatusCode == http.StatusInternalServerError && attempts != 0 {
+			attempts--
+			fmt.Printf("[FlareSolverr] Internal Server Error for %s, retrying...\n", _url)
+			return f.Get(_url, attempts) // Retry the request
+		}
+
+		// log the http status code
+		return nil, fmt.Errorf("failed to get response: %s, statusCode: %s", response.Message, resp.Status)
 	}
 
 	// Check if "Under attack" is in the response
@@ -248,6 +259,7 @@ func (f *FlareSolverr) Get(_url string) (io.ReadCloser, error) {
 	// check if the response is valid HTML
 	if !utils.IsValidHTML(response.Solution.Response) {
 		fmt.Printf("[FlareSolverr] Invalid HTML response from %s\n", _url)
+		fmt.Printf("[FlareSolverr] Response: %s\n", response.Solution.Response)
 		response.Solution.Response = ""
 	}
 
diff --git a/requester/requester.go b/requester/requester.go
index d2baf03..42a5278 100644
--- a/requester/requester.go
+++ b/requester/requester.go
@@ -50,7 +50,7 @@ func (i *Requster) GetDocument(ctx context.Context, url string) (io.ReadCloser,
 	resp, err := i.httpClient.Get(url)
 	if err != nil {
 		// try request with flare solverr
-		body, err = i.fs.Get(url)
+		body, err = i.fs.Get(url, 3)
 		if err != nil {
 			return nil, fmt.Errorf("failed to do request for url %s: %w", url, err)
 		}
@@ -65,7 +65,7 @@ func (i *Requster) GetDocument(ctx context.Context, url string) (io.ReadCloser,
 	}
 	if hasChallange(bodyByte) {
 		// try request with flare solverr
-		body, err = i.fs.Get(url)
+		body, err = i.fs.Get(url, 3)
 		if err != nil {
 			return nil, fmt.Errorf("failed to do request for url %s: %w", url, err)
 		}
@@ -92,6 +92,11 @@ func (i *Requster) GetDocument(ctx context.Context, url string) (io.ReadCloser,
 	return io.NopCloser(bytes.NewReader(bodyByte)), nil
 }
 
+func (i *Requster) ExpireDocument(ctx context.Context, url string) error {
+	key := fmt.Sprintf("%s:%s", cacheKey, url)
+	return i.c.Del(ctx, key)
+}
+
 // hasChallange checks if the body contains a challange by regex matching
 func hasChallange(body []byte) bool {
 	return challangeRegex.Match(body)