refactor(serverHandler): move access log and pre middleware to preprocessHandler

Author: marjune163

src/serverHandler/logHandler.go

@@ -1,9 +1,7 @@
 package serverHandler
 
 import (
-	"mjpclab.dev/ghfs/src/middleware"
 	"mjpclab.dev/ghfs/src/param"
-	"mjpclab.dev/ghfs/src/serverLog"
 	"net/http"
 )
 
@@ -12,30 +10,10 @@ type aliasWithHandler struct {
 	handler http.Handler
 }
 
-type multiplexHandler struct {
-	logger            *serverLog.Logger
-	preMiddlewares    []middleware.Middleware
-	aliasWithHandlers []aliasWithHandler
-}
+type multiplexHandler []aliasWithHandler
 
 func (mux multiplexHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	if len(mux.preMiddlewares) > 0 {
-		middlewareContext := &middleware.Context{
-			PrefixReqPath: r.URL.RawPath, // init by pathTransformHandler
-			VhostReqPath:  r.URL.Path,
-			Logger:        mux.logger,
-		}
-		for i := range mux.preMiddlewares {
-			processResult := mux.preMiddlewares[i](w, r, middlewareContext)
-			if processResult == middleware.Processed {
-				return
-			} else if processResult == middleware.SkipRests {
-				break
-			}
-		}
-	}
-
-	for _, ah := range mux.aliasWithHandlers {
+	for _, ah := range mux {
 		if ah.alias.isMatch(r.URL.Path) || ah.alias.isPredecessorOf(r.URL.Path) {
 			ah.handler.ServeHTTP(w, r)
 			return
@@ -70,9 +48,5 @@ func newMultiplexHandler(
 		}
 	}
 
-	return multiplexHandler{
-		logger:            ap.logger,
-		preMiddlewares:    p.PreMiddlewares,
-		aliasWithHandlers: aliasWithHandlers,
-	}
+	return multiplexHandler(aliasWithHandlers)
 }

src/serverHandler/multiplexHandler.go

@@ -0,0 +1,43 @@
+package serverHandler
+
+import (
+	"mjpclab.dev/ghfs/src/middleware"
+	"mjpclab.dev/ghfs/src/serverLog"
+	"net/http"
+)
+
+type preprocessHandler struct {
+	logger         *serverLog.Logger
+	preMiddlewares []middleware.Middleware
+	nextHandler    http.Handler
+}
+
+func (pph preprocessHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	logRequest(pph.logger, r)
+
+	if len(pph.preMiddlewares) > 0 {
+		middlewareContext := &middleware.Context{
+			PrefixReqPath: r.URL.RawPath, // init by pathTransformHandler
+			VhostReqPath:  r.URL.Path,
+			Logger:        pph.logger,
+		}
+		for i := range pph.preMiddlewares {
+			processResult := pph.preMiddlewares[i](w, r, middlewareContext)
+			if processResult == middleware.Processed {
+				return
+			} else if processResult == middleware.SkipRests {
+				break
+			}
+		}
+	}
+
+	pph.nextHandler.ServeHTTP(w, r)
+}
+
+func newPreprocessHandler(logger *serverLog.Logger, preMiddlewares []middleware.Middleware, nextHandler http.Handler) http.Handler {
+	return preprocessHandler{
+		logger:         logger,
+		preMiddlewares: preMiddlewares,
+		nextHandler:    nextHandler,
+	}
+}

src/serverHandler/preprocessHandler.go

@@ -104,8 +104,8 @@ func NewVhostHandler(
 	}
 
 	muxHandler := newMultiplexHandler(p, ap)
-	logHandler := newLogHandler(logger, muxHandler)
-	pathTransformHandler := newPathTransformHandler(p.PrefixUrls, logHandler)
+	preprocessHandler := newPreprocessHandler(logger, p.PreMiddlewares, muxHandler)
+	pathTransformHandler := newPathTransformHandler(p.PrefixUrls, preprocessHandler)
 
 	return pathTransformHandler, nil
 }