fix startup with kafka

Author: sbtaylor15

internal/api/fiber.go

@@ -2,6 +2,7 @@ package api
 
 import (
 	"log"
+	"time"
 
 	"github.com/gofiber/fiber/v2"
 	"github.com/gofiber/fiber/v2/middleware/compress"
@@ -11,7 +12,6 @@ import (
 	"github.com/ortelius/pdvd-backend/v12/database"
 	"github.com/ortelius/pdvd-backend/v12/graphql"
 	"github.com/ortelius/pdvd-backend/v12/restapi"
-	"github.com/ortelius/pdvd-backend/v12/restapi/modules/auth"
 )
 
 // NewFiberApp creates and configures a Fiber app with REST and GraphQL routes
@@ -26,34 +26,34 @@ func NewFiberApp(db database.DBConnection) *fiber.App {
 	app := fiber.New(fiber.Config{
 		AppName:     "pdvd-backend/v12 API v1.0",
 		BodyLimit:   50 * 1024 * 1024, // 50MB
-		ReadTimeout: 60,               // seconds
+		ReadTimeout: 60 * time.Second, // seconds
 	})
 
 	// Middleware
 	app.Use(fiberrecover.New())
 	app.Use(compress.New(compress.Config{Level: compress.LevelBestSpeed}))
-	app.Use(func(c *fiber.Ctx) error {
-		c.Locals("graphql_op", "-")
-		return c.Next()
-	})
-	app.Use(logger.New())
+
+	// Consolidated CORS Configuration
 	app.Use(cors.New(cors.Config{
-		AllowOrigins:     "http://localhost:3000,http://localhost:4000",
+		AllowOrigins:     "http://localhost:3000,http://localhost:4000,http://127.0.0.1:3000,http://127.0.0.1:4000",
 		AllowHeaders:     "Origin, Content-Type, Accept, Authorization, X-Requested-With",
 		AllowCredentials: true,
 		AllowMethods:     "GET, POST, HEAD, PUT, DELETE, PATCH, OPTIONS",
 	}))
 
+	app.Use(func(c *fiber.Ctx) error {
+		c.Locals("graphql_op", "-")
+		return c.Next()
+	})
+	app.Use(logger.New())
+
 	// Health check endpoint
 	app.Get("/", func(c *fiber.Ctx) error {
 		return c.JSON(fiber.Map{"status": "healthy"})
 	})
 
-	// REST routes
-	restapi.SetupRoutes(app, db)
-
-	// GraphQL endpoint
-	app.Post("/api/v1/graphql", auth.OptionalAuth(db), GraphQLHandler(schema))
+	// Setup REST and GraphQL routes (Pass the schema here)
+	restapi.SetupRoutes(app, db, schema)
 
 	return app
 }

main.go

@@ -18,27 +18,33 @@ func main() {
 	ctx, cancel := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGTERM)
 	defer cancel()
 
-	// Attempt to start Kafka (Optional)
-	if err := kafka.RunEventProcessor(ctx, db); err != nil {
-		log.Printf("Warning: Kafka initialization failed after 3 tries: %v. Starting without Kafka support.", err)
-	} else {
-		log.Println("Kafka processor initialized successfully.")
-	}
-
-	// Start everything else normally
+	// 1. Initialize Fiber App FIRST
 	app := api.NewFiberApp(db)
 	port := os.Getenv("MS_PORT")
 	if port == "" {
 		port = "3000"
 	}
 
+	// 2. Start Server in Goroutine
+	// This ensures the API is listening immediately
 	go func() {
 		log.Printf("Starting server on port %s", port)
 		if err := app.Listen(":" + port); err != nil {
 			log.Fatalf("Failed to start server: %v", err)
 		}
 	}()
 
+	// 3. Attempt to start Kafka (Optional) - Moved AFTER Fiber
+	// We run this in a separate goroutine so it doesn't block the main thread
+	// or delay the application if Kafka is unavailable.
+	go func() {
+		if err := kafka.RunEventProcessor(ctx, db); err != nil {
+			log.Printf("Warning: Kafka initialization failed after 3 tries: %v. Starting without Kafka support.", err)
+		} else {
+			log.Println("Kafka processor initialized successfully.")
+		}
+	}()
+
 	<-ctx.Done()
 	log.Println("Shutting down pdvd-backend...")
 	app.Shutdown()

internal/api/graphql.go restapi/graphql_handler.gointernal/api/graphql.go renamed to restapi/graphql_handler.go

@@ -1,4 +1,4 @@
-package api
+package restapi
 
 import (
 	"context"

restapi/router.go

@@ -12,26 +12,20 @@ import (
 	"github.com/go-git/go-git/v5"
 	githttp "github.com/go-git/go-git/v5/plumbing/transport/http"
 	"github.com/gofiber/fiber/v2"
-	"github.com/gofiber/fiber/v2/middleware/cors"
+	"github.com/graphql-go/graphql"
 	"github.com/ortelius/pdvd-backend/v12/database"
 	"github.com/ortelius/pdvd-backend/v12/restapi/modules/auth"
 	"github.com/ortelius/pdvd-backend/v12/restapi/modules/github"
 	"github.com/ortelius/pdvd-backend/v12/restapi/modules/releases"
 	"github.com/ortelius/pdvd-backend/v12/restapi/modules/sync"
 )
 
-// SetupRoutes configures all REST API routes
-func SetupRoutes(app *fiber.App, db database.DBConnection) {
-	// ========================================================================
-	// MIDDLEWARE
-	// ========================================================================
-	app.Use(cors.New(cors.Config{
-		AllowOrigins:     "http://localhost:3000,http://localhost:4000,http://127.0.0.1:3000,http://127.0.0.1:4000",
-		AllowHeaders:     "Origin, Content-Type, Accept, Authorization, X-Requested-With",
-		AllowCredentials: true,
-		AllowMethods:     "GET, POST, HEAD, PUT, DELETE, PATCH, OPTIONS",
-	}))
+// SetupRoutes configures all REST API routes and the GraphQL endpoint.
+// Redundant CORS middleware has been removed here as it is now handled globally
+// in internal/api/fiber.go to prevent 408 timeouts.
+func SetupRoutes(app *fiber.App, db database.DBConnection, schema graphql.Schema) {
 
+	// Background initialization tasks
 	go func() {
 		if err := auth.BootstrapAdmin(db); err != nil {
 			log.Printf("WARNING: Failed to bootstrap admin: %v", err)
@@ -48,8 +42,12 @@ func SetupRoutes(app *fiber.App, db database.DBConnection) {
 	go autoApplyRBACOnStartup(db, emailConfig)
 	go startInvitationCleanup(db)
 
+	// API Group /api/v1
 	api := app.Group("/api/v1")
 
+	// GraphQL Route - Mounted within the api group to inherit path prefixes
+	api.Post("/graphql", auth.OptionalAuth(db), GraphQLHandler(schema))
+
 	// Public Routes
 	api.Post("/signup", auth.Signup(db, emailConfig))