Revert LRU cache changes

common/cache/lrucache.go

@@ -3,9 +3,6 @@ package cache
 // Modified by https://github.com/die-net/lrucache
 
 import (
-	"context"
-	"log"
-	"runtime/debug"
 	"sync"
 	"time"
 
@@ -41,14 +38,13 @@ func WithSize[K comparable, V any](maxSize int) Option[K, V] {
 	}
 }
 
-func WithContext[K comparable, V any](ctx context.Context) Option[K, V] {
+func WithStale[K comparable, V any](stale bool) Option[K, V] {
 	return func(l *LruCache[K, V]) {
-		l.ctx = ctx
+		l.staleReturn = stale
 	}
 }
 
 type LruCache[K comparable, V any] struct {
-	ctx            context.Context
 	maxAge         int64
 	maxSize        int
 	mu             sync.Mutex
@@ -68,14 +64,6 @@ func New[K comparable, V any](options ...Option[K, V]) *LruCache[K, V] {
 		option(lc)
 	}
 
-	if lc.maxAge > 0 {
-		if lc.ctx == nil {
-			lc.ctx = context.Background()
-			log.Println("your lru cache is going to leak")
-			debug.PrintStack()
-		}
-		go lc.loopCheckTimeout()
-	}
 	return lc
 }
 
@@ -119,6 +107,8 @@ create:
 		e := &entry[K, V]{key: key, value: value, expires: time.Now().Unix() + c.maxAge}
 		c.cache[key] = c.lru.PushBack(e)
 	}
+
+	c.maybeDeleteOldest()
 	return value, false
 }
 
@@ -156,6 +146,8 @@ create:
 		e := &entry[K, V]{key: key, value: value, expires: time.Now().Unix() + c.maxAge}
 		c.cache[key] = c.lru.PushBack(e)
 	}
+
+	c.maybeDeleteOldest()
 	return value, false
 }
 
@@ -203,6 +195,8 @@ func (c *LruCache[K, V]) StoreWithExpire(key K, value V, expires time.Time) {
 			}
 		}
 	}
+
+	c.maybeDeleteOldest()
 }
 
 func (c *LruCache[K, V]) CloneTo(n *LruCache[K, V]) {
@@ -240,6 +234,8 @@ func (c *LruCache[K, V]) get(key K) *entry[K, V] {
 
 	if !c.staleReturn && c.maxAge > 0 && le.Value.expires <= time.Now().Unix() {
 		c.deleteElement(le)
+		c.maybeDeleteOldest()
+
 		return nil
 	}
 
@@ -262,34 +258,15 @@ func (c *LruCache[K, V]) Delete(key K) {
 	c.mu.Unlock()
 }
 
-func (c *LruCache[K, V]) loopCheckTimeout() {
+func (c *LruCache[K, V]) maybeDeleteOldest() {
-	ticker := time.NewTicker(time.Second * time.Duration(c.maxAge))
+	if !c.staleReturn && c.maxAge > 0 {
-	defer ticker.Stop()
+		now := time.Now().Unix()
-	for {
+		for le := c.lru.Front(); le != nil && le.Value.expires <= now; le = c.lru.Front() {
-		select {
+			c.deleteElement(le)
-		case <-ticker.C:
-			c.checkTimeout()
-		case <-c.ctx.Done():
-			return
 		}
 	}
 }
 
-func (c *LruCache[K, V]) checkTimeout() {
-	c.mu.Lock()
-	defer c.mu.Unlock()
-	now := time.Now().Unix()
-	var toDelete []*list.Element[*entry[K, V]]
-	for it := c.lru.Front(); it != nil; it = it.Next() {
-		if it.Value.expires <= now {
-			toDelete = append(toDelete, it)
-		}
-	}
-	for _, it := range toDelete {
-		c.deleteElement(it)
-	}
-}
-
 func (c *LruCache[K, V]) deleteElement(le *list.Element[*entry[K, V]]) {
 	c.lru.Remove(le)
 	e := le.Value

common/udpnat/service.go

@@ -25,10 +25,9 @@ type Service[K comparable] struct {
 	handler Handler
 }
 
-func New[K comparable](ctx context.Context, maxAge int64, handler Handler) *Service[K] {
+func New[K comparable](maxAge int64, handler Handler) *Service[K] {
 	return &Service[K]{
 		nat: cache.New(
-			cache.WithContext[K, *conn](ctx),
 			cache.WithAge[K, *conn](maxAge),
 			cache.WithUpdateAgeOnGet[K, *conn](),
 			cache.WithEvict[K, *conn](func(key K, conn *conn) {
@@ -103,10 +102,6 @@ func (s *Service[T]) NewContextPacket(ctx context.Context, key T, buffer *buf.Bu
 	}
 }
 
-func (s *Service[T]) Close() error {
-	return common.Close(common.PtrOrNil(s.nat))
-}
-
 type packet struct {
 	data        *buf.Buffer
 	destination M.Socksaddr