reset favicon cache on route reload

This commit is contained in:
yusing
2025-01-12 22:32:17 +08:00
parent 3f85d7f813
commit 137b0820b0
5 changed files with 17 additions and 16 deletions

View File

@@ -6,6 +6,7 @@ import (
v1 "github.com/yusing/go-proxy/internal/api/v1"
"github.com/yusing/go-proxy/internal/api/v1/auth"
"github.com/yusing/go-proxy/internal/api/v1/favicon"
. "github.com/yusing/go-proxy/internal/api/v1/utils"
"github.com/yusing/go-proxy/internal/common"
config "github.com/yusing/go-proxy/internal/config/types"
@@ -34,7 +35,7 @@ func NewHandler(cfg config.ConfigInstance) http.Handler {
mux.HandleFunc("GET", "/v1/schema/{filename...}", v1.GetSchemaFile)
mux.HandleFunc("GET", "/v1/stats", useCfg(cfg, v1.Stats))
mux.HandleFunc("GET", "/v1/stats/ws", useCfg(cfg, v1.StatsWS))
mux.HandleFunc("GET", "/v1/favicon/{alias}", auth.RequireAuth(v1.GetFavIcon))
mux.HandleFunc("GET", "/v1/favicon/{alias}", auth.RequireAuth(favicon.GetFavIcon))
return mux
}

View File

@@ -1,4 +1,4 @@
package v1
package favicon
import (
"bufio"
@@ -20,6 +20,7 @@ import (
"github.com/yusing/go-proxy/internal/homepage"
"github.com/yusing/go-proxy/internal/logging"
gphttp "github.com/yusing/go-proxy/internal/net/http"
"github.com/yusing/go-proxy/internal/route/routes"
route "github.com/yusing/go-proxy/internal/route/types"
)
@@ -66,8 +67,8 @@ func GetFavIcon(w http.ResponseWriter, req *http.Request) {
U.RespondError(w, U.ErrMissingKey("alias"), http.StatusBadRequest)
return
}
r := listRoute(alias)
if r == nil {
r, ok := routes.GetHTTPRoutes().Load(alias)
if !ok {
http.NotFound(w, req)
return
}
@@ -104,6 +105,12 @@ var (
iconCacheMu sync.RWMutex
)
func ResetIconCache(route route.HTTPRoute) {
iconCacheMu.Lock()
defer iconCacheMu.Unlock()
delete(iconCache, route.TargetName())
}
func loadIconCache(key string) (icon []byte, ok bool) {
iconCacheMu.RLock()
icon, ok = iconCache[key]
@@ -158,7 +165,6 @@ func sanitizeName(name string) string {
}
func findIcon(r route.HTTPRoute, req *http.Request, uri string) (icon []byte, status int, errMsg string) {
// FIXME: invalidate cache on route change
key := r.TargetName()
icon, ok := loadIconCache(key)
if ok {