sfcache and code modernization

Author: tstromberg

.golangci.yml

@@ -186,6 +186,8 @@ linters:
           arguments: [10]
         - name: flag-parameter # fixes are difficult
           disabled: true
+        - name: bare-return
+          disabled: true
 
     rowserrcheck:
       # database/sql is always checked.
@@ -231,14 +233,9 @@ linters:
       - path: _test\.go
         linters:
           - dupl
-          - errcheck
-          - gocognit
           - gosec
           - godot
-          - gosmopolitan
           - govet # alignment
-          - maintidx
-          - nestif
           - noctx
           - perfsprint
           - revive

Makefile

@@ -24,7 +24,7 @@ endif
 LINTERS :=
 FIXERS :=
 
-SHELLCHECK_VERSION ?= v0.10.0
+SHELLCHECK_VERSION ?= v0.11.0
 SHELLCHECK_BIN := $(LINT_ROOT)/out/linters/shellcheck-$(SHELLCHECK_VERSION)-$(LINT_ARCH)
 $(SHELLCHECK_BIN):
 	mkdir -p $(LINT_ROOT)/out/linters
@@ -45,7 +45,7 @@ shellcheck-fix: $(SHELLCHECK_BIN)
 	$(SHELLCHECK_BIN) $(shell find . -name "*.sh") -f diff | { read -t 1 line || exit 0; { echo "$$line" && cat; } | git apply -p2; }
 
 GOLANGCI_LINT_CONFIG := $(LINT_ROOT)/.golangci.yml
-GOLANGCI_LINT_VERSION ?= v2.5.0
+GOLANGCI_LINT_VERSION ?= v2.7.2
 GOLANGCI_LINT_BIN := $(LINT_ROOT)/out/linters/golangci-lint-$(GOLANGCI_LINT_VERSION)-$(LINT_ARCH)
 $(GOLANGCI_LINT_BIN):
 	mkdir -p $(LINT_ROOT)/out/linters

cmd/sociopath/main.go

@@ -17,7 +17,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/codeGROOVE-dev/sociopath/pkg/cache"
+	"github.com/codeGROOVE-dev/sociopath/pkg/httpcache"
 	"github.com/codeGROOVE-dev/sociopath/pkg/sociopath"
 )
 
@@ -62,16 +62,14 @@ func main() {
 	logger := slog.New(slog.NewTextHandler(os.Stderr, &slog.HandlerOptions{Level: logLevel}))
 
 	// Setup cache
-	var httpCache *cache.BDCache
+	var httpCache *httpcache.Cache
 	if !*noCache {
 		var err error
-		httpCache, err = cache.New(*cacheTTL)
+		httpCache, err = httpcache.New(*cacheTTL)
 		if err != nil {
 			logger.Warn("failed to initialize cache, continuing without cache", "error", err)
 		} else {
 			defer func() {
-				stats := httpCache.Stats()
-				logger.Info("cache stats", "hits", stats.Hits, "misses", stats.Misses, "hit_rate", fmt.Sprintf("%.1f%%", stats.HitRate()))
 				if err := httpCache.Close(); err != nil {
 					logger.Warn("failed to close cache", "error", err)
 				}

go.mod

@@ -4,8 +4,8 @@ go 1.25.4
 
 require (
 	github.com/browserutils/kooky v0.2.4
-	github.com/codeGROOVE-dev/bdcache v0.6.1
-	github.com/codeGROOVE-dev/bdcache/persist/localfs v0.0.0-20251121210535-3893c2b92813
+	github.com/codeGROOVE-dev/sfcache v1.3.0
+	github.com/codeGROOVE-dev/sfcache/pkg/persist/localfs v1.3.0
 	github.com/google/go-cmp v0.7.0
 )
 

go.sum

@@ -14,10 +14,10 @@ github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuy
 github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE=
 github.com/browserutils/kooky v0.2.4 h1:szrKufBIaZRc6AXs8MF7+4rgcoSZNckQE2q0sJw49kw=
 github.com/browserutils/kooky v0.2.4/go.mod h1:Ez5Gw643UabvRkvEnWIgb8Q6qPzxanMuHCTTqlwBHuw=
-github.com/codeGROOVE-dev/bdcache v0.6.1 h1:iFvZTXG+tYcfGHD2Jt4Ud/x7/34O/6kTYP9L6XFQ4QQ=
-github.com/codeGROOVE-dev/bdcache v0.6.1/go.mod h1:wJEFNbumCspw3PoiW17afq7QaMSeWXtMDO8WOH3GY74=
-github.com/codeGROOVE-dev/bdcache/persist/localfs v0.0.0-20251121210535-3893c2b92813 h1:sjXDZCJllfGRAE3yGhI1Ns8/w1S72/RCqoJ0K/qeFHU=
-github.com/codeGROOVE-dev/bdcache/persist/localfs v0.0.0-20251121210535-3893c2b92813/go.mod h1:I6U3M/72lAouQCf9EoWPJPDop8gPbDlMl9CgWKjxREg=
+github.com/codeGROOVE-dev/sfcache v1.3.0 h1:Ew900GWXkZhMEU560kz0Nk1HvhGshiqaIASbTH+ihHg=
+github.com/codeGROOVE-dev/sfcache v1.3.0/go.mod h1:ksV5Y1RwKmOPZZiV0zXpsBOENGUCgO0fVgr/P8f/DJM=
+github.com/codeGROOVE-dev/sfcache/pkg/persist/localfs v1.3.0 h1:7zKbd7aHVzmbK2eEbdsf6Dknrte/o8+7I6GkNob8bGA=
+github.com/codeGROOVE-dev/sfcache/pkg/persist/localfs v1.3.0/go.mod h1:vHDjjehmi+yjXD+DXVG0rnc4iOBsiIknLThqpkYwA/c=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

pkg/auth/static.go

@@ -1,6 +1,9 @@
 package auth
 
-import "context"
+import (
+	"context"
+	"maps"
+)
 
 // StaticSource provides cookies from a static map.
 // This is useful for testing or when cookies are provided via options.
@@ -20,8 +23,6 @@ func (s *StaticSource) Cookies(_ context.Context, _ string) (map[string]string,
 	}
 	// Return a copy to prevent mutation
 	result := make(map[string]string, len(s.cookies))
-	for k, v := range s.cookies {
-		result[k] = v
-	}
+	maps.Copy(result, s.cookies)
 	return result, nil
 }

pkg/bilibili/bilibili.go

@@ -10,8 +10,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/codeGROOVE-dev/sociopath/pkg/cache"
 	"github.com/codeGROOVE-dev/sociopath/pkg/htmlutil"
+	"github.com/codeGROOVE-dev/sociopath/pkg/httpcache"
 	"github.com/codeGROOVE-dev/sociopath/pkg/profile"
 )
 
@@ -30,20 +30,20 @@ func AuthRequired() bool { return false }
 // Client handles Bilibili requests.
 type Client struct {
 	httpClient *http.Client
-	cache      cache.HTTPCache
+	cache      *httpcache.Cache
 	logger     *slog.Logger
 }
 
 // Option configures a Client.
 type Option func(*config)
 
 type config struct {
-	cache  cache.HTTPCache
+	cache  *httpcache.Cache
 	logger *slog.Logger
 }
 
 // WithHTTPCache sets the HTTP cache.
-func WithHTTPCache(httpCache cache.HTTPCache) Option {
+func WithHTTPCache(httpCache *httpcache.Cache) Option {
 	return func(c *config) { c.cache = httpCache }
 }
 
@@ -83,7 +83,7 @@ func (c *Client) Fetch(ctx context.Context, urlStr string) (*profile.Profile, er
 	req.Header.Set("User-Agent", "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:146.0) Gecko/20100101 Firefox/146.0")
 	req.Header.Set("Accept-Language", "zh-CN,zh;q=0.9,en;q=0.8")
 
-	body, err := cache.FetchURL(ctx, c.cache, c.httpClient, req, c.logger)
+	body, err := httpcache.FetchURL(ctx, c.cache, c.httpClient, req, c.logger)
 	if err != nil {
 		return nil, err
 	}

pkg/bilibili/bilibili_test.go

@@ -1,3 +1,4 @@
+//nolint:gosmopolitan // Chinese platform requires Chinese characters in tests
 package bilibili
 
 import (
@@ -86,7 +87,7 @@ func TestFetch(t *testing.T) {
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		w.Header().Set("Content-Type", "text/html; charset=utf-8")
 		w.WriteHeader(http.StatusOK)
-		_, _ = w.Write([]byte(mockHTML))
+		_, _ = w.Write([]byte(mockHTML)) //nolint:errcheck // test helper
 	}))
 	defer server.Close()
 

pkg/bluesky/bluesky.go

@@ -12,7 +12,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/codeGROOVE-dev/sociopath/pkg/cache"
+	"github.com/codeGROOVE-dev/sociopath/pkg/httpcache"
 	"github.com/codeGROOVE-dev/sociopath/pkg/profile"
 )
 
@@ -29,20 +29,20 @@ func AuthRequired() bool { return false }
 // Client handles BlueSky requests.
 type Client struct {
 	httpClient *http.Client
-	cache      cache.HTTPCache
+	cache      *httpcache.Cache
 	logger     *slog.Logger
 }
 
 // Option configures a Client.
 type Option func(*config)
 
 type config struct {
-	cache  cache.HTTPCache
+	cache  *httpcache.Cache
 	logger *slog.Logger
 }
 
 // WithHTTPCache sets the HTTP cache.
-func WithHTTPCache(httpCache cache.HTTPCache) Option {
+func WithHTTPCache(httpCache *httpcache.Cache) Option {
 	return func(c *config) { c.cache = httpCache }
 }
 
@@ -88,7 +88,7 @@ func (c *Client) Fetch(ctx context.Context, urlStr string) (*profile.Profile, er
 	req.Header.Set("Accept", "application/json")
 	req.Header.Set("User-Agent", "sociopath/1.0")
 
-	body, err := cache.FetchURL(ctx, c.cache, c.httpClient, req, c.logger)
+	body, err := httpcache.FetchURL(ctx, c.cache, c.httpClient, req, c.logger)
 	if err != nil {
 		return nil, err
 	}
@@ -153,7 +153,7 @@ func (c *Client) fetchPosts(ctx context.Context, handle string, limit int) (post
 	req.Header.Set("Accept", "application/json")
 	req.Header.Set("User-Agent", "sociopath/1.0")
 
-	body, err := cache.FetchURL(ctx, c.cache, c.httpClient, req, c.logger)
+	body, err := httpcache.FetchURL(ctx, c.cache, c.httpClient, req, c.logger)
 	if err != nil {
 		return nil, ""
 	}

pkg/bluesky/bluesky_test.go

@@ -79,7 +79,7 @@ func TestFetch(t *testing.T) {
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		_, _ = w.Write([]byte(mockJSON))
+		_, _ = w.Write([]byte(mockJSON)) //nolint:errcheck // test helper
 	}))
 	defer server.Close()