修复静态资源访问错误的问题

pkg/maps/generic.go

@@ -2,15 +2,15 @@ package maps
 
 import "sync"
 
-type GenericMap[K comparable, V any] struct {
+type Map[K comparable, V any] struct {
-	m sync.Map
+	m *sync.Map
 }
 
-func (gm *GenericMap[K, V]) Store(key K, value V) {
+func (gm *Map[K, V]) Store(key K, value V) {
 	gm.m.Store(key, value)
 }
 
-func (gm *GenericMap[K, V]) Load(key K) (V, bool) {
+func (gm *Map[K, V]) Load(key K) (V, bool) {
 	value, ok := gm.m.Load(key)
 	if !ok {
 		var zero V
@@ -19,39 +19,54 @@ func (gm *GenericMap[K, V]) Load(key K) (V, bool) {
 	return value.(V), true
 }
 
-func (gm *GenericMap[K, V]) Delete(key K) {
+func (gm *Map[K, V]) Delete(key K) {
 	gm.m.Delete(key)
 }
 
-func (gm *GenericMap[K, V]) Range(f func(key K, value V) bool) {
+func (gm *Map[K, V]) Range(f func(key K, value V) bool) {
 	gm.m.Range(func(key, value any) bool {
 		return f(key.(K), value.(V))
 	})
 }
 
-func (gm *GenericMap[K, V]) Swap(key K, value V) (previous V, loaded bool) {
+func (gm *Map[K, V]) Swap(key K, value V) (previous V, loaded bool) {
 	actual, swapped := gm.m.Swap(key, value)
 	return actual.(V), swapped
 }
 
-func (gm *GenericMap[K, V]) LoadOrStore(key K, value V) (V, bool) {
+func (gm *Map[K, V]) Len() int {
+	var n int
+	gm.m.Range(func(key, value any) bool {
+		n++
+		return true
+	})
+	return n
+}
+
+func (gm *Map[K, V]) Clear() {
+	gm.m.Clear()
+}
+
+func (gm *Map[K, V]) LoadOrStore(key K, value V) (V, bool) {
 	actual, loaded := gm.m.LoadOrStore(key, value)
 	return actual.(V), loaded
 }
 
-func (gm *GenericMap[K, V]) LoadAndDelete(key K) (value V, loaded bool) {
+func (gm *Map[K, V]) LoadAndDelete(key K) (value V, loaded bool) {
 	actual, loaded := gm.m.LoadAndDelete(key)
 	return actual.(V), loaded
 }
 
-func (gm *GenericMap[K, V]) CompareAndSwap(key K, old V, new V) (swapped bool) {
+func (gm *Map[K, V]) CompareAndSwap(key K, old V, new V) (swapped bool) {
 	return gm.m.CompareAndSwap(key, old, new)
 }
 
-func (gm *GenericMap[K, V]) CompareAndDelete(key K, old V) (deleted bool) {
+func (gm *Map[K, V]) CompareAndDelete(key K, old V) (deleted bool) {
 	return gm.m.CompareAndDelete(key, old)
 }
 
-func New[K comparable, V any]() *GenericMap[K, V] {
+func New[K comparable, V any]() *Map[K, V] {
-	return &GenericMap[K, V]{m: sync.Map{}}
+	return &Map[K, V]{
+		m: new(sync.Map),
+	}
 }

transport/http/server.go

@@ -37,6 +37,7 @@ type Server struct {
 	fs           *filesystem
 	middlewares  []middleware.Middleware
 	Logger       logger.Logger
+	autoCompress bool
 }
 
 func (s *Server) Endpoint(ctx context.Context) (string, error) {
@@ -104,7 +105,8 @@ func (s *Server) Handle(method string, uri string, handler http.HandlerFunc) {
 	})
 }
 
-func (s *Server) Webroot(prefix string, fs http.FileSystem) {
+func (s *Server) Webroot(prefix string, authCompress bool, fs http.FileSystem) {
+	s.autoCompress = authCompress
 	s.fs = newFS(time.Now(), fs)
 	s.fs.SetPrefix(prefix)
 	s.fs.DenyAccessDirectory()
@@ -112,6 +114,9 @@ func (s *Server) Webroot(prefix string, fs http.FileSystem) {
 }
 
 func (s *Server) shouldCompress(req *http.Request) bool {
+	if !s.autoCompress {
+		return false
+	}
 	if !strings.Contains(req.Header.Get(headerAcceptEncoding), "gzip") ||
 		strings.Contains(req.Header.Get("Connection"), "Upgrade") {
 		return false
@@ -125,11 +130,11 @@ func (s *Server) shouldCompress(req *http.Request) bool {
 	return false
 }
 
-func (s *Server) staticHandle(ctx *gin.Context, fp http.File) {
+func (s *Server) staticHandle(ctx *gin.Context, fp http.File) bool {
 	uri := path.Clean(ctx.Request.URL.Path)
 	fi, err := fp.Stat()
 	if err != nil {
-		return
+		return false
 	}
 	if !fi.IsDir() {
 		//https://github.com/gin-contrib/gzip
@@ -157,14 +162,25 @@ func (s *Server) staticHandle(ctx *gin.Context, fp http.File) {
 	}
 	http.ServeContent(ctx.Writer, ctx.Request, path.Base(uri), s.fs.modtime, fp)
 	ctx.Abort()
+	return true
 }
 
 func (s *Server) notFoundHandle(ctx *gin.Context) {
 	if s.fs != nil && ctx.Request.Method == http.MethodGet {
 		uri := path.Clean(ctx.Request.URL.Path)
 		if fp, err := s.fs.Open(uri); err == nil {
-			s.staticHandle(ctx, fp)
+			defer fp.Close()
-			fp.Close()
+			if s.staticHandle(ctx, fp) {
+				return
+			}
+		} else {
+			//if found compress file
+			if fp, err := s.fs.Open(uri + ".gz"); err == nil {
+				defer fp.Close()
+				if s.staticHandle(ctx, fp) {
+					return
+				}
+			}
 		}
 	}
 	ctx.JSON(http.StatusNotFound, newResponse(errors.NotFound, "Not Found", nil))