拆分http的server,client

Author: c-wind

http_client/client.go http/client/client.gohttp_client/client.go renamed to http/client/client.go

@@ -1,4 +1,4 @@
-package httpClient
+package client
 
 import (
 	"bytes"

handler/common.go http/server/common.gohandler/common.go renamed to http/server/common.go

@@ -1,4 +1,4 @@
-package handler
+package server
 
 import (
 	"encoding/json"

handler/handler.go http/server/handler.gohandler/handler.go renamed to http/server/handler.go

@@ -1,7 +1,8 @@
-package handler
+package server
 
 import (
 	"fmt"
+	"net"
 	"net/http"
 	"reflect"
 	"runtime/debug"
@@ -13,19 +14,24 @@ import (
 )
 
 var (
-	//Server 默认服务
-	Server = newHTTPServer()
+	server = newHTTPServer()
 )
 
-type server struct {
+// iface 对外服务接口, path格式：Method/URI
+type iface struct {
+	path   string
+	source reflect.Type
+}
+
+type httpServer struct {
 	path   map[string]iface
 	prefix *btree.BTree
 	filter Filter
-	mu     sync.RWMutex
+	sync.RWMutex
 }
 
-func newHTTPServer() *server {
-	return &server{
+func newHTTPServer() *httpServer {
+	return &httpServer{
 		path:   make(map[string]iface),
 		prefix: btree.New(3),
 		filter: defaultFilter,
@@ -35,12 +41,6 @@ func newHTTPServer() *server {
 // Filter 请求过滤， 如果返回结果为nil,直接返回，不再进行后续处理.
 type Filter func(http.ResponseWriter, *http.Request) *http.Request
 
-// iface 对外服务接口, path格式：Method/URI
-type iface struct {
-	path   string
-	source reflect.Type
-}
-
 func (i *iface) Less(bi btree.Item) bool {
 	return strings.Compare(i.path, bi.(*iface).path) == 1
 }
@@ -64,7 +64,7 @@ func NameToPath(name string, depth int) string {
 
 //AddInterface 自动注册接口
 //只要struct实现了Get(),Post(),Delete(),Put()接口就可以自动注册
-func (s *server) AddInterface(obj interface{}, path string, isPrefix bool) error {
+func AddInterface(obj interface{}, path string, isPrefix bool) error {
 	rt := reflect.TypeOf(obj)
 	if rt.Kind() != reflect.Ptr {
 		return fmt.Errorf("need ptr")
@@ -78,13 +78,13 @@ func (s *server) AddInterface(obj interface{}, path string, isPrefix bool) error
 		path = "/" + path
 	}
 
-	s.mu.Lock()
-	defer s.mu.Unlock()
+	server.Lock()
+	defer server.Unlock()
 
 	rv := reflect.ValueOf(obj)
 	for i := 0; i < rv.NumMethod(); i++ {
 		method := rt.Method(i).Name
-        log.Debugf("rt:%v, %d, method:%v", rt, i, method)
+		log.Debugf("rt:%v, %d, method:%v", rt, i, method)
 		switch method {
 		case POST.String():
 		case GET.String():
@@ -102,57 +102,57 @@ func (s *server) AddInterface(obj interface{}, path string, isPrefix bool) error
 
 		//前缀匹配
 		if isPrefix {
-			if s.prefix.Has(&ifc) {
+			if server.prefix.Has(&ifc) {
 				panic(fmt.Sprintf("exist url:%v %v", method, path))
 			}
-			s.prefix.ReplaceOrInsert(&ifc)
-            log.Debugf("add prefix:%v", path)
+			server.prefix.ReplaceOrInsert(&ifc)
+			log.Debugf("add prefix:%v", path)
 			continue
 		}
 
 		//全路径匹配
-		if _, ok := s.path[ifc.path]; ok {
+		if _, ok := server.path[ifc.path]; ok {
 			panic(fmt.Sprintf("exist url:%v %v", method, path))
 		}
 
-		s.path[ifc.path] = ifc
+		server.path[ifc.path] = ifc
 	}
 
 	return nil
 }
 
 //AddFilter 添加过滤函数.
-func (s *server) AddFilter(filter Filter) {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	s.filter = filter
+func AddFilter(filter Filter) {
+	server.Lock()
+	defer server.Unlock()
+	server.filter = filter
 }
 
-func (s *server) iface(w http.ResponseWriter, r *http.Request) (i iface, ok bool) {
-	s.mu.RLock()
-	defer s.mu.RUnlock()
+func getInterface(w http.ResponseWriter, r *http.Request) (i iface, ok bool) {
+	server.RLock()
+	defer server.RUnlock()
 
 	path := r.Method + r.URL.Path
 
-	if i, ok = s.path[path]; ok {
+	if i, ok = server.path[path]; ok {
 		//log.Debugf("find path:%v", path)
 		return
 	}
 
 	//如果完全匹配没找到，再找前缀的
-	s.prefix.AscendGreaterOrEqual(&iface{path: path}, func(item btree.Item) bool {
+	server.prefix.AscendGreaterOrEqual(&iface{path: path}, func(item btree.Item) bool {
 		i = *(item.(*iface))
 		ok = strings.HasPrefix(path, i.path)
-       // log.Debugf("path:%v, ipath:%v, ok:%v", path, i.path, ok)
+		// log.Debugf("path:%v, ipath:%v, ok:%v", path, i.path, ok)
 		return !ok
 	})
 
-//	log.Debugf("find prefix:%v, ok:%v", path, ok)
+	//	log.Debugf("find prefix:%v, ok:%v", path, ok)
 	return
 }
 
 //ServeHTTP 真正对外服务接口
-func (s *server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+func (s *httpServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	defer func() {
 		if p := recover(); p != nil {
 			log.Errorf("panic:%v req:%v, stack:%s", p, r, debug.Stack())
@@ -167,7 +167,7 @@ func (s *server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	i, ok := s.iface(w, r)
+	i, ok := getInterface(w, r)
 	if !ok {
 		log.Errorf("%v %v %v not found.", r.RemoteAddr, r.Method, r.URL)
 		SendResponse(w, http.StatusNotFound, "invalid request")
@@ -176,7 +176,7 @@ func (s *server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 
 	log.Debugf("%v %v %v %v", r.RemoteAddr, r.Method, r.URL, i.path)
 
-    callback := reflect.New(i.source).MethodByName(r.Method).Interface().(func(http.ResponseWriter, *http.Request))
+	callback := reflect.New(i.source).MethodByName(r.Method).Interface().(func(http.ResponseWriter, *http.Request))
 	callback(w, nr)
 
 	return
@@ -185,3 +185,8 @@ func (s *server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 func defaultFilter(_ http.ResponseWriter, r *http.Request) *http.Request {
 	return r
 }
+
+//Start 启动httpServer.
+func Start(l net.Listener) error {
+	return http.Serve(l, server)
+}

handler/vars.go http/server/vars.gohandler/vars.go renamed to http/server/vars.go

@@ -1,4 +1,4 @@
-package handler
+package server
 
 import (
 	"encoding/json"

handler/vars_test.go http/server/vars_test.gohandler/vars_test.go renamed to http/server/vars_test.go

@@ -1,4 +1,4 @@
-package handler
+package server
 
 import (
 	"bytes"

main.go

@@ -6,22 +6,17 @@ import (
 	"net"
 	"net/http"
 
-	"github.com/dearcode/crab/handler"
+	"github.com/dearcode/crab/http/server"
 	_ "github.com/dearcode/crab/server"
 )
 
 type index struct {
-    r *http.Request
-}
-
-func test(r *http.Request) {
-  fmt.Printf("%v\n",    r.RemoteAddr)
+	r *http.Request
 }
 
 func (i *index) GET(w http.ResponseWriter, req *http.Request) {
-	fmt.Printf("index:%p\n", i)
-    test(req)
-	w.Write([]byte("ok"))
+	i.r = req
+	w.Write([]byte(fmt.Sprintf("client:%v addr:%p", i.r.RemoteAddr, i)))
 }
 
 func main() {
@@ -33,9 +28,8 @@ func main() {
 		panic(err.Error())
 	}
 
-	handler.Server.AddInterface(&index{}, "/index", false)
-
-	if err = http.Serve(ln, handler.Server); err != nil {
+	server.AddInterface(&index{}, "/index", false)
+	if err = server.Start(ln); err != nil {
 		panic(err.Error())
 	}
 }

server/init.go

@@ -1,14 +1,14 @@
 package server
 
 import (
-	"github.com/dearcode/crab/handler"
+	"github.com/dearcode/crab/http/server"
 )
 
 func init() {
-	handler.Server.AddInterface(&staticServer{}, "/", true)
-	handler.Server.AddInterface(&debugServer{}, "/debug/", true)
+	server.AddInterface(&staticServer{}, "/", true)
+	server.AddInterface(&debugServer{}, "/debug/", true)
 
-	handler.Server.AddInterface(&testServer{}, "/test/", false)
+	server.AddInterface(&testServer{}, "/test/", false)
 
-	handler.Server.AddInterface(&user{}, "", false)
+	server.AddInterface(&user{}, "", false)
 }