Add TransportGetter & HandlerGetter interface

Author: andot

Diff for: rpc/client.go

@@ -6,7 +6,7 @@
 |                                                          |
 | rpc/client.go                                            |
 |                                                          |
-| LastModified: May 12, 2021                               |
+| LastModified: May 17, 2021                               |
 | Author: Ma Bingyao <[email protected]>                    |
 |                                                          |
 \*________________________________________________________*/
@@ -31,22 +31,25 @@ func init() {
 }
 
 // Client for RPC.
-type Client = core.Client
+type (
+	Client          = core.Client
+	TransportGetter = core.TransportGetter
+)
 
 var NewClient = core.NewClient
 
-func HTTPTransport(c *Client) *http.Transport {
-	return c.GetTransport("http").(*http.Transport)
+func HTTPTransport(t TransportGetter) *http.Transport {
+	return t.GetTransport("http").(*http.Transport)
 }
 
-func SocketTransport(c *Client) *socket.Transport {
-	return c.GetTransport("socket").(*socket.Transport)
+func SocketTransport(t TransportGetter) *socket.Transport {
+	return t.GetTransport("socket").(*socket.Transport)
 }
 
-func UDPTransport(c *Client) *udp.Transport {
-	return c.GetTransport("udp").(*udp.Transport)
+func UDPTransport(t TransportGetter) *udp.Transport {
+	return t.GetTransport("udp").(*udp.Transport)
 }
 
-func WebSocketTransport(c *Client) *websocket.Transport {
-	return c.GetTransport("websocket").(*websocket.Transport)
+func WebSocketTransport(t TransportGetter) *websocket.Transport {
+	return t.GetTransport("websocket").(*websocket.Transport)
 }

Diff for: rpc/core/client.go

@@ -6,7 +6,7 @@
 |                                                          |
 | rpc/core/client.go                                       |
 |                                                          |
-| LastModified: May 8, 2021                                |
+| LastModified: May 17, 2021                               |
 | Author: Ma Bingyao <[email protected]>                    |
 |                                                          |
 \*________________________________________________________*/
@@ -47,6 +47,10 @@ func RegisterTransport(name string, transportFactory TransportFactory) {
 	}
 }
 
+type TransportGetter interface {
+	GetTransport(name string) Transport
+}
+
 // Client for RPC.
 type Client struct {
 	Codec          ClientCodec

Diff for: rpc/core/service.go

@@ -6,7 +6,7 @@
 |                                                          |
 | rpc/core/service.go                                      |
 |                                                          |
-| LastModified: May 4, 2021                                |
+| LastModified: May 17, 2021                               |
 | Author: Ma Bingyao <[email protected]>                    |
 |                                                          |
 \*________________________________________________________*/
@@ -48,6 +48,10 @@ func RegisterHandler(name string, handlerFactory HandlerFactory) {
 	}
 }
 
+type HandlerGetter interface {
+	GetHandler(name string) Handler
+}
+
 // Service for RPC.
 type Service struct {
 	Codec            ServiceCodec

Diff for: rpc/rpc_test.go

@@ -481,8 +481,8 @@ func TestHTTP(t *testing.T) {
 	httpHandler.SetClientAccessPolicyXMLContent([]byte(clientAccessPolicyXMLContent))
 	service.AddFunction(func(ctx context.Context, name string) string {
 		serviceContext := rpc.GetServiceContext(ctx)
-		header, _ := serviceContext.Items().Get("httpRequestHeaders")
-		return header.(http.Header).Get("test") + ":hello " + name
+		header := serviceContext.Items().GetInterface("httpRequestHeaders").(http.Header)
+		return header.Get("test") + ":hello " + name
 	}, "hello")
 	assert.True(t, service.Get("hello").PassContext())
 	serverMux := http.NewServeMux()
@@ -770,7 +770,12 @@ func TestPush(t *testing.T) {
 	assert.NoError(t, err)
 	err = service.Bind(server)
 	assert.NoError(t, err)
-
+	service.AddFunction(func(ctx context.Context, name string) string {
+		serviceContext := rpc.GetServiceContext(ctx)
+		producer := serviceContext.Items().GetInterface("producer").(push.Producer)
+		producer.Push("ooxx", "test")
+		return "hello " + name
+	}, "hello")
 	time.Sleep(time.Millisecond * 5)
 
 	client1 := rpc.NewClient("tcp://127.0.0.1/")
@@ -792,6 +797,7 @@ func TestPush(t *testing.T) {
 		fmt.Println(message)
 	})
 	time.Sleep(time.Millisecond * 100)
+	client1.Invoke("hello", []interface{}{"world"})
 	var wg sync.WaitGroup
 	n := 1000
 	wg.Add(n)

Diff for: rpc/service.go

@@ -6,7 +6,7 @@
 |                                                          |
 | rpc/service.go                                           |
 |                                                          |
-| LastModified: May 12, 2021                               |
+| LastModified: May 17, 2021                               |
 | Author: Ma Bingyao <[email protected]>                    |
 |                                                          |
 \*________________________________________________________*/
@@ -30,22 +30,25 @@ func init() {
 }
 
 // Service for RPC.
-type Service = core.Service
+type (
+	Service       = core.Service
+	HandlerGetter = core.HandlerGetter
+)
 
 var NewService = core.NewService
 
-func HTTPHandler(s *Service) *http.Handler {
-	return &s.GetHandler("websocket").(*websocket.Handler).Handler
+func HTTPHandler(h HandlerGetter) *http.Handler {
+	return &h.GetHandler("websocket").(*websocket.Handler).Handler
 }
 
-func SocketHandler(s *Service) *socket.Handler {
-	return s.GetHandler("socket").(*socket.Handler)
+func SocketHandler(h HandlerGetter) *socket.Handler {
+	return h.GetHandler("socket").(*socket.Handler)
 }
 
-func UDPHandler(s *Service) *udp.Handler {
-	return s.GetHandler("udp").(*udp.Handler)
+func UDPHandler(h HandlerGetter) *udp.Handler {
+	return h.GetHandler("udp").(*udp.Handler)
 }
 
-func WebSocketHandler(s *Service) *websocket.Handler {
-	return s.GetHandler("websocket").(*websocket.Handler)
+func WebSocketHandler(h HandlerGetter) *websocket.Handler {
+	return h.GetHandler("websocket").(*websocket.Handler)
 }