Move request limiter to middleware.

server/middleware/error_handler.go

@@ -2,9 +2,10 @@ package middleware
 
 import (
 	"errors"
-	"github.com/gofiber/fiber/v3/log"
 	"nysoure/server/model"
 
+	"github.com/gofiber/fiber/v3/log"
+
 	"github.com/gofiber/fiber/v3"
 )
 
@@ -14,6 +15,7 @@ func ErrorHandler(c fiber.Ctx) error {
 		var requestErr *model.RequestError
 		var unauthorizedErr *model.UnAuthorizedError
 		var notFoundErr *model.NotFoundError
+		var fiberErr *fiber.Error
 		if errors.As(err, &requestErr) {
 			log.Error("Request Error: ", err)
 			return c.Status(fiber.StatusBadRequest).JSON(model.Response[any]{
@@ -47,6 +49,12 @@ func ErrorHandler(c fiber.Ctx) error {
 				Data:    nil,
 				Message: "Method not allowed",
 			})
+		} else if errors.As(err, &fiberErr) && fiberErr.Message != "" {
+			return c.Status(fiberErr.Code).JSON(model.Response[any]{
+				Success: false,
+				Data:    nil,
+				Message: fiberErr.Message,
+			})
 		} else {
 			var fiberErr *fiber.Error
 			if errors.As(err, &fiberErr) {

server/middleware/request_limiter.go

@@ -0,0 +1,34 @@
+package middleware
+
+import (
+	"nysoure/server/utils"
+	"time"
+
+	"github.com/gofiber/fiber/v3"
+	"github.com/gofiber/fiber/v3/log"
+)
+
+func NewRequestLimiter(maxRequests int, duration time.Duration) func(c fiber.Ctx) error {
+	limiter := utils.NewRequestLimiter(func() int {
+		return maxRequests
+	}, duration)
+
+	return func(c fiber.Ctx) error {
+		if !limiter.AllowRequest(c.IP()) {
+			log.Warnf("IP %s has exceeded the request limit of %d requests in %s", c.IP(), maxRequests, duration)
+			return fiber.NewError(fiber.StatusTooManyRequests, "Too many requests")
+		}
+		return c.Next()
+	}
+}
+
+func NewDynamicRequestLimiter(maxRequestsFunc func() int, duration time.Duration) func(c fiber.Ctx) error {
+	limiter := utils.NewRequestLimiter(maxRequestsFunc, duration)
+
+	return func(c fiber.Ctx) error {
+		if !limiter.AllowRequest(c.IP()) {
+			return fiber.NewError(fiber.StatusTooManyRequests, "Too many requests")
+		}
+		return c.Next()
+	}
+}