From 161d16967fbae2623bf4d130c842b187ced27ed8 Mon Sep 17 00:00:00 2001 From: loveuer Date: Thu, 11 Jan 2024 22:29:30 +0800 Subject: [PATCH] wip --- app.go | 43 +++++++++++++++++------ ctx.go | 73 ++++++++++++---------------------------- example/body/main.go | 37 ++++++++++++++++++++ example/simple/logger.go | 32 ++++++++++++++++++ example/simple/main.go | 15 +++++++-- go.mod | 25 ++++++++++++-- go.sum | 71 ++++++++++++++++++++++++++++++++++++-- group.go | 22 +++++++++++- handler.go | 2 -- req.go | 45 +++++++++++++++++++++++++ resp.go | 49 +++++++++++++++++++++++++++ router.go | 6 ++-- tree.go | 5 --- util.go | 46 +++++++++++++++++++++++++ xtest/main.go | 45 ++++++++++++++++++++++++- 15 files changed, 435 insertions(+), 81 deletions(-) create mode 100644 example/body/main.go create mode 100644 example/simple/logger.go create mode 100644 req.go create mode 100644 resp.go create mode 100644 util.go diff --git a/app.go b/app.go index 49eb295..cd6ec47 100644 --- a/app.go +++ b/app.go @@ -3,6 +3,7 @@ package nf import ( "fmt" "net/http" + "strings" ) type App struct { @@ -13,6 +14,12 @@ type App struct { func (a *App) ServeHTTP(writer http.ResponseWriter, request *http.Request) { c := newContext(writer, request) + for _, group := range a.groups { + if strings.HasPrefix(request.URL.Path, group.prefix) { + c.handlers = append(c.handlers, group.middlewares...) + } + } + if err := a.router.handle(c); err != nil { writer.WriteHeader(500) _, _ = writer.Write([]byte(err.Error())) @@ -20,19 +27,35 @@ func (a *App) ServeHTTP(writer http.ResponseWriter, request *http.Request) { } func (a *App) Get(path string, handlers ...HandlerFunc) { - if len(handlers) == 0 { - panic(fmt.Sprintf("missing handler in route: %s", path)) - } - - for _, handler := range handlers { - if handler == nil { - panic(fmt.Sprintf("nil handler found in route: %s", path)) - } - } - + verifyHandlers(path, handlers...) a.router.addRoute(http.MethodGet, path, handlers...) } +func (a *App) Post(path string, handlers ...HandlerFunc) { + verifyHandlers(path, handlers...) + a.router.addRoute(http.MethodPost, path, handlers...) +} + +func (a *App) Delete(path string, handlers ...HandlerFunc) { + verifyHandlers(path, handlers...) + a.router.addRoute(http.MethodDelete, path, handlers...) +} + +func (a *App) Put(path string, handlers ...HandlerFunc) { + verifyHandlers(path, handlers...) + a.router.addRoute(http.MethodPut, path, handlers...) +} + +func (a *App) Patch(path string, handlers ...HandlerFunc) { + verifyHandlers(path, handlers...) + a.router.addRoute(http.MethodPatch, path, handlers...) +} + +func (a *App) Head(path string, handlers ...HandlerFunc) { + verifyHandlers(path, handlers...) + a.router.addRoute(http.MethodHead, path, handlers...) +} + func (a *App) Run(address string) error { fmt.Println(banner + "nf serve at: " + address + "\n") return http.ListenAndServe(address, a) diff --git a/ctx.go b/ctx.go index f40145a..c909a0a 100644 --- a/ctx.go +++ b/ctx.go @@ -1,8 +1,6 @@ package nf import ( - "encoding/json" - "fmt" "net/http" ) @@ -13,74 +11,45 @@ type Ctx struct { Writer http.ResponseWriter Request *http.Request // request info - Path string + path string Method string // response info StatusCode int - Params map[string]string + params map[string]string index int handlers []HandlerFunc + locals map[string]any } func newContext(writer http.ResponseWriter, request *http.Request) *Ctx { return &Ctx{ - Writer: writer, - Request: request, - Path: request.URL.Path, - Method: request.Method, - index: -1, + Writer: writer, + Request: request, + path: request.URL.Path, + Method: request.Method, + index: -1, + locals: map[string]any{}, + handlers: make([]HandlerFunc, 0), } } -func (c *Ctx) Form(key string) string { - return c.Request.FormValue(key) -} - -func (c *Ctx) Query(key string) string { - return c.Request.URL.Query().Get(key) -} - -func (c *Ctx) Status(code int) { - c.StatusCode = code - c.Writer.WriteHeader(code) -} - -func (c *Ctx) SetHeader(key string, value string) { - c.Writer.Header().Set(key, value) -} - -func (c *Ctx) SendString(data string) error { - c.SetHeader("Content-Type", "text/plain") - _, err := c.Write([]byte(data)) - return err -} - -func (c *Ctx) Writef(format string, values ...interface{}) (int, error) { - c.SetHeader("Content-Type", "text/plain") - return c.Writer.Write([]byte(fmt.Sprintf(format, values...))) -} - -func (c *Ctx) JSON(data interface{}) error { - c.SetHeader("Content-Type", "application/json") - - encoder := json.NewEncoder(c.Writer) - - if err := encoder.Encode(data); err != nil { - return err +func (c *Ctx) Locals(key string, value ...any) any { + data := c.locals[key] + if len(value) > 0 { + c.locals[key] = value[0] } - return nil + return data } -func (c *Ctx) Write(data []byte) (int, error) { - return c.Writer.Write(data) -} +func (c *Ctx) Path(overWrite ...string) string { + path := c.Request.URL.Path + if len(overWrite) > 0 && overWrite[0] != "" { + c.Request.URL.Path = overWrite[0] + } -func (c *Ctx) HTML(html string) error { - c.SetHeader("Content-Type", "text/html") - _, err := c.Writer.Write([]byte(html)) - return err + return path } func (c *Ctx) Next() error { diff --git a/example/body/main.go b/example/body/main.go new file mode 100644 index 0000000..62e07ad --- /dev/null +++ b/example/body/main.go @@ -0,0 +1,37 @@ +package main + +import ( + "log" + "nf" +) + +func main() { + app := nf.New() + + app.Post("/data", func(c *nf.Ctx) error { + type Req struct { + Name string `json:"name"` + Age int `json:"age"` + } + + var ( + err error + req = new(Req) + rm = make(map[string]any) + ) + + if err = c.BodyParser(req); err != nil { + log.Print("err 1:", err) + return c.Status(500).SendString(err.Error()) + } + + if err = c.BodyParser(&rm); err != nil { + log.Print("err 2:", err) + return c.Status(500).SendString(err.Error()) + } + + return c.JSON(nf.Map{"rm": rm, "req": req}) + }) + + log.Fatal(app.Run(":19991")) +} diff --git a/example/simple/logger.go b/example/simple/logger.go new file mode 100644 index 0000000..804f028 --- /dev/null +++ b/example/simple/logger.go @@ -0,0 +1,32 @@ +package main + +import ( + "log" + "nf" + "time" +) + +func Logger() nf.HandlerFunc { + return func(c *nf.Ctx) error { + // Start timer + t := time.Now() + // Process request + err := c.Next() + // Calculate resolution time + log.Printf("[%d] %s in %v", c.StatusCode, c.Request.RequestURI, time.Since(t)) + + return err + } +} + +func NewRecovery() nf.HandlerFunc { + return func(c *nf.Ctx) error { + defer func() { + if err := recover(); err != nil { + log.Printf("[recovery] %v", err) + } + }() + + return c.Next() + } +} diff --git a/example/simple/main.go b/example/simple/main.go index e74dd94..700874f 100644 --- a/example/simple/main.go +++ b/example/simple/main.go @@ -20,6 +20,7 @@ func main() { }) v1 := app.Group("/v1") + v1.Use(NewRecovery()) v1.Get("/hello", func(c *nf.Ctx) error { return c.JSON(nf.Map{"version": "v1", "date": time.Now()}) }) @@ -27,11 +28,21 @@ func main() { v1.Get( "/name", func(c *nf.Ctx) error { - c.Params["name"] = "zyp" + c.Locals("name", "zyp") + panic("name") return c.Next() }, func(c *nf.Ctx) error { - return c.SendString(fmt.Sprintf("hi, %s", c.Params["name"])) + return c.SendString(fmt.Sprintf("hi, %s", c.Locals("name1"))) + }, + ) + + v2 := v1.Group("/v2") + v2.Use(Logger()) + v2.Get( + "/name", + func(c *nf.Ctx) error { + return c.SendString("hi, loveuer") }, ) diff --git a/go.mod b/go.mod index 1ae6e70..70ac223 100644 --- a/go.mod +++ b/go.mod @@ -3,21 +3,42 @@ module nf go 1.20 require ( + github.com/gin-gonic/gin v1.9.1 github.com/gofiber/fiber/v2 v2.52.0 - github.com/sirupsen/logrus v1.9.3 ) require ( github.com/andybalholm/brotli v1.0.5 // indirect + github.com/bytedance/sonic v1.9.1 // indirect + github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect + github.com/gabriel-vasile/mimetype v1.4.2 // indirect + github.com/gin-contrib/sse v0.1.0 // indirect + github.com/go-playground/locales v0.14.1 // indirect + github.com/go-playground/universal-translator v0.18.1 // indirect + github.com/go-playground/validator/v10 v10.14.0 // indirect + github.com/goccy/go-json v0.10.2 // indirect github.com/google/uuid v1.5.0 // indirect + github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.0 // indirect + github.com/klauspost/cpuid/v2 v2.2.4 // indirect + github.com/leodido/go-urn v1.2.4 // 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/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/pelletier/go-toml/v2 v2.0.8 // indirect github.com/rivo/uniseg v0.2.0 // indirect - github.com/stretchr/testify v1.8.3 // indirect + github.com/twitchyliquid64/golang-asm v0.15.1 // indirect + github.com/ugorji/go/codec v1.2.11 // 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/arch v0.3.0 // indirect + golang.org/x/crypto v0.14.0 // indirect + golang.org/x/net v0.17.0 // indirect golang.org/x/sys v0.15.0 // indirect + golang.org/x/text v0.13.0 // indirect + google.golang.org/protobuf v1.30.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index c4aa757..193fde5 100644 --- a/go.sum +++ b/go.sum @@ -1,14 +1,46 @@ github.com/andybalholm/brotli v1.0.5 h1:8uQZIdzKmjc/iuPu7O2ioW48L81FgatrcpfFmiq/cCs= github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= +github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM= +github.com/bytedance/sonic v1.9.1 h1:6iJ6NqdoxCDr6mbY8h18oSO+cShGSMRGCEo7F2h0x8s= +github.com/bytedance/sonic v1.9.1/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U= +github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY= +github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 h1:qSGYFH7+jGhDF8vLC+iwCD4WpbV1EBDSzWkJODFLams= +github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU= +github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA= +github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= +github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= +github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg= +github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU= +github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= +github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= +github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= +github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= +github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= +github.com/go-playground/validator/v10 v10.14.0 h1:vgvQWe3XCz3gIeFDm/HnTIbj6UGmg/+t63MyGU2n5js= +github.com/go-playground/validator/v10 v10.14.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU= +github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= +github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= github.com/gofiber/fiber/v2 v2.52.0 h1:S+qXi7y+/Pgvqq4DrSmREGiFwtB7Bu6+QFLuIHYw/UE= github.com/gofiber/fiber/v2 v2.52.0/go.mod h1:KEOE+cXMhXG0zHc9d8+E38hoX+ZN7bhOtgeF2oT6jrQ= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= 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/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= +github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/klauspost/compress v1.17.0 h1:Rnbp4K9EjcDuVuHtd0dgA4qNuv9yKDYKK1ulpJwgrqM= github.com/klauspost/compress v1.17.0/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= +github.com/klauspost/cpuid/v2 v2.2.4 h1:acbojRNwl3o09bUq+yDCtZFc1aiwaAAxtcn8YkZXnvk= +github.com/klauspost/cpuid/v2 v2.2.4/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY= +github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q= +github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4= 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= @@ -16,27 +48,60 @@ github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWE 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/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= +github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/pelletier/go-toml/v2 v2.0.8 h1:0ctb6s9mE31h0/lhu+J6OPmVeDxJn+kYnJc2jZR9tGQ= +github.com/pelletier/go-toml/v2 v2.0.8/go.mod h1:vuYfssBdrU2XDZ9bYydBu6t+6a6PYNcZljzZR9VXg+4= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= -github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= -github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= +github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= +github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU= +github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= 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-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= +golang.org/x/arch v0.3.0 h1:02VY4/ZcO/gBOH6PUaoiptASxtXU10jazRCP865E97k= +golang.org/x/arch v0.3.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= +golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= +golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= +golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= +golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= +golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= 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= +golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= +golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= +google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= diff --git a/group.go b/group.go index 774f75c..909d33b 100644 --- a/group.go +++ b/group.go @@ -27,7 +27,7 @@ func (group *RouterGroup) Group(prefix string) *RouterGroup { func (group *RouterGroup) addRoute(method string, comp string, handlers ...HandlerFunc) { pattern := group.prefix + comp - log.Printf("Route %4s - %s", method, pattern) + log.Printf("Add Route %4s - %s", method, pattern) group.app.router.addRoute(method, pattern, handlers...) } @@ -38,3 +38,23 @@ func (group *RouterGroup) Get(pattern string, handlers ...HandlerFunc) { func (group *RouterGroup) Post(pattern string, handlers ...HandlerFunc) { group.addRoute(http.MethodPost, pattern, handlers...) } + +func (group *RouterGroup) Put(pattern string, handlers ...HandlerFunc) { + group.addRoute(http.MethodPut, pattern, handlers...) +} + +func (group *RouterGroup) Delete(pattern string, handlers ...HandlerFunc) { + group.addRoute(http.MethodDelete, pattern, handlers...) +} + +func (group *RouterGroup) Patch(pattern string, handlers ...HandlerFunc) { + group.addRoute(http.MethodPatch, pattern, handlers...) +} + +func (group *RouterGroup) Head(pattern string, handlers ...HandlerFunc) { + group.addRoute(http.MethodHead, pattern, handlers...) +} + +func (group *RouterGroup) Use(middlewares ...HandlerFunc) { + group.middlewares = append(group.middlewares, middlewares...) +} diff --git a/handler.go b/handler.go index e85abcb..64f3a2a 100644 --- a/handler.go +++ b/handler.go @@ -1,5 +1,3 @@ package nf type HandlerFunc func(*Ctx) error - -type HandlerFuncs []HandlerFunc diff --git a/req.go b/req.go new file mode 100644 index 0000000..89f813c --- /dev/null +++ b/req.go @@ -0,0 +1,45 @@ +package nf + +import ( + "bytes" + "encoding/json" + "errors" + "io" + "log" + "strings" +) + +func (c *Ctx) Form(key string) string { + return c.Request.FormValue(key) +} + +func (c *Ctx) Query(key string) string { + return c.Request.URL.Query().Get(key) +} + +func (c *Ctx) BodyParser(out interface{}) error { + + ctype := strings.ToLower(c.Request.Header.Get("Content-Type")) + + log.Printf("BodyParser: Content-Type=%s", ctype) + + ctype = parseVendorSpecificContentType(ctype) + + ctypeEnd := strings.IndexByte(ctype, ';') + if ctypeEnd != -1 { + ctype = ctype[:ctypeEnd] + } + + if strings.HasSuffix(ctype, "json") { + bs, err := io.ReadAll(c.Request.Body) + if err != nil { + return err + } + + c.Request.Body = io.NopCloser(bytes.NewReader(bs)) + + return json.Unmarshal(bs, out) + } + + return errors.New("422 Unprocessable Content") +} diff --git a/resp.go b/resp.go new file mode 100644 index 0000000..7c9a03a --- /dev/null +++ b/resp.go @@ -0,0 +1,49 @@ +package nf + +import ( + "encoding/json" + "fmt" +) + +func (c *Ctx) Status(code int) *Ctx { + c.StatusCode = code + c.Writer.WriteHeader(code) + return c +} + +func (c *Ctx) SetHeader(key string, value string) { + c.Writer.Header().Set(key, value) +} + +func (c *Ctx) SendString(data string) error { + c.SetHeader("Content-Type", "text/plain") + _, err := c.Write([]byte(data)) + return err +} + +func (c *Ctx) Writef(format string, values ...interface{}) (int, error) { + c.SetHeader("Content-Type", "text/plain") + return c.Writer.Write([]byte(fmt.Sprintf(format, values...))) +} + +func (c *Ctx) JSON(data interface{}) error { + c.SetHeader("Content-Type", "application/json") + + encoder := json.NewEncoder(c.Writer) + + if err := encoder.Encode(data); err != nil { + return err + } + + return nil +} + +func (c *Ctx) Write(data []byte) (int, error) { + return c.Writer.Write(data) +} + +func (c *Ctx) HTML(html string) error { + c.SetHeader("Content-Type", "text/html") + _, err := c.Writer.Write([]byte(html)) + return err +} diff --git a/router.go b/router.go index fd7e924..b9718bb 100644 --- a/router.go +++ b/router.go @@ -81,13 +81,13 @@ func (r *router) getRoutes(method string) []*_node { } func (r *router) handle(c *Ctx) error { - node, params := r.getRoute(c.Method, c.Path) + node, params := r.getRoute(c.Method, c.path) if node != nil { - c.Params = params + c.params = params key := c.Method + "-" + node.pattern c.handlers = append(c.handlers, r.handlers[key]...) } else { - _, err := c.Writef("404 NOT FOUND: %s\n", c.Path) + _, err := c.Writef("404 NOT FOUND: %s\n", c.path) return err } diff --git a/tree.go b/tree.go index f350e1c..49aaa85 100644 --- a/tree.go +++ b/tree.go @@ -1,7 +1,6 @@ package nf import ( - "fmt" "strings" ) @@ -12,10 +11,6 @@ type _node struct { isWild bool } -func (n *_node) String() string { - return fmt.Sprintf("_node{pattern=%s, part=%s, isWild=%t}", n.pattern, n.part, n.isWild) -} - func (n *_node) insert(pattern string, parts []string, height int) { if len(parts) == height { n.pattern = pattern diff --git a/util.go b/util.go new file mode 100644 index 0000000..7182a58 --- /dev/null +++ b/util.go @@ -0,0 +1,46 @@ +package nf + +import ( + "fmt" + "strings" +) + +func verifyHandlers(path string, handlers ...HandlerFunc) { + if len(handlers) == 0 { + panic(fmt.Sprintf("missing handler in route: %s", path)) + } + + for _, handler := range handlers { + if handler == nil { + panic(fmt.Sprintf("nil handler found in route: %s", path)) + } + } +} + +// parseVendorSpecificContentType check if content type is vendor specific and +// if it is parsable to any known types. If it's not vendor specific then returns +// the original content type. +func parseVendorSpecificContentType(cType string) string { + plusIndex := strings.Index(cType, "+") + + if plusIndex == -1 { + return cType + } + + var parsableType string + if semiColonIndex := strings.Index(cType, ";"); semiColonIndex == -1 { + parsableType = cType[plusIndex+1:] + } else if plusIndex < semiColonIndex { + parsableType = cType[plusIndex+1 : semiColonIndex] + } else { + return cType[:semiColonIndex] + } + + slashIndex := strings.Index(cType, "/") + + if slashIndex == -1 { + return cType + } + + return cType[0:slashIndex+1] + parsableType +} diff --git a/xtest/main.go b/xtest/main.go index 47e62f1..9f0c143 100644 --- a/xtest/main.go +++ b/xtest/main.go @@ -1,16 +1,59 @@ package main import ( + "github.com/gin-gonic/gin" "github.com/gofiber/fiber/v2" "github.com/gofiber/fiber/v2/middleware/logger" "log" ) func main() { + go ft() + go gint() + + select {} +} + +func ft() { app := fiber.New() app.Use(logger.New()) - app.Get("/hello", nil) + app.Get("/hello", func(ctx *fiber.Ctx) error { + return ctx.BodyParser(nil) + }) log.Fatal(app.Listen(":9989")) } + +func gint() { + app := gin.Default() + + app.POST("/data", func(c *gin.Context) { + type Req struct { + Name string `json:"name"` + Age int `json:"age"` + } + + var ( + err error + req = new(Req) + rm = make(map[string]any) + ) + + if err = c.Bind(req); err != nil { + log.Print("err 1:", err) + c.String(500, err.Error()) + return + } + + if err = c.Bind(&rm); err != nil { + log.Print("err 2:", err) + c.String(500, err.Error()) + return + } + + c.JSON(200, gin.H{"rm": rm, "req": req}) + }) + + log.Fatal(app.Run(":9998")) +}