chore: upgrade to hashicorp/golang-lru v2 (closes #500)

go.mod

@@ -1,6 +1,6 @@
 module github.com/apernet/hysteria
 
-go 1.17
+go 1.18
 
 require (
 	github.com/LiamHaworth/go-tproxy v0.0.0-20190726054950-ef7efd7f24ed
@@ -13,7 +13,7 @@ require (
 	github.com/folbricht/routedns v0.1.6-0.20220806202012-361f5b35b4c3
 	github.com/fsnotify/fsnotify v1.6.0
 	github.com/google/gopacket v1.1.19
-	github.com/hashicorp/golang-lru v0.5.4
+	github.com/hashicorp/golang-lru/v2 v2.0.1
 	github.com/lucas-clemente/quic-go v0.31.0
 	github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40
 	github.com/oschwald/geoip2-golang v1.8.0

pkg/acl/engine.go

@@ -6,8 +6,9 @@ import (
 	"os"
 	"strings"
 
+	lru "github.com/hashicorp/golang-lru/v2"
+
 	"github.com/apernet/hysteria/pkg/utils"
-	lru "github.com/hashicorp/golang-lru"
 	"github.com/oschwald/geoip2-golang"
 )
 
@@ -16,7 +17,7 @@ const entryCacheSize = 1024
 type Engine struct {
 	DefaultAction Action
 	Entries       []Entry
-	Cache         *lru.ARCCache
+	Cache         *lru.ARCCache[cacheKey, cacheValue]
 	ResolveIPAddr func(string) (*net.IPAddr, error)
 	GeoIPReader   *geoip2.Reader
 }
@@ -59,7 +60,7 @@ func LoadFromFile(filename string, resolveIPAddr func(string) (*net.IPAddr, erro
 		}
 		entries = append(entries, entry)
 	}
-	cache, err := lru.NewARC(entryCacheSize)
+	cache, err := lru.NewARC[cacheKey, cacheValue](entryCacheSize)
 	if err != nil {
 		return nil, err
 	}
@@ -78,9 +79,8 @@ func (e *Engine) ResolveAndMatch(host string, port uint16, isUDP bool) (Action,
 	if ip == nil {
 		// Domain
 		ipAddr, err := e.ResolveIPAddr(host)
-		if v, ok := e.Cache.Get(cacheKey{host, port, isUDP}); ok {
+		if ce, ok := e.Cache.Get(cacheKey{host, port, isUDP}); ok {
 			// Cache hit
-			ce := v.(cacheValue)
 			return ce.Action, ce.Arg, true, ipAddr, err
 		}
 		for _, entry := range e.Entries {
@@ -107,9 +107,8 @@ func (e *Engine) ResolveAndMatch(host string, port uint16, isUDP bool) (Action,
 		return e.DefaultAction, "", true, ipAddr, err
 	} else {
 		// IP
-		if v, ok := e.Cache.Get(cacheKey{ip.String(), port, isUDP}); ok {
+		if ce, ok := e.Cache.Get(cacheKey{ip.String(), port, isUDP}); ok {
 			// Cache hit
-			ce := v.(cacheValue)
 			return ce.Action, ce.Arg, false, &net.IPAddr{
 				IP:   ip,
 				Zone: zone,

pkg/acl/engine_test.go

@@ -6,11 +6,11 @@ import (
 	"strings"
 	"testing"
 
-	lru "github.com/hashicorp/golang-lru"
+	lru "github.com/hashicorp/golang-lru/v2"
 )
 
 func TestEngine_ResolveAndMatch(t *testing.T) {
-	cache, _ := lru.NewARC(16)
+	cache, _ := lru.NewARC[cacheKey, cacheValue](entryCacheSize)
 	e := &Engine{
 		DefaultAction: ActionDirect,
 		Entries: []Entry{