From 4c7a3fd9a0ff0fa237a6790575949d80457204e0 Mon Sep 17 00:00:00 2001 From: Imbus <> Date: Wed, 28 Feb 2024 11:28:57 +0100 Subject: [PATCH 1/2] Pulling in fiber as a dep --- backend/go.mod | 18 +++++++++++++++++- backend/go.sum | 27 +++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 1 deletion(-) diff --git a/backend/go.mod b/backend/go.mod index 8c06f45..fdbbaf7 100644 --- a/backend/go.mod +++ b/backend/go.mod @@ -3,7 +3,23 @@ module ttime go 1.21.1 require ( + github.com/BurntSushi/toml v1.3.2 github.com/jmoiron/sqlx v1.3.5 github.com/mattn/go-sqlite3 v1.14.22 - github.com/BurntSushi/toml v1.3.2 +) + +// These are all for fiber +require ( + github.com/andybalholm/brotli v1.0.5 // indirect + github.com/gofiber/fiber/v2 v2.52.1 // indirect + github.com/google/uuid v1.5.0 // indirect + github.com/klauspost/compress v1.17.0 // indirect + github.com/mattn/go-colorable v0.1.13 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect + github.com/mattn/go-runewidth v0.0.15 // indirect + github.com/rivo/uniseg v0.2.0 // indirect + github.com/valyala/bytebufferpool v1.0.0 // indirect + github.com/valyala/fasthttp v1.51.0 // indirect + github.com/valyala/tcplisten v1.0.0 // indirect + golang.org/x/sys v0.15.0 // indirect ) diff --git a/backend/go.sum b/backend/go.sum index afab06f..9ddb540 100644 --- a/backend/go.sum +++ b/backend/go.sum @@ -1,11 +1,38 @@ github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8= github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= +github.com/andybalholm/brotli v1.0.5 h1:8uQZIdzKmjc/iuPu7O2ioW48L81FgatrcpfFmiq/cCs= +github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE= github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= +github.com/gofiber/fiber/v2 v2.52.1 h1:1RoU2NS+b98o1L77sdl5mboGPiW+0Ypsi5oLmcYlgHI= +github.com/gofiber/fiber/v2 v2.52.1/go.mod h1:KEOE+cXMhXG0zHc9d8+E38hoX+ZN7bhOtgeF2oT6jrQ= +github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU= +github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/jmoiron/sqlx v1.3.5 h1:vFFPA71p1o5gAeqtEAwLU4dnX2napprKtHr7PYIcN3g= github.com/jmoiron/sqlx v1.3.5/go.mod h1:nRVWtLre0KfCLJvgxzCsLVMogSvQ1zNJtpYr2Ccp0mQ= +github.com/klauspost/compress v1.17.0 h1:Rnbp4K9EjcDuVuHtd0dgA4qNuv9yKDYKK1ulpJwgrqM= +github.com/klauspost/compress v1.17.0/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= github.com/lib/pq v1.2.0 h1:LXpIM/LZ5xGFhOpXAQUIMM1HdyqzVYM13zNdjCEEcA0= github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= +github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= +github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U= +github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU= github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= +github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY= +github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= +github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= +github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= +github.com/valyala/fasthttp v1.51.0 h1:8b30A5JlZ6C7AS81RsWjYMQmrZG6feChmgAolCl1SqA= +github.com/valyala/fasthttp v1.51.0/go.mod h1:oI2XroL+lI7vdXyYoQk03bXBThfFl2cVdIA3Xl7cH8g= +github.com/valyala/tcplisten v1.0.0 h1:rBHj/Xf+E1tRGZyWIWwJDiRY0zc1Js+CV5DqwacVSA8= +github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc= +golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= +golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= From d51b9f78c2e20234b6c8482c3719fb6b1e21c129 Mon Sep 17 00:00:00 2001 From: Imbus <> Date: Wed, 28 Feb 2024 11:29:32 +0100 Subject: [PATCH 2/2] Porting to fiber --- backend/cmd/main.go | 56 ++++++++++++++++++--------------------------- 1 file changed, 22 insertions(+), 34 deletions(-) diff --git a/backend/cmd/main.go b/backend/cmd/main.go index ea8d968..ee394ca 100644 --- a/backend/cmd/main.go +++ b/backend/cmd/main.go @@ -3,11 +3,10 @@ package main import ( "encoding/json" "fmt" - "io" - "net/http" "ttime/internal/config" "ttime/internal/database" + "github.com/gofiber/fiber/v2" _ "github.com/mattn/go-sqlite3" ) @@ -19,25 +18,15 @@ type ButtonState struct { // This is what a handler with a receiver looks like // Keep in mind that concurrent state access is not (usually) safe // And will in practice be guarded by a mutex -func (b *ButtonState) pressHandler(w http.ResponseWriter, r *http.Request) { - if r.Method == "POST" { - b.PressCount++ - } - - response, err := json.Marshal(b) - if err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) - return - } - - fmt.Println("Request received") - io.WriteString(w, string(response)) +func (b *ButtonState) pressHandlerGet(c *fiber.Ctx) error { + fmt.Println("Get request received") + return c.JSON(b) } -// This is what a handler looks like -func handler(w http.ResponseWriter, r *http.Request) { - fmt.Println("Request received") - io.WriteString(w, "This is my website!\n") +func (b *ButtonState) pressHandlerPost(c *fiber.Ctx) error { + fmt.Println("Post request received") + b.PressCount++ + return c.JSON(b) } func main() { @@ -52,23 +41,22 @@ func main() { fmt.Println(string(str)) database.DbConnect(conf.DbPath) + + app := fiber.New() + + app.Static("/", "./static") + b := &ButtonState{PressCount: 0} + app.Get("/api/button", b.pressHandlerGet) + app.Post("/api/button", b.pressHandlerPost) + app.Post("/api/project", func(c *fiber.Ctx) error { + return c.JSON(fiber.Map{ + "message": "Project created", + }) + }) - // Mounting the handlers - fs := http.FileServer(http.Dir("static")) - http.Handle("/", fs) - http.HandleFunc("/hello", handler) - http.HandleFunc("/api/button", b.pressHandler) - - // Construct a server URL - server_url := fmt.Sprintf(":%d", conf.Port) - - println("Server running on port", conf.Port) - println("Visit http://localhost" + server_url) - println("Press Ctrl+C to stop the server") - - err = http.ListenAndServe(server_url, nil) + err = app.Listen(fmt.Sprintf(":%d", conf.Port)) if err != nil { - panic(err) + fmt.Println("Error starting server: ", err) } }