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

@@ -141,7 +141,12 @@ func (h *Handler) HandleAPIAnimeRelations(w http.ResponseWriter, r *http.Request
return return
} }
relations := h.svc.GetRelations(id) relations, err := h.svc.GetRelations(id)
if err != nil {
log.Printf("failed to get relations for anime %d: %v", id, err)
http.Error(w, "Failed to load relations", http.StatusInternalServerError)
return
}
templates.AnimeRelationsList(relations).Render(r.Context(), w) templates.AnimeRelationsList(relations).Render(r.Context(), w)
} }
@@ -164,18 +169,22 @@ func (h *Handler) HandleAPIAnime(w http.ResponseWriter, r *http.Request) {
switch parts[1] { switch parts[1] {
case "relations": case "relations":
relations := h.svc.GetRelations(id) relations, err := h.svc.GetRelations(id)
if err != nil {
log.Printf("relations error for %d: %v", id, err)
w.Header().Set("Content-Type", "text/html")
w.Write([]byte(`<p style="color: var(--text-muted); font-size: var(--text-sm);">Failed to load relations.</p>`))
return
}
templates.AnimeRelationsList(relations).Render(r.Context(), w) templates.AnimeRelationsList(relations).Render(r.Context(), w)
case "recommendations": case "recommendations":
recs, err := h.svc.GetRecommendations(id, 10) recs, err := h.svc.GetRecommendations(id, 10)
if err != nil { if err != nil {
log.Printf("recommendations error for %d: %v", id, err) log.Printf("recommendations error for %d: %v", id, err)
http.Error(w, "Failed to fetch recommendations", http.StatusInternalServerError) w.Header().Set("Content-Type", "text/html")
w.Write([]byte(`<p style="color: var(--text-muted); font-size: var(--text-sm);">Failed to load recommendations.</p>`))
return return
} }
if len(recs) > 10 {
recs = recs[:10]
}
templates.AnimeRecommendations(recs).Render(r.Context(), w) templates.AnimeRecommendations(recs).Render(r.Context(), w)
default: default:
http.Error(w, "not found", http.StatusNotFound) http.Error(w, "not found", http.StatusNotFound)

View File

@@ -57,7 +57,7 @@ func (s *Service) GetAnimeDetails(ctx context.Context, id int, userID string) (j
return anime, currentStatus, nil return anime, currentStatus, nil
} }
func (s *Service) GetRelations(id int) []jikan.RelationEntry { func (s *Service) GetRelations(id int) ([]jikan.RelationEntry, error) {
return s.jikanClient.GetFullRelations(id) return s.jikanClient.GetFullRelations(id)
} }

View File

@@ -5,15 +5,18 @@ import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"net/http" "net/http"
"sync"
"time" "time"
"mal/internal/database" "mal/internal/database"
) )
type Client struct { type Client struct {
httpClient *http.Client httpClient *http.Client
baseURL string baseURL string
db database.Querier db database.Querier
mu sync.Mutex
lastReqTime time.Time
} }
func NewClient(db database.Querier) *Client { 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 { func (c *Client) getCache(key string, out interface{}) bool {
ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second) ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
defer cancel() 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 { func (c *Client) fetchWithRetry(urlStr string, out interface{}) error {
maxRetries := 3 maxRetries := 3
for i := 0; i < maxRetries; i++ { for i := 0; i < maxRetries; i++ {
// Base delay for Jikan rate limiting (3 requests per second) c.waitRateLimit()
time.Sleep(340 * time.Millisecond)
resp, err := c.httpClient.Get(urlStr) resp, err := c.httpClient.Get(urlStr)
if err != nil { 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) // 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) rels, err := c.GetRelationsData(startID)
if err != nil { if err != nil {
return nil return nil, err
} }
nextIDPtr := findFirstAnimeRelation(rels, direction) nextIDPtr := findFirstAnimeRelation(rels, direction)
if nextIDPtr == nil { if nextIDPtr == nil {
return nil return nil, nil // normal end of chain
} }
nextID := *nextIDPtr nextID := *nextIDPtr
if visited[nextID] { // prevent loops if visited[nextID] { // prevent loops
return nil return nil, nil
} }
visited[nextID] = true visited[nextID] = true
anime, err := c.GetAnimeByID(nextID) anime, err := c.GetAnimeByID(nextID)
if err != nil { if err != nil {
return nil return nil, err
} }
entry := RelationEntry{Anime: anime, IsCurrent: false} 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" { 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 // 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) currentAnime, err := c.GetAnimeByID(id)
if err != nil { if err != nil {
return nil return nil, err
} }
visited := map[int]bool{id: true} 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) visitedSeq := make(map[int]bool)
for k, v := range visited { for k, v := range visited {
visitedSeq[k] = v 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 var result []RelationEntry
result = append(result, prequels...) result = append(result, prequels...)
result = append(result, RelationEntry{Anime: currentAnime, IsCurrent: true}) result = append(result, RelationEntry{Anime: currentAnime, IsCurrent: true})
result = append(result, sequels...) result = append(result, sequels...)
return result var finalErr error
if err1 != nil {
finalErr = err1
} else if err2 != nil {
finalErr = err2
}
return result, finalErr
} }