cleanup

internal/server/middleware.go → internal/server/handler.go

@@ -3,8 +3,8 @@ package server
 import "net/http"
 
 type HandlerWithCtx struct {
-	w    http.ResponseWriter
-	r    *http.Request
+	res  http.ResponseWriter
+	req  *http.Request
 	name string
 }
 
@@ -14,14 +14,14 @@ func NewHandler(f HandlerFunc) HandlerFunc {
 	return f
 }
 
-type Middleware func(HandlerFunc) HandlerFunc
-
-func NewMiddleware(m Middleware) Middleware {
-	return m
-}
-
 func ToHttpHandler(f HandlerFunc) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		f(HandlerWithCtx{w, r, ""}) // Create empty base context
 	}
 }
+
+type Middleware func(HandlerFunc) HandlerFunc
+
+func NewMiddleware(m Middleware) Middleware {
+	return m
+}

internal/server/server.go

@@ -34,10 +34,12 @@ func (s *Server) Run(addr string) error {
 
 func (s *Server) MountHandlers() {
 
+	// Create simple base handler using a context
 	handler := NewHandler(func(hwc HandlerWithCtx) {
-		hwc.w.Write([]byte("Hello " + hwc.name))
+		hwc.res.Write([]byte("Hello " + hwc.name))
 	})
 
+	// Create middleware that writes to the context before calling the handler
 	middleware := NewMiddleware(func(hf HandlerFunc) HandlerFunc {
 		return func(hwc HandlerWithCtx) {
 			hwc.name = "John"