fix

apps/efka/include/message_pb.hrl

@@ -35,10 +35,11 @@
         }).
 -endif.
 
--ifndef('SESSION_REQUEST_PB_H').
+-ifndef('TOPIC_MESSAGE_PB_H').
--define('SESSION_REQUEST_PB_H', true).
+-define('TOPIC_MESSAGE_PB_H', true).
--record(session_request,
+-record(topic_message,
-        {
+        {topic = <<>>           :: unicode:chardata() | undefined, % = 1, optional
+         content = <<>>         :: unicode:chardata() | undefined % = 2, optional
         }).
 -endif.
 
@@ -127,15 +128,4 @@
         }).
 -endif.
 
--ifndef('DIRECTIVE_PB_H').
--define('DIRECTIVE_PB_H', true).
--record(directive,
-        {device_uuid = <<>>     :: unicode:chardata() | undefined, % = 1, optional
-         version = <<>>         :: unicode:chardata() | undefined, % = 2, optional
-         directive_type = 0     :: non_neg_integer() | undefined, % = 3, optional, 32 bits
-         timeout = 0            :: non_neg_integer() | undefined, % = 4, optional, 32 bits
-         directive = <<>>       :: iodata() | undefined % = 5, optional
-        }).
--endif.
-
 -endif.

apps/efka/src/efka_agent.erl

@@ -144,18 +144,17 @@ handle_info({server_push_message, <<8:8, ActivatePush>>}, State = #state{transpo
             {noreply, State#state{status = ?STATE_DENIED}}
     end;
 
-%% 收到指令
+%% TODO 收到指令
-handle_info({server_push_message, <<16:8, Directive>>}, State = #state{transport_pid = TransportPid, status = Status}) ->
+handle_info({server_push_message, <<16:8, Directive>>}, State = #state{}) ->
-    #activate_push{auth = Auth} = message_pb:decode_msg(Directive, activate_push),
+    #topic_message{topic = Topic, content = Content} = message_pb:decode_msg(Directive, directive),
-    case {Auth, Status} of
+    lager:debug("[efka_agent] get directive to device_uuid: ~p, content: ~p", [Topic, Content]),
-        {true, ?STATE_ACTIVATED} ->
+    {noreply, State};
-            {noreply, State};
+
-        {true, ?STATE_DENIED} ->
+%% TODO 收到需要回复的指令
-            efka_transport:auth_request(TransportPid, 5000),
+handle_info({server_push_message, PacketId, <<16:8, Directive>>}, State = #state{}) ->
-            {noreply, State};
+    #topic_message{topic = Topic, content = Content} = message_pb:decode_msg(Directive, directive),
-        {false, _} ->
+    lager:debug("[efka_agent] get directive with packet_id: ~p, to device_uuid: ~p, content: ~p", [PacketId, Topic, Content]),
-            {noreply, State#state{status = ?STATE_DENIED}}
+    {noreply, State};
-    end;
 
 %% 不管transport因为什么原因退出，间隔一定时间后重试
 handle_info({'EXIT', TransportPid, Reason}, State = #state{transport_pid = TransportPid}) ->

apps/efka/src/proto/message_pb.erl

@@ -61,7 +61,7 @@
 
 -type activate_push() :: #activate_push{}.
 
--type session_request() :: #session_request{}.
+-type topic_message() :: #topic_message{}.
 
 -type session_reply() :: #session_reply{}.
 
@@ -79,11 +79,9 @@
 
 -type ai_event() :: #ai_event{}.
 
--type directive() :: #directive{}.
+-export_type(['auth_request'/0, 'auth_reply'/0, 'activate_push'/0, 'topic_message'/0, 'session_reply'/0, 'data'/0, 'ping'/0, 'service_inform'/0, 'feedback_step'/0, 'feedback_result'/0, 'event'/0, 'ai_event'/0]).
-
+-type '$msg_name'() :: auth_request | auth_reply | activate_push | topic_message | session_reply | data | ping | service_inform | feedback_step | feedback_result | event | ai_event.
--export_type(['auth_request'/0, 'auth_reply'/0, 'activate_push'/0, 'session_request'/0, 'session_reply'/0, 'data'/0, 'ping'/0, 'service_inform'/0, 'feedback_step'/0, 'feedback_result'/0, 'event'/0, 'ai_event'/0, 'directive'/0]).
+-type '$msg'() :: auth_request() | auth_reply() | activate_push() | topic_message() | session_reply() | data() | ping() | service_inform() | feedback_step() | feedback_result() | event() | ai_event().
--type '$msg_name'() :: auth_request | auth_reply | activate_push | session_request | session_reply | data | ping | service_inform | feedback_step | feedback_result | event | ai_event | directive.
--type '$msg'() :: auth_request() | auth_reply() | activate_push() | session_request() | session_reply() | data() | ping() | service_inform() | feedback_step() | feedback_result() | event() | ai_event() | directive().
 -export_type(['$msg_name'/0, '$msg'/0]).
 
 -record('map<string,string>',{key, value}).
@@ -114,7 +112,7 @@ encode_msg(Msg, MsgName, Opts) ->
         auth_request -> encode_msg_auth_request(id(Msg, TrUserData), TrUserData);
         auth_reply -> encode_msg_auth_reply(id(Msg, TrUserData), TrUserData);
         activate_push -> encode_msg_activate_push(id(Msg, TrUserData), TrUserData);
-        session_request -> encode_msg_session_request(id(Msg, TrUserData), TrUserData);
+        topic_message -> encode_msg_topic_message(id(Msg, TrUserData), TrUserData);
         session_reply -> encode_msg_session_reply(id(Msg, TrUserData), TrUserData);
         data -> encode_msg_data(id(Msg, TrUserData), TrUserData);
         ping -> encode_msg_ping(id(Msg, TrUserData), TrUserData);
@@ -122,8 +120,7 @@ encode_msg(Msg, MsgName, Opts) ->
         feedback_step -> encode_msg_feedback_step(id(Msg, TrUserData), TrUserData);
         feedback_result -> encode_msg_feedback_result(id(Msg, TrUserData), TrUserData);
         event -> encode_msg_event(id(Msg, TrUserData), TrUserData);
-        ai_event -> encode_msg_ai_event(id(Msg, TrUserData), TrUserData);
+        ai_event -> encode_msg_ai_event(id(Msg, TrUserData), TrUserData)
-        directive -> encode_msg_directive(id(Msg, TrUserData), TrUserData)
     end.
 
 
@@ -229,7 +226,30 @@ encode_msg_activate_push(#activate_push{auth = F1}, Bin, TrUserData) ->
            end
     end.
 
-encode_msg_session_request(_Msg, _TrUserData) -> <<>>.
+encode_msg_topic_message(Msg, TrUserData) -> encode_msg_topic_message(Msg, <<>>, TrUserData).
+
+
+encode_msg_topic_message(#topic_message{topic = F1, content = F2}, Bin, TrUserData) ->
+    B1 = if F1 == undefined -> Bin;
+            true ->
+                begin
+                    TrF1 = id(F1, TrUserData),
+                    case is_empty_string(TrF1) of
+                        true -> Bin;
+                        false -> e_type_string(TrF1, <<Bin/binary, 10>>, TrUserData)
+                    end
+                end
+         end,
+    if F2 == undefined -> B1;
+       true ->
+           begin
+               TrF2 = id(F2, TrUserData),
+               case is_empty_string(TrF2) of
+                   true -> B1;
+                   false -> e_type_string(TrF2, <<B1/binary, 18>>, TrUserData)
+               end
+           end
+    end.
 
 encode_msg_session_reply(Msg, TrUserData) -> encode_msg_session_reply(Msg, <<>>, TrUserData).
 
@@ -604,59 +624,6 @@ encode_msg_ai_event(#ai_event{event_type = F1, params = F2}, Bin, TrUserData) ->
            end
     end.
 
-encode_msg_directive(Msg, TrUserData) -> encode_msg_directive(Msg, <<>>, TrUserData).
-
-
-encode_msg_directive(#directive{device_uuid = F1, version = F2, directive_type = F3, timeout = F4, directive = F5}, Bin, TrUserData) ->
-    B1 = if F1 == undefined -> Bin;
-            true ->
-                begin
-                    TrF1 = id(F1, TrUserData),
-                    case is_empty_string(TrF1) of
-                        true -> Bin;
-                        false -> e_type_string(TrF1, <<Bin/binary, 10>>, TrUserData)
-                    end
-                end
-         end,
-    B2 = if F2 == undefined -> B1;
-            true ->
-                begin
-                    TrF2 = id(F2, TrUserData),
-                    case is_empty_string(TrF2) of
-                        true -> B1;
-                        false -> e_type_string(TrF2, <<B1/binary, 18>>, TrUserData)
-                    end
-                end
-         end,
-    B3 = if F3 == undefined -> B2;
-            true ->
-                begin
-                    TrF3 = id(F3, TrUserData),
-                    if TrF3 =:= 0 -> B2;
-                       true -> e_varint(TrF3, <<B2/binary, 24>>, TrUserData)
-                    end
-                end
-         end,
-    B4 = if F4 == undefined -> B3;
-            true ->
-                begin
-                    TrF4 = id(F4, TrUserData),
-                    if TrF4 =:= 0 -> B3;
-                       true -> e_varint(TrF4, <<B3/binary, 32>>, TrUserData)
-                    end
-                end
-         end,
-    if F5 == undefined -> B4;
-       true ->
-           begin
-               TrF5 = id(F5, TrUserData),
-               case iolist_size(TrF5) of
-                   0 -> B4;
-                   _ -> e_type_bytes(TrF5, <<B4/binary, 42>>, TrUserData)
-               end
-           end
-    end.
-
 e_mfield_data_tags(Msg, Bin, TrUserData) ->
     SubBin = 'encode_msg_map<string,string>'(Msg, <<>>, TrUserData),
     Bin2 = e_varint(byte_size(SubBin), Bin),
@@ -855,7 +822,7 @@ decode_msg_1_catch(Bin, MsgName, TrUserData) ->
 decode_msg_2_doit(auth_request, Bin, TrUserData) -> id(decode_msg_auth_request(Bin, TrUserData), TrUserData);
 decode_msg_2_doit(auth_reply, Bin, TrUserData) -> id(decode_msg_auth_reply(Bin, TrUserData), TrUserData);
 decode_msg_2_doit(activate_push, Bin, TrUserData) -> id(decode_msg_activate_push(Bin, TrUserData), TrUserData);
-decode_msg_2_doit(session_request, Bin, TrUserData) -> id(decode_msg_session_request(Bin, TrUserData), TrUserData);
+decode_msg_2_doit(topic_message, Bin, TrUserData) -> id(decode_msg_topic_message(Bin, TrUserData), TrUserData);
 decode_msg_2_doit(session_reply, Bin, TrUserData) -> id(decode_msg_session_reply(Bin, TrUserData), TrUserData);
 decode_msg_2_doit(data, Bin, TrUserData) -> id(decode_msg_data(Bin, TrUserData), TrUserData);
 decode_msg_2_doit(ping, Bin, TrUserData) -> id(decode_msg_ping(Bin, TrUserData), TrUserData);
@@ -863,8 +830,7 @@ decode_msg_2_doit(service_inform, Bin, TrUserData) -> id(decode_msg_service_info
 decode_msg_2_doit(feedback_step, Bin, TrUserData) -> id(decode_msg_feedback_step(Bin, TrUserData), TrUserData);
 decode_msg_2_doit(feedback_result, Bin, TrUserData) -> id(decode_msg_feedback_result(Bin, TrUserData), TrUserData);
 decode_msg_2_doit(event, Bin, TrUserData) -> id(decode_msg_event(Bin, TrUserData), TrUserData);
-decode_msg_2_doit(ai_event, Bin, TrUserData) -> id(decode_msg_ai_event(Bin, TrUserData), TrUserData);
+decode_msg_2_doit(ai_event, Bin, TrUserData) -> id(decode_msg_ai_event(Bin, TrUserData), TrUserData).
-decode_msg_2_doit(directive, Bin, TrUserData) -> id(decode_msg_directive(Bin, TrUserData), TrUserData).
 
 
 
@@ -1042,39 +1008,56 @@ skip_32_activate_push(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, TrUserData) -> dfp
 
 skip_64_activate_push(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, TrUserData) -> dfp_read_field_def_activate_push(Rest, Z1, Z2, F, F@_1, TrUserData).
 
-decode_msg_session_request(Bin, TrUserData) -> dfp_read_field_def_session_request(Bin, 0, 0, 0, TrUserData).
+decode_msg_topic_message(Bin, TrUserData) -> dfp_read_field_def_topic_message(Bin, 0, 0, 0, id(<<>>, TrUserData), id(<<>>, TrUserData), TrUserData).
 
-dfp_read_field_def_session_request(<<>>, 0, 0, _, _) -> #session_request{};
+dfp_read_field_def_topic_message(<<10, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> d_field_topic_message_topic(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData);
-dfp_read_field_def_session_request(Other, Z1, Z2, F, TrUserData) -> dg_read_field_def_session_request(Other, Z1, Z2, F, TrUserData).
+dfp_read_field_def_topic_message(<<18, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> d_field_topic_message_content(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData);
+dfp_read_field_def_topic_message(<<>>, 0, 0, _, F@_1, F@_2, _) -> #topic_message{topic = F@_1, content = F@_2};
+dfp_read_field_def_topic_message(Other, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dg_read_field_def_topic_message(Other, Z1, Z2, F, F@_1, F@_2, TrUserData).
 
-dg_read_field_def_session_request(<<1:1, X:7, Rest/binary>>, N, Acc, F, TrUserData) when N < 32 - 7 -> dg_read_field_def_session_request(Rest, N + 7, X bsl N + Acc, F, TrUserData);
+dg_read_field_def_topic_message(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 32 - 7 -> dg_read_field_def_topic_message(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData);
-dg_read_field_def_session_request(<<0:1, X:7, Rest/binary>>, N, Acc, _, TrUserData) ->
+dg_read_field_def_topic_message(<<0:1, X:7, Rest/binary>>, N, Acc, _, F@_1, F@_2, TrUserData) ->
     Key = X bsl N + Acc,
-    case Key band 7 of
+    case Key of
-        0 -> skip_varint_session_request(Rest, 0, 0, Key bsr 3, TrUserData);
+        10 -> d_field_topic_message_topic(Rest, 0, 0, 0, F@_1, F@_2, TrUserData);
-        1 -> skip_64_session_request(Rest, 0, 0, Key bsr 3, TrUserData);
+        18 -> d_field_topic_message_content(Rest, 0, 0, 0, F@_1, F@_2, TrUserData);
-        2 -> skip_length_delimited_session_request(Rest, 0, 0, Key bsr 3, TrUserData);
+        _ ->
-        3 -> skip_group_session_request(Rest, 0, 0, Key bsr 3, TrUserData);
+            case Key band 7 of
-        5 -> skip_32_session_request(Rest, 0, 0, Key bsr 3, TrUserData)
+                0 -> skip_varint_topic_message(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData);
+                1 -> skip_64_topic_message(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData);
+                2 -> skip_length_delimited_topic_message(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData);
+                3 -> skip_group_topic_message(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData);
+                5 -> skip_32_topic_message(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData)
+            end
     end;
-dg_read_field_def_session_request(<<>>, 0, 0, _, _) -> #session_request{}.
+dg_read_field_def_topic_message(<<>>, 0, 0, _, F@_1, F@_2, _) -> #topic_message{topic = F@_1, content = F@_2}.
 
-skip_varint_session_request(<<1:1, _:7, Rest/binary>>, Z1, Z2, F, TrUserData) -> skip_varint_session_request(Rest, Z1, Z2, F, TrUserData);
+d_field_topic_message_topic(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> d_field_topic_message_topic(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData);
-skip_varint_session_request(<<0:1, _:7, Rest/binary>>, Z1, Z2, F, TrUserData) -> dfp_read_field_def_session_request(Rest, Z1, Z2, F, TrUserData).
+d_field_topic_message_topic(<<0:1, X:7, Rest/binary>>, N, Acc, F, _, F@_2, TrUserData) ->
+    {NewFValue, RestF} = begin Len = X bsl N + Acc, <<Bytes:Len/binary, Rest2/binary>> = Rest, Bytes2 = binary:copy(Bytes), {id(Bytes2, TrUserData), Rest2} end,
+    dfp_read_field_def_topic_message(RestF, 0, 0, F, NewFValue, F@_2, TrUserData).
 
-skip_length_delimited_session_request(<<1:1, X:7, Rest/binary>>, N, Acc, F, TrUserData) when N < 57 -> skip_length_delimited_session_request(Rest, N + 7, X bsl N + Acc, F, TrUserData);
+d_field_topic_message_content(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> d_field_topic_message_content(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData);
-skip_length_delimited_session_request(<<0:1, X:7, Rest/binary>>, N, Acc, F, TrUserData) ->
+d_field_topic_message_content(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, _, TrUserData) ->
+    {NewFValue, RestF} = begin Len = X bsl N + Acc, <<Bytes:Len/binary, Rest2/binary>> = Rest, Bytes2 = binary:copy(Bytes), {id(Bytes2, TrUserData), Rest2} end,
+    dfp_read_field_def_topic_message(RestF, 0, 0, F, F@_1, NewFValue, TrUserData).
+
+skip_varint_topic_message(<<1:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> skip_varint_topic_message(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData);
+skip_varint_topic_message(<<0:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_topic_message(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData).
+
+skip_length_delimited_topic_message(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> skip_length_delimited_topic_message(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData);
+skip_length_delimited_topic_message(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) ->
     Length = X bsl N + Acc,
     <<_:Length/binary, Rest2/binary>> = Rest,
-    dfp_read_field_def_session_request(Rest2, 0, 0, F, TrUserData).
+    dfp_read_field_def_topic_message(Rest2, 0, 0, F, F@_1, F@_2, TrUserData).
 
-skip_group_session_request(Bin, _, Z2, FNum, TrUserData) ->
+skip_group_topic_message(Bin, _, Z2, FNum, F@_1, F@_2, TrUserData) ->
     {_, Rest} = read_group(Bin, FNum),
-    dfp_read_field_def_session_request(Rest, 0, Z2, FNum, TrUserData).
+    dfp_read_field_def_topic_message(Rest, 0, Z2, FNum, F@_1, F@_2, TrUserData).
 
-skip_32_session_request(<<_:32, Rest/binary>>, Z1, Z2, F, TrUserData) -> dfp_read_field_def_session_request(Rest, Z1, Z2, F, TrUserData).
+skip_32_topic_message(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_topic_message(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData).
 
-skip_64_session_request(<<_:64, Rest/binary>>, Z1, Z2, F, TrUserData) -> dfp_read_field_def_session_request(Rest, Z1, Z2, F, TrUserData).
+skip_64_topic_message(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_topic_message(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData).
 
 decode_msg_session_reply(Bin, TrUserData) -> dfp_read_field_def_session_reply(Bin, 0, 0, 0, id(false, TrUserData), TrUserData).
 
@@ -1727,78 +1710,6 @@ skip_32_ai_event(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> df
 
 skip_64_ai_event(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_ai_event(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData).
 
-decode_msg_directive(Bin, TrUserData) -> dfp_read_field_def_directive(Bin, 0, 0, 0, id(<<>>, TrUserData), id(<<>>, TrUserData), id(0, TrUserData), id(0, TrUserData), id(<<>>, TrUserData), TrUserData).
-
-dfp_read_field_def_directive(<<10, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData) -> d_field_directive_device_uuid(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData);
-dfp_read_field_def_directive(<<18, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData) -> d_field_directive_version(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData);
-dfp_read_field_def_directive(<<24, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData) -> d_field_directive_directive_type(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData);
-dfp_read_field_def_directive(<<32, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData) -> d_field_directive_timeout(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData);
-dfp_read_field_def_directive(<<42, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData) -> d_field_directive_directive(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData);
-dfp_read_field_def_directive(<<>>, 0, 0, _, F@_1, F@_2, F@_3, F@_4, F@_5, _) -> #directive{device_uuid = F@_1, version = F@_2, directive_type = F@_3, timeout = F@_4, directive = F@_5};
-dfp_read_field_def_directive(Other, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData) -> dg_read_field_def_directive(Other, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData).
-
-dg_read_field_def_directive(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData) when N < 32 - 7 -> dg_read_field_def_directive(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData);
-dg_read_field_def_directive(<<0:1, X:7, Rest/binary>>, N, Acc, _, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData) ->
-    Key = X bsl N + Acc,
-    case Key of
-        10 -> d_field_directive_device_uuid(Rest, 0, 0, 0, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData);
-        18 -> d_field_directive_version(Rest, 0, 0, 0, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData);
-        24 -> d_field_directive_directive_type(Rest, 0, 0, 0, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData);
-        32 -> d_field_directive_timeout(Rest, 0, 0, 0, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData);
-        42 -> d_field_directive_directive(Rest, 0, 0, 0, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData);
-        _ ->
-            case Key band 7 of
-                0 -> skip_varint_directive(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData);
-                1 -> skip_64_directive(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData);
-                2 -> skip_length_delimited_directive(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData);
-                3 -> skip_group_directive(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData);
-                5 -> skip_32_directive(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData)
-            end
-    end;
-dg_read_field_def_directive(<<>>, 0, 0, _, F@_1, F@_2, F@_3, F@_4, F@_5, _) -> #directive{device_uuid = F@_1, version = F@_2, directive_type = F@_3, timeout = F@_4, directive = F@_5}.
-
-d_field_directive_device_uuid(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData) when N < 57 -> d_field_directive_device_uuid(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData);
-d_field_directive_device_uuid(<<0:1, X:7, Rest/binary>>, N, Acc, F, _, F@_2, F@_3, F@_4, F@_5, TrUserData) ->
-    {NewFValue, RestF} = begin Len = X bsl N + Acc, <<Bytes:Len/binary, Rest2/binary>> = Rest, Bytes2 = binary:copy(Bytes), {id(Bytes2, TrUserData), Rest2} end,
-    dfp_read_field_def_directive(RestF, 0, 0, F, NewFValue, F@_2, F@_3, F@_4, F@_5, TrUserData).
-
-d_field_directive_version(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData) when N < 57 -> d_field_directive_version(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData);
-d_field_directive_version(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, _, F@_3, F@_4, F@_5, TrUserData) ->
-    {NewFValue, RestF} = begin Len = X bsl N + Acc, <<Bytes:Len/binary, Rest2/binary>> = Rest, Bytes2 = binary:copy(Bytes), {id(Bytes2, TrUserData), Rest2} end,
-    dfp_read_field_def_directive(RestF, 0, 0, F, F@_1, NewFValue, F@_3, F@_4, F@_5, TrUserData).
-
-d_field_directive_directive_type(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData) when N < 57 -> d_field_directive_directive_type(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData);
-d_field_directive_directive_type(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, _, F@_4, F@_5, TrUserData) ->
-    {NewFValue, RestF} = {id((X bsl N + Acc) band 4294967295, TrUserData), Rest},
-    dfp_read_field_def_directive(RestF, 0, 0, F, F@_1, F@_2, NewFValue, F@_4, F@_5, TrUserData).
-
-d_field_directive_timeout(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData) when N < 57 -> d_field_directive_timeout(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData);
-d_field_directive_timeout(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, _, F@_5, TrUserData) ->
-    {NewFValue, RestF} = {id((X bsl N + Acc) band 4294967295, TrUserData), Rest},
-    dfp_read_field_def_directive(RestF, 0, 0, F, F@_1, F@_2, F@_3, NewFValue, F@_5, TrUserData).
-
-d_field_directive_directive(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData) when N < 57 -> d_field_directive_directive(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData);
-d_field_directive_directive(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, _, TrUserData) ->
-    {NewFValue, RestF} = begin Len = X bsl N + Acc, <<Bytes:Len/binary, Rest2/binary>> = Rest, Bytes2 = binary:copy(Bytes), {id(Bytes2, TrUserData), Rest2} end,
-    dfp_read_field_def_directive(RestF, 0, 0, F, F@_1, F@_2, F@_3, F@_4, NewFValue, TrUserData).
-
-skip_varint_directive(<<1:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData) -> skip_varint_directive(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData);
-skip_varint_directive(<<0:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData) -> dfp_read_field_def_directive(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData).
-
-skip_length_delimited_directive(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData) when N < 57 -> skip_length_delimited_directive(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData);
-skip_length_delimited_directive(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData) ->
-    Length = X bsl N + Acc,
-    <<_:Length/binary, Rest2/binary>> = Rest,
-    dfp_read_field_def_directive(Rest2, 0, 0, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData).
-
-skip_group_directive(Bin, _, Z2, FNum, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData) ->
-    {_, Rest} = read_group(Bin, FNum),
-    dfp_read_field_def_directive(Rest, 0, Z2, FNum, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData).
-
-skip_32_directive(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData) -> dfp_read_field_def_directive(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData).
-
-skip_64_directive(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData) -> dfp_read_field_def_directive(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData).
-
 'decode_msg_map<string,string>'(Bin, TrUserData) -> 'dfp_read_field_def_map<string,string>'(Bin, 0, 0, 0, id(<<>>, TrUserData), id(<<>>, TrUserData), TrUserData).
 
 'dfp_read_field_def_map<string,string>'(<<10, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> 'd_field_map<string,string>_key'(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData);
@@ -1919,7 +1830,7 @@ merge_msgs(Prev, New, MsgName, Opts) ->
         auth_request -> merge_msg_auth_request(Prev, New, TrUserData);
         auth_reply -> merge_msg_auth_reply(Prev, New, TrUserData);
         activate_push -> merge_msg_activate_push(Prev, New, TrUserData);
-        session_request -> merge_msg_session_request(Prev, New, TrUserData);
+        topic_message -> merge_msg_topic_message(Prev, New, TrUserData);
         session_reply -> merge_msg_session_reply(Prev, New, TrUserData);
         data -> merge_msg_data(Prev, New, TrUserData);
         ping -> merge_msg_ping(Prev, New, TrUserData);
@@ -1927,8 +1838,7 @@ merge_msgs(Prev, New, MsgName, Opts) ->
         feedback_step -> merge_msg_feedback_step(Prev, New, TrUserData);
         feedback_result -> merge_msg_feedback_result(Prev, New, TrUserData);
         event -> merge_msg_event(Prev, New, TrUserData);
-        ai_event -> merge_msg_ai_event(Prev, New, TrUserData);
+        ai_event -> merge_msg_ai_event(Prev, New, TrUserData)
-        directive -> merge_msg_directive(Prev, New, TrUserData)
     end.
 
 -compile({nowarn_unused_function,merge_msg_auth_request/3}).
@@ -1976,8 +1886,16 @@ merge_msg_activate_push(#activate_push{auth = PFauth}, #activate_push{auth = NFa
                           true -> NFauth
                        end}.
 
--compile({nowarn_unused_function,merge_msg_session_request/3}).
+-compile({nowarn_unused_function,merge_msg_topic_message/3}).
-merge_msg_session_request(_Prev, New, _TrUserData) -> New.
+merge_msg_topic_message(#topic_message{topic = PFtopic, content = PFcontent}, #topic_message{topic = NFtopic, content = NFcontent}, _) ->
+    #topic_message{topic =
+                       if NFtopic =:= undefined -> PFtopic;
+                          true -> NFtopic
+                       end,
+                   content =
+                       if NFcontent =:= undefined -> PFcontent;
+                          true -> NFcontent
+                       end}.
 
 -compile({nowarn_unused_function,merge_msg_session_reply/3}).
 merge_msg_session_reply(#session_reply{a = PFa}, #session_reply{a = NFa}, _) ->
@@ -2164,30 +2082,6 @@ merge_msg_ai_event(#ai_event{event_type = PFevent_type, params = PFparams}, #ai_
                      true -> NFparams
                   end}.
 
--compile({nowarn_unused_function,merge_msg_directive/3}).
-merge_msg_directive(#directive{device_uuid = PFdevice_uuid, version = PFversion, directive_type = PFdirective_type, timeout = PFtimeout, directive = PFdirective},
-                    #directive{device_uuid = NFdevice_uuid, version = NFversion, directive_type = NFdirective_type, timeout = NFtimeout, directive = NFdirective}, _) ->
-    #directive{device_uuid =
-                   if NFdevice_uuid =:= undefined -> PFdevice_uuid;
-                      true -> NFdevice_uuid
-                   end,
-               version =
-                   if NFversion =:= undefined -> PFversion;
-                      true -> NFversion
-                   end,
-               directive_type =
-                   if NFdirective_type =:= undefined -> PFdirective_type;
-                      true -> NFdirective_type
-                   end,
-               timeout =
-                   if NFtimeout =:= undefined -> PFtimeout;
-                      true -> NFtimeout
-                   end,
-               directive =
-                   if NFdirective =:= undefined -> PFdirective;
-                      true -> NFdirective
-                   end}.
-
 
 verify_msg(Msg) when tuple_size(Msg) >= 1 -> verify_msg(Msg, element(1, Msg), []);
 verify_msg(X) -> mk_type_error(not_a_known_message, X, []).
@@ -2202,7 +2096,7 @@ verify_msg(Msg, MsgName, Opts) ->
         auth_request -> v_msg_auth_request(Msg, [MsgName], TrUserData);
         auth_reply -> v_msg_auth_reply(Msg, [MsgName], TrUserData);
         activate_push -> v_msg_activate_push(Msg, [MsgName], TrUserData);
-        session_request -> v_msg_session_request(Msg, [MsgName], TrUserData);
+        topic_message -> v_msg_topic_message(Msg, [MsgName], TrUserData);
         session_reply -> v_msg_session_reply(Msg, [MsgName], TrUserData);
         data -> v_msg_data(Msg, [MsgName], TrUserData);
         ping -> v_msg_ping(Msg, [MsgName], TrUserData);
@@ -2211,7 +2105,6 @@ verify_msg(Msg, MsgName, Opts) ->
         feedback_result -> v_msg_feedback_result(Msg, [MsgName], TrUserData);
         event -> v_msg_event(Msg, [MsgName], TrUserData);
         ai_event -> v_msg_ai_event(Msg, [MsgName], TrUserData);
-        directive -> v_msg_directive(Msg, [MsgName], TrUserData);
         _ -> mk_type_error(not_a_known_message, Msg, [])
     end.
 
@@ -2261,10 +2154,17 @@ v_msg_activate_push(#activate_push{auth = F1}, Path, TrUserData) ->
     ok;
 v_msg_activate_push(X, Path, _TrUserData) -> mk_type_error({expected_msg, activate_push}, X, Path).
 
--compile({nowarn_unused_function,v_msg_session_request/3}).
+-compile({nowarn_unused_function,v_msg_topic_message/3}).
--dialyzer({nowarn_function,v_msg_session_request/3}).
+-dialyzer({nowarn_function,v_msg_topic_message/3}).
-v_msg_session_request(#session_request{}, _Path, _) -> ok;
+v_msg_topic_message(#topic_message{topic = F1, content = F2}, Path, TrUserData) ->
-v_msg_session_request(X, Path, _TrUserData) -> mk_type_error({expected_msg, session_request}, X, Path).
+    if F1 == undefined -> ok;
+       true -> v_type_string(F1, [topic | Path], TrUserData)
+    end,
+    if F2 == undefined -> ok;
+       true -> v_type_string(F2, [content | Path], TrUserData)
+    end,
+    ok;
+v_msg_topic_message(X, Path, _TrUserData) -> mk_type_error({expected_msg, topic_message}, X, Path).
 
 -compile({nowarn_unused_function,v_msg_session_reply/3}).
 -dialyzer({nowarn_function,v_msg_session_reply/3}).
@@ -2433,27 +2333,6 @@ v_msg_ai_event(#ai_event{event_type = F1, params = F2}, Path, TrUserData) ->
     ok;
 v_msg_ai_event(X, Path, _TrUserData) -> mk_type_error({expected_msg, ai_event}, X, Path).
 
--compile({nowarn_unused_function,v_msg_directive/3}).
--dialyzer({nowarn_function,v_msg_directive/3}).
-v_msg_directive(#directive{device_uuid = F1, version = F2, directive_type = F3, timeout = F4, directive = F5}, Path, TrUserData) ->
-    if F1 == undefined -> ok;
-       true -> v_type_string(F1, [device_uuid | Path], TrUserData)
-    end,
-    if F2 == undefined -> ok;
-       true -> v_type_string(F2, [version | Path], TrUserData)
-    end,
-    if F3 == undefined -> ok;
-       true -> v_type_uint32(F3, [directive_type | Path], TrUserData)
-    end,
-    if F4 == undefined -> ok;
-       true -> v_type_uint32(F4, [timeout | Path], TrUserData)
-    end,
-    if F5 == undefined -> ok;
-       true -> v_type_bytes(F5, [directive | Path], TrUserData)
-    end,
-    ok;
-v_msg_directive(X, Path, _TrUserData) -> mk_type_error({expected_msg, directive}, X, Path).
-
 -compile({nowarn_unused_function,v_type_int32/3}).
 -dialyzer({nowarn_function,v_type_int32/3}).
 v_type_int32(N, _Path, _TrUserData) when is_integer(N), -2147483648 =< N, N =< 2147483647 -> ok;
@@ -2599,7 +2478,7 @@ get_msg_defs() ->
        #field{name = message, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []},
        #field{name = repository_url, fnum = 3, rnum = 4, type = string, occurrence = optional, opts = []}]},
      {{msg, activate_push}, [#field{name = auth, fnum = 1, rnum = 2, type = bool, occurrence = optional, opts = []}]},
-     {{msg, session_request}, []},
+     {{msg, topic_message}, [#field{name = topic, fnum = 1, rnum = 2, type = string, occurrence = optional, opts = []}, #field{name = content, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []}]},
      {{msg, session_reply}, [#field{name = a, fnum = 1, rnum = 2, type = bool, occurrence = optional, opts = []}]},
      {{msg, data},
       [#field{name = device_uuid, fnum = 1, rnum = 2, type = string, occurrence = optional, opts = []},
@@ -2637,22 +2516,16 @@ get_msg_defs() ->
        #field{name = reason, fnum = 5, rnum = 6, type = string, occurrence = optional, opts = []},
        #field{name = error, fnum = 6, rnum = 7, type = string, occurrence = optional, opts = []}]},
      {{msg, event}, [#field{name = event_type, fnum = 1, rnum = 2, type = uint32, occurrence = optional, opts = []}, #field{name = params, fnum = 2, rnum = 3, type = bytes, occurrence = optional, opts = []}]},
-     {{msg, ai_event}, [#field{name = event_type, fnum = 1, rnum = 2, type = uint32, occurrence = optional, opts = []}, #field{name = params, fnum = 2, rnum = 3, type = bytes, occurrence = optional, opts = []}]},
+     {{msg, ai_event}, [#field{name = event_type, fnum = 1, rnum = 2, type = uint32, occurrence = optional, opts = []}, #field{name = params, fnum = 2, rnum = 3, type = bytes, occurrence = optional, opts = []}]}].
-     {{msg, directive},
-      [#field{name = device_uuid, fnum = 1, rnum = 2, type = string, occurrence = optional, opts = []},
-       #field{name = version, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []},
-       #field{name = directive_type, fnum = 3, rnum = 4, type = uint32, occurrence = optional, opts = []},
-       #field{name = timeout, fnum = 4, rnum = 5, type = uint32, occurrence = optional, opts = []},
-       #field{name = directive, fnum = 5, rnum = 6, type = bytes, occurrence = optional, opts = []}]}].
 
 
-get_msg_names() -> [auth_request, auth_reply, activate_push, session_request, session_reply, data, ping, service_inform, feedback_step, feedback_result, event, ai_event, directive].
+get_msg_names() -> [auth_request, auth_reply, activate_push, topic_message, session_reply, data, ping, service_inform, feedback_step, feedback_result, event, ai_event].
 
 
 get_group_names() -> [].
 
 
-get_msg_or_group_names() -> [auth_request, auth_reply, activate_push, session_request, session_reply, data, ping, service_inform, feedback_step, feedback_result, event, ai_event, directive].
+get_msg_or_group_names() -> [auth_request, auth_reply, activate_push, topic_message, session_reply, data, ping, service_inform, feedback_step, feedback_result, event, ai_event].
 
 
 get_enum_names() -> [].
@@ -2680,7 +2553,7 @@ find_msg_def(auth_reply) ->
      #field{name = message, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []},
      #field{name = repository_url, fnum = 3, rnum = 4, type = string, occurrence = optional, opts = []}];
 find_msg_def(activate_push) -> [#field{name = auth, fnum = 1, rnum = 2, type = bool, occurrence = optional, opts = []}];
-find_msg_def(session_request) -> [];
+find_msg_def(topic_message) -> [#field{name = topic, fnum = 1, rnum = 2, type = string, occurrence = optional, opts = []}, #field{name = content, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []}];
 find_msg_def(session_reply) -> [#field{name = a, fnum = 1, rnum = 2, type = bool, occurrence = optional, opts = []}];
 find_msg_def(data) ->
     [#field{name = device_uuid, fnum = 1, rnum = 2, type = string, occurrence = optional, opts = []},
@@ -2719,12 +2592,6 @@ find_msg_def(feedback_result) ->
      #field{name = error, fnum = 6, rnum = 7, type = string, occurrence = optional, opts = []}];
 find_msg_def(event) -> [#field{name = event_type, fnum = 1, rnum = 2, type = uint32, occurrence = optional, opts = []}, #field{name = params, fnum = 2, rnum = 3, type = bytes, occurrence = optional, opts = []}];
 find_msg_def(ai_event) -> [#field{name = event_type, fnum = 1, rnum = 2, type = uint32, occurrence = optional, opts = []}, #field{name = params, fnum = 2, rnum = 3, type = bytes, occurrence = optional, opts = []}];
-find_msg_def(directive) ->
-    [#field{name = device_uuid, fnum = 1, rnum = 2, type = string, occurrence = optional, opts = []},
-     #field{name = version, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []},
-     #field{name = directive_type, fnum = 3, rnum = 4, type = uint32, occurrence = optional, opts = []},
-     #field{name = timeout, fnum = 4, rnum = 5, type = uint32, occurrence = optional, opts = []},
-     #field{name = directive, fnum = 5, rnum = 6, type = bytes, occurrence = optional, opts = []}];
 find_msg_def(_) -> error.
 
 
@@ -2786,7 +2653,7 @@ service_and_rpc_name_to_fqbins(S, R) -> error({gpb_error, {badservice_or_rpc, {S
 fqbin_to_msg_name(<<"AuthRequest">>) -> auth_request;
 fqbin_to_msg_name(<<"AuthReply">>) -> auth_reply;
 fqbin_to_msg_name(<<"ActivatePush">>) -> activate_push;
-fqbin_to_msg_name(<<"SessionRequest">>) -> session_request;
+fqbin_to_msg_name(<<"TopicMessage">>) -> topic_message;
 fqbin_to_msg_name(<<"SessionReply">>) -> session_reply;
 fqbin_to_msg_name(<<"Data">>) -> data;
 fqbin_to_msg_name(<<"Ping">>) -> ping;
@@ -2795,14 +2662,13 @@ fqbin_to_msg_name(<<"FeedbackStep">>) -> feedback_step;
 fqbin_to_msg_name(<<"FeedbackResult">>) -> feedback_result;
 fqbin_to_msg_name(<<"Event">>) -> event;
 fqbin_to_msg_name(<<"AIEvent">>) -> ai_event;
-fqbin_to_msg_name(<<"Directive">>) -> directive;
 fqbin_to_msg_name(E) -> error({gpb_error, {badmsg, E}}).
 
 
 msg_name_to_fqbin(auth_request) -> <<"AuthRequest">>;
 msg_name_to_fqbin(auth_reply) -> <<"AuthReply">>;
 msg_name_to_fqbin(activate_push) -> <<"ActivatePush">>;
-msg_name_to_fqbin(session_request) -> <<"SessionRequest">>;
+msg_name_to_fqbin(topic_message) -> <<"TopicMessage">>;
 msg_name_to_fqbin(session_reply) -> <<"SessionReply">>;
 msg_name_to_fqbin(data) -> <<"Data">>;
 msg_name_to_fqbin(ping) -> <<"Ping">>;
@@ -2811,7 +2677,6 @@ msg_name_to_fqbin(feedback_step) -> <<"FeedbackStep">>;
 msg_name_to_fqbin(feedback_result) -> <<"FeedbackResult">>;
 msg_name_to_fqbin(event) -> <<"Event">>;
 msg_name_to_fqbin(ai_event) -> <<"AIEvent">>;
-msg_name_to_fqbin(directive) -> <<"Directive">>;
 msg_name_to_fqbin(E) -> error({gpb_error, {badmsg, E}}).
 
 
@@ -2850,7 +2715,7 @@ get_all_source_basenames() -> ["message_pb.proto"].
 get_all_proto_names() -> ["message_pb"].
 
 
-get_msg_containment("message_pb") -> [ai_event, activate_push, auth_reply, auth_request, data, directive, event, feedback_result, feedback_step, ping, service_inform, session_reply, session_request];
+get_msg_containment("message_pb") -> [ai_event, activate_push, auth_reply, auth_request, data, event, feedback_result, feedback_step, ping, service_inform, session_reply, topic_message];
 get_msg_containment(P) -> error({gpb_error, {badproto, P}}).
 
 
@@ -2872,12 +2737,11 @@ get_enum_containment(P) -> error({gpb_error, {badproto, P}}).
 
 get_proto_by_msg_name_as_fqbin(<<"FeedbackStep">>) -> "message_pb";
 get_proto_by_msg_name_as_fqbin(<<"Data">>) -> "message_pb";
-get_proto_by_msg_name_as_fqbin(<<"SessionRequest">>) -> "message_pb";
 get_proto_by_msg_name_as_fqbin(<<"FeedbackResult">>) -> "message_pb";
 get_proto_by_msg_name_as_fqbin(<<"Event">>) -> "message_pb";
 get_proto_by_msg_name_as_fqbin(<<"AuthRequest">>) -> "message_pb";
 get_proto_by_msg_name_as_fqbin(<<"AIEvent">>) -> "message_pb";
-get_proto_by_msg_name_as_fqbin(<<"Directive">>) -> "message_pb";
+get_proto_by_msg_name_as_fqbin(<<"TopicMessage">>) -> "message_pb";
 get_proto_by_msg_name_as_fqbin(<<"Ping">>) -> "message_pb";
 get_proto_by_msg_name_as_fqbin(<<"ActivatePush">>) -> "message_pb";
 get_proto_by_msg_name_as_fqbin(<<"SessionReply">>) -> "message_pb";

message_pb.proto

@@ -21,9 +21,10 @@ message ActivatePush {
     bool auth = 1;
 }
 
-// 创建会话
+// 基于pub/sub的机制实现远程调用
-message SessionRequest {
+message TopicMessage {
-
+    string topic = 1;
+    string content = 2;
 }
 
 message SessionReply {
@@ -104,13 +105,4 @@ message Event {
 message AIEvent {
     uint32 event_type = 1;
     bytes params = 2;
-}
-
-// 指令
-message Directive {
-    string device_uuid = 1;
-    string version = 2;
-    uint32 directive_type = 3;
-    uint32 timeout = 4;
-    bytes directive = 5;
 }