Skip to content

Commit

Permalink
Merge eab5cea into fe77dd0
Browse files Browse the repository at this point in the history
  • Loading branch information
@sunnanping
sunnanping committed Jun 9, 2021
2 parents fe77dd0 + eab5cea commit 8cd98f1
Show file tree
Hide file tree
Showing 2 changed files with 104 additions and 66 deletions.
111 changes: 73 additions & 38 deletions router.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,21 @@ import (
"net/http"
"strings"
"sync"

"fmt"
"io"
"os"
"reflect"
"runtime"
)

// Handle is a function that can be registered to a route to handle HTTP
// requests. Like http.HandlerFunc, but has a third parameter for the values of
// wildcards (path variables).
type Handle func(http.ResponseWriter, *http.Request, Params)

var DefaultWriter io.Writer = os.Stdout

// Param is a single URL parameter, consisting of a key and a value.
type Param struct {
Key string
Expand Down Expand Up @@ -231,54 +239,61 @@ func (r *Router) putParams(ps *Params) {
}
}

func (r *Router) saveMatchedRoutePath(path string, handle Handle) Handle {
return func(w http.ResponseWriter, req *http.Request, ps Params) {
if ps == nil {
psp := r.getParams()
ps = (*psp)[0:1]
ps[0] = Param{Key: MatchedRoutePathParam, Value: path}
handle(w, req, ps)
r.putParams(psp)
} else {
ps = append(ps, Param{Key: MatchedRoutePathParam, Value: path})
handle(w, req, ps)
// If enabled, adds the matched route path onto the http.Request context
// before invoking the handler.
// The matched route path is only added to handlers of routes that were
// registered when this option was enabled.
func (r *Router) saveMatchedRoutePath(path string, handles ...Handle) HandlersChain {
for i, handle := range handles {
handles[i] = func(w http.ResponseWriter, req *http.Request, ps Params) {
if ps == nil {
psp := r.getParams()
ps = (*psp)[0:1]
ps[0] = Param{Key: MatchedRoutePathParam, Value: path}
handle(w, req, ps)
r.putParams(psp)
} else {
ps = append(ps, Param{Key: MatchedRoutePathParam, Value: path})
handle(w, req, ps)
}
}
}
return handles;
}

// GET is a shortcut for router.Handle(http.MethodGet, path, handle)
func (r *Router) GET(path string, handle Handle) {
r.Handle(http.MethodGet, path, handle)
func (r *Router) GET(path string, handle ...Handle) {
r.Handle(http.MethodGet, path, handle...)
}

// HEAD is a shortcut for router.Handle(http.MethodHead, path, handle)
func (r *Router) HEAD(path string, handle Handle) {
r.Handle(http.MethodHead, path, handle)
func (r *Router) HEAD(path string, handle ...Handle) {
r.Handle(http.MethodHead, path, handle...)
}

// OPTIONS is a shortcut for router.Handle(http.MethodOptions, path, handle)
func (r *Router) OPTIONS(path string, handle Handle) {
r.Handle(http.MethodOptions, path, handle)
func (r *Router) OPTIONS(path string, handle ...Handle) {
r.Handle(http.MethodOptions, path, handle...)
}

// POST is a shortcut for router.Handle(http.MethodPost, path, handle)
func (r *Router) POST(path string, handle Handle) {
r.Handle(http.MethodPost, path, handle)
func (r *Router) POST(path string, handle ...Handle) {
r.Handle(http.MethodPost, path, handle...)
}

// PUT is a shortcut for router.Handle(http.MethodPut, path, handle)
func (r *Router) PUT(path string, handle Handle) {
r.Handle(http.MethodPut, path, handle)
func (r *Router) PUT(path string, handle ...Handle) {
r.Handle(http.MethodPut, path, handle...)
}

// PATCH is a shortcut for router.Handle(http.MethodPatch, path, handle)
func (r *Router) PATCH(path string, handle Handle) {
r.Handle(http.MethodPatch, path, handle)
func (r *Router) PATCH(path string, handle ...Handle) {
r.Handle(http.MethodPatch, path, handle...)
}

// DELETE is a shortcut for router.Handle(http.MethodDelete, path, handle)
func (r *Router) DELETE(path string, handle Handle) {
r.Handle(http.MethodDelete, path, handle)
func (r *Router) DELETE(path string, handle ...Handle) {
r.Handle(http.MethodDelete, path, handle...)
}

// Handle registers a new request handle with the given path and method.
Expand All @@ -289,7 +304,7 @@ func (r *Router) DELETE(path string, handle Handle) {
// This function is intended for bulk loading and to allow the usage of less
// frequently used, non-standardized or custom methods (e.g. for internal
// communication with a proxy).
func (r *Router) Handle(method, path string, handle Handle) {
func (r *Router) Handle(method, path string, handles ...Handle) {
varsCount := uint16(0)

if method == "" {
Expand All @@ -298,18 +313,28 @@ func (r *Router) Handle(method, path string, handle Handle) {
if len(path) < 1 || path[0] != '/' {
panic("path must begin with '/' in path '" + path + "'")
}
if handle == nil {
if handles == nil {
panic("handle must not be nil")
}

if r.SaveMatchedRoutePath {
varsCount++
handle = r.saveMatchedRoutePath(path, handle)
handles = r.saveMatchedRoutePath(path, handles...)
}

if r.trees == nil {
r.trees = make(map[string]*node)
}
//log handles
handleNames := ""
for _, handle := range handles {
if len(handleNames) > 0 {
handleNames = handleNames + "," + runtime.FuncForPC(reflect.ValueOf(handle).Pointer()).Name()
}else{
handleNames = runtime.FuncForPC(reflect.ValueOf(handle).Pointer()).Name()
}
}
fmt.Fprintf(DefaultWriter, "[router-debug] %-6s %-40s --> [%s] (%d handlers)\n", method, path,handleNames,len(handles) )

root := r.trees[method]
if root == nil {
Expand All @@ -319,7 +344,7 @@ func (r *Router) Handle(method, path string, handle Handle) {
r.globalAllowed = r.allowed("*", "")
}

root.addRoute(path, handle)
root.addRoute(path, handles)

// Update maxParams
if paramsCount := countParams(path); paramsCount+varsCount > r.maxParams {
Expand Down Expand Up @@ -391,17 +416,17 @@ func (r *Router) recv(w http.ResponseWriter, req *http.Request) {
// If the path was found, it returns the handle function and the path parameter
// values. Otherwise the third return value indicates whether a redirection to
// the same path with an extra / without the trailing slash should be performed.
func (r *Router) Lookup(method, path string) (Handle, Params, bool) {
func (r *Router) Lookup(method, path string) (HandlersChain, Params, bool) {
if root := r.trees[method]; root != nil {
handle, ps, tsr := root.getValue(path, r.getParams)
if handle == nil {
handles, ps, tsr := root.getValue(path, r.getParams)
if handles == nil {
r.putParams(ps)
return nil, nil, tsr
}
if ps == nil {
return handle, nil, tsr
return handles, nil, tsr
}
return handle, *ps, tsr
return handles, *ps, tsr
}
return nil, nil, false
}
Expand Down Expand Up @@ -464,14 +489,24 @@ func (r *Router) ServeHTTP(w http.ResponseWriter, req *http.Request) {
}

path := req.URL.Path
//log RequestURI
reqLog := fmt.Sprintf("[http-router] %-6s req.uri=%-12s", req.Method,req.RequestURI)

if root := r.trees[req.Method]; root != nil {
if handle, ps, tsr := root.getValue(path, r.getParams); handle != nil {
if handles, ps, tsr := root.getValue(path, r.getParams); handles != nil {
if ps != nil {
handle(w, req, *ps)
r.putParams(ps)
for _,handle := range handles {
//log handler.name
fmt.Fprintf(DefaultWriter, reqLog+",req.handle=%-40s\n", runtime.FuncForPC(reflect.ValueOf(handle).Pointer()).Name())
handle(w, req, *ps)
r.putParams(ps)
}
} else {
handle(w, req, nil)
for _,handle := range handles {
//log handler.name
fmt.Fprintf(DefaultWriter, reqLog+",req.handle=%-40s\n", runtime.FuncForPC(reflect.ValueOf(handle).Pointer()).Name())
handle(w, req, nil)
}
}
return
} else if req.Method != http.MethodConnect && path != "/" {
Expand Down

0 comments on commit 8cd98f1

Please sign in to comment.