diff --git a/apps/efka/include/efka.hrl b/apps/efka/include/efka.hrl index 6eeeacf..76880fa 100644 --- a/apps/efka/include/efka.hrl +++ b/apps/efka/include/efka.hrl @@ -19,7 +19,6 @@ -define(METHOD_INFORM, 16#04). -define(METHOD_EVENT, 16#07). -define(METHOD_PHASE, 16#09). -%% 部署微服务 -define(METHOD_DEPLOY, 16#10). %% 服务器基于pub/sub的消息 @@ -33,4 +32,11 @@ %% 服务器端推送消息 -define(PACKET_PUSH, 16#05). --define(PACKET_PUSH_REPLY, 16#06). \ No newline at end of file +-define(PACKET_PUSH_REPLY, 16#06). + +%% 主动推送的消息类型 + +%% 部署微服务 +-define(PUSH_DEPLOY, 16#01). +%% 服务配置 +-define(PUSH_SERVICE_CONFIG, 16#02). diff --git a/apps/efka/include/message_pb.hrl b/apps/efka/include/message_pb.hrl index e8f7ca9..9cfbd9d 100644 --- a/apps/efka/include/message_pb.hrl +++ b/apps/efka/include/message_pb.hrl @@ -27,6 +27,14 @@ }). -endif. +-ifndef('PUB_PB_H'). +-define('PUB_PB_H', true). +-record(pub, + {topic = <<>> :: unicode:chardata() | undefined, % = 1, optional + content = <<>> :: unicode:chardata() | undefined % = 2, optional + }). +-endif. + -ifndef('DEPLOY_PB_H'). -define('DEPLOY_PB_H', true). -record(deploy, @@ -36,25 +44,24 @@ }). -endif. --ifndef('PUB_PB_H'). --define('PUB_PB_H', true). --record(pub, - {topic = <<>> :: unicode:chardata() | undefined, % = 1, optional - content = <<>> :: unicode:chardata() | undefined % = 2, optional +-ifndef('DEPLOY_REPLY_PB_H'). +-define('DEPLOY_REPLY_PB_H', true). +-record(deploy_reply, + { }). -endif. --ifndef('PUSH_PB_H'). --define('PUSH_PB_H', true). --record(push, +-ifndef('INVOKE_PB_H'). +-define('INVOKE_PB_H', true). +-record(invoke, {service_id = <<>> :: unicode:chardata() | undefined, % = 1, optional payload = <<>> :: unicode:chardata() | undefined % = 2, optional }). -endif. --ifndef('PUSH_RESPONSE_PB_H'). --define('PUSH_RESPONSE_PB_H', true). --record(push_response, +-ifndef('INVOKE_REPLY_PB_H'). +-define('INVOKE_REPLY_PB_H', true). +-record(invoke_reply, {response = <<>> :: unicode:chardata() | undefined % = 1, optional }). -endif. @@ -68,6 +75,13 @@ }). -endif. +-ifndef('SERVICE_CONFIG_REPLY_PB_H'). +-define('SERVICE_CONFIG_REPLY_PB_H', true). +-record(service_config_reply, + { + }). +-endif. + -ifndef('DATA_PB_H'). -define('DATA_PB_H', true). -record(data, diff --git a/apps/efka/src/proto/message_pb.erl b/apps/efka/src/proto/message_pb.erl index 41361de..3fba65b 100644 --- a/apps/efka/src/proto/message_pb.erl +++ b/apps/efka/src/proto/message_pb.erl @@ -59,16 +59,20 @@ -type auth_reply() :: #auth_reply{}. --type deploy() :: #deploy{}. - -type pub() :: #pub{}. --type push() :: #push{}. +-type deploy() :: #deploy{}. --type push_response() :: #push_response{}. +-type deploy_reply() :: #deploy_reply{}. + +-type invoke() :: #invoke{}. + +-type invoke_reply() :: #invoke_reply{}. -type service_config() :: #service_config{}. +-type service_config_reply() :: #service_config_reply{}. + -type data() :: #data{}. -type ping() :: #ping{}. @@ -79,9 +83,9 @@ -type event() :: #event{}. --export_type(['auth_request'/0, 'auth_reply'/0, 'deploy'/0, 'pub'/0, 'push'/0, 'push_response'/0, 'service_config'/0, 'data'/0, 'ping'/0, 'service_inform'/0, 'feedback_phase'/0, 'event'/0]). --type '$msg_name'() :: auth_request | auth_reply | deploy | pub | push | push_response | service_config | data | ping | service_inform | feedback_phase | event. --type '$msg'() :: auth_request() | auth_reply() | deploy() | pub() | push() | push_response() | service_config() | data() | ping() | service_inform() | feedback_phase() | event(). +-export_type(['auth_request'/0, 'auth_reply'/0, 'pub'/0, 'deploy'/0, 'deploy_reply'/0, 'invoke'/0, 'invoke_reply'/0, 'service_config'/0, 'service_config_reply'/0, 'data'/0, 'ping'/0, 'service_inform'/0, 'feedback_phase'/0, 'event'/0]). +-type '$msg_name'() :: auth_request | auth_reply | pub | deploy | deploy_reply | invoke | invoke_reply | service_config | service_config_reply | data | ping | service_inform | feedback_phase | event. +-type '$msg'() :: auth_request() | auth_reply() | pub() | deploy() | deploy_reply() | invoke() | invoke_reply() | service_config() | service_config_reply() | data() | ping() | service_inform() | feedback_phase() | event(). -export_type(['$msg_name'/0, '$msg'/0]). -if(?OTP_RELEASE >= 24). @@ -110,11 +114,13 @@ encode_msg(Msg, MsgName, Opts) -> case MsgName of auth_request -> encode_msg_auth_request(id(Msg, TrUserData), TrUserData); auth_reply -> encode_msg_auth_reply(id(Msg, TrUserData), TrUserData); - deploy -> encode_msg_deploy(id(Msg, TrUserData), TrUserData); pub -> encode_msg_pub(id(Msg, TrUserData), TrUserData); - push -> encode_msg_push(id(Msg, TrUserData), TrUserData); - push_response -> encode_msg_push_response(id(Msg, TrUserData), TrUserData); + deploy -> encode_msg_deploy(id(Msg, TrUserData), TrUserData); + deploy_reply -> encode_msg_deploy_reply(id(Msg, TrUserData), TrUserData); + invoke -> encode_msg_invoke(id(Msg, TrUserData), TrUserData); + invoke_reply -> encode_msg_invoke_reply(id(Msg, TrUserData), TrUserData); service_config -> encode_msg_service_config(id(Msg, TrUserData), TrUserData); + service_config_reply -> encode_msg_service_config_reply(id(Msg, TrUserData), TrUserData); data -> encode_msg_data(id(Msg, TrUserData), TrUserData); ping -> encode_msg_ping(id(Msg, TrUserData), TrUserData); service_inform -> encode_msg_service_inform(id(Msg, TrUserData), TrUserData); @@ -201,6 +207,31 @@ encode_msg_auth_reply(#auth_reply{code = F1, message = F2}, Bin, TrUserData) -> end end. +encode_msg_pub(Msg, TrUserData) -> encode_msg_pub(Msg, <<>>, TrUserData). + + +encode_msg_pub(#pub{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, <>, 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, <>, TrUserData) + end + end + end. + encode_msg_deploy(Msg, TrUserData) -> encode_msg_deploy(Msg, <<>>, TrUserData). @@ -235,10 +266,12 @@ encode_msg_deploy(#deploy{task_id = F1, service_id = F2, tar_url = F3}, Bin, TrU end end. -encode_msg_pub(Msg, TrUserData) -> encode_msg_pub(Msg, <<>>, TrUserData). +encode_msg_deploy_reply(_Msg, _TrUserData) -> <<>>. + +encode_msg_invoke(Msg, TrUserData) -> encode_msg_invoke(Msg, <<>>, TrUserData). -encode_msg_pub(#pub{topic = F1, content = F2}, Bin, TrUserData) -> +encode_msg_invoke(#invoke{service_id = F1, payload = F2}, Bin, TrUserData) -> B1 = if F1 == undefined -> Bin; true -> begin @@ -260,35 +293,10 @@ encode_msg_pub(#pub{topic = F1, content = F2}, Bin, TrUserData) -> end end. -encode_msg_push(Msg, TrUserData) -> encode_msg_push(Msg, <<>>, TrUserData). +encode_msg_invoke_reply(Msg, TrUserData) -> encode_msg_invoke_reply(Msg, <<>>, TrUserData). -encode_msg_push(#push{service_id = F1, payload = 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, <>, 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, <>, TrUserData) - end - end - end. - -encode_msg_push_response(Msg, TrUserData) -> encode_msg_push_response(Msg, <<>>, TrUserData). - - -encode_msg_push_response(#push_response{response = F1}, Bin, TrUserData) -> +encode_msg_invoke_reply(#invoke_reply{response = F1}, Bin, TrUserData) -> if F1 == undefined -> Bin; true -> begin @@ -334,6 +342,8 @@ encode_msg_service_config(#service_config{service_id = F1, config_json = F2, tim end end. +encode_msg_service_config_reply(_Msg, _TrUserData) -> <<>>. + encode_msg_data(Msg, TrUserData) -> encode_msg_data(Msg, <<>>, TrUserData). @@ -769,11 +779,13 @@ 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(deploy, Bin, TrUserData) -> id(decode_msg_deploy(Bin, TrUserData), TrUserData); decode_msg_2_doit(pub, Bin, TrUserData) -> id(decode_msg_pub(Bin, TrUserData), TrUserData); -decode_msg_2_doit(push, Bin, TrUserData) -> id(decode_msg_push(Bin, TrUserData), TrUserData); -decode_msg_2_doit(push_response, Bin, TrUserData) -> id(decode_msg_push_response(Bin, TrUserData), TrUserData); +decode_msg_2_doit(deploy, Bin, TrUserData) -> id(decode_msg_deploy(Bin, TrUserData), TrUserData); +decode_msg_2_doit(deploy_reply, Bin, TrUserData) -> id(decode_msg_deploy_reply(Bin, TrUserData), TrUserData); +decode_msg_2_doit(invoke, Bin, TrUserData) -> id(decode_msg_invoke(Bin, TrUserData), TrUserData); +decode_msg_2_doit(invoke_reply, Bin, TrUserData) -> id(decode_msg_invoke_reply(Bin, TrUserData), TrUserData); decode_msg_2_doit(service_config, Bin, TrUserData) -> id(decode_msg_service_config(Bin, TrUserData), TrUserData); +decode_msg_2_doit(service_config_reply, Bin, TrUserData) -> id(decode_msg_service_config_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); decode_msg_2_doit(service_inform, Bin, TrUserData) -> id(decode_msg_service_inform(Bin, TrUserData), TrUserData); @@ -905,6 +917,57 @@ skip_32_auth_reply(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> skip_64_auth_reply(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_auth_reply(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData). +decode_msg_pub(Bin, TrUserData) -> dfp_read_field_def_pub(Bin, 0, 0, 0, id(<<>>, TrUserData), id(<<>>, TrUserData), TrUserData). + +dfp_read_field_def_pub(<<10, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> d_field_pub_topic(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); +dfp_read_field_def_pub(<<18, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> d_field_pub_content(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); +dfp_read_field_def_pub(<<>>, 0, 0, _, F@_1, F@_2, _) -> #pub{topic = F@_1, content = F@_2}; +dfp_read_field_def_pub(Other, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dg_read_field_def_pub(Other, Z1, Z2, F, F@_1, F@_2, TrUserData). + +dg_read_field_def_pub(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 32 - 7 -> dg_read_field_def_pub(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); +dg_read_field_def_pub(<<0:1, X:7, Rest/binary>>, N, Acc, _, F@_1, F@_2, TrUserData) -> + Key = X bsl N + Acc, + case Key of + 10 -> d_field_pub_topic(Rest, 0, 0, 0, F@_1, F@_2, TrUserData); + 18 -> d_field_pub_content(Rest, 0, 0, 0, F@_1, F@_2, TrUserData); + _ -> + case Key band 7 of + 0 -> skip_varint_pub(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); + 1 -> skip_64_pub(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); + 2 -> skip_length_delimited_pub(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); + 3 -> skip_group_pub(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); + 5 -> skip_32_pub(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData) + end + end; +dg_read_field_def_pub(<<>>, 0, 0, _, F@_1, F@_2, _) -> #pub{topic = F@_1, content = F@_2}. + +d_field_pub_topic(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> d_field_pub_topic(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); +d_field_pub_topic(<<0:1, X:7, Rest/binary>>, N, Acc, F, _, F@_2, TrUserData) -> + {NewFValue, RestF} = begin Len = X bsl N + Acc, <> = Rest, Bytes2 = binary:copy(Bytes), {id(Bytes2, TrUserData), Rest2} end, + dfp_read_field_def_pub(RestF, 0, 0, F, NewFValue, F@_2, TrUserData). + +d_field_pub_content(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> d_field_pub_content(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); +d_field_pub_content(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, _, TrUserData) -> + {NewFValue, RestF} = begin Len = X bsl N + Acc, <> = Rest, Bytes2 = binary:copy(Bytes), {id(Bytes2, TrUserData), Rest2} end, + dfp_read_field_def_pub(RestF, 0, 0, F, F@_1, NewFValue, TrUserData). + +skip_varint_pub(<<1:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> skip_varint_pub(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); +skip_varint_pub(<<0:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_pub(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData). + +skip_length_delimited_pub(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> skip_length_delimited_pub(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); +skip_length_delimited_pub(<<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_pub(Rest2, 0, 0, F, F@_1, F@_2, TrUserData). + +skip_group_pub(Bin, _, Z2, FNum, F@_1, F@_2, TrUserData) -> + {_, Rest} = read_group(Bin, FNum), + dfp_read_field_def_pub(Rest, 0, Z2, FNum, F@_1, F@_2, TrUserData). + +skip_32_pub(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_pub(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData). + +skip_64_pub(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_pub(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData). + decode_msg_deploy(Bin, TrUserData) -> dfp_read_field_def_deploy(Bin, 0, 0, 0, id(0, TrUserData), id(<<>>, TrUserData), id(<<>>, TrUserData), TrUserData). dfp_read_field_def_deploy(<<8, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> d_field_deploy_task_id(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData); @@ -963,151 +1026,134 @@ skip_32_deploy(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) - skip_64_deploy(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> dfp_read_field_def_deploy(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData). -decode_msg_pub(Bin, TrUserData) -> dfp_read_field_def_pub(Bin, 0, 0, 0, id(<<>>, TrUserData), id(<<>>, TrUserData), TrUserData). +decode_msg_deploy_reply(Bin, TrUserData) -> dfp_read_field_def_deploy_reply(Bin, 0, 0, 0, TrUserData). -dfp_read_field_def_pub(<<10, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> d_field_pub_topic(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); -dfp_read_field_def_pub(<<18, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> d_field_pub_content(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); -dfp_read_field_def_pub(<<>>, 0, 0, _, F@_1, F@_2, _) -> #pub{topic = F@_1, content = F@_2}; -dfp_read_field_def_pub(Other, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dg_read_field_def_pub(Other, Z1, Z2, F, F@_1, F@_2, TrUserData). +dfp_read_field_def_deploy_reply(<<>>, 0, 0, _, _) -> #deploy_reply{}; +dfp_read_field_def_deploy_reply(Other, Z1, Z2, F, TrUserData) -> dg_read_field_def_deploy_reply(Other, Z1, Z2, F, TrUserData). -dg_read_field_def_pub(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 32 - 7 -> dg_read_field_def_pub(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); -dg_read_field_def_pub(<<0:1, X:7, Rest/binary>>, N, Acc, _, F@_1, F@_2, TrUserData) -> +dg_read_field_def_deploy_reply(<<1:1, X:7, Rest/binary>>, N, Acc, F, TrUserData) when N < 32 - 7 -> dg_read_field_def_deploy_reply(Rest, N + 7, X bsl N + Acc, F, TrUserData); +dg_read_field_def_deploy_reply(<<0:1, X:7, Rest/binary>>, N, Acc, _, TrUserData) -> Key = X bsl N + Acc, - case Key of - 10 -> d_field_pub_topic(Rest, 0, 0, 0, F@_1, F@_2, TrUserData); - 18 -> d_field_pub_content(Rest, 0, 0, 0, F@_1, F@_2, TrUserData); - _ -> - case Key band 7 of - 0 -> skip_varint_pub(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); - 1 -> skip_64_pub(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); - 2 -> skip_length_delimited_pub(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); - 3 -> skip_group_pub(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); - 5 -> skip_32_pub(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData) - end + case Key band 7 of + 0 -> skip_varint_deploy_reply(Rest, 0, 0, Key bsr 3, TrUserData); + 1 -> skip_64_deploy_reply(Rest, 0, 0, Key bsr 3, TrUserData); + 2 -> skip_length_delimited_deploy_reply(Rest, 0, 0, Key bsr 3, TrUserData); + 3 -> skip_group_deploy_reply(Rest, 0, 0, Key bsr 3, TrUserData); + 5 -> skip_32_deploy_reply(Rest, 0, 0, Key bsr 3, TrUserData) end; -dg_read_field_def_pub(<<>>, 0, 0, _, F@_1, F@_2, _) -> #pub{topic = F@_1, content = F@_2}. +dg_read_field_def_deploy_reply(<<>>, 0, 0, _, _) -> #deploy_reply{}. -d_field_pub_topic(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> d_field_pub_topic(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); -d_field_pub_topic(<<0:1, X:7, Rest/binary>>, N, Acc, F, _, F@_2, TrUserData) -> - {NewFValue, RestF} = begin Len = X bsl N + Acc, <> = Rest, Bytes2 = binary:copy(Bytes), {id(Bytes2, TrUserData), Rest2} end, - dfp_read_field_def_pub(RestF, 0, 0, F, NewFValue, F@_2, TrUserData). +skip_varint_deploy_reply(<<1:1, _:7, Rest/binary>>, Z1, Z2, F, TrUserData) -> skip_varint_deploy_reply(Rest, Z1, Z2, F, TrUserData); +skip_varint_deploy_reply(<<0:1, _:7, Rest/binary>>, Z1, Z2, F, TrUserData) -> dfp_read_field_def_deploy_reply(Rest, Z1, Z2, F, TrUserData). -d_field_pub_content(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> d_field_pub_content(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); -d_field_pub_content(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, _, TrUserData) -> - {NewFValue, RestF} = begin Len = X bsl N + Acc, <> = Rest, Bytes2 = binary:copy(Bytes), {id(Bytes2, TrUserData), Rest2} end, - dfp_read_field_def_pub(RestF, 0, 0, F, F@_1, NewFValue, TrUserData). - -skip_varint_pub(<<1:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> skip_varint_pub(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); -skip_varint_pub(<<0:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_pub(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData). - -skip_length_delimited_pub(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> skip_length_delimited_pub(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); -skip_length_delimited_pub(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) -> +skip_length_delimited_deploy_reply(<<1:1, X:7, Rest/binary>>, N, Acc, F, TrUserData) when N < 57 -> skip_length_delimited_deploy_reply(Rest, N + 7, X bsl N + Acc, F, TrUserData); +skip_length_delimited_deploy_reply(<<0:1, X:7, Rest/binary>>, N, Acc, F, TrUserData) -> Length = X bsl N + Acc, <<_:Length/binary, Rest2/binary>> = Rest, - dfp_read_field_def_pub(Rest2, 0, 0, F, F@_1, F@_2, TrUserData). + dfp_read_field_def_deploy_reply(Rest2, 0, 0, F, TrUserData). -skip_group_pub(Bin, _, Z2, FNum, F@_1, F@_2, TrUserData) -> +skip_group_deploy_reply(Bin, _, Z2, FNum, TrUserData) -> {_, Rest} = read_group(Bin, FNum), - dfp_read_field_def_pub(Rest, 0, Z2, FNum, F@_1, F@_2, TrUserData). + dfp_read_field_def_deploy_reply(Rest, 0, Z2, FNum, TrUserData). -skip_32_pub(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_pub(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData). +skip_32_deploy_reply(<<_:32, Rest/binary>>, Z1, Z2, F, TrUserData) -> dfp_read_field_def_deploy_reply(Rest, Z1, Z2, F, TrUserData). -skip_64_pub(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_pub(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData). +skip_64_deploy_reply(<<_:64, Rest/binary>>, Z1, Z2, F, TrUserData) -> dfp_read_field_def_deploy_reply(Rest, Z1, Z2, F, TrUserData). -decode_msg_push(Bin, TrUserData) -> dfp_read_field_def_push(Bin, 0, 0, 0, id(<<>>, TrUserData), id(<<>>, TrUserData), TrUserData). +decode_msg_invoke(Bin, TrUserData) -> dfp_read_field_def_invoke(Bin, 0, 0, 0, id(<<>>, TrUserData), id(<<>>, TrUserData), TrUserData). -dfp_read_field_def_push(<<10, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> d_field_push_service_id(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); -dfp_read_field_def_push(<<18, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> d_field_push_payload(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); -dfp_read_field_def_push(<<>>, 0, 0, _, F@_1, F@_2, _) -> #push{service_id = F@_1, payload = F@_2}; -dfp_read_field_def_push(Other, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dg_read_field_def_push(Other, Z1, Z2, F, F@_1, F@_2, TrUserData). +dfp_read_field_def_invoke(<<10, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> d_field_invoke_service_id(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); +dfp_read_field_def_invoke(<<18, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> d_field_invoke_payload(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); +dfp_read_field_def_invoke(<<>>, 0, 0, _, F@_1, F@_2, _) -> #invoke{service_id = F@_1, payload = F@_2}; +dfp_read_field_def_invoke(Other, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dg_read_field_def_invoke(Other, Z1, Z2, F, F@_1, F@_2, TrUserData). -dg_read_field_def_push(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 32 - 7 -> dg_read_field_def_push(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); -dg_read_field_def_push(<<0:1, X:7, Rest/binary>>, N, Acc, _, F@_1, F@_2, TrUserData) -> +dg_read_field_def_invoke(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 32 - 7 -> dg_read_field_def_invoke(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); +dg_read_field_def_invoke(<<0:1, X:7, Rest/binary>>, N, Acc, _, F@_1, F@_2, TrUserData) -> Key = X bsl N + Acc, case Key of - 10 -> d_field_push_service_id(Rest, 0, 0, 0, F@_1, F@_2, TrUserData); - 18 -> d_field_push_payload(Rest, 0, 0, 0, F@_1, F@_2, TrUserData); + 10 -> d_field_invoke_service_id(Rest, 0, 0, 0, F@_1, F@_2, TrUserData); + 18 -> d_field_invoke_payload(Rest, 0, 0, 0, F@_1, F@_2, TrUserData); _ -> case Key band 7 of - 0 -> skip_varint_push(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); - 1 -> skip_64_push(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); - 2 -> skip_length_delimited_push(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); - 3 -> skip_group_push(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); - 5 -> skip_32_push(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData) + 0 -> skip_varint_invoke(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); + 1 -> skip_64_invoke(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); + 2 -> skip_length_delimited_invoke(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); + 3 -> skip_group_invoke(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); + 5 -> skip_32_invoke(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData) end end; -dg_read_field_def_push(<<>>, 0, 0, _, F@_1, F@_2, _) -> #push{service_id = F@_1, payload = F@_2}. +dg_read_field_def_invoke(<<>>, 0, 0, _, F@_1, F@_2, _) -> #invoke{service_id = F@_1, payload = F@_2}. -d_field_push_service_id(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> d_field_push_service_id(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); -d_field_push_service_id(<<0:1, X:7, Rest/binary>>, N, Acc, F, _, F@_2, TrUserData) -> +d_field_invoke_service_id(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> d_field_invoke_service_id(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); +d_field_invoke_service_id(<<0:1, X:7, Rest/binary>>, N, Acc, F, _, F@_2, TrUserData) -> {NewFValue, RestF} = begin Len = X bsl N + Acc, <> = Rest, Bytes2 = binary:copy(Bytes), {id(Bytes2, TrUserData), Rest2} end, - dfp_read_field_def_push(RestF, 0, 0, F, NewFValue, F@_2, TrUserData). + dfp_read_field_def_invoke(RestF, 0, 0, F, NewFValue, F@_2, TrUserData). -d_field_push_payload(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> d_field_push_payload(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); -d_field_push_payload(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, _, TrUserData) -> +d_field_invoke_payload(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> d_field_invoke_payload(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); +d_field_invoke_payload(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, _, TrUserData) -> {NewFValue, RestF} = begin Len = X bsl N + Acc, <> = Rest, Bytes2 = binary:copy(Bytes), {id(Bytes2, TrUserData), Rest2} end, - dfp_read_field_def_push(RestF, 0, 0, F, F@_1, NewFValue, TrUserData). + dfp_read_field_def_invoke(RestF, 0, 0, F, F@_1, NewFValue, TrUserData). -skip_varint_push(<<1:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> skip_varint_push(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); -skip_varint_push(<<0:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_push(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData). +skip_varint_invoke(<<1:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> skip_varint_invoke(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); +skip_varint_invoke(<<0:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_invoke(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData). -skip_length_delimited_push(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> skip_length_delimited_push(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); -skip_length_delimited_push(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) -> +skip_length_delimited_invoke(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> skip_length_delimited_invoke(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); +skip_length_delimited_invoke(<<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_push(Rest2, 0, 0, F, F@_1, F@_2, TrUserData). + dfp_read_field_def_invoke(Rest2, 0, 0, F, F@_1, F@_2, TrUserData). -skip_group_push(Bin, _, Z2, FNum, F@_1, F@_2, TrUserData) -> +skip_group_invoke(Bin, _, Z2, FNum, F@_1, F@_2, TrUserData) -> {_, Rest} = read_group(Bin, FNum), - dfp_read_field_def_push(Rest, 0, Z2, FNum, F@_1, F@_2, TrUserData). + dfp_read_field_def_invoke(Rest, 0, Z2, FNum, F@_1, F@_2, TrUserData). -skip_32_push(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_push(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData). +skip_32_invoke(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_invoke(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData). -skip_64_push(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_push(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData). +skip_64_invoke(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_invoke(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData). -decode_msg_push_response(Bin, TrUserData) -> dfp_read_field_def_push_response(Bin, 0, 0, 0, id(<<>>, TrUserData), TrUserData). +decode_msg_invoke_reply(Bin, TrUserData) -> dfp_read_field_def_invoke_reply(Bin, 0, 0, 0, id(<<>>, TrUserData), TrUserData). -dfp_read_field_def_push_response(<<10, Rest/binary>>, Z1, Z2, F, F@_1, TrUserData) -> d_field_push_response_response(Rest, Z1, Z2, F, F@_1, TrUserData); -dfp_read_field_def_push_response(<<>>, 0, 0, _, F@_1, _) -> #push_response{response = F@_1}; -dfp_read_field_def_push_response(Other, Z1, Z2, F, F@_1, TrUserData) -> dg_read_field_def_push_response(Other, Z1, Z2, F, F@_1, TrUserData). +dfp_read_field_def_invoke_reply(<<10, Rest/binary>>, Z1, Z2, F, F@_1, TrUserData) -> d_field_invoke_reply_response(Rest, Z1, Z2, F, F@_1, TrUserData); +dfp_read_field_def_invoke_reply(<<>>, 0, 0, _, F@_1, _) -> #invoke_reply{response = F@_1}; +dfp_read_field_def_invoke_reply(Other, Z1, Z2, F, F@_1, TrUserData) -> dg_read_field_def_invoke_reply(Other, Z1, Z2, F, F@_1, TrUserData). -dg_read_field_def_push_response(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, TrUserData) when N < 32 - 7 -> dg_read_field_def_push_response(Rest, N + 7, X bsl N + Acc, F, F@_1, TrUserData); -dg_read_field_def_push_response(<<0:1, X:7, Rest/binary>>, N, Acc, _, F@_1, TrUserData) -> +dg_read_field_def_invoke_reply(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, TrUserData) when N < 32 - 7 -> dg_read_field_def_invoke_reply(Rest, N + 7, X bsl N + Acc, F, F@_1, TrUserData); +dg_read_field_def_invoke_reply(<<0:1, X:7, Rest/binary>>, N, Acc, _, F@_1, TrUserData) -> Key = X bsl N + Acc, case Key of - 10 -> d_field_push_response_response(Rest, 0, 0, 0, F@_1, TrUserData); + 10 -> d_field_invoke_reply_response(Rest, 0, 0, 0, F@_1, TrUserData); _ -> case Key band 7 of - 0 -> skip_varint_push_response(Rest, 0, 0, Key bsr 3, F@_1, TrUserData); - 1 -> skip_64_push_response(Rest, 0, 0, Key bsr 3, F@_1, TrUserData); - 2 -> skip_length_delimited_push_response(Rest, 0, 0, Key bsr 3, F@_1, TrUserData); - 3 -> skip_group_push_response(Rest, 0, 0, Key bsr 3, F@_1, TrUserData); - 5 -> skip_32_push_response(Rest, 0, 0, Key bsr 3, F@_1, TrUserData) + 0 -> skip_varint_invoke_reply(Rest, 0, 0, Key bsr 3, F@_1, TrUserData); + 1 -> skip_64_invoke_reply(Rest, 0, 0, Key bsr 3, F@_1, TrUserData); + 2 -> skip_length_delimited_invoke_reply(Rest, 0, 0, Key bsr 3, F@_1, TrUserData); + 3 -> skip_group_invoke_reply(Rest, 0, 0, Key bsr 3, F@_1, TrUserData); + 5 -> skip_32_invoke_reply(Rest, 0, 0, Key bsr 3, F@_1, TrUserData) end end; -dg_read_field_def_push_response(<<>>, 0, 0, _, F@_1, _) -> #push_response{response = F@_1}. +dg_read_field_def_invoke_reply(<<>>, 0, 0, _, F@_1, _) -> #invoke_reply{response = F@_1}. -d_field_push_response_response(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, TrUserData) when N < 57 -> d_field_push_response_response(Rest, N + 7, X bsl N + Acc, F, F@_1, TrUserData); -d_field_push_response_response(<<0:1, X:7, Rest/binary>>, N, Acc, F, _, TrUserData) -> +d_field_invoke_reply_response(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, TrUserData) when N < 57 -> d_field_invoke_reply_response(Rest, N + 7, X bsl N + Acc, F, F@_1, TrUserData); +d_field_invoke_reply_response(<<0:1, X:7, Rest/binary>>, N, Acc, F, _, TrUserData) -> {NewFValue, RestF} = begin Len = X bsl N + Acc, <> = Rest, Bytes2 = binary:copy(Bytes), {id(Bytes2, TrUserData), Rest2} end, - dfp_read_field_def_push_response(RestF, 0, 0, F, NewFValue, TrUserData). + dfp_read_field_def_invoke_reply(RestF, 0, 0, F, NewFValue, TrUserData). -skip_varint_push_response(<<1:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, TrUserData) -> skip_varint_push_response(Rest, Z1, Z2, F, F@_1, TrUserData); -skip_varint_push_response(<<0:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, TrUserData) -> dfp_read_field_def_push_response(Rest, Z1, Z2, F, F@_1, TrUserData). +skip_varint_invoke_reply(<<1:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, TrUserData) -> skip_varint_invoke_reply(Rest, Z1, Z2, F, F@_1, TrUserData); +skip_varint_invoke_reply(<<0:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, TrUserData) -> dfp_read_field_def_invoke_reply(Rest, Z1, Z2, F, F@_1, TrUserData). -skip_length_delimited_push_response(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, TrUserData) when N < 57 -> skip_length_delimited_push_response(Rest, N + 7, X bsl N + Acc, F, F@_1, TrUserData); -skip_length_delimited_push_response(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, TrUserData) -> +skip_length_delimited_invoke_reply(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, TrUserData) when N < 57 -> skip_length_delimited_invoke_reply(Rest, N + 7, X bsl N + Acc, F, F@_1, TrUserData); +skip_length_delimited_invoke_reply(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, TrUserData) -> Length = X bsl N + Acc, <<_:Length/binary, Rest2/binary>> = Rest, - dfp_read_field_def_push_response(Rest2, 0, 0, F, F@_1, TrUserData). + dfp_read_field_def_invoke_reply(Rest2, 0, 0, F, F@_1, TrUserData). -skip_group_push_response(Bin, _, Z2, FNum, F@_1, TrUserData) -> +skip_group_invoke_reply(Bin, _, Z2, FNum, F@_1, TrUserData) -> {_, Rest} = read_group(Bin, FNum), - dfp_read_field_def_push_response(Rest, 0, Z2, FNum, F@_1, TrUserData). + dfp_read_field_def_invoke_reply(Rest, 0, Z2, FNum, F@_1, TrUserData). -skip_32_push_response(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, TrUserData) -> dfp_read_field_def_push_response(Rest, Z1, Z2, F, F@_1, TrUserData). +skip_32_invoke_reply(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, TrUserData) -> dfp_read_field_def_invoke_reply(Rest, Z1, Z2, F, F@_1, TrUserData). -skip_64_push_response(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, TrUserData) -> dfp_read_field_def_push_response(Rest, Z1, Z2, F, F@_1, TrUserData). +skip_64_invoke_reply(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, TrUserData) -> dfp_read_field_def_invoke_reply(Rest, Z1, Z2, F, F@_1, TrUserData). decode_msg_service_config(Bin, TrUserData) -> dfp_read_field_def_service_config(Bin, 0, 0, 0, id(<<>>, TrUserData), id(<<>>, TrUserData), id(0, TrUserData), TrUserData). @@ -1167,6 +1213,40 @@ skip_32_service_config(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUse skip_64_service_config(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> dfp_read_field_def_service_config(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData). +decode_msg_service_config_reply(Bin, TrUserData) -> dfp_read_field_def_service_config_reply(Bin, 0, 0, 0, TrUserData). + +dfp_read_field_def_service_config_reply(<<>>, 0, 0, _, _) -> #service_config_reply{}; +dfp_read_field_def_service_config_reply(Other, Z1, Z2, F, TrUserData) -> dg_read_field_def_service_config_reply(Other, Z1, Z2, F, TrUserData). + +dg_read_field_def_service_config_reply(<<1:1, X:7, Rest/binary>>, N, Acc, F, TrUserData) when N < 32 - 7 -> dg_read_field_def_service_config_reply(Rest, N + 7, X bsl N + Acc, F, TrUserData); +dg_read_field_def_service_config_reply(<<0:1, X:7, Rest/binary>>, N, Acc, _, TrUserData) -> + Key = X bsl N + Acc, + case Key band 7 of + 0 -> skip_varint_service_config_reply(Rest, 0, 0, Key bsr 3, TrUserData); + 1 -> skip_64_service_config_reply(Rest, 0, 0, Key bsr 3, TrUserData); + 2 -> skip_length_delimited_service_config_reply(Rest, 0, 0, Key bsr 3, TrUserData); + 3 -> skip_group_service_config_reply(Rest, 0, 0, Key bsr 3, TrUserData); + 5 -> skip_32_service_config_reply(Rest, 0, 0, Key bsr 3, TrUserData) + end; +dg_read_field_def_service_config_reply(<<>>, 0, 0, _, _) -> #service_config_reply{}. + +skip_varint_service_config_reply(<<1:1, _:7, Rest/binary>>, Z1, Z2, F, TrUserData) -> skip_varint_service_config_reply(Rest, Z1, Z2, F, TrUserData); +skip_varint_service_config_reply(<<0:1, _:7, Rest/binary>>, Z1, Z2, F, TrUserData) -> dfp_read_field_def_service_config_reply(Rest, Z1, Z2, F, TrUserData). + +skip_length_delimited_service_config_reply(<<1:1, X:7, Rest/binary>>, N, Acc, F, TrUserData) when N < 57 -> skip_length_delimited_service_config_reply(Rest, N + 7, X bsl N + Acc, F, TrUserData); +skip_length_delimited_service_config_reply(<<0:1, X:7, Rest/binary>>, N, Acc, F, TrUserData) -> + Length = X bsl N + Acc, + <<_:Length/binary, Rest2/binary>> = Rest, + dfp_read_field_def_service_config_reply(Rest2, 0, 0, F, TrUserData). + +skip_group_service_config_reply(Bin, _, Z2, FNum, TrUserData) -> + {_, Rest} = read_group(Bin, FNum), + dfp_read_field_def_service_config_reply(Rest, 0, Z2, FNum, TrUserData). + +skip_32_service_config_reply(<<_:32, Rest/binary>>, Z1, Z2, F, TrUserData) -> dfp_read_field_def_service_config_reply(Rest, Z1, Z2, F, TrUserData). + +skip_64_service_config_reply(<<_:64, Rest/binary>>, Z1, Z2, F, TrUserData) -> dfp_read_field_def_service_config_reply(Rest, Z1, Z2, F, TrUserData). + decode_msg_data(Bin, TrUserData) -> dfp_read_field_def_data(Bin, 0, 0, 0, id(<<>>, TrUserData), id(<<>>, TrUserData), id(<<>>, TrUserData), TrUserData). dfp_read_field_def_data(<<10, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> d_field_data_service_id(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData); @@ -1694,11 +1774,13 @@ merge_msgs(Prev, New, MsgName, Opts) -> case MsgName of auth_request -> merge_msg_auth_request(Prev, New, TrUserData); auth_reply -> merge_msg_auth_reply(Prev, New, TrUserData); - deploy -> merge_msg_deploy(Prev, New, TrUserData); pub -> merge_msg_pub(Prev, New, TrUserData); - push -> merge_msg_push(Prev, New, TrUserData); - push_response -> merge_msg_push_response(Prev, New, TrUserData); + deploy -> merge_msg_deploy(Prev, New, TrUserData); + deploy_reply -> merge_msg_deploy_reply(Prev, New, TrUserData); + invoke -> merge_msg_invoke(Prev, New, TrUserData); + invoke_reply -> merge_msg_invoke_reply(Prev, New, TrUserData); service_config -> merge_msg_service_config(Prev, New, TrUserData); + service_config_reply -> merge_msg_service_config_reply(Prev, New, TrUserData); data -> merge_msg_data(Prev, New, TrUserData); ping -> merge_msg_ping(Prev, New, TrUserData); service_inform -> merge_msg_service_inform(Prev, New, TrUserData); @@ -1740,6 +1822,17 @@ merge_msg_auth_reply(#auth_reply{code = PFcode, message = PFmessage}, #auth_repl true -> NFmessage end}. +-compile({nowarn_unused_function,merge_msg_pub/3}). +merge_msg_pub(#pub{topic = PFtopic, content = PFcontent}, #pub{topic = NFtopic, content = NFcontent}, _) -> + #pub{topic = + if NFtopic =:= undefined -> PFtopic; + true -> NFtopic + end, + content = + if NFcontent =:= undefined -> PFcontent; + true -> NFcontent + end}. + -compile({nowarn_unused_function,merge_msg_deploy/3}). merge_msg_deploy(#deploy{task_id = PFtask_id, service_id = PFservice_id, tar_url = PFtar_url}, #deploy{task_id = NFtask_id, service_id = NFservice_id, tar_url = NFtar_url}, _) -> #deploy{task_id = @@ -1755,34 +1848,26 @@ merge_msg_deploy(#deploy{task_id = PFtask_id, service_id = PFservice_id, tar_url true -> NFtar_url end}. --compile({nowarn_unused_function,merge_msg_pub/3}). -merge_msg_pub(#pub{topic = PFtopic, content = PFcontent}, #pub{topic = NFtopic, content = NFcontent}, _) -> - #pub{topic = - if NFtopic =:= undefined -> PFtopic; - true -> NFtopic - end, - content = - if NFcontent =:= undefined -> PFcontent; - true -> NFcontent - end}. +-compile({nowarn_unused_function,merge_msg_deploy_reply/3}). +merge_msg_deploy_reply(_Prev, New, _TrUserData) -> New. --compile({nowarn_unused_function,merge_msg_push/3}). -merge_msg_push(#push{service_id = PFservice_id, payload = PFpayload}, #push{service_id = NFservice_id, payload = NFpayload}, _) -> - #push{service_id = - if NFservice_id =:= undefined -> PFservice_id; - true -> NFservice_id - end, - payload = - if NFpayload =:= undefined -> PFpayload; - true -> NFpayload - end}. +-compile({nowarn_unused_function,merge_msg_invoke/3}). +merge_msg_invoke(#invoke{service_id = PFservice_id, payload = PFpayload}, #invoke{service_id = NFservice_id, payload = NFpayload}, _) -> + #invoke{service_id = + if NFservice_id =:= undefined -> PFservice_id; + true -> NFservice_id + end, + payload = + if NFpayload =:= undefined -> PFpayload; + true -> NFpayload + end}. --compile({nowarn_unused_function,merge_msg_push_response/3}). -merge_msg_push_response(#push_response{response = PFresponse}, #push_response{response = NFresponse}, _) -> - #push_response{response = - if NFresponse =:= undefined -> PFresponse; - true -> NFresponse - end}. +-compile({nowarn_unused_function,merge_msg_invoke_reply/3}). +merge_msg_invoke_reply(#invoke_reply{response = PFresponse}, #invoke_reply{response = NFresponse}, _) -> + #invoke_reply{response = + if NFresponse =:= undefined -> PFresponse; + true -> NFresponse + end}. -compile({nowarn_unused_function,merge_msg_service_config/3}). merge_msg_service_config(#service_config{service_id = PFservice_id, config_json = PFconfig_json, timeout = PFtimeout}, #service_config{service_id = NFservice_id, config_json = NFconfig_json, timeout = NFtimeout}, _) -> @@ -1799,6 +1884,9 @@ merge_msg_service_config(#service_config{service_id = PFservice_id, config_json true -> NFtimeout end}. +-compile({nowarn_unused_function,merge_msg_service_config_reply/3}). +merge_msg_service_config_reply(_Prev, New, _TrUserData) -> New. + -compile({nowarn_unused_function,merge_msg_data/3}). merge_msg_data(#data{service_id = PFservice_id, device_uuid = PFdevice_uuid, metric = PFmetric}, #data{service_id = NFservice_id, device_uuid = NFdevice_uuid, metric = NFmetric}, _) -> #data{service_id = @@ -1938,11 +2026,13 @@ verify_msg(Msg, MsgName, Opts) -> case MsgName of auth_request -> v_msg_auth_request(Msg, [MsgName], TrUserData); auth_reply -> v_msg_auth_reply(Msg, [MsgName], TrUserData); - deploy -> v_msg_deploy(Msg, [MsgName], TrUserData); pub -> v_msg_pub(Msg, [MsgName], TrUserData); - push -> v_msg_push(Msg, [MsgName], TrUserData); - push_response -> v_msg_push_response(Msg, [MsgName], TrUserData); + deploy -> v_msg_deploy(Msg, [MsgName], TrUserData); + deploy_reply -> v_msg_deploy_reply(Msg, [MsgName], TrUserData); + invoke -> v_msg_invoke(Msg, [MsgName], TrUserData); + invoke_reply -> v_msg_invoke_reply(Msg, [MsgName], TrUserData); service_config -> v_msg_service_config(Msg, [MsgName], TrUserData); + service_config_reply -> v_msg_service_config_reply(Msg, [MsgName], TrUserData); data -> v_msg_data(Msg, [MsgName], TrUserData); ping -> v_msg_ping(Msg, [MsgName], TrUserData); service_inform -> v_msg_service_inform(Msg, [MsgName], TrUserData); @@ -1985,6 +2075,18 @@ v_msg_auth_reply(#auth_reply{code = F1, message = F2}, Path, TrUserData) -> ok; v_msg_auth_reply(X, Path, _TrUserData) -> mk_type_error({expected_msg, auth_reply}, X, Path). +-compile({nowarn_unused_function,v_msg_pub/3}). +-dialyzer({nowarn_function,v_msg_pub/3}). +v_msg_pub(#pub{topic = F1, content = F2}, Path, TrUserData) -> + 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_pub(X, Path, _TrUserData) -> mk_type_error({expected_msg, pub}, X, Path). + -compile({nowarn_unused_function,v_msg_deploy/3}). -dialyzer({nowarn_function,v_msg_deploy/3}). v_msg_deploy(#deploy{task_id = F1, service_id = F2, tar_url = F3}, Path, TrUserData) -> @@ -2000,21 +2102,14 @@ v_msg_deploy(#deploy{task_id = F1, service_id = F2, tar_url = F3}, Path, TrUserD ok; v_msg_deploy(X, Path, _TrUserData) -> mk_type_error({expected_msg, deploy}, X, Path). --compile({nowarn_unused_function,v_msg_pub/3}). --dialyzer({nowarn_function,v_msg_pub/3}). -v_msg_pub(#pub{topic = F1, content = F2}, Path, TrUserData) -> - 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_pub(X, Path, _TrUserData) -> mk_type_error({expected_msg, pub}, X, Path). +-compile({nowarn_unused_function,v_msg_deploy_reply/3}). +-dialyzer({nowarn_function,v_msg_deploy_reply/3}). +v_msg_deploy_reply(#deploy_reply{}, _Path, _) -> ok; +v_msg_deploy_reply(X, Path, _TrUserData) -> mk_type_error({expected_msg, deploy_reply}, X, Path). --compile({nowarn_unused_function,v_msg_push/3}). --dialyzer({nowarn_function,v_msg_push/3}). -v_msg_push(#push{service_id = F1, payload = F2}, Path, TrUserData) -> +-compile({nowarn_unused_function,v_msg_invoke/3}). +-dialyzer({nowarn_function,v_msg_invoke/3}). +v_msg_invoke(#invoke{service_id = F1, payload = F2}, Path, TrUserData) -> if F1 == undefined -> ok; true -> v_type_string(F1, [service_id | Path], TrUserData) end, @@ -2022,16 +2117,16 @@ v_msg_push(#push{service_id = F1, payload = F2}, Path, TrUserData) -> true -> v_type_string(F2, [payload | Path], TrUserData) end, ok; -v_msg_push(X, Path, _TrUserData) -> mk_type_error({expected_msg, push}, X, Path). +v_msg_invoke(X, Path, _TrUserData) -> mk_type_error({expected_msg, invoke}, X, Path). --compile({nowarn_unused_function,v_msg_push_response/3}). --dialyzer({nowarn_function,v_msg_push_response/3}). -v_msg_push_response(#push_response{response = F1}, Path, TrUserData) -> +-compile({nowarn_unused_function,v_msg_invoke_reply/3}). +-dialyzer({nowarn_function,v_msg_invoke_reply/3}). +v_msg_invoke_reply(#invoke_reply{response = F1}, Path, TrUserData) -> if F1 == undefined -> ok; true -> v_type_string(F1, [response | Path], TrUserData) end, ok; -v_msg_push_response(X, Path, _TrUserData) -> mk_type_error({expected_msg, push_response}, X, Path). +v_msg_invoke_reply(X, Path, _TrUserData) -> mk_type_error({expected_msg, invoke_reply}, X, Path). -compile({nowarn_unused_function,v_msg_service_config/3}). -dialyzer({nowarn_function,v_msg_service_config/3}). @@ -2048,6 +2143,11 @@ v_msg_service_config(#service_config{service_id = F1, config_json = F2, timeout ok; v_msg_service_config(X, Path, _TrUserData) -> mk_type_error({expected_msg, service_config}, X, Path). +-compile({nowarn_unused_function,v_msg_service_config_reply/3}). +-dialyzer({nowarn_function,v_msg_service_config_reply/3}). +v_msg_service_config_reply(#service_config_reply{}, _Path, _) -> ok; +v_msg_service_config_reply(X, Path, _TrUserData) -> mk_type_error({expected_msg, service_config_reply}, X, Path). + -compile({nowarn_unused_function,v_msg_data/3}). -dialyzer({nowarn_function,v_msg_data/3}). v_msg_data(#data{service_id = F1, device_uuid = F2, metric = F3}, Path, TrUserData) -> @@ -2239,17 +2339,19 @@ get_msg_defs() -> #field{name = token, fnum = 5, rnum = 5, type = string, occurrence = optional, opts = []}, #field{name = timestamp, fnum = 6, rnum = 6, type = uint32, occurrence = optional, opts = []}]}, {{msg, auth_reply}, [#field{name = code, fnum = 1, rnum = 2, type = uint32, occurrence = optional, opts = []}, #field{name = message, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []}]}, + {{msg, pub}, [#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, deploy}, [#field{name = task_id, fnum = 1, rnum = 2, type = uint32, occurrence = optional, opts = []}, #field{name = service_id, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []}, #field{name = tar_url, fnum = 3, rnum = 4, type = string, occurrence = optional, opts = []}]}, - {{msg, pub}, [#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, push}, [#field{name = service_id, fnum = 1, rnum = 2, type = string, occurrence = optional, opts = []}, #field{name = payload, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []}]}, - {{msg, push_response}, [#field{name = response, fnum = 1, rnum = 2, type = string, occurrence = optional, opts = []}]}, + {{msg, deploy_reply}, []}, + {{msg, invoke}, [#field{name = service_id, fnum = 1, rnum = 2, type = string, occurrence = optional, opts = []}, #field{name = payload, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []}]}, + {{msg, invoke_reply}, [#field{name = response, fnum = 1, rnum = 2, type = string, occurrence = optional, opts = []}]}, {{msg, service_config}, [#field{name = service_id, fnum = 1, rnum = 2, type = string, occurrence = optional, opts = []}, #field{name = config_json, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []}, #field{name = timeout, fnum = 3, rnum = 4, type = uint32, occurrence = optional, opts = []}]}, + {{msg, service_config_reply}, []}, {{msg, data}, [#field{name = service_id, fnum = 1, rnum = 2, type = string, occurrence = optional, opts = []}, #field{name = device_uuid, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []}, @@ -2283,13 +2385,13 @@ get_msg_defs() -> #field{name = params, fnum = 3, rnum = 4, type = string, occurrence = optional, opts = []}]}]. -get_msg_names() -> [auth_request, auth_reply, deploy, pub, push, push_response, service_config, data, ping, service_inform, feedback_phase, event]. +get_msg_names() -> [auth_request, auth_reply, pub, deploy, deploy_reply, invoke, invoke_reply, service_config, service_config_reply, data, ping, service_inform, feedback_phase, event]. get_group_names() -> []. -get_msg_or_group_names() -> [auth_request, auth_reply, deploy, pub, push, push_response, service_config, data, ping, service_inform, feedback_phase, event]. +get_msg_or_group_names() -> [auth_request, auth_reply, pub, deploy, deploy_reply, invoke, invoke_reply, service_config, service_config_reply, data, ping, service_inform, feedback_phase, event]. get_enum_names() -> []. @@ -2313,17 +2415,19 @@ find_msg_def(auth_request) -> #field{name = token, fnum = 5, rnum = 5, type = string, occurrence = optional, opts = []}, #field{name = timestamp, fnum = 6, rnum = 6, type = uint32, occurrence = optional, opts = []}]; find_msg_def(auth_reply) -> [#field{name = code, fnum = 1, rnum = 2, type = uint32, occurrence = optional, opts = []}, #field{name = message, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []}]; +find_msg_def(pub) -> [#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(deploy) -> [#field{name = task_id, fnum = 1, rnum = 2, type = uint32, occurrence = optional, opts = []}, #field{name = service_id, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []}, #field{name = tar_url, fnum = 3, rnum = 4, type = string, occurrence = optional, opts = []}]; -find_msg_def(pub) -> [#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(push) -> [#field{name = service_id, fnum = 1, rnum = 2, type = string, occurrence = optional, opts = []}, #field{name = payload, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []}]; -find_msg_def(push_response) -> [#field{name = response, fnum = 1, rnum = 2, type = string, occurrence = optional, opts = []}]; +find_msg_def(deploy_reply) -> []; +find_msg_def(invoke) -> [#field{name = service_id, fnum = 1, rnum = 2, type = string, occurrence = optional, opts = []}, #field{name = payload, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []}]; +find_msg_def(invoke_reply) -> [#field{name = response, fnum = 1, rnum = 2, type = string, occurrence = optional, opts = []}]; find_msg_def(service_config) -> [#field{name = service_id, fnum = 1, rnum = 2, type = string, occurrence = optional, opts = []}, #field{name = config_json, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []}, #field{name = timeout, fnum = 3, rnum = 4, type = uint32, occurrence = optional, opts = []}]; +find_msg_def(service_config_reply) -> []; find_msg_def(data) -> [#field{name = service_id, fnum = 1, rnum = 2, type = string, occurrence = optional, opts = []}, #field{name = device_uuid, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []}, @@ -2415,11 +2519,13 @@ 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(<<"Deploy">>) -> deploy; fqbin_to_msg_name(<<"Pub">>) -> pub; -fqbin_to_msg_name(<<"Push">>) -> push; -fqbin_to_msg_name(<<"PushResponse">>) -> push_response; +fqbin_to_msg_name(<<"Deploy">>) -> deploy; +fqbin_to_msg_name(<<"DeployReply">>) -> deploy_reply; +fqbin_to_msg_name(<<"Invoke">>) -> invoke; +fqbin_to_msg_name(<<"InvokeReply">>) -> invoke_reply; fqbin_to_msg_name(<<"ServiceConfig">>) -> service_config; +fqbin_to_msg_name(<<"ServiceConfigReply">>) -> service_config_reply; fqbin_to_msg_name(<<"Data">>) -> data; fqbin_to_msg_name(<<"Ping">>) -> ping; fqbin_to_msg_name(<<"ServiceInform">>) -> service_inform; @@ -2430,11 +2536,13 @@ 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(deploy) -> <<"Deploy">>; msg_name_to_fqbin(pub) -> <<"Pub">>; -msg_name_to_fqbin(push) -> <<"Push">>; -msg_name_to_fqbin(push_response) -> <<"PushResponse">>; +msg_name_to_fqbin(deploy) -> <<"Deploy">>; +msg_name_to_fqbin(deploy_reply) -> <<"DeployReply">>; +msg_name_to_fqbin(invoke) -> <<"Invoke">>; +msg_name_to_fqbin(invoke_reply) -> <<"InvokeReply">>; msg_name_to_fqbin(service_config) -> <<"ServiceConfig">>; +msg_name_to_fqbin(service_config_reply) -> <<"ServiceConfigReply">>; msg_name_to_fqbin(data) -> <<"Data">>; msg_name_to_fqbin(ping) -> <<"Ping">>; msg_name_to_fqbin(service_inform) -> <<"ServiceInform">>; @@ -2478,7 +2586,7 @@ get_all_source_basenames() -> ["message_pb.proto"]. get_all_proto_names() -> ["message_pb"]. -get_msg_containment("message_pb") -> [auth_reply, auth_request, data, deploy, event, feedback_phase, ping, pub, push, push_response, service_config, service_inform]; +get_msg_containment("message_pb") -> [auth_reply, auth_request, data, deploy, deploy_reply, event, feedback_phase, invoke, invoke_reply, ping, pub, service_config, service_config_reply, service_inform]; get_msg_containment(P) -> error({gpb_error, {badproto, P}}). @@ -2502,11 +2610,13 @@ get_proto_by_msg_name_as_fqbin(<<"Data">>) -> "message_pb"; get_proto_by_msg_name_as_fqbin(<<"Pub">>) -> "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(<<"PushResponse">>) -> "message_pb"; +get_proto_by_msg_name_as_fqbin(<<"Invoke">>) -> "message_pb"; get_proto_by_msg_name_as_fqbin(<<"FeedbackPhase">>) -> "message_pb"; get_proto_by_msg_name_as_fqbin(<<"ServiceConfig">>) -> "message_pb"; get_proto_by_msg_name_as_fqbin(<<"Ping">>) -> "message_pb"; -get_proto_by_msg_name_as_fqbin(<<"Push">>) -> "message_pb"; +get_proto_by_msg_name_as_fqbin(<<"ServiceConfigReply">>) -> "message_pb"; +get_proto_by_msg_name_as_fqbin(<<"InvokeReply">>) -> "message_pb"; +get_proto_by_msg_name_as_fqbin(<<"DeployReply">>) -> "message_pb"; get_proto_by_msg_name_as_fqbin(<<"Deploy">>) -> "message_pb"; get_proto_by_msg_name_as_fqbin(<<"AuthReply">>) -> "message_pb"; get_proto_by_msg_name_as_fqbin(<<"ServiceInform">>) -> "message_pb"; diff --git a/message_pb.proto b/message_pb.proto index a1679d9..57fa064 100644 --- a/message_pb.proto +++ b/message_pb.proto @@ -15,6 +15,14 @@ message AuthReply { string message = 2; } +// 不需要响应的,基于pub/sub的机制实现远程调用 +message Pub { + string topic = 1; + string content = 2; +} + +///// 服务器主动推送的消息 + // 部署逻辑 message Deploy { uint32 task_id = 1; @@ -22,19 +30,17 @@ message Deploy { string tar_url = 3; } -// 不需要响应的,基于pub/sub的机制实现远程调用 -message Pub { - string topic = 1; - string content = 2; +message DeployReply { + } // 需要响应; 系统内部的调用采用: $sys_前缀 -message Push { +message Invoke { string service_id = 1; string payload = 2; } -message PushResponse { +message InvokeReply { string response = 1; } @@ -45,6 +51,12 @@ message ServiceConfig { uint32 timeout = 3; } +message ServiceConfigReply { + +} + +/////// EFKA主动上报的消息类型 + // 数据传输 message Data { string service_id = 1;