From bb9a7e348892eb5c4fccb063380aa6fcd9612b71 Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期二, 06 四月 2021 17:32:35 +0800
Subject: [PATCH] server resend failed; rename msgs; refactor.
---
proto/source/bhome_msg.proto | 70 +++++++++++++++++++++++-----------
1 files changed, 47 insertions(+), 23 deletions(-)
diff --git a/proto/source/bhome_msg.proto b/proto/source/bhome_msg.proto
index a8e5073..9827f17 100644
--- a/proto/source/bhome_msg.proto
+++ b/proto/source/bhome_msg.proto
@@ -2,7 +2,11 @@
option optimize_for = LITE_RUNTIME;
+import "google/protobuf/descriptor.proto";
+import "error_msg.proto";
+
package bhome.msg;
+
// message format : header(BHMsgHead) + body(variable types)
message BHAddress {
@@ -13,7 +17,7 @@
message ProcInfo
{
- bytes id = 1;
+ bytes id = 1; // serial number, maybe managed
bytes name = 2;
bytes public_info = 3;
bytes private_info = 4;
@@ -28,6 +32,10 @@
bytes topic = 6; // for request route
}
+message BHMsgBody {
+ bytes data = 1;
+}
+
message BHMsg { // deprecated
bytes msg_id = 1;
int64 timestamp = 2;
@@ -38,55 +46,71 @@
enum MsgType {
kMsgTypeInvalid = 0;
- kMsgTypeRequest = 1;
- kMsgTypeReply = 2;
- kMsgTypePublish = 3;
- kMsgTypeSubscribe = 4;
- kMsgTypeUnsubscribe = 5;
- kMsgTypeProcQueryTopic = 6;
- kMsgTypeProcQueryTopicReply = 7;
- kMsgTypeProcRegisterTopics = 8;
- kMsgTypeProcHeartbeat = 9;
+ kMsgTypeCommonReply = 2;
+
+ kMsgTypeRegister= 10;
+ // kMsgTypeRegisterReply= 11;
+ kMsgTypeHeartbeat = 12;
+ // kMsgTypeHeartbeatReply = 13;
+ kMsgTypeQueryTopic = 14;
+ kMsgTypeQueryTopicReply = 15;
+ kMsgTypeRequestTopic = 16;
+ kMsgTypeRequestTopicReply = 17;
+
+ kMsgTypePublish = 100;
+ // kMsgTypePublishReply = 101;
+ kMsgTypeSubscribe = 102;
+ // kMsgTypeSubscribeReply = 103;
+ kMsgTypeUnsubscribe = 104;
+ // kMsgTypeUnsubscribeReply = 105;
+
}
-message DataPub {
+message MsgPub {
bytes topic = 1;
bytes data = 2;
}
-message DataSub {
+message MsgSub {
repeated bytes topics = 1;
}
-message DataRequest {
+message MsgCommonReply {
+ ErrorMsg errmsg = 1;
+}
+
+message MsgRequestTopic {
bytes topic = 1;
bytes data = 2;
}
-message DataReply {
- bytes data = 1;
+message MsgRequestTopicReply {
+ ErrorMsg errmsg = 1;
+ bytes data = 2;
}
-message DataProcRegister
+message MsgRegister
{
ProcInfo proc = 1;
repeated bytes topics = 2;
}
-message DataProcHeartbeat
+message MsgHeartbeat
{
ProcInfo proc = 1;
}
-message DataProcQueryTopic {
+message MsgQueryTopic {
bytes topic = 1;
}
-message DataProcQueryTopicReply {
- BHAddress address = 1;
+message MsgQueryTopicReply {
+ ErrorMsg errmsg = 1;
+ BHAddress address = 2;
}
-service TopicRequestReplyService {
- rpc Request (DataRequest) returns (DataReply);
-}
\ No newline at end of file
+service TopicRPC {
+ rpc Query (MsgQueryTopic) returns (MsgQueryTopicReply);
+ rpc Request (MsgRequestTopic) returns (MsgQueryTopicReply);
+}
--
Gitblit v1.8.0