stop: use graceful shutdown for 5s

framework/context.go

@@ -19,7 +19,7 @@ type Context struct {
 	// current handler index
 	index int
 
-	params map[string]any
+	params map[string]string
 
 	hasTimeout bool
 	writerMux  *sync.Mutex
@@ -117,4 +117,8 @@ func (ctx *Context) SetHandlers(handlers []ControllerHandler) {
 	ctx.handlers = handlers
 }
 
+func (ctx *Context) SetParams(params map[string]string) {
+	ctx.params = params
+}
+
 // }}}

framework/core.go

@@ -66,7 +66,7 @@ func (c *Core) Use(middlewares ...ControllerHandler) {
 }
 
 // FindRouteByRequest finds route using the request
-func (c *Core) FindRouteByRequest(r *http.Request) []ControllerHandler {
+func (c *Core) FindRouteByRequest(r *http.Request) *node {
 	upperMethod := strings.ToUpper(r.Method)
 
 	mapper, ok := c.router[upperMethod]
@@ -75,13 +75,13 @@ func (c *Core) FindRouteByRequest(r *http.Request) []ControllerHandler {
 		return nil
 	}
 
-	controllers := mapper.FindRoute(r.URL.Path)
+	node := mapper.FindRoute(r.URL.Path)
-	if controllers == nil {
+	if node == nil {
 		log.Printf("URI %q is not recognized\n", r.URL.Path)
 		return nil
 	}
 
-	return controllers
+	return node
 }
 
 func (c *Core) Group(prefix string) IGroup {
@@ -97,13 +97,16 @@ func (c *Core) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 
 	ctx := NewContext(w, r)
 
-	handlers := c.FindRouteByRequest(r)
+	node := c.FindRouteByRequest(r)
-	if handlers == nil {
+	if node == nil {
 		ctx.WriteJSON(http.StatusNotFound, "Request not found")
 		return
 	}
 
-	ctx.SetHandlers(handlers)
+	params := node.ParseParamsFromEndNode(r.URL.Path)
+
+	ctx.SetParams(params)
+	ctx.SetHandlers(node.handlers)
 
 	if err := ctx.Next(); err != nil {
 		ctx.WriteJSON(http.StatusInternalServerError, "Internal error")

framework/trie.go

@@ -14,11 +14,11 @@ func NewTrie() *Trie {
 	return &Trie{root: newNode("")}
 }
 
-func (t *Trie) FindRoute(uri string) []ControllerHandler {
+func (t *Trie) FindRoute(uri string) *node {
 	uri = strings.ToUpper(uri)
 	uri = strings.TrimPrefix(uri, "/")
 	if uri == "" {
-		return t.root.handlers
+		return t.root
 	}
 
 	found := t.root.findRoute(uri)
@@ -26,7 +26,7 @@ func (t *Trie) FindRoute(uri string) []ControllerHandler {
 		return nil
 	}
 
-	return found.handlers
+	return found
 }
 
 func (t *Trie) AddRouter(uri string, handlers []ControllerHandler) error {
@@ -58,6 +58,29 @@ type node struct {
 	segment  string
 	handlers []ControllerHandler
 	children []*node
+	parent   *node
+}
+
+func (n *node) ParseParamsFromEndNode(uri string) map[string]string {
+	ret := map[string]string{}
+	uri = strings.ToUpper(uri)
+	uri = strings.TrimPrefix(uri, "/")
+	if uri == "" {
+		// root
+		return ret
+	}
+	segments := strings.Split(uri, "/")
+	cnt := len(segments)
+	cur := n
+
+	for i := cnt - 1; i >= 0; i-- {
+		if isWildcard(cur.segment) {
+			// set params
+			ret[cur.segment[1:]] = segments[i]
+		}
+		cur = cur.parent
+	}
+	return ret
 }
 
 func newNode(segment string) *node {
@@ -138,6 +161,7 @@ func (n *node) addRoute(uri string, handlers []ControllerHandler) error {
 
 	// create a new node
 	new := newNode(splitted[0])
+	new.parent = n
 	if isLast {
 		// this is the end
 		new.handlers = append(new.handlers, handlers...)

handlers.go

@@ -58,6 +58,7 @@ func FooControllerHandler(ctx *framework.Context) error {
 }
 
 func UserLoginController(ctx *framework.Context) error {
+	time.Sleep(10 * time.Second)
 	ctx.WriteJSON(http.StatusOK, "ok")
 	return nil
 }
@@ -74,6 +75,7 @@ func SubjectUpdateController(ctx *framework.Context) error {
 
 func SubjectGetController(ctx *framework.Context) error {
 	ctx.WriteJSON(http.StatusAccepted, "got")
+	log.Println(ctx.ParamInt("ID", 0))
 	return nil
 }
 

main.go

@@ -1,8 +1,14 @@
 package main
 
 import (
+	"context"
+	"fmt"
 	"log"
 	"net/http"
+	"os"
+	"os/signal"
+	"syscall"
+	"time"
 
 	"git.vinchent.xyz/vinchent/go-web/framework"
 )
@@ -15,7 +21,22 @@ func main() {
 		Handler: core,
 	}
 
-	if err := server.ListenAndServe(); err != nil {
+	go func() {
-		log.Panic(err)
+		server.ListenAndServe()
+	}()
+
+	// create quit channel
+	quit := make(chan os.Signal, 1)
+
+	// set notifier
+	signal.Notify(quit, syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT)
+
+	<-quit
+	fmt.Println("YOLO")
+
+	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+	defer cancel()
+	if err := server.Shutdown(ctx); err != nil {
+		log.Fatal("server shutdown: ", err)
 	}
 }

routes.go

@@ -15,6 +15,7 @@ func registerRouter(core *framework.Core) {
 		subjectApi.Delete("/:id", SubjectDelController)
 		subjectApi.Put("/:id", SubjectUpdateController)
 		subjectApi.Get("/:id", SubjectGetController)
+		subjectApi.Get("/:id/test", SubjectGetController)
 		subjectApi.Get("/list/all", SubjectListController)
 	}
 }