refactor: Create middleware pacakge (#23)

internal/web/middleware.go → internal/web/middleware/logging.go

@@ -1,4 +1,4 @@
-package web
+package middleware
 
 import (
 	"log"
@@ -11,20 +11,6 @@ type wrappedWriter struct {
 	statusCode int
 }
 
-type Middleware func(http.Handler) http.Handler
-
-func CreateMiddlewareStack(ms ...Middleware) Middleware {
-	return func(next http.Handler) http.Handler {
-		// Call from the end of the stack to the beginning
-		for i := len(ms) - 1; i >= 0; i-- {
-			x := ms[i]
-			next = x(next)
-		}
-
-		return next
-	}
-}
-
 func (w *wrappedWriter) WriteHeader(sc int) {
 	w.ResponseWriter.WriteHeader(sc)
 	w.statusCode = sc
@@ -44,10 +30,3 @@ func LoggingMiddleware(next http.Handler) http.Handler {
 		log.Println(wrapped.statusCode, r.Method, r.URL.Path, time.Since(start))
 	})
 }
-
-func DemoMiddleware(next http.Handler) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		time.Sleep(10 * time.Millisecond)
-		next.ServeHTTP(w, r)
-	})
-}

internal/web/middleware/slowdown.go

@@ -0,0 +1,13 @@
+package middleware
+
+import (
+	"net/http"
+	"time"
+)
+
+func DemoMiddleware(next http.Handler) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		time.Sleep(10 * time.Millisecond)
+		next.ServeHTTP(w, r)
+	})
+}

internal/web/middleware/stack.go

@@ -0,0 +1,19 @@
+package middleware
+
+import (
+	"net/http"
+)
+
+type Middleware func(http.Handler) http.Handler
+
+func CreateMiddlewareStack(ms ...Middleware) Middleware {
+	return func(next http.Handler) http.Handler {
+		// Call from the end of the stack to the beginning
+		for i := len(ms) - 1; i >= 0; i-- {
+			x := ms[i]
+			next = x(next)
+		}
+
+		return next
+	}
+}

internal/web/web.go

@@ -10,6 +10,7 @@ import (
 
 	"github.com/a-h/templ"
 	"github.com/sonjek/go-templ-htmx-picocss-example/internal/notes"
+	"github.com/sonjek/go-templ-htmx-picocss-example/internal/web/middleware"
 	"github.com/sonjek/go-templ-htmx-picocss-example/internal/web/templ/components"
 	"github.com/sonjek/go-templ-htmx-picocss-example/internal/web/templ/page"
 	"github.com/sonjek/go-templ-htmx-picocss-example/internal/web/templ/view"
@@ -170,9 +171,9 @@ func (ws Server) Start() {
 	fmt.Println("Starting web interface on port: 8089")
 
 	// Create stack for handle multiple middlewares
-	middlewares := CreateMiddlewareStack(
-		LoggingMiddleware,
-		DemoMiddleware,
+	middlewares := middleware.CreateMiddlewareStack(
+		middleware.LoggingMiddleware,
+		middleware.DemoMiddleware,
 	)
 
 	server := &http.Server{