ing

servlet/rpc-servlet.go

@@ -5,11 +5,11 @@ import (
 
 	"git.loafle.net/commons/logging-go"
 	crp "git.loafle.net/commons/rpc-go/protocol"
-	crpj "git.loafle.net/commons/rpc-go/protocol/json"
 	crr "git.loafle.net/commons/rpc-go/registry"
 	"git.loafle.net/commons/server-go"
 	css "git.loafle.net/commons/server-go/socket"
 	cssn "git.loafle.net/commons/server-go/socket/net"
+	"git.loafle.net/overflow/container-go"
 )
 
 type RPCServlet interface {
@@ -19,8 +19,9 @@ type RPCServlet interface {
 type RPCServlets struct {
 	cssn.Servlets
 
-	RPCInvoker   crr.RPCInvoker
-	RPCWriteChan <-chan []byte
+	RPCServerCodec crp.ServerCodec
+	RPCInvoker     crr.RPCInvoker
+	RPCWriteChan   <-chan *container.RPCNotification
 }
 
 func (s *RPCServlets) Handshake(servletCtx server.ServletCtx, conn net.Conn) error {
@@ -49,7 +50,7 @@ func (s *RPCServlets) Handle(servletCtx server.ServletCtx,
 		replyBuff []byte
 		err       error
 	)
-	sc := crpj.NewServerCodec()
+
 	go s.handleRPCWrite(stopChan, writeChan)
 
 	for {
@@ -59,7 +60,7 @@ func (s *RPCServlets) Handle(servletCtx server.ServletCtx,
 				return
 			}
 			// grpc exec method call
-			src, err = sc.NewRequest(msg)
+			src, err = s.RPCServerCodec.NewRequest(msg)
 			if nil != err {
 				logging.Logger().Error(err)
 				break
@@ -81,13 +82,22 @@ func (s *RPCServlets) Handle(servletCtx server.ServletCtx,
 }
 
 func (s *RPCServlets) handleRPCWrite(stopChan <-chan struct{}, writeChan chan<- []byte) {
+	var (
+		buf []byte
+		err error
+	)
 	for {
 		select {
-		case buf, ok := <-s.RPCWriteChan:
+		case noti, ok := <-s.RPCWriteChan:
 			if !ok {
 				break
 			}
 
+			buf, err = s.RPCServerCodec.NewNotification(noti.Method, noti.Params)
+			if nil != err {
+				logging.Logger().Error(err)
+			}
+
 			writeChan <- buf
 		case <-stopChan:
 			return