新增tcp protobuf接口

sysservice/tcpsocketpbservice.go

@@ -1,25 +1,38 @@
 package sysservice
 
 import (
+	"errors"
 	"github.com/duanhf2012/origin/network"
 	"github.com/duanhf2012/origin/service"
+	"github.com/golang/protobuf/proto"
+	"reflect"
 )
 
 type TcpSocketPbService struct {
 	service.BaseService
 	listenaddr string
 	tcpsocketserver network.TcpSocketServer
-	reciver network.ITcpSocketServerReciver
+	mapMsg map[uint16]MessageInfo
+
+	connEvent EventHandler
+	disconnEvent EventHandler
+
+	exceptMsgHandler ExceptMsgHandler
 }
 
 
-func NewTcpSocketPbService(listenaddr string,reciver network.ITcpSocketServerReciver) *TcpSocketPbService {
+type MessageHandler func(pClient *network.SClient,msgtype uint16,msg proto.Message)
+type EventHandler func(pClient *network.SClient)
+type ExceptMsgHandler func(pClient *network.SClient,pPack *network.MsgBasePack,err error)
+
+
+
+func NewTcpSocketPbService(listenaddr string) *TcpSocketPbService {
 	ts := new(TcpSocketPbService)
 
 	ts.listenaddr = listenaddr
-	ts.reciver = reciver
-
-	ts.tcpsocketserver.Register(listenaddr,reciver)
+	ts.mapMsg = make(map[uint16]MessageInfo,1)
+	ts.tcpsocketserver.Register(listenaddr,ts)
 	return ts
 }
 
@@ -29,6 +42,97 @@ func (slf *TcpSocketPbService) OnInit() error {
 
 func (slf *TcpSocketPbService) OnRun() bool {
 	slf.tcpsocketserver.Start()
+
+/*
+	slf.RegisterMessage(10,&msgpb.Test{},slf.Test)
+	var testpack network.MsgBasePack
+	a := msgpb.Test{}
+	a.WinCount =proto.Int32(33)
+	d,err := proto.Marshal(&a)
+	fmt.Print(err)
+
+	testpack.Make(10,d)
+	slf.OnRecvMsg(nil,&testpack)
+
+ */
 	return false
 }
 
+
+type MessageInfo struct {
+	msgType    reflect.Type
+	msgHandler MessageHandler
+}
+
+
+func (slf *TcpSocketPbService) RegMessage(msgtype uint16,msg proto.Message,handle MessageHandler){
+	var info MessageInfo
+
+	info.msgType = reflect.TypeOf(msg.(proto.Message))
+	info.msgHandler = handle
+	slf.mapMsg[msgtype] = info
+}
+
+func (slf *TcpSocketPbService) RegConnectEvent(eventHandler EventHandler){
+	slf.connEvent = eventHandler
+}
+
+func (slf *TcpSocketPbService) RegDisconnectEvent(eventHandler EventHandler){
+	slf.disconnEvent = eventHandler
+}
+
+func (slf *TcpSocketPbService) RegExceptMessage(exceptMsgHandler ExceptMsgHandler){
+	slf.exceptMsgHandler = exceptMsgHandler
+}
+
+
+func (slf *TcpSocketPbService) OnConnected(pClient *network.SClient){
+	if slf.connEvent!=nil {
+		slf.connEvent(pClient)
+	}
+}
+
+func (slf *TcpSocketPbService) OnDisconnect(pClient *network.SClient){
+	if slf.disconnEvent!=nil {
+		slf.disconnEvent(pClient)
+	}
+}
+
+func (slf *TcpSocketPbService) OnExceptMsg (pClient *network.SClient,pPack *network.MsgBasePack,err error){
+	if slf.exceptMsgHandler!=nil {
+		slf.exceptMsgHandler(pClient,pPack,err)
+	}else{
+		pClient.Close()
+		//记录日志
+		service.GetLogger().Printf(service.LEVER_WARN, "OnExceptMsg packtype %d,error %+v",pPack.PackType(),err)
+	}
+}
+
+func (slf *TcpSocketPbService) OnRecvMsg(pClient *network.SClient, pPack *network.MsgBasePack){
+	if info, ok := slf.mapMsg[pPack.PackType()]; ok {
+		msg := reflect.New(info.msgType.Elem()).Interface()
+		tmp := msg.(proto.Message)
+		err := proto.Unmarshal(pPack.Body(), tmp)
+		if err != nil {
+			slf.OnExceptMsg(pClient,pPack,err)
+			return
+		}
+
+		info.msgHandler(pClient,pPack.PackType(), msg.(proto.Message))
+		return
+	}
+
+	slf.OnExceptMsg(pClient,pPack,errors.New("not found PackType"))
+
+	return
+}
+
+func DefaultTSPbService() *TcpSocketPbService{
+	iservice := service.InstanceServiceMgr().FindService("TcpSocketPbService")
+	if iservice == nil {
+		return  nil
+	}
+
+	return iservice.(*TcpSocketPbService)
+}
+