Major code cleanup and switch to Fiber

src/main.go

@@ -3,24 +3,25 @@ package main
 import (
 	"fmt"
 	"log"
-	"os"
-	"strconv"
-	"time"
+	"net/http"
 
-	"github.com/buaazp/fasthttprouter"
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/middleware/cors"
+	"github.com/gofiber/fiber/v2/middleware/recover"
 	"github.com/joho/godotenv"
-	"github.com/mineatar-io/api-server/src/conf"
-	"github.com/mineatar-io/api-server/src/redis"
-	"github.com/mineatar-io/api-server/src/routes"
-	"github.com/mineatar-io/api-server/src/util"
-	"github.com/valyala/fasthttp"
 )
 
 var (
-	host   string              = "127.0.0.1"
-	port   uint16              = 3000
-	config *conf.Configuration = &conf.Configuration{}
-	r      *redis.Redis        = &redis.Redis{}
+	app *fiber.App = fiber.New(fiber.Config{
+		DisableStartupMessage: true,
+		ErrorHandler: func(ctx *fiber.Ctx, err error) error {
+			log.Println(ctx.Request().URI(), err)
+
+			return ctx.SendStatus(http.StatusInternalServerError)
+		},
+	})
+	r      *Redis         = &Redis{}
+	config *Configuration = &Configuration{}
 )
 
 func init() {
@@ -32,64 +33,29 @@ func init() {
 		log.Fatal(err)
 	}
 
-	start := time.Now()
-
 	if err = r.Connect(config.Redis.URI, config.Redis.Database); err != nil {
 		log.Fatal(err)
 	}
 
-	log.Printf("Successfully connected to Redis (%s)\n", time.Since(start))
+	log.Println("Successfully connected to Redis")
 
-	if value, ok := os.LookupEnv("HOST"); ok {
-		host = value
-	}
-
-	if value, ok := os.LookupEnv("PORT"); ok {
-		parsedValue, err := strconv.ParseUint(value, 10, 16)
-
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		port = uint16(parsedValue)
-	}
-
-	routes.Init(r, config)
-	util.Init(r, config)
-}
-
-func middleware(next fasthttp.RequestHandler) fasthttp.RequestHandler {
-	return func(ctx *fasthttp.RequestCtx) {
-		ctx.Response.Header.Set("Access-Control-Allow-Origin", "*")
-		ctx.Response.Header.Set("Access-Control-Allow-Headers", "*")
-		ctx.Response.Header.Set("Access-Control-Allow-Methods", "GET,POST,HEAD,OPTIONS")
-		ctx.Response.Header.Set("Access-Control-Expose-Headers", "X-Cache-Hit")
-
-		if util.Debug {
-			log.Printf("%s %s (%s) - %s\n", ctx.Method(), ctx.URI(), ctx.RemoteAddr(), ctx.UserAgent())
-		}
-
-		next(ctx)
-	}
+	app.Use(recover.New())
+	app.Use(cors.New(cors.Config{
+		AllowOrigins:  "*",
+		AllowMethods:  "HEAD,OPTIONS,GET",
+		ExposeHeaders: "Content-Type,Content-Disposition,X-Cache-Hit",
+	}))
 }
 
 func main() {
 	defer r.Close()
 
-	router := fasthttprouter.New()
+	instanceID, err := GetInstanceID()
 
-	router.GET("/ping", routes.PingHandler)
-	router.GET("/uuid/:user", routes.UUIDHandler)
-	router.GET("/skin/:user", routes.SkinHandler)
-	router.GET("/face/:user", routes.FaceHandler)
-	router.GET("/head/:user", routes.HeadHandler)
-	router.GET("/body/full/:user", routes.FullBodyHandler)
-	router.GET("/body/front/:user", routes.FrontBodyHandler)
-	router.GET("/body/back/:user", routes.BackBodyHandler)
-	router.GET("/body/left/:user", routes.LeftBodyHandler)
-	router.GET("/body/right/:user", routes.RightBodyHandler)
+	if err != nil {
+		log.Fatal(err)
+	}
 
-	log.Printf("Listening on %s:%d\n", host, port)
-
-	log.Fatal(fasthttp.ListenAndServe(fmt.Sprintf("%s:%d", host, port), middleware(router.Handler)))
+	log.Printf("Listening on %s:%d\n", config.Host, config.Port+instanceID)
+	log.Fatal(app.Listen(fmt.Sprintf("%s:%d", config.Host, config.Port+instanceID)))
 }