fix: middleware not work

ctx.go

@@ -5,7 +5,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"log"
 	"mime/multipart"
 	"net"
 	"net/http"
@@ -62,16 +61,33 @@ func (c *Ctx) Path(overWrite ...string) string {
 	return path
 }
 
-func (c *Ctx) Next() error {
-	c.index++
-	s := len(c.handlers)
-	for ; c.index < s; c.index++ {
-		if err := c.handlers[c.index](c); err != nil {
-			return err
-		}
+func (c *Ctx) Cookies(key string, defaultValue ...string) string {
+	var (
+		dv = ""
+	)
+
+	if len(defaultValue) > 0 {
+		dv = defaultValue[0]
 	}
 
-	return nil
+	cookie, err := c.Request.Cookie(key)
+	if err != nil || cookie.Value == "" {
+		return dv
+	}
+
+	return cookie.Value
+}
+
+func (c *Ctx) Next() error {
+	c.index++
+
+	var err error
+
+	if c.index < len(c.handlers) {
+		err = c.handlers[c.index](c)
+	}
+
+	return err
 }
 
 /* ===============================================================
@@ -127,8 +143,6 @@ 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, ';')
@@ -139,9 +153,9 @@ func (c *Ctx) BodyParser(out interface{}) error {
 	if strings.HasSuffix(ctype, "json") {
 		bs, err := io.ReadAll(c.Request.Body)
 		if err != nil {
-			log.Printf("BodyParser: read all err=%v", err)
 			return err
 		}
+		_ = c.Request.Body.Close()
 
 		c.Request.Body = io.NopCloser(bytes.NewReader(bs))
 

nf.go

@@ -53,7 +53,7 @@ func New(config ...Config) *App {
 		app.config = defaultConfig
 	}
 
-	app.RouterGroup = &RouterGroup{app: app}
+	app.RouterGroup = &RouterGroup{app: app, prefix: ""}
 	app.groups = []*RouterGroup{app.RouterGroup}
 
 	if !app.config.DisableLogger {

router.go

@@ -48,7 +48,7 @@ func (r *router) getRoute(method string, path string) (*_node, map[string]string
 	root, ok := r.roots[method]
 
 	if !ok {
-		return nil, nil
+		return &_node{}, nil
 	}
 
 	n := root.search(searchParts, 0)
@@ -64,10 +64,11 @@ func (r *router) getRoute(method string, path string) (*_node, map[string]string
 				break
 			}
 		}
+
 		return n, params
 	}
 
-	return nil, nil
+	return root, nil
 }
 
 func (r *router) getRoutes(method string) []*_node {
@@ -90,6 +91,7 @@ func (r *router) handle(c *Ctx) error {
 		c.params = params
 		key := c.Method + "-" + node.pattern
 		c.handlers = append(c.handlers, r.handlers[key]...)
+		//c.handlers = append(r.handlers[key], c.handlers...)
 	} else {
 		return c.app.config.NotFoundHandler(c)
 	}

xtest/basic/basic.http

@@ -4,3 +4,11 @@ GET http://127.0.0.1/hello/nf
 
 ### test resp error
 GET http://127.0.0.1/error
+
+### test basic post
+POST http://127.0.0.1/data
+Content-Type: application/json
+
+{
+  "name": "nice"
+}

xtest/basic/main.go

@@ -5,7 +5,6 @@ import (
 	"github.com/loveuer/nf"
 	"github.com/loveuer/nf/nft/resp"
 	"log"
-	"net"
 	"time"
 )
 
@@ -25,7 +24,27 @@ func main() {
 	app.Get("/error", func(c *nf.Ctx) error {
 		return resp.RespError(c, resp.NewError(404, "not found", errors.New("NNNot Found"), nil))
 	})
+	app.Post("/data", func(c *nf.Ctx) error {
+		type Req struct {
+			Name string `json:"name"`
+		}
 
-	ln, _ := net.Listen("tcp", ":80")
-	log.Fatal(app.RunListener(ln))
+		var (
+			err error
+			req = new(Req)
+			rm  = make(map[string]any)
+		)
+
+		if err = c.BodyParser(req); err != nil {
+			return c.JSON(nf.Map{"status": 400, "msg": err.Error()})
+		}
+
+		if err = c.BodyParser(&rm); err != nil {
+			return c.JSON(nf.Map{"status": 400, "msg": err.Error()})
+		}
+
+		return c.JSON(nf.Map{"status": 200, "data": req, "map": rm})
+	})
+
+	log.Fatal(app.Run(":80"))
 }

xtest/midd/main.go

@@ -0,0 +1,30 @@
+package main
+
+import (
+	"github.com/loveuer/nf"
+	"log"
+)
+
+func main() {
+	app := nf.New(nf.Config{DisableLogger: false})
+
+	app.Get("/hello", func(c *nf.Ctx) error {
+		return c.SendString("world")
+	})
+	app.Get("/panic", func(c *nf.Ctx) error {
+		panic("panic")
+	})
+	app.Use(ml())
+
+	log.Fatal(app.Run(":7777"))
+}
+
+func ml() nf.HandlerFunc {
+	return func(c *nf.Ctx) error {
+		log.Printf("[ML] [%s] - [%s]", c.Method, c.Path())
+		index := []byte(`<h1>my not found</h1>`)
+		c.Set("Content-Type", "text/html")
+		_, err := c.Write(index)
+		return err
+	}
+}

xtest/multihandler/main.go

@@ -0,0 +1,27 @@
+package main
+
+import (
+	"github.com/loveuer/nf"
+	"log"
+)
+
+func main() {
+	app := nf.New()
+
+	app.Get("/nice", h1, h2)
+
+	log.Fatal(app.Run(":3333"))
+}
+
+func h1(c *nf.Ctx) error {
+	you := c.Query("to")
+	if you == "you" {
+		return c.JSON(nf.Map{"status": 201, "msg": "nice to meet you"})
+	}
+
+	return c.Next()
+}
+
+func h2(c *nf.Ctx) error {
+	return c.JSON(nf.Map{"status": 200, "msg": "hello world"})
+}

xtest/multihandler/req.http

@@ -0,0 +1,5 @@
+### test multi handlers no next
+GET http://127.0.0.1:3333/nice?to=you
+
+### test multi handlers do next
+GET http://127.0.0.1:3333/nice?to=nf