fix: enforce global rate limit in jikan client and handle relation errors

This commit is contained in:
2026-04-08 16:27:10 +02:00
parent e31ac4b148
commit 704ae49b3c
4 changed files with 62 additions and 26 deletions

View File

@@ -5,15 +5,18 @@ import (
"encoding/json"
"fmt"
"net/http"
"sync"
"time"
"mal/internal/database"
)
type Client struct {
httpClient *http.Client
baseURL string
db database.Querier
httpClient *http.Client
baseURL string
db database.Querier
mu sync.Mutex
lastReqTime time.Time
}
func NewClient(db database.Querier) *Client {
@@ -24,6 +27,20 @@ func NewClient(db database.Querier) *Client {
}
}
func (c *Client) waitRateLimit() {
c.mu.Lock()
defer c.mu.Unlock()
now := time.Now()
nextAllowed := c.lastReqTime.Add(340 * time.Millisecond)
if now.Before(nextAllowed) {
time.Sleep(nextAllowed.Sub(now))
c.lastReqTime = time.Now()
} else {
c.lastReqTime = now
}
}
func (c *Client) getCache(key string, out interface{}) bool {
ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
defer cancel()
@@ -57,8 +74,7 @@ func (c *Client) setCache(key string, data interface{}, ttl time.Duration) {
func (c *Client) fetchWithRetry(urlStr string, out interface{}) error {
maxRetries := 3
for i := 0; i < maxRetries; i++ {
// Base delay for Jikan rate limiting (3 requests per second)
time.Sleep(340 * time.Millisecond)
c.waitRateLimit()
resp, err := c.httpClient.Get(urlStr)
if err != nil {

View File

@@ -39,60 +39,71 @@ func findFirstAnimeRelation(res JikanRelationsResponse, relType string) *int {
}
// fetchChain recursively builds the relational chain (Prequels or Sequels)
func (c *Client) fetchChain(startID int, direction string, visited map[int]bool) []RelationEntry {
func (c *Client) fetchChain(startID int, direction string, visited map[int]bool) ([]RelationEntry, error) {
rels, err := c.GetRelationsData(startID)
if err != nil {
return nil
return nil, err
}
nextIDPtr := findFirstAnimeRelation(rels, direction)
if nextIDPtr == nil {
return nil
return nil, nil // normal end of chain
}
nextID := *nextIDPtr
if visited[nextID] { // prevent loops
return nil
return nil, nil
}
visited[nextID] = true
anime, err := c.GetAnimeByID(nextID)
if err != nil {
return nil
return nil, err
}
entry := RelationEntry{Anime: anime, IsCurrent: false}
rest := c.fetchChain(nextID, direction, visited)
rest, err := c.fetchChain(nextID, direction, visited)
if err != nil {
return nil, err
}
if direction == "Prequel" {
return append(rest, entry)
return append(rest, entry), nil
}
return append([]RelationEntry{entry}, rest...)
return append([]RelationEntry{entry}, rest...), nil
}
// GetFullRelations resolves the full Prequel/Sequel chronological chain synchronously
func (c *Client) GetFullRelations(id int) []RelationEntry {
func (c *Client) GetFullRelations(id int) ([]RelationEntry, error) {
currentAnime, err := c.GetAnimeByID(id)
if err != nil {
return nil
return nil, err
}
visited := map[int]bool{id: true}
prequels := c.fetchChain(id, "Prequel", visited)
prequels, err1 := c.fetchChain(id, "Prequel", visited)
// Clone visited set for sequels so we don't block valid paths if there's weird branching
visitedSeq := make(map[int]bool)
for k, v := range visited {
visitedSeq[k] = v
}
sequels := c.fetchChain(id, "Sequel", visitedSeq)
sequels, err2 := c.fetchChain(id, "Sequel", visitedSeq)
// If both chains errored and it wasn't just "no relations", we should probably error out
// But it's safer to just return what we have and the error so the UI can decide
var result []RelationEntry
result = append(result, prequels...)
result = append(result, RelationEntry{Anime: currentAnime, IsCurrent: true})
result = append(result, sequels...)
return result
var finalErr error
if err1 != nil {
finalErr = err1
} else if err2 != nil {
finalErr = err2
}
return result, finalErr
}