优化origin默认模式的服务发现

2026-02-04 06:54:45 +08:00 · 2024-04-25 11:20:06 +08:00
parent 59efc05d24
commit bba5eb2929
15 changed files with 573 additions and 181 deletions
--- a/rpc/client.go
+++ b/rpc/client.go
@@ -14,8 +14,8 @@ const(
 	DefaultRpcLenMsgLen         = 4
 	DefaultRpcMinMsgLen         = 2
 	DefaultMaxCheckCallRpcCount = 1000
-	DefaultMaxPendingWriteNum 	 = 200000
-	
+	DefaultMaxPendingWriteNum 	 = 1000000
+
 	DefaultConnectInterval = 2*time.Second
 	DefaultCheckRpcCallTimeoutInterval = 1*time.Second
 	DefaultRpcTimeout = 15*time.Second
--- a/rpc/natsclient.go
+++ b/rpc/natsclient.go
@@ -10,7 +10,8 @@ import (
 //跨结点连接的Client
 type NatsClient struct {
 	localNodeId string
-
+	notifyEventFun NotifyEventFun
+	
 	natsConn *nats.Conn
 	client *Client
 }
@@ -85,5 +86,5 @@ func (rc *NatsClient) WriteMsg (nodeId string,args ...[]byte) error{
 }

 func (rc *NatsClient) IsConnected() bool{
-	return rc.natsConn.Status() == nats.CONNECTED
+	return rc.natsConn!=nil && rc.natsConn.Status() == nats.CONNECTED
 }
--- a/rpc/natsserver.go
+++ b/rpc/natsserver.go
@@ -15,6 +15,7 @@ type NatsServer struct {

 	nodeSubTopic string
 	compressBytesLen int
+	notifyEventFun NotifyEventFun
 }

 func (ns *NatsServer) Start() error{
@@ -23,10 +24,18 @@ func (ns *NatsServer) Start() error{

 	options = append(options,nats.DisconnectErrHandler(func(nc *nats.Conn, err error) {
 		log.Error("nats is disconnect",log.String("connUrl",nc.ConnectedUrl()))
+		ns.notifyEventFun(&NatsConnEvent{IsConnect:false})
+		// handle disconnect error event
+	}))
+
+	options = append(options,nats.ConnectHandler(func(nc *nats.Conn) {
+		ns.notifyEventFun(&NatsConnEvent{IsConnect:true})
+		//log.Error("nats is connect",log.String("connUrl",nc.ConnectedUrl()))
 		// handle disconnect error event
 	}))

 	options = append(options,nats.ReconnectHandler(func(nc *nats.Conn) {
+		ns.notifyEventFun(&NatsConnEvent{IsConnect:true})
 		log.Error("nats is reconnection",log.String("connUrl",nc.ConnectedUrl()))
 		// handle reconnect event
 	}))
@@ -109,11 +118,12 @@ func (ns *NatsServer) Stop(){
 	}
 }

-func (ns *NatsServer) initServer(natsUrl string, noRandomize bool,localNodeId string,compressBytesLen int,rpcHandleFinder RpcHandleFinder){
+func (ns *NatsServer) initServer(natsUrl string, noRandomize bool,localNodeId string,compressBytesLen int,rpcHandleFinder RpcHandleFinder,notifyEventFun NotifyEventFun){
 	ns.natsUrl = natsUrl
 	ns.NoRandomize = noRandomize
 	ns.localNodeId = localNodeId
 	ns.compressBytesLen = compressBytesLen
+	ns.notifyEventFun = notifyEventFun
 	ns.initBaseServer(compressBytesLen,rpcHandleFinder)
 	ns.nodeSubTopic = "os."+localNodeId //服务器
 }
--- a/rpc/origindiscover.pb.go
+++ b/rpc/origindiscover.pb.go
@@ -108,7 +108,7 @@ func (x *NodeInfo) GetPublicServiceList() []string {
 }

 // Client->Master
-type ServiceDiscoverReq struct {
+type RegServiceDiscoverReq struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -116,8 +116,8 @@ type ServiceDiscoverReq struct {
 	NodeInfo *NodeInfo `protobuf:"bytes,1,opt,name=nodeInfo,proto3" json:"nodeInfo,omitempty"`
 }

-func (x *ServiceDiscoverReq) Reset() {
-	*x = ServiceDiscoverReq{}
+func (x *RegServiceDiscoverReq) Reset() {
+	*x = RegServiceDiscoverReq{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_rpcproto_origindiscover_proto_msgTypes[1]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -125,13 +125,13 @@ func (x *ServiceDiscoverReq) Reset() {
 	}
 }

-func (x *ServiceDiscoverReq) String() string {
+func (x *RegServiceDiscoverReq) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }

-func (*ServiceDiscoverReq) ProtoMessage() {}
+func (*RegServiceDiscoverReq) ProtoMessage() {}

-func (x *ServiceDiscoverReq) ProtoReflect() protoreflect.Message {
+func (x *RegServiceDiscoverReq) ProtoReflect() protoreflect.Message {
 	mi := &file_rpcproto_origindiscover_proto_msgTypes[1]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -143,12 +143,12 @@ func (x *ServiceDiscoverReq) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }

-// Deprecated: Use ServiceDiscoverReq.ProtoReflect.Descriptor instead.
-func (*ServiceDiscoverReq) Descriptor() ([]byte, []int) {
+// Deprecated: Use RegServiceDiscoverReq.ProtoReflect.Descriptor instead.
+func (*RegServiceDiscoverReq) Descriptor() ([]byte, []int) {
 	return file_rpcproto_origindiscover_proto_rawDescGZIP(), []int{1}
 }

-func (x *ServiceDiscoverReq) GetNodeInfo() *NodeInfo {
+func (x *RegServiceDiscoverReq) GetNodeInfo() *NodeInfo {
 	if x != nil {
 		return x.NodeInfo
 	}
@@ -314,6 +314,149 @@ func (*Empty) Descriptor() ([]byte, []int) {
 	return file_rpcproto_origindiscover_proto_rawDescGZIP(), []int{4}
 }

+// Client->Master
+type Ping struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	NodeId string `protobuf:"bytes,1,opt,name=NodeId,proto3" json:"NodeId,omitempty"`
+}
+
+func (x *Ping) Reset() {
+	*x = Ping{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_rpcproto_origindiscover_proto_msgTypes[5]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *Ping) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*Ping) ProtoMessage() {}
+
+func (x *Ping) ProtoReflect() protoreflect.Message {
+	mi := &file_rpcproto_origindiscover_proto_msgTypes[5]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use Ping.ProtoReflect.Descriptor instead.
+func (*Ping) Descriptor() ([]byte, []int) {
+	return file_rpcproto_origindiscover_proto_rawDescGZIP(), []int{5}
+}
+
+func (x *Ping) GetNodeId() string {
+	if x != nil {
+		return x.NodeId
+	}
+	return ""
+}
+
+// Master->Client
+type Pong struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Ok bool `protobuf:"varint,1,opt,name=ok,proto3" json:"ok,omitempty"`
+}
+
+func (x *Pong) Reset() {
+	*x = Pong{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_rpcproto_origindiscover_proto_msgTypes[6]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *Pong) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*Pong) ProtoMessage() {}
+
+func (x *Pong) ProtoReflect() protoreflect.Message {
+	mi := &file_rpcproto_origindiscover_proto_msgTypes[6]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use Pong.ProtoReflect.Descriptor instead.
+func (*Pong) Descriptor() ([]byte, []int) {
+	return file_rpcproto_origindiscover_proto_rawDescGZIP(), []int{6}
+}
+
+func (x *Pong) GetOk() bool {
+	if x != nil {
+		return x.Ok
+	}
+	return false
+}
+
+type UnRegServiceDiscoverReq struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	NodeId string `protobuf:"bytes,1,opt,name=NodeId,proto3" json:"NodeId,omitempty"`
+}
+
+func (x *UnRegServiceDiscoverReq) Reset() {
+	*x = UnRegServiceDiscoverReq{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_rpcproto_origindiscover_proto_msgTypes[7]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *UnRegServiceDiscoverReq) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*UnRegServiceDiscoverReq) ProtoMessage() {}
+
+func (x *UnRegServiceDiscoverReq) ProtoReflect() protoreflect.Message {
+	mi := &file_rpcproto_origindiscover_proto_msgTypes[7]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use UnRegServiceDiscoverReq.ProtoReflect.Descriptor instead.
+func (*UnRegServiceDiscoverReq) Descriptor() ([]byte, []int) {
+	return file_rpcproto_origindiscover_proto_rawDescGZIP(), []int{7}
+}
+
+func (x *UnRegServiceDiscoverReq) GetNodeId() string {
+	if x != nil {
+		return x.NodeId
+	}
+	return ""
+}
+
 var File_rpcproto_origindiscover_proto protoreflect.FileDescriptor

 var file_rpcproto_origindiscover_proto_rawDesc = []byte{
@@ -332,26 +475,33 @@ var file_rpcproto_origindiscover_proto_rawDesc = []byte{
 	0x69, 0x72, 0x65, 0x12, 0x2c, 0x0a, 0x11, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x53, 0x65, 0x72,
 	0x76, 0x69, 0x63, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x06, 0x20, 0x03, 0x28, 0x09, 0x52, 0x11,
 	0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x4c, 0x69, 0x73,
-	0x74, 0x22, 0x3f, 0x0a, 0x12, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x44, 0x69, 0x73, 0x63,
-	0x6f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x29, 0x0a, 0x08, 0x6e, 0x6f, 0x64, 0x65, 0x49,
+	0x74, 0x22, 0x42, 0x0a, 0x15, 0x52, 0x65, 0x67, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x44,
+	0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x29, 0x0a, 0x08, 0x6e, 0x6f,
+	0x64, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x72,
+	0x70, 0x63, 0x2e, 0x4e, 0x6f, 0x64, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x08, 0x6e, 0x6f, 0x64,
+	0x65, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0x9e, 0x01, 0x0a, 0x17, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72,
+	0x69, 0x62, 0x65, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x4e, 0x6f, 0x74, 0x69, 0x66,
+	0x79, 0x12, 0x22, 0x0a, 0x0c, 0x4d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x4e, 0x6f, 0x64, 0x65, 0x49,
+	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x4d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x4e,
+	0x6f, 0x64, 0x65, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x49, 0x73, 0x46, 0x75, 0x6c, 0x6c, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x49, 0x73, 0x46, 0x75, 0x6c, 0x6c, 0x12, 0x1c, 0x0a,
+	0x09, 0x44, 0x65, 0x6c, 0x4e, 0x6f, 0x64, 0x65, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x09, 0x44, 0x65, 0x6c, 0x4e, 0x6f, 0x64, 0x65, 0x49, 0x64, 0x12, 0x29, 0x0a, 0x08, 0x6e,
+	0x6f, 0x64, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e,
+	0x72, 0x70, 0x63, 0x2e, 0x4e, 0x6f, 0x64, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x08, 0x6e, 0x6f,
+	0x64, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0x3a, 0x0a, 0x0d, 0x4e, 0x6f, 0x64, 0x65, 0x52, 0x65,
+	0x74, 0x69, 0x72, 0x65, 0x52, 0x65, 0x71, 0x12, 0x29, 0x0a, 0x08, 0x6e, 0x6f, 0x64, 0x65, 0x49,
 	0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x72, 0x70, 0x63, 0x2e,
 	0x4e, 0x6f, 0x64, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x08, 0x6e, 0x6f, 0x64, 0x65, 0x49, 0x6e,
-	0x66, 0x6f, 0x22, 0x9e, 0x01, 0x0a, 0x17, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65,
-	0x44, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x12, 0x22,
-	0x0a, 0x0c, 0x4d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x4e, 0x6f, 0x64, 0x65, 0x49, 0x64, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x4d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x4e, 0x6f, 0x64, 0x65,
-	0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x49, 0x73, 0x46, 0x75, 0x6c, 0x6c, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x08, 0x52, 0x06, 0x49, 0x73, 0x46, 0x75, 0x6c, 0x6c, 0x12, 0x1c, 0x0a, 0x09, 0x44, 0x65,
-	0x6c, 0x4e, 0x6f, 0x64, 0x65, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x44,
-	0x65, 0x6c, 0x4e, 0x6f, 0x64, 0x65, 0x49, 0x64, 0x12, 0x29, 0x0a, 0x08, 0x6e, 0x6f, 0x64, 0x65,
-	0x49, 0x6e, 0x66, 0x6f, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x72, 0x70, 0x63,
-	0x2e, 0x4e, 0x6f, 0x64, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x08, 0x6e, 0x6f, 0x64, 0x65, 0x49,
-	0x6e, 0x66, 0x6f, 0x22, 0x3a, 0x0a, 0x0d, 0x4e, 0x6f, 0x64, 0x65, 0x52, 0x65, 0x74, 0x69, 0x72,
-	0x65, 0x52, 0x65, 0x71, 0x12, 0x29, 0x0a, 0x08, 0x6e, 0x6f, 0x64, 0x65, 0x49, 0x6e, 0x66, 0x6f,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x4e, 0x6f, 0x64,
-	0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x08, 0x6e, 0x6f, 0x64, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x22,
-	0x07, 0x0a, 0x05, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x42, 0x07, 0x5a, 0x05, 0x2e, 0x3b, 0x72, 0x70,
-	0x63, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x66, 0x6f, 0x22, 0x07, 0x0a, 0x05, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x1e, 0x0a, 0x04, 0x50,
+	0x69, 0x6e, 0x67, 0x12, 0x16, 0x0a, 0x06, 0x4e, 0x6f, 0x64, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x06, 0x4e, 0x6f, 0x64, 0x65, 0x49, 0x64, 0x22, 0x16, 0x0a, 0x04, 0x50,
+	0x6f, 0x6e, 0x67, 0x12, 0x0e, 0x0a, 0x02, 0x6f, 0x6b, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52,
+	0x02, 0x6f, 0x6b, 0x22, 0x31, 0x0a, 0x17, 0x55, 0x6e, 0x52, 0x65, 0x67, 0x53, 0x65, 0x72, 0x76,
+	0x69, 0x63, 0x65, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x16,
+	0x0a, 0x06, 0x4e, 0x6f, 0x64, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
+	0x4e, 0x6f, 0x64, 0x65, 0x49, 0x64, 0x42, 0x07, 0x5a, 0x05, 0x2e, 0x3b, 0x72, 0x70, 0x63, 0x62,
+	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }

 var (
@@ -366,16 +516,19 @@ func file_rpcproto_origindiscover_proto_rawDescGZIP() []byte {
 	return file_rpcproto_origindiscover_proto_rawDescData
 }

-var file_rpcproto_origindiscover_proto_msgTypes = make([]protoimpl.MessageInfo, 5)
+var file_rpcproto_origindiscover_proto_msgTypes = make([]protoimpl.MessageInfo, 8)
 var file_rpcproto_origindiscover_proto_goTypes = []interface{}{
 	(*NodeInfo)(nil),                // 0: rpc.NodeInfo
-	(*ServiceDiscoverReq)(nil),      // 1: rpc.ServiceDiscoverReq
+	(*RegServiceDiscoverReq)(nil),   // 1: rpc.RegServiceDiscoverReq
 	(*SubscribeDiscoverNotify)(nil), // 2: rpc.SubscribeDiscoverNotify
 	(*NodeRetireReq)(nil),           // 3: rpc.NodeRetireReq
 	(*Empty)(nil),                   // 4: rpc.Empty
+	(*Ping)(nil),                    // 5: rpc.Ping
+	(*Pong)(nil),                    // 6: rpc.Pong
+	(*UnRegServiceDiscoverReq)(nil), // 7: rpc.UnRegServiceDiscoverReq
 }
 var file_rpcproto_origindiscover_proto_depIdxs = []int32{
-	0, // 0: rpc.ServiceDiscoverReq.nodeInfo:type_name -> rpc.NodeInfo
+	0, // 0: rpc.RegServiceDiscoverReq.nodeInfo:type_name -> rpc.NodeInfo
 	0, // 1: rpc.SubscribeDiscoverNotify.nodeInfo:type_name -> rpc.NodeInfo
 	0, // 2: rpc.NodeRetireReq.nodeInfo:type_name -> rpc.NodeInfo
 	3, // [3:3] is the sub-list for method output_type
@@ -404,7 +557,7 @@ func file_rpcproto_origindiscover_proto_init() {
 			}
 		}
 		file_rpcproto_origindiscover_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ServiceDiscoverReq); i {
+			switch v := v.(*RegServiceDiscoverReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -451,6 +604,42 @@ func file_rpcproto_origindiscover_proto_init() {
 				return nil
 			}
 		}
+		file_rpcproto_origindiscover_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Ping); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_rpcproto_origindiscover_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Pong); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_rpcproto_origindiscover_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*UnRegServiceDiscoverReq); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
 	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
@@ -458,7 +647,7 @@ func file_rpcproto_origindiscover_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_rpcproto_origindiscover_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   5,
+			NumMessages:   8,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
--- a/rpc/origindiscover.proto
+++ b/rpc/origindiscover.proto
@@ -12,7 +12,7 @@ message NodeInfo{
 }

 //Client->Master
-message ServiceDiscoverReq{
+message RegServiceDiscoverReq{
    NodeInfo nodeInfo = 1;
 }

@@ -32,4 +32,18 @@ message NodeRetireReq{

 //Master->Client
 message Empty{
-}
+}
+
+//Client->Master
+message Ping{
+    string NodeId = 1;
+}
+
+//Master->Client
+message Pong{
+    bool ok = 1;
+}
+
+message UnRegServiceDiscoverReq{
+    string NodeId = 1;
+}
--- a/rpc/rclient.go
+++ b/rpc/rclient.go
@@ -16,7 +16,8 @@ type RClient struct {
 	selfClient *Client
 	network.TCPClient
 	conn *network.TCPConn
-	TriggerRpcConnEvent
+
+	notifyEventFun NotifyEventFun
 }

 func (rc *RClient) IsConnected() bool {
@@ -80,7 +81,11 @@ func (rc *RClient) Run() {
 		}
 	}()

-	rc.TriggerRpcConnEvent(true, rc.selfClient.GetClientId(), rc.selfClient.GetTargetNodeId())
+	var eventData RpcConnEvent
+	eventData.IsConnect = true
+	eventData.NodeId =  rc.selfClient.GetTargetNodeId()
+	rc.notifyEventFun(&eventData)
+	
 	for {
 		bytes, err := rc.conn.ReadMsg()
 		if err != nil {
@@ -97,15 +102,16 @@ func (rc *RClient) Run() {
 }

 func (rc *RClient) OnClose() {
-	rc.TriggerRpcConnEvent(false, rc.selfClient.GetClientId(), rc.selfClient.GetTargetNodeId())
+	var connEvent RpcConnEvent
+	connEvent.IsConnect = false
+	connEvent.NodeId = rc.selfClient.GetTargetNodeId()
+	rc.notifyEventFun(&connEvent)
 }

-func NewRClient(targetNodeId string, addr string, maxRpcParamLen uint32,compressBytesLen int,triggerRpcConnEvent TriggerRpcConnEvent,callSet *CallSet) *Client{
+func NewRClient(targetNodeId string, addr string, maxRpcParamLen uint32,compressBytesLen int,callSet *CallSet,notifyEventFun NotifyEventFun) *Client{
 	client := &Client{}
 	client.clientId = atomic.AddUint32(&clientSeq, 1)
 	client.targetNodeId = targetNodeId
-	//client.maxCheckCallRpcCount = DefaultMaxCheckCallRpcCount
-	//client.callRpcTimeout = DefaultRpcTimeout
 	client.compressBytesLen = compressBytesLen

 	c:= &RClient{}
@@ -114,7 +120,7 @@ func NewRClient(targetNodeId string, addr string, maxRpcParamLen uint32,compress
 	c.ConnectInterval = DefaultConnectInterval
 	c.PendingWriteNum = DefaultMaxPendingWriteNum
 	c.AutoReconnect = true
-	c.TriggerRpcConnEvent = triggerRpcConnEvent
+	c.notifyEventFun = notifyEventFun
 	c.ConnNum = DefaultRpcConnNum
 	c.LenMsgLen = DefaultRpcLenMsgLen
 	c.MinMsgLen = DefaultRpcMinMsgLen
--- a/rpc/rpcevent.go
+++ b/rpc/rpcevent.go
@@ -0,0 +1,23 @@
+package rpc
+
+import "github.com/duanhf2012/origin/v2/event"
+
+type NotifyEventFun func (event event.IEvent)
+
+// RpcConnEvent Node结点连接事件
+type RpcConnEvent struct{
+	IsConnect bool
+	NodeId string
+}
+
+func (rc *RpcConnEvent) GetEventType() event.EventType{
+	return event.Sys_Event_Node_Conn_Event
+}
+
+type NatsConnEvent struct {
+	IsConnect bool
+}
+
+func (nc *NatsConnEvent)  GetEventType() event.EventType{
+	return event.Sys_Event_Nats_Conn_Event
+}
--- a/rpc/rpchandler.go
+++ b/rpc/rpchandler.go
@@ -9,6 +9,7 @@ import (
 	"strings"
 	"unicode"
 	"unicode/utf8"
+	"github.com/duanhf2012/origin/v2/event"
 	"time"
 )

@@ -65,12 +66,19 @@ type RpcHandler struct {
 	pClientList []*Client
 }

-type TriggerRpcConnEvent func(bConnect bool, clientSeq uint32, nodeId string)
-type INodeListener interface {
+//type TriggerRpcConnEvent func(bConnect bool, clientSeq uint32, nodeId string)
+type NotifyEventToAllService func(event event.IEvent)
+
+type INodeConnListener interface {
 	OnNodeConnected(nodeId string)
 	OnNodeDisconnect(nodeId string)
 }

+type INatsConnListener interface {
+	OnNatsConnected()
+	OnNatsDisconnect()
+}
+
 type IDiscoveryServiceListener interface {
 	OnDiscoveryService(nodeId string, serviceName []string)
 	OnUnDiscoveryService(nodeId string)
--- a/rpc/rpcnats.go
+++ b/rpc/rpcnats.go
@@ -16,13 +16,13 @@ func (rn *RpcNats) Start() error{
 	return rn.NatsClient.Start(rn.NatsServer.natsConn)
 }

-func (rn *RpcNats) Init(natsUrl string, noRandomize bool, nodeId string,compressBytesLen int,rpcHandleFinder RpcHandleFinder){
+func (rn *RpcNats) Init(natsUrl string, noRandomize bool, nodeId string,compressBytesLen int,rpcHandleFinder RpcHandleFinder,notifyEventFun NotifyEventFun){
 	rn.NatsClient.localNodeId = nodeId
-	rn.NatsServer.initServer(natsUrl,noRandomize, nodeId,compressBytesLen,rpcHandleFinder)
+	rn.NatsServer.initServer(natsUrl,noRandomize, nodeId,compressBytesLen,rpcHandleFinder,notifyEventFun)
 	rn.NatsServer.iServer = rn
 }

-func  (rn *RpcNats) NewNatsClient(targetNodeId string,localNodeId string,callSet *CallSet) *Client{
+func  (rn *RpcNats) NewNatsClient(targetNodeId string,localNodeId string,callSet *CallSet,notifyEventFun NotifyEventFun) *Client{
 	var client Client

 	client.clientId = atomic.AddUint32(&clientSeq, 1)
@@ -33,6 +33,7 @@ func  (rn *RpcNats) NewNatsClient(targetNodeId string,localNodeId string,callSet
 	natsClient := &rn.NatsClient
 	natsClient.localNodeId = localNodeId
 	natsClient.client = &client
+	natsClient.notifyEventFun = notifyEventFun

 	client.IRealClient = natsClient
 	client.CallSet = callSet