go-tower: added StaticFS to Group: v0.1.2

group.go

@@ -1,7 +1,11 @@
 package tower
 
 import (
+	"io/fs"
 	"net/http"
+	"path"
+
+	"github.com/julienschmidt/httprouter"
 )
 
 type Group struct {
@@ -17,7 +21,7 @@ func (g *Group) Use(groupMiddlewares ...Middleware) {
 func (g *Group) Group(prefix string, mws ...Middleware) *Group {
 	child := &Group{
 		parent: g.parent,
-		prefix: g.buildFullPath(prefix),
+		prefix: buildFullPath(g.prefix, prefix),
 	}
 
 	child.groupMiddlewares = make([]Middleware, 0, len(g.groupMiddlewares)+len(mws))
@@ -37,7 +41,28 @@ func (g *Group) Static(prefix, dir string) {
 	}
 	prefix += "/*filepath"
 
-	g.parent.router.ServeFiles(g.buildFullPath(prefix), http.Dir(dir))
+	g.parent.router.ServeFiles(buildFullPath(g.prefix, prefix), http.Dir(dir))
+}
+
+func (g *Group) StaticFS(prefix string, fsys fs.FS) {
+	fileServer := http.FileServer(http.FS(fsys))
+
+	handler := func(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
+		fp := p.ByName("filepath")
+		if fp == "" {
+			fp = "/"
+		}
+
+		fp = path.Clean("/" + fp)
+
+		req := r.Clone(r.Context())
+		req.URL.Path = fp
+
+		fileServer.ServeHTTP(w, req)
+	}
+
+	g.parent.router.Handle(http.MethodGet, buildFullPath(g.prefix, buildFullPath(prefix, "/*filepath")), handler)
+	g.parent.router.Handle(http.MethodHead, buildFullPath(g.prefix, buildFullPath(prefix, "/*filepath")), handler)
 }
 
 func (g *Group) GET(path string, h Handler, routeMiddlewares ...Middleware) {
@@ -61,7 +86,7 @@ func (g *Group) DELETE(path string, h Handler, routeMiddlewares ...Middleware) {
 }
 
 func (g *Group) Handle(method string, path string, h Handler, routeMiddlewares ...Middleware) {
-	fullPath := g.buildFullPath(path)
+	fullPath := buildFullPath(g.prefix, path)
 
 	mws := make([]Middleware, 0, len(g.groupMiddlewares)+len(routeMiddlewares))
 	mws = append(mws, g.groupMiddlewares...)
@@ -69,14 +94,3 @@ func (g *Group) Handle(method string, path string, h Handler, routeMiddlewares .
 
 	g.parent.Handle(method, fullPath, h, mws...)
 }
-
-func (g *Group) buildFullPath(path string) string {
-	normalizedPrefix := normalizePath(g.prefix)
-	normalizedPath := normalizePath(path)
-
-	if normalizedPrefix == "/" && normalizedPath == "/" {
-		return "/"
-	}
-
-	return normalizePath(g.prefix) + normalizePath(path)
-}

path.go

@@ -12,3 +12,22 @@ func normalizePath(path string) string {
 
 	return "/" + path
 }
+
+func buildFullPath(prefix string, path string) string {
+	normalizedPrefix := normalizePath(prefix)
+	normalizedPath := normalizePath(path)
+
+	if normalizedPrefix == "/" && normalizedPath == "/" {
+		return "/"
+	}
+
+	if normalizedPrefix == "/" {
+		return normalizedPath
+	}
+
+	if normalizedPath == "/" {
+		return normalizedPrefix
+	}
+
+	return normalizedPrefix + normalizedPath
+}

tower.go

@@ -2,8 +2,10 @@ package tower
 
 import (
 	"context"
+	"io/fs"
 	"log"
 	"net/http"
+	"path"
 
 	"github.com/julienschmidt/httprouter"
 )
@@ -66,6 +68,27 @@ func (t *Tower) Static(prefix, dir string) {
 	t.router.ServeFiles(prefix, http.Dir(dir))
 }
 
+func (t *Tower) StaticFS(prefix string, fsys fs.FS) {
+	fileServer := http.FileServer(http.FS(fsys))
+
+	handler := func(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
+		fp := p.ByName("filepath")
+		if fp == "" {
+			fp = "/"
+		}
+
+		fp = path.Clean("/" + fp)
+
+		req := r.Clone(r.Context())
+		req.URL.Path = fp
+
+		fileServer.ServeHTTP(w, req)
+	}
+
+	t.router.Handle(http.MethodGet, buildFullPath(prefix, "/*filepath"), handler)
+	t.router.Handle(http.MethodHead, buildFullPath(prefix, "/*filepath"), handler)
+}
+
 func (t *Tower) GET(path string, h Handler, routeMiddlewares ...Middleware) {
 	t.Handle(http.MethodGet, path, h, routeMiddlewares...)
 }