allow cache injection again

Author: tstromberg

pkg/bilibili/bilibili.go

@@ -30,20 +30,20 @@ func AuthRequired() bool { return false }
 // Client handles Bilibili requests.
 type Client struct {
 	httpClient *http.Client
-	cache      *httpcache.Cache
+	cache      httpcache.Cacher
 	logger     *slog.Logger
 }
 
 // Option configures a Client.
 type Option func(*config)
 
 type config struct {
-	cache  *httpcache.Cache
+	cache  httpcache.Cacher
 	logger *slog.Logger
 }
 
 // WithHTTPCache sets the HTTP cache.
-func WithHTTPCache(httpCache *httpcache.Cache) Option {
+func WithHTTPCache(httpCache httpcache.Cacher) Option {
 	return func(c *config) { c.cache = httpCache }
 }
 

pkg/bluesky/bluesky.go

@@ -29,20 +29,20 @@ func AuthRequired() bool { return false }
 // Client handles BlueSky requests.
 type Client struct {
 	httpClient *http.Client
-	cache      *httpcache.Cache
+	cache      httpcache.Cacher
 	logger     *slog.Logger
 }
 
 // Option configures a Client.
 type Option func(*config)
 
 type config struct {
-	cache  *httpcache.Cache
+	cache  httpcache.Cacher
 	logger *slog.Logger
 }
 
 // WithHTTPCache sets the HTTP cache.
-func WithHTTPCache(httpCache *httpcache.Cache) Option {
+func WithHTTPCache(httpCache httpcache.Cacher) Option {
 	return func(c *config) { c.cache = httpCache }
 }
 

pkg/codeberg/codeberg.go

@@ -49,20 +49,20 @@ func AuthRequired() bool { return false }
 // Client handles Codeberg requests.
 type Client struct {
 	httpClient *http.Client
-	cache      *httpcache.Cache
+	cache      httpcache.Cacher
 	logger     *slog.Logger
 }
 
 // Option configures a Client.
 type Option func(*config)
 
 type config struct {
-	cache  *httpcache.Cache
+	cache  httpcache.Cacher
 	logger *slog.Logger
 }
 
 // WithHTTPCache sets the HTTP cache.
-func WithHTTPCache(httpCache *httpcache.Cache) Option {
+func WithHTTPCache(httpCache httpcache.Cacher) Option {
 	return func(c *config) { c.cache = httpCache }
 }
 

pkg/devto/devto.go

@@ -31,20 +31,20 @@ func AuthRequired() bool { return false }
 // Client handles Dev.to requests.
 type Client struct {
 	httpClient *http.Client
-	cache      *httpcache.Cache
+	cache      httpcache.Cacher
 	logger     *slog.Logger
 }
 
 // Option configures a Client.
 type Option func(*config)
 
 type config struct {
-	cache  *httpcache.Cache
+	cache  httpcache.Cacher
 	logger *slog.Logger
 }
 
 // WithHTTPCache sets the HTTP cache.
-func WithHTTPCache(httpCache *httpcache.Cache) Option {
+func WithHTTPCache(httpCache httpcache.Cacher) Option {
 	return func(c *config) { c.cache = httpCache }
 }
 

pkg/generic/generic.go

@@ -34,20 +34,20 @@ func AuthRequired() bool { return false }
 // Client handles generic website requests.
 type Client struct {
 	httpClient *http.Client
-	cache      *httpcache.Cache
+	cache      httpcache.Cacher
 	logger     *slog.Logger
 }
 
 // Option configures a Client.
 type Option func(*config)
 
 type config struct {
-	cache  *httpcache.Cache
+	cache  httpcache.Cacher
 	logger *slog.Logger
 }
 
 // WithHTTPCache sets the HTTP cache.
-func WithHTTPCache(httpCache *httpcache.Cache) Option {
+func WithHTTPCache(httpCache httpcache.Cacher) Option {
 	return func(c *config) { c.cache = httpCache }
 }
 

pkg/github/github.go

@@ -67,7 +67,7 @@ func AuthRequired() bool { return false }
 // Client handles GitHub requests.
 type Client struct {
 	httpClient *http.Client
-	cache      *httpcache.Cache
+	cache      httpcache.Cacher
 	logger     *slog.Logger
 	token      string
 }
@@ -76,13 +76,13 @@ type Client struct {
 type Option func(*config)
 
 type config struct {
-	cache  *httpcache.Cache
+	cache  httpcache.Cacher
 	logger *slog.Logger
 	token  string
 }
 
 // WithHTTPCache sets the HTTP cache.
-func WithHTTPCache(httpCache *httpcache.Cache) Option {
+func WithHTTPCache(httpCache httpcache.Cacher) Option {
 	return func(c *config) { c.cache = httpCache }
 }
 

pkg/habr/habr.go

@@ -39,20 +39,20 @@ func AuthRequired() bool { return false }
 // Client handles Habr requests.
 type Client struct {
 	httpClient *http.Client
-	cache      *httpcache.Cache
+	cache      httpcache.Cacher
 	logger     *slog.Logger
 }
 
 // Option configures a Client.
 type Option func(*config)
 
 type config struct {
-	cache  *httpcache.Cache
+	cache  httpcache.Cacher
 	logger *slog.Logger
 }
 
 // WithHTTPCache sets the HTTP cache.
-func WithHTTPCache(httpCache *httpcache.Cache) Option {
+func WithHTTPCache(httpCache httpcache.Cacher) Option {
 	return func(c *config) { c.cache = httpCache }
 }
 

pkg/httpcache/httpcache.go

@@ -22,6 +22,13 @@ import (
 	"github.com/codeGROOVE-dev/sfcache/pkg/persist/localfs"
 )
 
+// Cacher is the interface that cache implementations must satisfy.
+// This allows external packages to provide their own cache implementation.
+type Cacher interface {
+	GetSet(ctx context.Context, key string, fetch func(context.Context) ([]byte, error), ttl ...time.Duration) ([]byte, error)
+	TTL() time.Duration
+}
+
 // Cache wraps sfcache for HTTP response caching.
 type Cache struct {
 	*sfcache.TieredCache[string, []byte]
@@ -57,6 +64,11 @@ func NewWithPath(ttl time.Duration, cachePath string) (*Cache, error) {
 	return &Cache{TieredCache: tc, ttl: ttl}, nil
 }
 
+// TTL returns the default TTL for cache entries.
+func (c *Cache) TTL() time.Duration {
+	return c.ttl
+}
+
 // URLToKey converts a URL to a cache key using SHA256 hash.
 func URLToKey(rawURL string) string {
 	hash := sha256.Sum256([]byte(rawURL))
@@ -78,15 +90,15 @@ type ResponseValidator func(body []byte) bool
 
 // FetchURL fetches a URL with caching and thundering herd prevention.
 // If cache is non-nil, uses GetSet to ensure only one request is made for concurrent calls.
-func FetchURL(ctx context.Context, cache *Cache, client *http.Client, req *http.Request, logger *slog.Logger) ([]byte, error) {
+func FetchURL(ctx context.Context, cache Cacher, client *http.Client, req *http.Request, logger *slog.Logger) ([]byte, error) {
 	return FetchURLWithValidator(ctx, cache, client, req, logger, nil)
 }
 
 // FetchURLWithValidator fetches a URL with caching and optional response validation.
 // If validator returns false, the response is returned but NOT cached.
 func FetchURLWithValidator(
 	ctx context.Context,
-	cache *Cache,
+	cache Cacher,
 	client *http.Client,
 	req *http.Request,
 	logger *slog.Logger,
@@ -123,7 +135,7 @@ func FetchURLWithValidator(
 			return nil, &validationError{data: body}
 		}
 		return body, nil
-	}, cache.ttl)
+	}, cache.TTL())
 
 	// Handle validation failure - return the data but it wasn't cached.
 	var validErr *validationError

pkg/linkedin/linkedin.go

@@ -34,7 +34,7 @@ type Option func(*config)
 
 type config struct {
 	cookies        map[string]string
-	cache          *httpcache.Cache
+	cache          httpcache.Cacher
 	logger         *slog.Logger
 	browserCookies bool
 }
@@ -45,7 +45,7 @@ func WithCookies(cookies map[string]string) Option {
 }
 
 // WithHTTPCache sets the HTTP cache (currently unused - auth is broken).
-func WithHTTPCache(httpCache *httpcache.Cache) Option {
+func WithHTTPCache(httpCache httpcache.Cacher) Option {
 	return func(c *config) { c.cache = httpCache }
 }
 

pkg/linktree/linktree.go

@@ -30,20 +30,20 @@ func AuthRequired() bool { return false }
 // Client handles Linktree requests.
 type Client struct {
 	httpClient *http.Client
-	cache      *httpcache.Cache
+	cache      httpcache.Cacher
 	logger     *slog.Logger
 }
 
 // Option configures a Client.
 type Option func(*config)
 
 type config struct {
-	cache  *httpcache.Cache
+	cache  httpcache.Cacher
 	logger *slog.Logger
 }
 
 // WithHTTPCache sets the HTTP cache.
-func WithHTTPCache(httpCache *httpcache.Cache) Option {
+func WithHTTPCache(httpCache httpcache.Cacher) Option {
 	return func(c *config) { c.cache = httpCache }
 }