simplified middleware interface

auth/auth.go

@@ -10,8 +10,7 @@ const UserCtxKey = "user"
 
 // Middleware adds authentication handling
 func Middleware(userLookup func(int) any) sushi.Middleware {
-	return func(next sushi.Handler) sushi.Handler {
+	return func(ctx sushi.Ctx, params []string, next func()) {
-		return func(ctx sushi.Ctx, params []string) {
 		sess := session.GetCurrentSession(ctx)
 		if sess != nil && sess.UserID > 0 && userLookup != nil {
 			user := userLookup(sess.UserID)
@@ -22,8 +21,7 @@ func Middleware(userLookup func(int) any) sushi.Middleware {
 				session.StoreSession(sess)
 			}
 		}
-			next(ctx, params)
+		next()
-		}
 	}
 }
 
@@ -34,14 +32,12 @@ func RequireAuth(redirectPath ...string) sushi.Middleware {
 		redirect = redirectPath[0]
 	}
 
-	return func(next sushi.Handler) sushi.Handler {
+	return func(ctx sushi.Ctx, params []string, next func()) {
-		return func(ctx sushi.Ctx, params []string) {
 		if !IsAuthenticated(ctx) {
 			ctx.Redirect(redirect, fasthttp.StatusFound)
 			return
 		}
-			next(ctx, params)
+		next()
-		}
 	}
 }
 
@@ -52,14 +48,12 @@ func RequireGuest(redirectPath ...string) sushi.Middleware {
 		redirect = redirectPath[0]
 	}
 
-	return func(next sushi.Handler) sushi.Handler {
+	return func(ctx sushi.Ctx, params []string, next func()) {
-		return func(ctx sushi.Ctx, params []string) {
 		if IsAuthenticated(ctx) {
 			ctx.Redirect(redirect, fasthttp.StatusFound)
 			return
 		}
-			next(ctx, params)
+		next()
-		}
 	}
 }
 

csrf/csrf.go

@@ -119,8 +119,7 @@ func ValidateFormCSRFToken(ctx sushi.Ctx) bool {
 
 // Middleware returns middleware that automatically validates CSRF tokens
 func Middleware() sushi.Middleware {
-	return func(next sushi.Handler) sushi.Handler {
+	return func(ctx sushi.Ctx, params []string, next func()) {
-		return func(ctx sushi.Ctx, params []string) {
 		method := string(ctx.Method())
 
 		if method == "POST" || method == "PUT" || method == "PATCH" || method == "DELETE" {
@@ -132,7 +131,6 @@ func Middleware() sushi.Middleware {
 			}
 		}
 
-			next(ctx, params)
+		next()
-		}
 	}
 }

router.go

@@ -141,12 +141,29 @@ func (r *Router) methodNode(method string) *node {
 }
 
 func applyMiddleware(h Handler, mw []Middleware) Handler {
-	for i := len(mw) - 1; i >= 0; i-- {
+	if len(mw) == 0 {
-		h = mw[i](h)
-	}
 		return h
 	}
 
+	return func(ctx Ctx, params []string) {
+		var index int
+		var next func()
+
+		next = func() {
+			if index >= len(mw) {
+				h(ctx, params)
+				return
+			}
+
+			currentMW := mw[index]
+			index++
+			currentMW(ctx, params, next)
+		}
+
+		next()
+	}
+}
+
 func readSegment(path string, start int) (segment string, end int, hasMore bool) {
 	if start >= len(path) {
 		return "", start, false

session/middleware.go

@@ -4,8 +4,7 @@ import sushi "git.sharkk.net/Sharkk/Sushi"
 
 // Middleware provides session handling
 func Middleware() sushi.Middleware {
-	return func(next sushi.Handler) sushi.Handler {
+	return func(ctx sushi.Ctx, params []string, next func()) {
-		return func(ctx sushi.Ctx, params []string) {
 		sessionID := sushi.GetCookie(ctx, SessionCookieName)
 		var sess *Session
 
@@ -24,7 +23,6 @@ func Middleware() sushi.Middleware {
 		}
 
 		ctx.SetUserValue(SessionCtxKey, sess)
-			next(ctx, params)
+		next()
-		}
 	}
 }

timing/timing.go

@@ -11,12 +11,10 @@ const RequestTimerKey = "request_start_time"
 
 // Middleware adds request timing functionality
 func Middleware() sushi.Middleware {
-	return func(next sushi.Handler) sushi.Handler {
+	return func(ctx sushi.Ctx, params []string, next func()) {
-		return func(ctx sushi.Ctx, params []string) {
 		startTime := time.Now()
 		ctx.SetUserValue(RequestTimerKey, startTime)
-			next(ctx, params)
+		next()
-		}
 	}
 }
 

types.go

@@ -4,4 +4,4 @@ import "github.com/valyala/fasthttp"
 
 type Ctx = *fasthttp.RequestCtx
 type Handler func(ctx Ctx, params []string)
-type Middleware func(Handler) Handler
+type Middleware func(ctx Ctx, params []string, next func())