schreifuchs/schreifuchs.ch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: better caching headers for images

Browse Source
This commit is contained in:
schreifuchs
2026-03-09 13:35:23 +01:00
parent a27b4a66e6
commit 2b07701762
11 changed files with 83 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/components/translate/context.go
-1
View File
@@ -52,7 +52,6 @@ func Path(ctx context.Context, pp ...string) string {
}
func PathForLang(ctx context.Context, lang string, pp ...string) string {
slog.Info("path for lang", "path", pp)
s, ok := ctx.Value(serviceKey).(*Service)
if !ok {
slog.Error("could not extract translation service from context for translating path", "ctx", ctx, "path", pp)
internal/handlers/restutil/error.go → internal/handlers/rest/error.go
+1 -1
View File
@@ -1,4 +1,4 @@
package restutil
package rest
import (
"encoding/json"
internal/handlers/restutil/params.go → internal/handlers/rest/params.go
+1 -1
View File
@@ -1,4 +1,4 @@
package restutil
package rest
import (
"fmt"
internal/handlers/rest/use.go
+13
View File
@@ -0,0 +1,13 @@
package rest
import "net/http"
type Middeware = func(next http.Handler) http.Handler
func Use(handler http.Handler, middlewares ...Middeware) http.Handler {
for _, middleware := range middlewares {
handler = middleware(handler)
}
return handler
}
internal/handlers/resthome/resource.go
+6 -3
View File
@@ -10,14 +10,17 @@ import (
)
type Handler struct {
http.Handler
src pageService
r renderer
}
func New(mux *http.ServeMux, renderer renderer, srv pageService) *Handler {
func New(renderer renderer, srv pageService) *Handler {
mux := http.NewServeMux()
h := &Handler{
src: srv,
r: renderer,
Handler: mux,
src: srv,
r: renderer,
}
mux.HandleFunc("GET /{$}", h.home)
internal/handlers/restimage/conroller.go
+7 -7
View File
@@ -6,7 +6,7 @@ import (
"net/http"
"git.schreifuchs.ch/schreifuchs/schreifuchs.ch/internal/components/images"
"git.schreifuchs.ch/schreifuchs/schreifuchs.ch/internal/handlers/restutil"
"git.schreifuchs.ch/schreifuchs/schreifuchs.ch/internal/handlers/rest"
)
func (h *Handler) getImage(w http.ResponseWriter, r *http.Request) {
@@ -14,20 +14,20 @@ func (h *Handler) getImage(w http.ResponseWriter, r *http.Request) {
var err error
options := images.Options{}
options.Height, err = restutil.IntParam(r, "h")
options.Height, err = rest.IntParam(r, "h")
if err != nil {
restutil.SendErr(w, err)
rest.SendErr(w, err)
return
}
options.Width, err = restutil.IntParam(r, "w")
options.Width, err = rest.IntParam(r, "w")
if err != nil {
restutil.SendErr(w, err)
rest.SendErr(w, err)
return
}
options.Quality, err = restutil.IntParam(r, "q")
options.Quality, err = rest.IntParam(r, "q")
if err != nil {
restutil.SendErr(w, err)
rest.SendErr(w, err)
return
}
internal/handlers/restimage/resource.go
+5 -2
View File
@@ -9,12 +9,15 @@ import (
)
type Handler struct {
http.Handler
img imageService
}
func New(mux *http.ServeMux, srv imageService) *Handler {
func New(srv imageService) *Handler {
mux := http.NewServeMux()
h := &Handler{
img: srv,
Handler: mux,
img: srv,
}
mux.HandleFunc("GET /images/{uid}", h.getImage)
internal/server/middlewares.go → internal/pkg/middleware/cache.go
+3 -3
View File
@@ -1,4 +1,4 @@
package server
package middleware
import (
"fmt"
@@ -17,7 +17,7 @@ func (c *captureWriter) WriteHeader(statusCode int) {
c.ResponseWriter.WriteHeader(statusCode)
}
func (s *Server) loggingMiddleware(next http.Handler) http.Handler {
func Logging(next http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
start := time.Now()
cw := &captureWriter{
@@ -35,7 +35,7 @@ func (s *Server) loggingMiddleware(next http.Handler) http.Handler {
}
// cacheMiddleware adds Cache-Control headers to the response.
func cacheMiddleware(maxAge time.Duration) func(next http.Handler) http.Handler {
func Cache(maxAge time.Duration) func(next http.Handler) http.Handler {
return func(next http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Cache-Control", fmt.Sprintf("public, max-age=%.0f", maxAge.Seconds()))
internal/server/routes.go → internal/server/factory.go
+35 -20
View File
@@ -1,40 +1,50 @@
package server
import (
"log/slog"
"fmt"
"net/http"
"time"
"git.schreifuchs.ch/schreifuchs/schreifuchs.ch/internal/components/images"
"git.schreifuchs.ch/schreifuchs/schreifuchs.ch/internal/components/page"
"git.schreifuchs.ch/schreifuchs/schreifuchs.ch/internal/components/translate"
"git.schreifuchs.ch/schreifuchs/schreifuchs.ch/internal/handlers/rest"
"git.schreifuchs.ch/schreifuchs/schreifuchs.ch/internal/handlers/resthome"
"git.schreifuchs.ch/schreifuchs/schreifuchs.ch/internal/handlers/restimage"
"git.schreifuchs.ch/schreifuchs/schreifuchs.ch/internal/pkg/filesystem"
"git.schreifuchs.ch/schreifuchs/schreifuchs.ch/internal/pkg/middleware"
"git.schreifuchs.ch/schreifuchs/schreifuchs.ch/internal/pkg/templer"
"git.schreifuchs.ch/schreifuchs/schreifuchs.ch/web"
"git.schreifuchs.ch/schreifuchs/schreifuchs.ch/web/layouts"
"github.com/studio-b12/gowebdav"
"github.com/valkey-io/valkey-go"
)
func (s *Server) RegisterRoutes() (h http.Handler) {
func (s *Server) allRoutes() (h http.Handler, err error) {
mux := http.NewServeMux()
registerStatic(mux)
mux.Handle("/", s.registerOther())
other, err := s.dynamicRoutes()
if err != nil {
return
}
mux.Handle("/", other)
h = mux
h = templer.Middleware(h)
h = s.loggingMiddleware(h)
return h
h = middleware.Logging(h)
return h, nil
}
func (s *Server) registerOther() (h http.Handler) {
func (s *Server) dynamicRoutes() (h http.Handler, err error) {
mux := http.NewServeMux()
webdavClient := gowebdav.NewClient(s.cfg.FileSystem.URL, s.cfg.FileSystem.User, s.cfg.FileSystem.Password)
if err := webdavClient.Connect(); err != nil {
slog.Error("could not connect webdavClient", "err", err)
err = webdavClient.Connect()
if err != nil {
err = fmt.Errorf("could not connect webdavClient: %w", err)
return
}
var fs filesystem.FS = webdavClient
@@ -44,22 +54,27 @@ func (s *Server) registerOther() (h http.Handler) {
Password: s.cfg.Cache.Password,
})
if err != nil {
slog.Error("failed to create valkey client", "err", err)
err = fmt.Errorf("failed to create valkey client: %w", err)
return
}
if err != nil {
} else {
fs = filesystem.NewCachedClient(webdavClient, valkeyClient, 5*time.Hour)
}
renderer := layouts.New(s.cfg)
_ = resthome.New(mux, renderer, page.New(fs))
_ = restimage.New(mux, images.New(fs, s.cfg.Image, valkeyClient))
mux.Handle("/", http.FileServer(http.FS(web.GetStaticFS())))
mux.Handle("/images/", rest.Use(
restimage.New(images.New(fs, s.cfg.Image, valkeyClient)),
middleware.Cache(time.Hour*24*5),
))
translator := translate.New()
renderer := layouts.New(s.cfg)
h = mux
h = translator.Middleware(h)
h = cacheMiddleware(time.Minute * 5)(h)
return h
mux.Handle("/", rest.Use(
resthome.New(renderer, page.New(fs)),
translator.Middleware,
middleware.Cache(time.Minute),
))
return mux, nil
}
internal/server/server.go
+9 -3
View File
@@ -27,10 +27,16 @@ func Start(ctx context.Context, cfg config.Cfg) (err error) {
cfg: cfg,
}
hander, err := s.allRoutes()
if err != nil {
err = fmt.Errorf("could not setup routes: %w", err)
return
}
// Declare Server config
srv := &http.Server{
Addr: fmt.Sprintf(":%d", s.port),
Handler: s.RegisterRoutes(),
Handler: hander,
IdleTimeout: time.Minute,
ReadTimeout: 10 * time.Second,
WriteTimeout: 30 * time.Second,
@@ -45,7 +51,7 @@ func Start(ctx context.Context, cfg config.Cfg) (err error) {
// Shutdown server when ctx done
if err = srv.Shutdown(context.Background()); err != nil {
// Error from closing listeners, or context timeout:
err = fmt.Errorf("error whilse shutting down server: %w", err)
err = fmt.Errorf("error while shutting down server: %w", err)
}
close(idleConnsClosed)
@@ -53,7 +59,7 @@ func Start(ctx context.Context, cfg config.Cfg) (err error) {
slog.Info("starting server", "address", srv.Addr)
if err := srv.ListenAndServe(); err != http.ErrServerClosed {
return fmt.Errorf("error while server ListenAndServe: %w", err)
return fmt.Errorf("error while serving: %w", err)
}
<-idleConnsClosed
internal/server/static.go
+3 -2
View File
@@ -6,6 +6,7 @@ import (
"net/http"
"time"
"git.schreifuchs.ch/schreifuchs/schreifuchs.ch/internal/pkg/middleware"
"git.schreifuchs.ch/schreifuchs/schreifuchs.ch/web"
)
@@ -14,7 +15,7 @@ func registerStatic(mux *http.ServeMux) {
fileSystem := web.GetStaticFS()
// we still use go's fileServer to avoid unnecessary implementation
fileServer := cacheMiddleware(time.Hour * 24)(http.FileServer(http.FS(fileSystem)))
fileServer := middleware.Cache(time.Hour * 24)(http.FileServer(http.FS(fileSystem)))
err := fs.WalkDir(fileSystem, ".", func(path string, d fs.DirEntry, err error) error {
if err != nil {
@@ -26,7 +27,7 @@ func registerStatic(mux *http.ServeMux) {
path = "/" + path
slog.Debug("registering file", "path", path)
slog.Debug("registered static file", "path", path)
mux.Handle(path, fileServer)