Protocol.Packet‘s input parameter changed to Interface (#96)

Allenxuxu · Jul 5, 2021 · 979940f · 979940f
1 parent 2341c31
commit 979940f
Show file tree

Hide file tree

Showing 16 changed files with 30 additions and 29 deletions.
diff --git a/benchmarks/gev-echo-server/echo.go b/benchmarks/gev-echo-server/echo.go
@@ -3,12 +3,11 @@ package main
 import (
 	"flag"
 	"net/http"
+	_ "net/http/pprof"
 	"strconv"
 
 	"github.com/Allenxuxu/gev/log"
 
-	_ "net/http/pprof"
-
 	"github.com/Allenxuxu/gev"
 	"github.com/Allenxuxu/gev/connection"
 )
@@ -17,7 +16,7 @@ type example struct {
 }
 
 func (s *example) OnConnect(c *connection.Connection) {}
-func (s *example) OnMessage(c *connection.Connection, ctx interface{}, data []byte) (out []byte) {
+func (s *example) OnMessage(c *connection.Connection, ctx interface{}, data []byte) (out interface{}) {
 
 	out = data
 

diff --git a/connection/connection.go b/connection/connection.go
@@ -17,7 +17,7 @@ import (
 )
 
 type CallBack interface {
-	OnMessage(c *Connection, ctx interface{}, data []byte) []byte
+	OnMessage(c *Connection, ctx interface{}, data []byte) interface{}
 	OnClose(c *Connection)
 }
 
@@ -112,14 +112,14 @@ func (c *Connection) Connected() bool {
 }
 
 // Send 用来在非 loop 协程发送
-func (c *Connection) Send(buffer []byte) error {
+func (c *Connection) Send(data interface{}) error {
 	if !c.connected.Get() {
 		return ErrConnectionClosed
 	}
 
 	c.loop.QueueInLoop(func() {
 		if c.connected.Get() {
-			c.sendInLoop(c.protocol.Packet(c, buffer))
+			c.sendInLoop(c.protocol.Packet(c, data))
 		}
 	})
 	return nil
@@ -193,7 +193,7 @@ func (c *Connection) handlerProtocol(tmpBuffer *[]byte, buffer *ringbuffer.RingB
 	ctx, receivedData := c.protocol.UnPacket(c, buffer)
 	for ctx != nil || len(receivedData) != 0 {
 		sendData := c.callBack.OnMessage(c, ctx, receivedData)
-		if len(sendData) > 0 {
+		if sendData != nil {
 			*tmpBuffer = append(*tmpBuffer, c.protocol.Packet(c, sendData)...)
 		}
 

diff --git a/connection/protocol.go b/connection/protocol.go
@@ -9,7 +9,7 @@ var _ Protocol = &DefaultProtocol{}
 // Protocol 自定义协议编解码接口
 type Protocol interface {
 	UnPacket(c *Connection, buffer *ringbuffer.RingBuffer) (interface{}, []byte)
-	Packet(c *Connection, data []byte) []byte
+	Packet(c *Connection, data interface{}) []byte
 }
 
 // DefaultProtocol 默认 Protocol
@@ -38,6 +38,6 @@ func (d *DefaultProtocol) UnPacket(c *Connection, buffer *ringbuffer.RingBuffer)
 }
 
 // Packet 封包
-func (d *DefaultProtocol) Packet(c *Connection, data []byte) []byte {
-	return data
+func (d *DefaultProtocol) Packet(c *Connection, data interface{}) []byte {
+	return data.([]byte)
 }
diff --git a/example/bufferlength/main.go b/example/bufferlength/main.go
@@ -74,7 +74,7 @@ func (s *Server) OnConnect(c *connection.Connection) {
 }
 
 // OnMessage callback
-func (s *Server) OnMessage(c *connection.Connection, ctx interface{}, data []byte) (out []byte) {
+func (s *Server) OnMessage(c *connection.Connection, ctx interface{}, data []byte) (out interface{}) {
 	log.Printf("OnMessage, read buffer len %d, write buffer len %d \n", c.ReadBufferLength(), c.WriteBufferLength())
 
 	out = data

diff --git a/example/echo/echo.go b/example/echo/echo.go
@@ -21,7 +21,7 @@ func (s *example) OnConnect(c *connection.Connection) {
 	s.Count.Add(1)
 	//log.Println(" OnConnect ： ", c.PeerAddr())
 }
-func (s *example) OnMessage(c *connection.Connection, ctx interface{}, data []byte) (out []byte) {
+func (s *example) OnMessage(c *connection.Connection, ctx interface{}, data []byte) (out interface{}) {
 	//log.Println("OnMessage")
 	out = data
 	return

diff --git a/example/idleconnection/echo.go b/example/idleconnection/echo.go
@@ -18,7 +18,7 @@ type example struct {
 func (s *example) OnConnect(c *connection.Connection) {
 	log.Info(" OnConnect ： ", c.PeerAddr())
 }
-func (s *example) OnMessage(c *connection.Connection, ctx interface{}, data []byte) (out []byte) {
+func (s *example) OnMessage(c *connection.Connection, ctx interface{}, data []byte) (out interface{}) {
 	log.Infof("OnMessage from : %s", c.PeerAddr())
 	out = data
 	return

diff --git a/example/maxconnection/main.go b/example/maxconnection/main.go
@@ -54,7 +54,7 @@ func (s *Server) OnConnect(c *connection.Connection) {
 }
 
 // OnMessage callback
-func (s *Server) OnMessage(c *connection.Connection, ctx interface{}, data []byte) (out []byte) {
+func (s *Server) OnMessage(c *connection.Connection, ctx interface{}, data []byte) (out interface{}) {
 	log.Println("OnMessage")
 	out = data
 	return

diff --git a/example/protobuf/server/main.go b/example/protobuf/server/main.go
@@ -17,7 +17,7 @@ type example struct{}
 func (s *example) OnConnect(c *connection.Connection) {
 	log.Println(" OnConnect ： ", c.PeerAddr())
 }
-func (s *example) OnMessage(c *connection.Connection, ctx interface{}, data []byte) (out []byte) {
+func (s *example) OnMessage(c *connection.Connection, ctx interface{}, data []byte) (out interface{}) {
 	msgType := ctx.(string)
 
 	switch msgType {

diff --git a/example/protocol/protocol.go b/example/protocol/protocol.go
@@ -2,6 +2,7 @@ package main
 
 import (
 	"encoding/binary"
+
 	"github.com/Allenxuxu/gev/connection"
 	"github.com/Allenxuxu/ringbuffer"
 	"github.com/gobwas/pool/pbytes"
@@ -31,10 +32,11 @@ func (d *ExampleProtocol) UnPacket(c *connection.Connection, buffer *ringbuffer.
 	return nil, nil
 }
 
-func (d *ExampleProtocol) Packet(c *connection.Connection, data []byte) []byte {
-	dataLen := len(data)
+func (d *ExampleProtocol) Packet(c *connection.Connection, data interface{}) []byte {
+	dd := data.([]byte)
+	dataLen := len(dd)
 	ret := make([]byte, exampleHeaderLen+dataLen)
 	binary.BigEndian.PutUint32(ret, uint32(dataLen))
-	copy(ret[4:], data)
+	copy(ret[4:], dd)
 	return ret
 }
diff --git a/example/protocol/server.go b/example/protocol/server.go
@@ -14,7 +14,7 @@ type example struct{}
 func (s *example) OnConnect(c *connection.Connection) {
 	log.Println(" OnConnect ： ", c.PeerAddr())
 }
-func (s *example) OnMessage(c *connection.Connection, ctx interface{}, data []byte) (out []byte) {
+func (s *example) OnMessage(c *connection.Connection, ctx interface{}, data []byte) (out interface{}) {
 	log.Println("OnMessage：", data)
 	out = data
 	return

diff --git a/example/pushmessage/main.go b/example/pushmessage/main.go
@@ -70,7 +70,7 @@ func (s *Server) OnConnect(c *connection.Connection) {
 }
 
 // OnMessage callback
-func (s *Server) OnMessage(c *connection.Connection, ctx interface{}, data []byte) (out []byte) {
+func (s *Server) OnMessage(c *connection.Connection, ctx interface{}, data []byte) (out interface{}) {
 	log.Println("OnMessage")
 	out = data
 	return

diff --git a/plugins/protobuf/protocol.go b/plugins/protobuf/protocol.go
@@ -50,6 +50,6 @@ func (p *Protocol) UnPacket(c *connection.Connection, buffer *ringbuffer.RingBuf
 }
 
 // Packet ...
-func (p *Protocol) Packet(c *connection.Connection, data []byte) []byte {
-	return data
+func (p *Protocol) Packet(c *connection.Connection, data interface{}) []byte {
+	return data.([]byte)
 }
diff --git a/plugins/websocket/protocol.go b/plugins/websocket/protocol.go
@@ -64,6 +64,6 @@ func (p *Protocol) UnPacket(c *connection.Connection, buffer *ringbuffer.RingBuf
 }
 
 // Packet 直接返回
-func (p *Protocol) Packet(c *connection.Connection, data []byte) []byte {
-	return data
+func (p *Protocol) Packet(c *connection.Connection, data interface{}) []byte {
+	return data.([]byte)
 }
diff --git a/plugins/websocket/wrap.go b/plugins/websocket/wrap.go
@@ -35,7 +35,7 @@ func (s *HandlerWrap) OnConnect(c *connection.Connection) {
 }
 
 // OnMessage wrap
-func (s *HandlerWrap) OnMessage(c *connection.Connection, ctx interface{}, payload []byte) []byte {
+func (s *HandlerWrap) OnMessage(c *connection.Connection, ctx interface{}, payload []byte) interface{} {
 	header, ok := ctx.(*ws.Header)
 	if !ok && len(payload) != 0 { // 升级协议 握手
 		return payload

diff --git a/server_conn_test.go b/server_conn_test.go
@@ -24,7 +24,7 @@ func (s *example2) OnConnect(c *connection.Connection) {
 	}
 }
 
-func (s *example2) OnMessage(c *connection.Connection, ctx interface{}, data []byte) (out []byte) {
+func (s *example2) OnMessage(c *connection.Connection, ctx interface{}, data []byte) (out interface{}) {
 	log.Info("OnMessage")
 
 	return
@@ -71,7 +71,7 @@ func (s *example3) OnConnect(c *connection.Connection) {
 	//log.Info(" OnConnect ： ", c.PeerAddr())
 }
 
-func (s *example3) OnMessage(c *connection.Connection, ctx interface{}, data []byte) (out []byte) {
+func (s *example3) OnMessage(c *connection.Connection, ctx interface{}, data []byte) (out interface{}) {
 	//log.Info("OnMessage")
 
 	return

diff --git a/server_test.go b/server_test.go
@@ -24,7 +24,7 @@ func (s *example) OnConnect(c *connection.Connection) {
 	//log.Println(" OnConnect ： ", c.PeerAddr())
 }
 
-func (s *example) OnMessage(c *connection.Connection, ctx interface{}, data []byte) (out []byte) {
+func (s *example) OnMessage(c *connection.Connection, ctx interface{}, data []byte) (out interface{}) {
 	//log.Println("OnMessage")
 
 	//out = data
@@ -207,7 +207,7 @@ func (s *example1) OnConnect(c *connection.Connection) {
 	//log.Println(" OnConnect ： ", c.PeerAddr())
 }
 
-func (s *example1) OnMessage(c *connection.Connection, ctx interface{}, data []byte) (out []byte) {
+func (s *example1) OnMessage(c *connection.Connection, ctx interface{}, data []byte) (out interface{}) {
 	//log.Println("OnMessage")
 
 	//out = data