From 7b84c595bb128d0ae72555b4e8f93df516499584 Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期五, 21 五月 2021 16:10:24 +0800
Subject: [PATCH] fix api test get error.
---
proto/source/bhome_msg.proto | 64 +++++++++++++++++++++++++++-----
1 files changed, 54 insertions(+), 10 deletions(-)
diff --git a/proto/source/bhome_msg.proto b/proto/source/bhome_msg.proto
index b06b692..f34aebb 100644
--- a/proto/source/bhome_msg.proto
+++ b/proto/source/bhome_msg.proto
@@ -1,10 +1,12 @@
syntax = "proto3";
option optimize_for = LITE_RUNTIME;
+option go_package="./bhome_msg";
// import "google/protobuf/descriptor.proto";
import "bhome_msg_api.proto";
+import "error_msg.proto";
-package bhome.msg;
+package bhome_msg;
// message format : head_len(4) + head(BHMsgHead) + body_len(4) + body(variable types)
@@ -14,17 +16,12 @@
repeated BHAddress route = 2; // for reply and proxy.
int64 timestamp = 3;
int32 type = 4;
- bytes proc_id = 5;
- bytes topic = 6; // for request route
+ uint64 ssn_id = 5; // node mq id
+ bytes proc_id = 6;
+ bytes topic = 7; // for request route
+ BHAddress dest = 8; // other host
}
-message BHMsg { // deprecated
- bytes msg_id = 1;
- int64 timestamp = 2;
- int32 type = 3;
- repeated BHAddress route = 4; // for reply and proxy.
- bytes body = 5;
-}
enum MsgType {
kMsgTypeInvalid = 0;
@@ -32,6 +29,8 @@
kMsgTypeCommonReply = 2;
+ kMsgTypeProcInit = 8;
+ kMsgTypeProcInitReply = 9;
kMsgTypeRegister= 10;
// kMsgTypeRegisterReply= 11;
kMsgTypeHeartbeat = 12;
@@ -49,10 +48,55 @@
// kMsgTypeSubscribeReply = 23;
kMsgTypeUnsubscribe = 24;
// kMsgTypeUnsubscribeReply = 25;
+ kMsgTypeUnregister = 26;
+ // kMsgTypeUnregisterReply = 27;
+ kMsgTypeQueryProc = 28;
+ kMsgTypeQueryProcReply = 29;
+}
+
+message MsgSubscribe {
+ MsgTopicList topics = 1;
+}
+message MsgUnsubscribe {
+ MsgTopicList topics = 1;
+}
+message MsgRegisterRPC {
+ MsgTopicList topics = 1;
+}
+
+message MsgProcInit{
+ int32 extra_mq_num = 1;
+} // proc_id is in header.
+
+message MsgProcInitReply {
+ ErrorMsg errmsg = 1;
+ int32 proc_index = 2;
+ repeated BHAddress extra_mqs = 3;
}
service TopicRPC {
rpc Query (MsgQueryTopic) returns (MsgQueryTopicReply);
rpc Request (MsgRequestTopic) returns (MsgQueryTopicReply);
}
+
+message MsgRequest {
+ // oneof body;
+ oneof request {
+ MsgRegister register = 1;
+ MsgRequestTopic topic_request = 2;
+ MsgQueryTopic topic_query = 3;
+ }
+}
+
+message MsgReply {
+ ErrorMsg err_msg = 1;
+ // oneof reply
+}
+
+message BHMsgBody {
+ oneof reqrep {
+ MsgRequest request = 1;
+ MsgReply reply = 2;
+ }
+}
--
Gitblit v1.8.0