feat: replaced middleware implementations with generic ones, added logger field to dispatcher

v1/middleware/middleware.go

@@ -2,20 +2,20 @@ package middleware
 
 import (
 	"errors"
+	"fmt"
 	mcontext "github.com/abelith/gomax/v1/context"
 	"github.com/abelith/gomax/v1/core"
 	merrors "github.com/abelith/gomax/v1/errors"
-	"github.com/rs/zerolog"
-	"github.com/rs/zerolog/log"
 )
 
-func MwPanicHandler() core.Middleware {
+func MwPanicHandler(onPanic func()) core.Middleware {
 	return func(next core.HandlerFunc) core.HandlerFunc {
-		return func(c *mcontext.Context) error {
+		return func(c *mcontext.Context) (err error) {
 			defer func() {
 				p := recover()
 				if p != nil {
-					log.Fatal().Any("panic", p).Send()
+					onPanic()
+					err = fmt.Errorf("panic: %v", p)
 				}
 			}()
 			return next(c)
@@ -30,45 +30,34 @@ func MwErrorResponder(defaultMsg string) core.Middleware {
 			var maxErr *merrors.GoMaxError
 
 			if errors.As(err, &maxErr) {
-				return c.Respond(maxErr.Message)
+				return errors.Join(c.Respond(maxErr.Message), maxErr)
 			}
 
 			if err != nil {
-				return c.Respond(defaultMsg)
+				return errors.Join(c.Respond(defaultMsg), err)
 			}
 			return nil
 		}
 	}
 }
 
-func MwLoggerInjector(logger zerolog.Logger) core.Middleware {
+func MwCallback(callback func(c *mcontext.Context)) core.Middleware {
 	return func(next core.HandlerFunc) core.HandlerFunc {
 		return func(c *mcontext.Context) error {
-			ctx := logger.With().Int64("user_id", c.Update().UserID).
-				Logger().WithContext(c.Context())
-			c.SetContext(ctx)
+			callback(c)
 			return next(c)
 		}
 	}
 }
 
-func MwDebugState() core.Middleware {
+func MwErrorHandler(onError func(err error)) core.Middleware {
 	return func(next core.HandlerFunc) core.HandlerFunc {
 		return func(c *mcontext.Context) error {
-			log.Debug().Any("state", c.State()).Any("update", c.Update()).Send()
-			return next(c)
-		}
-	}
-}
-
-func MwErrorLogger() core.Middleware {
-	return func(next core.HandlerFunc) core.HandlerFunc {
-		return func(c *mcontext.Context) error {
-			if err := next(c); err != nil {
-				log.Ctx(c).Err(err).Send()
-				return err
+			var err error
+			if err = next(c); err != nil {
+				onError(err)
 			}
-			return nil
+			return err
 		}
 	}
 }