diff --git a/apps/efka/include/message_pb.hrl b/apps/efka/include/message_pb.hrl index 4d3bbac..09b07c1 100644 --- a/apps/efka/include/message_pb.hrl +++ b/apps/efka/include/message_pb.hrl @@ -44,11 +44,12 @@ }). -endif. --ifndef('DEPLOY_REPLY_PB_H'). --define('DEPLOY_REPLY_PB_H', true). --record(deploy_reply, - {is_ok = false :: boolean() | 0 | 1 | undefined, % = 1, optional - message = <<>> :: unicode:chardata() | undefined % = 2, optional +-ifndef('EFKA_RESPONSE_PB_H'). +-define('EFKA_RESPONSE_PB_H', true). +-record(efka_response, + {code = 0 :: integer() | undefined, % = 1, optional, 32 bits + result = <<>> :: unicode:chardata() | undefined, % = 2, optional + message = <<>> :: unicode:chardata() | undefined % = 3, optional }). -endif. @@ -68,14 +69,6 @@ }). -endif. --ifndef('SERVICE_ARGUMENTS_REPLY_PB_H'). --define('SERVICE_ARGUMENTS_REPLY_PB_H', true). --record(service_arguments_reply, - {is_ok = false :: boolean() | 0 | 1 | undefined, % = 1, optional - message = <<>> :: unicode:chardata() | undefined % = 2, optional - }). --endif. - -ifndef('SERVICE_METRICS_PB_H'). -define('SERVICE_METRICS_PB_H', true). -record(service_metrics, @@ -84,14 +77,6 @@ }). -endif. --ifndef('SERVICE_METRICS_REPLY_PB_H'). --define('SERVICE_METRICS_REPLY_PB_H', true). --record(service_metrics_reply, - {is_ok = false :: boolean() | 0 | 1 | undefined, % = 1, optional - message = <<>> :: unicode:chardata() | undefined % = 2, optional - }). --endif. - -ifndef('DATA_PB_H'). -define('DATA_PB_H', true). -record(data, diff --git a/apps/efka/src/efka_agent.erl b/apps/efka/src/efka_agent.erl index 287a775..9f9657d 100644 --- a/apps/efka/src/efka_agent.erl +++ b/apps/efka/src/efka_agent.erl @@ -198,9 +198,9 @@ handle_info({server_push_message, PacketId, < - #deploy_reply{is_ok = true, message = <<"">>}; + #efka_response{code = 1, message = <<"">>}; {error, Reason} when is_binary(Reason) -> - #deploy_reply{is_ok = false, message = Reason} + #efka_response{code = 1, message = Reason} end, efka_transport:response(TransportPid, PacketId, message_pb:encode_msg(Reply)), @@ -212,22 +212,22 @@ handle_info({server_push_message, PacketId, < - Reply = #service_arguments_reply{ - is_ok = false, + Reply = #efka_response { + code = 0, message = <<"服务未启动"/utf8>> }, efka_transport:response(TransportPid, PacketId, message_pb:encode_msg(Reply)); {ok, ServicePid} -> case efka_micro_service:push_arguments(ServicePid, Args) of ok -> - Reply = #service_arguments_reply{ - is_ok = true, + Reply = #efka_response{ + code = 1, message = <<"">> }, efka_transport:response(TransportPid, PacketId, message_pb:encode_msg(Reply)); {error, Reason} -> - Reply = #service_arguments_reply{ - is_ok = false, + Reply = #efka_response{ + code = 0, message = Reason }, efka_transport:response(TransportPid, PacketId, message_pb:encode_msg(Reply)) @@ -241,22 +241,22 @@ handle_info({server_push_message, PacketId, < - Reply = #service_metrics_reply{ - is_ok = false, + Reply = #efka_response{ + code = 0, message = <<"服务未启动"/utf8>> }, efka_transport:response(TransportPid, PacketId, message_pb:encode_msg(Reply)); {ok, ServicePid} -> case efka_micro_service:push_metrics(ServicePid, Metrics) of ok -> - Reply = #service_metrics_reply { - is_ok = true, + Reply = #efka_response { + code = 1, message = <<"">> }, efka_transport:response(TransportPid, PacketId, message_pb:encode_msg(Reply)); {error, Reason} -> - Reply = #service_metrics_reply{ - is_ok = false, + Reply = #efka_response{ + code = 0, message = Reason }, efka_transport:response(TransportPid, PacketId, message_pb:encode_msg(Reply)) diff --git a/apps/efka/src/proto/message_pb.erl b/apps/efka/src/proto/message_pb.erl index 5c64c49..f3a954c 100644 --- a/apps/efka/src/proto/message_pb.erl +++ b/apps/efka/src/proto/message_pb.erl @@ -63,18 +63,14 @@ -type deploy() :: #deploy{}. --type deploy_reply() :: #deploy_reply{}. +-type efka_response() :: #efka_response{}. -type topic_message() :: #topic_message{}. -type service_arguments() :: #service_arguments{}. --type service_arguments_reply() :: #service_arguments_reply{}. - -type service_metrics() :: #service_metrics{}. --type service_metrics_reply() :: #service_metrics_reply{}. - -type data() :: #data{}. -type ping() :: #ping{}. @@ -87,9 +83,9 @@ -type ai_event() :: #ai_event{}. --export_type(['auth_request'/0, 'auth_reply'/0, 'activate_push'/0, 'deploy'/0, 'deploy_reply'/0, 'topic_message'/0, 'service_arguments'/0, 'service_arguments_reply'/0, 'service_metrics'/0, 'service_metrics_reply'/0, 'data'/0, 'ping'/0, 'service_inform'/0, 'feedback_phase'/0, 'event'/0, 'ai_event'/0]). --type '$msg_name'() :: auth_request | auth_reply | activate_push | deploy | deploy_reply | topic_message | service_arguments | service_arguments_reply | service_metrics | service_metrics_reply | data | ping | service_inform | feedback_phase | event | ai_event. --type '$msg'() :: auth_request() | auth_reply() | activate_push() | deploy() | deploy_reply() | topic_message() | service_arguments() | service_arguments_reply() | service_metrics() | service_metrics_reply() | data() | ping() | service_inform() | feedback_phase() | event() | ai_event(). +-export_type(['auth_request'/0, 'auth_reply'/0, 'activate_push'/0, 'deploy'/0, 'efka_response'/0, 'topic_message'/0, 'service_arguments'/0, 'service_metrics'/0, 'data'/0, 'ping'/0, 'service_inform'/0, 'feedback_phase'/0, 'event'/0, 'ai_event'/0]). +-type '$msg_name'() :: auth_request | auth_reply | activate_push | deploy | efka_response | topic_message | service_arguments | service_metrics | data | ping | service_inform | feedback_phase | event | ai_event. +-type '$msg'() :: auth_request() | auth_reply() | activate_push() | deploy() | efka_response() | topic_message() | service_arguments() | service_metrics() | data() | ping() | service_inform() | feedback_phase() | event() | ai_event(). -export_type(['$msg_name'/0, '$msg'/0]). -record('map',{key, value}). @@ -121,12 +117,10 @@ encode_msg(Msg, MsgName, Opts) -> auth_reply -> encode_msg_auth_reply(id(Msg, TrUserData), TrUserData); activate_push -> encode_msg_activate_push(id(Msg, TrUserData), TrUserData); deploy -> encode_msg_deploy(id(Msg, TrUserData), TrUserData); - deploy_reply -> encode_msg_deploy_reply(id(Msg, TrUserData), TrUserData); + efka_response -> encode_msg_efka_response(id(Msg, TrUserData), TrUserData); topic_message -> encode_msg_topic_message(id(Msg, TrUserData), TrUserData); service_arguments -> encode_msg_service_arguments(id(Msg, TrUserData), TrUserData); - service_arguments_reply -> encode_msg_service_arguments_reply(id(Msg, TrUserData), TrUserData); service_metrics -> encode_msg_service_metrics(id(Msg, TrUserData), TrUserData); - service_metrics_reply -> encode_msg_service_metrics_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); @@ -272,26 +266,36 @@ encode_msg_deploy(#deploy{task_id = F1, from = F2, service_id = F3}, Bin, TrUser end end. -encode_msg_deploy_reply(Msg, TrUserData) -> encode_msg_deploy_reply(Msg, <<>>, TrUserData). +encode_msg_efka_response(Msg, TrUserData) -> encode_msg_efka_response(Msg, <<>>, TrUserData). -encode_msg_deploy_reply(#deploy_reply{is_ok = F1, message = F2}, Bin, TrUserData) -> +encode_msg_efka_response(#efka_response{code = F1, result = F2, message = F3}, Bin, TrUserData) -> B1 = if F1 == undefined -> Bin; true -> begin TrF1 = id(F1, TrUserData), - if TrF1 =:= false -> Bin; - true -> e_type_bool(TrF1, <>, TrUserData) + if TrF1 =:= 0 -> Bin; + true -> e_type_int32(TrF1, <>, TrUserData) end end end, - if F2 == undefined -> B1; + B2 = 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, + if F3 == undefined -> B2; true -> begin - TrF2 = id(F2, TrUserData), - case is_empty_string(TrF2) of - true -> B1; - false -> e_type_string(TrF2, <>, TrUserData) + TrF3 = id(F3, TrUserData), + case is_empty_string(TrF3) of + true -> B2; + false -> e_type_string(TrF3, <>, TrUserData) end end end. @@ -346,30 +350,6 @@ encode_msg_service_arguments(#service_arguments{service_id = F1, args = F2}, Bin end end. -encode_msg_service_arguments_reply(Msg, TrUserData) -> encode_msg_service_arguments_reply(Msg, <<>>, TrUserData). - - -encode_msg_service_arguments_reply(#service_arguments_reply{is_ok = F1, message = F2}, Bin, TrUserData) -> - B1 = if F1 == undefined -> Bin; - true -> - begin - TrF1 = id(F1, TrUserData), - if TrF1 =:= false -> Bin; - true -> e_type_bool(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_service_metrics(Msg, TrUserData) -> encode_msg_service_metrics(Msg, <<>>, TrUserData). @@ -395,30 +375,6 @@ encode_msg_service_metrics(#service_metrics{service_id = F1, metrics = F2}, Bin, end end. -encode_msg_service_metrics_reply(Msg, TrUserData) -> encode_msg_service_metrics_reply(Msg, <<>>, TrUserData). - - -encode_msg_service_metrics_reply(#service_metrics_reply{is_ok = F1, message = F2}, Bin, TrUserData) -> - B1 = if F1 == undefined -> Bin; - true -> - begin - TrF1 = id(F1, TrUserData), - if TrF1 =:= false -> Bin; - true -> e_type_bool(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_data(Msg, TrUserData) -> encode_msg_data(Msg, <<>>, TrUserData). @@ -919,12 +875,10 @@ decode_msg_2_doit(auth_request, Bin, TrUserData) -> id(decode_msg_auth_request(B 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(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(efka_response, Bin, TrUserData) -> id(decode_msg_efka_response(Bin, TrUserData), TrUserData); decode_msg_2_doit(topic_message, Bin, TrUserData) -> id(decode_msg_topic_message(Bin, TrUserData), TrUserData); decode_msg_2_doit(service_arguments, Bin, TrUserData) -> id(decode_msg_service_arguments(Bin, TrUserData), TrUserData); -decode_msg_2_doit(service_arguments_reply, Bin, TrUserData) -> id(decode_msg_service_arguments_reply(Bin, TrUserData), TrUserData); decode_msg_2_doit(service_metrics, Bin, TrUserData) -> id(decode_msg_service_metrics(Bin, TrUserData), TrUserData); -decode_msg_2_doit(service_metrics_reply, Bin, TrUserData) -> id(decode_msg_service_metrics_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); @@ -1166,56 +1120,63 @@ 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_deploy_reply(Bin, TrUserData) -> dfp_read_field_def_deploy_reply(Bin, 0, 0, 0, id(false, TrUserData), id(<<>>, TrUserData), TrUserData). +decode_msg_efka_response(Bin, TrUserData) -> dfp_read_field_def_efka_response(Bin, 0, 0, 0, id(0, TrUserData), id(<<>>, TrUserData), id(<<>>, TrUserData), TrUserData). -dfp_read_field_def_deploy_reply(<<8, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> d_field_deploy_reply_is_ok(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); -dfp_read_field_def_deploy_reply(<<18, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> d_field_deploy_reply_message(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); -dfp_read_field_def_deploy_reply(<<>>, 0, 0, _, F@_1, F@_2, _) -> #deploy_reply{is_ok = F@_1, message = F@_2}; -dfp_read_field_def_deploy_reply(Other, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dg_read_field_def_deploy_reply(Other, Z1, Z2, F, F@_1, F@_2, TrUserData). +dfp_read_field_def_efka_response(<<8, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> d_field_efka_response_code(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData); +dfp_read_field_def_efka_response(<<18, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> d_field_efka_response_result(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData); +dfp_read_field_def_efka_response(<<26, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> d_field_efka_response_message(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData); +dfp_read_field_def_efka_response(<<>>, 0, 0, _, F@_1, F@_2, F@_3, _) -> #efka_response{code = F@_1, result = F@_2, message = F@_3}; +dfp_read_field_def_efka_response(Other, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> dg_read_field_def_efka_response(Other, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData). -dg_read_field_def_deploy_reply(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 32 - 7 -> dg_read_field_def_deploy_reply(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); -dg_read_field_def_deploy_reply(<<0:1, X:7, Rest/binary>>, N, Acc, _, F@_1, F@_2, TrUserData) -> +dg_read_field_def_efka_response(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, TrUserData) when N < 32 - 7 -> dg_read_field_def_efka_response(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, TrUserData); +dg_read_field_def_efka_response(<<0:1, X:7, Rest/binary>>, N, Acc, _, F@_1, F@_2, F@_3, TrUserData) -> Key = X bsl N + Acc, case Key of - 8 -> d_field_deploy_reply_is_ok(Rest, 0, 0, 0, F@_1, F@_2, TrUserData); - 18 -> d_field_deploy_reply_message(Rest, 0, 0, 0, F@_1, F@_2, TrUserData); + 8 -> d_field_efka_response_code(Rest, 0, 0, 0, F@_1, F@_2, F@_3, TrUserData); + 18 -> d_field_efka_response_result(Rest, 0, 0, 0, F@_1, F@_2, F@_3, TrUserData); + 26 -> d_field_efka_response_message(Rest, 0, 0, 0, F@_1, F@_2, F@_3, TrUserData); _ -> case Key band 7 of - 0 -> skip_varint_deploy_reply(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); - 1 -> skip_64_deploy_reply(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); - 2 -> skip_length_delimited_deploy_reply(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); - 3 -> skip_group_deploy_reply(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); - 5 -> skip_32_deploy_reply(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData) + 0 -> skip_varint_efka_response(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, TrUserData); + 1 -> skip_64_efka_response(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, TrUserData); + 2 -> skip_length_delimited_efka_response(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, TrUserData); + 3 -> skip_group_efka_response(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, TrUserData); + 5 -> skip_32_efka_response(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, TrUserData) end end; -dg_read_field_def_deploy_reply(<<>>, 0, 0, _, F@_1, F@_2, _) -> #deploy_reply{is_ok = F@_1, message = F@_2}. +dg_read_field_def_efka_response(<<>>, 0, 0, _, F@_1, F@_2, F@_3, _) -> #efka_response{code = F@_1, result = F@_2, message = F@_3}. -d_field_deploy_reply_is_ok(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> d_field_deploy_reply_is_ok(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); -d_field_deploy_reply_is_ok(<<0:1, X:7, Rest/binary>>, N, Acc, F, _, F@_2, TrUserData) -> - {NewFValue, RestF} = {id(X bsl N + Acc =/= 0, TrUserData), Rest}, - dfp_read_field_def_deploy_reply(RestF, 0, 0, F, NewFValue, F@_2, TrUserData). +d_field_efka_response_code(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, TrUserData) when N < 57 -> d_field_efka_response_code(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, TrUserData); +d_field_efka_response_code(<<0:1, X:7, Rest/binary>>, N, Acc, F, _, F@_2, F@_3, TrUserData) -> + {NewFValue, RestF} = {begin <> = <<(X bsl N + Acc):32/unsigned-native>>, id(Res, TrUserData) end, Rest}, + dfp_read_field_def_efka_response(RestF, 0, 0, F, NewFValue, F@_2, F@_3, TrUserData). -d_field_deploy_reply_message(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> d_field_deploy_reply_message(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); -d_field_deploy_reply_message(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, _, TrUserData) -> +d_field_efka_response_result(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, TrUserData) when N < 57 -> d_field_efka_response_result(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, TrUserData); +d_field_efka_response_result(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, _, F@_3, TrUserData) -> {NewFValue, RestF} = begin Len = X bsl N + Acc, <> = Rest, Bytes2 = binary:copy(Bytes), {id(Bytes2, TrUserData), Rest2} end, - dfp_read_field_def_deploy_reply(RestF, 0, 0, F, F@_1, NewFValue, TrUserData). + dfp_read_field_def_efka_response(RestF, 0, 0, F, F@_1, NewFValue, F@_3, TrUserData). -skip_varint_deploy_reply(<<1:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> skip_varint_deploy_reply(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); -skip_varint_deploy_reply(<<0:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_deploy_reply(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData). +d_field_efka_response_message(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, TrUserData) when N < 57 -> d_field_efka_response_message(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, TrUserData); +d_field_efka_response_message(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, 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_efka_response(RestF, 0, 0, F, F@_1, F@_2, NewFValue, TrUserData). -skip_length_delimited_deploy_reply(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> skip_length_delimited_deploy_reply(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); -skip_length_delimited_deploy_reply(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) -> +skip_varint_efka_response(<<1:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> skip_varint_efka_response(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData); +skip_varint_efka_response(<<0:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> dfp_read_field_def_efka_response(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData). + +skip_length_delimited_efka_response(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, TrUserData) when N < 57 -> skip_length_delimited_efka_response(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, TrUserData); +skip_length_delimited_efka_response(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, TrUserData) -> Length = X bsl N + Acc, <<_:Length/binary, Rest2/binary>> = Rest, - dfp_read_field_def_deploy_reply(Rest2, 0, 0, F, F@_1, F@_2, TrUserData). + dfp_read_field_def_efka_response(Rest2, 0, 0, F, F@_1, F@_2, F@_3, TrUserData). -skip_group_deploy_reply(Bin, _, Z2, FNum, F@_1, F@_2, TrUserData) -> +skip_group_efka_response(Bin, _, Z2, FNum, F@_1, F@_2, F@_3, TrUserData) -> {_, Rest} = read_group(Bin, FNum), - dfp_read_field_def_deploy_reply(Rest, 0, Z2, FNum, F@_1, F@_2, TrUserData). + dfp_read_field_def_efka_response(Rest, 0, Z2, FNum, F@_1, F@_2, F@_3, TrUserData). -skip_32_deploy_reply(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_deploy_reply(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData). +skip_32_efka_response(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> dfp_read_field_def_efka_response(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData). -skip_64_deploy_reply(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_deploy_reply(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData). +skip_64_efka_response(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> dfp_read_field_def_efka_response(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData). decode_msg_topic_message(Bin, TrUserData) -> dfp_read_field_def_topic_message(Bin, 0, 0, 0, id(<<>>, TrUserData), id(<<>>, TrUserData), TrUserData). @@ -1319,57 +1280,6 @@ skip_32_service_arguments(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserDa skip_64_service_arguments(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_service_arguments(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData). -decode_msg_service_arguments_reply(Bin, TrUserData) -> dfp_read_field_def_service_arguments_reply(Bin, 0, 0, 0, id(false, TrUserData), id(<<>>, TrUserData), TrUserData). - -dfp_read_field_def_service_arguments_reply(<<8, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> d_field_service_arguments_reply_is_ok(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); -dfp_read_field_def_service_arguments_reply(<<18, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> d_field_service_arguments_reply_message(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); -dfp_read_field_def_service_arguments_reply(<<>>, 0, 0, _, F@_1, F@_2, _) -> #service_arguments_reply{is_ok = F@_1, message = F@_2}; -dfp_read_field_def_service_arguments_reply(Other, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dg_read_field_def_service_arguments_reply(Other, Z1, Z2, F, F@_1, F@_2, TrUserData). - -dg_read_field_def_service_arguments_reply(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 32 - 7 -> dg_read_field_def_service_arguments_reply(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); -dg_read_field_def_service_arguments_reply(<<0:1, X:7, Rest/binary>>, N, Acc, _, F@_1, F@_2, TrUserData) -> - Key = X bsl N + Acc, - case Key of - 8 -> d_field_service_arguments_reply_is_ok(Rest, 0, 0, 0, F@_1, F@_2, TrUserData); - 18 -> d_field_service_arguments_reply_message(Rest, 0, 0, 0, F@_1, F@_2, TrUserData); - _ -> - case Key band 7 of - 0 -> skip_varint_service_arguments_reply(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); - 1 -> skip_64_service_arguments_reply(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); - 2 -> skip_length_delimited_service_arguments_reply(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); - 3 -> skip_group_service_arguments_reply(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); - 5 -> skip_32_service_arguments_reply(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData) - end - end; -dg_read_field_def_service_arguments_reply(<<>>, 0, 0, _, F@_1, F@_2, _) -> #service_arguments_reply{is_ok = F@_1, message = F@_2}. - -d_field_service_arguments_reply_is_ok(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> d_field_service_arguments_reply_is_ok(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); -d_field_service_arguments_reply_is_ok(<<0:1, X:7, Rest/binary>>, N, Acc, F, _, F@_2, TrUserData) -> - {NewFValue, RestF} = {id(X bsl N + Acc =/= 0, TrUserData), Rest}, - dfp_read_field_def_service_arguments_reply(RestF, 0, 0, F, NewFValue, F@_2, TrUserData). - -d_field_service_arguments_reply_message(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> d_field_service_arguments_reply_message(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); -d_field_service_arguments_reply_message(<<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_service_arguments_reply(RestF, 0, 0, F, F@_1, NewFValue, TrUserData). - -skip_varint_service_arguments_reply(<<1:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> skip_varint_service_arguments_reply(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); -skip_varint_service_arguments_reply(<<0:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_service_arguments_reply(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData). - -skip_length_delimited_service_arguments_reply(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> skip_length_delimited_service_arguments_reply(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); -skip_length_delimited_service_arguments_reply(<<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_service_arguments_reply(Rest2, 0, 0, F, F@_1, F@_2, TrUserData). - -skip_group_service_arguments_reply(Bin, _, Z2, FNum, F@_1, F@_2, TrUserData) -> - {_, Rest} = read_group(Bin, FNum), - dfp_read_field_def_service_arguments_reply(Rest, 0, Z2, FNum, F@_1, F@_2, TrUserData). - -skip_32_service_arguments_reply(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_service_arguments_reply(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData). - -skip_64_service_arguments_reply(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_service_arguments_reply(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData). - decode_msg_service_metrics(Bin, TrUserData) -> dfp_read_field_def_service_metrics(Bin, 0, 0, 0, id(<<>>, TrUserData), id(<<>>, TrUserData), TrUserData). dfp_read_field_def_service_metrics(<<10, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> d_field_service_metrics_service_id(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); @@ -1421,57 +1331,6 @@ skip_32_service_metrics(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData skip_64_service_metrics(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_service_metrics(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData). -decode_msg_service_metrics_reply(Bin, TrUserData) -> dfp_read_field_def_service_metrics_reply(Bin, 0, 0, 0, id(false, TrUserData), id(<<>>, TrUserData), TrUserData). - -dfp_read_field_def_service_metrics_reply(<<8, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> d_field_service_metrics_reply_is_ok(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); -dfp_read_field_def_service_metrics_reply(<<18, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> d_field_service_metrics_reply_message(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); -dfp_read_field_def_service_metrics_reply(<<>>, 0, 0, _, F@_1, F@_2, _) -> #service_metrics_reply{is_ok = F@_1, message = F@_2}; -dfp_read_field_def_service_metrics_reply(Other, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dg_read_field_def_service_metrics_reply(Other, Z1, Z2, F, F@_1, F@_2, TrUserData). - -dg_read_field_def_service_metrics_reply(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 32 - 7 -> dg_read_field_def_service_metrics_reply(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); -dg_read_field_def_service_metrics_reply(<<0:1, X:7, Rest/binary>>, N, Acc, _, F@_1, F@_2, TrUserData) -> - Key = X bsl N + Acc, - case Key of - 8 -> d_field_service_metrics_reply_is_ok(Rest, 0, 0, 0, F@_1, F@_2, TrUserData); - 18 -> d_field_service_metrics_reply_message(Rest, 0, 0, 0, F@_1, F@_2, TrUserData); - _ -> - case Key band 7 of - 0 -> skip_varint_service_metrics_reply(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); - 1 -> skip_64_service_metrics_reply(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); - 2 -> skip_length_delimited_service_metrics_reply(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); - 3 -> skip_group_service_metrics_reply(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); - 5 -> skip_32_service_metrics_reply(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData) - end - end; -dg_read_field_def_service_metrics_reply(<<>>, 0, 0, _, F@_1, F@_2, _) -> #service_metrics_reply{is_ok = F@_1, message = F@_2}. - -d_field_service_metrics_reply_is_ok(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> d_field_service_metrics_reply_is_ok(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); -d_field_service_metrics_reply_is_ok(<<0:1, X:7, Rest/binary>>, N, Acc, F, _, F@_2, TrUserData) -> - {NewFValue, RestF} = {id(X bsl N + Acc =/= 0, TrUserData), Rest}, - dfp_read_field_def_service_metrics_reply(RestF, 0, 0, F, NewFValue, F@_2, TrUserData). - -d_field_service_metrics_reply_message(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> d_field_service_metrics_reply_message(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); -d_field_service_metrics_reply_message(<<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_service_metrics_reply(RestF, 0, 0, F, F@_1, NewFValue, TrUserData). - -skip_varint_service_metrics_reply(<<1:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> skip_varint_service_metrics_reply(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); -skip_varint_service_metrics_reply(<<0:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_service_metrics_reply(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData). - -skip_length_delimited_service_metrics_reply(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> skip_length_delimited_service_metrics_reply(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); -skip_length_delimited_service_metrics_reply(<<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_service_metrics_reply(Rest2, 0, 0, F, F@_1, F@_2, TrUserData). - -skip_group_service_metrics_reply(Bin, _, Z2, FNum, F@_1, F@_2, TrUserData) -> - {_, Rest} = read_group(Bin, FNum), - dfp_read_field_def_service_metrics_reply(Rest, 0, Z2, FNum, F@_1, F@_2, TrUserData). - -skip_32_service_metrics_reply(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_service_metrics_reply(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData). - -skip_64_service_metrics_reply(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_service_metrics_reply(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData). - decode_msg_data(Bin, TrUserData) -> dfp_read_field_def_data(Bin, 0, 0, 0, id(<<>>, TrUserData), id(<<>>, TrUserData), id(0, TrUserData), 'tr_decode_init_default_data.tags'([], TrUserData), id(<<>>, TrUserData), TrUserData). dfp_read_field_def_data(<<10, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData) -> d_field_data_device_uuid(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData); @@ -2124,12 +1983,10 @@ merge_msgs(Prev, New, MsgName, Opts) -> auth_reply -> merge_msg_auth_reply(Prev, New, TrUserData); activate_push -> merge_msg_activate_push(Prev, New, TrUserData); deploy -> merge_msg_deploy(Prev, New, TrUserData); - deploy_reply -> merge_msg_deploy_reply(Prev, New, TrUserData); + efka_response -> merge_msg_efka_response(Prev, New, TrUserData); topic_message -> merge_msg_topic_message(Prev, New, TrUserData); service_arguments -> merge_msg_service_arguments(Prev, New, TrUserData); - service_arguments_reply -> merge_msg_service_arguments_reply(Prev, New, TrUserData); service_metrics -> merge_msg_service_metrics(Prev, New, TrUserData); - service_metrics_reply -> merge_msg_service_metrics_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); @@ -2198,16 +2055,20 @@ merge_msg_deploy(#deploy{task_id = PFtask_id, from = PFfrom, service_id = PFserv true -> NFservice_id end}. --compile({nowarn_unused_function,merge_msg_deploy_reply/3}). -merge_msg_deploy_reply(#deploy_reply{is_ok = PFis_ok, message = PFmessage}, #deploy_reply{is_ok = NFis_ok, message = NFmessage}, _) -> - #deploy_reply{is_ok = - if NFis_ok =:= undefined -> PFis_ok; - true -> NFis_ok - end, - message = - if NFmessage =:= undefined -> PFmessage; - true -> NFmessage - end}. +-compile({nowarn_unused_function,merge_msg_efka_response/3}). +merge_msg_efka_response(#efka_response{code = PFcode, result = PFresult, message = PFmessage}, #efka_response{code = NFcode, result = NFresult, message = NFmessage}, _) -> + #efka_response{code = + if NFcode =:= undefined -> PFcode; + true -> NFcode + end, + result = + if NFresult =:= undefined -> PFresult; + true -> NFresult + end, + message = + if NFmessage =:= undefined -> PFmessage; + true -> NFmessage + end}. -compile({nowarn_unused_function,merge_msg_topic_message/3}). merge_msg_topic_message(#topic_message{topic = PFtopic, content = PFcontent}, #topic_message{topic = NFtopic, content = NFcontent}, _) -> @@ -2231,17 +2092,6 @@ merge_msg_service_arguments(#service_arguments{service_id = PFservice_id, args = true -> NFargs end}. --compile({nowarn_unused_function,merge_msg_service_arguments_reply/3}). -merge_msg_service_arguments_reply(#service_arguments_reply{is_ok = PFis_ok, message = PFmessage}, #service_arguments_reply{is_ok = NFis_ok, message = NFmessage}, _) -> - #service_arguments_reply{is_ok = - if NFis_ok =:= undefined -> PFis_ok; - true -> NFis_ok - end, - message = - if NFmessage =:= undefined -> PFmessage; - true -> NFmessage - end}. - -compile({nowarn_unused_function,merge_msg_service_metrics/3}). merge_msg_service_metrics(#service_metrics{service_id = PFservice_id, metrics = PFmetrics}, #service_metrics{service_id = NFservice_id, metrics = NFmetrics}, _) -> #service_metrics{service_id = @@ -2253,17 +2103,6 @@ merge_msg_service_metrics(#service_metrics{service_id = PFservice_id, metrics = true -> NFmetrics end}. --compile({nowarn_unused_function,merge_msg_service_metrics_reply/3}). -merge_msg_service_metrics_reply(#service_metrics_reply{is_ok = PFis_ok, message = PFmessage}, #service_metrics_reply{is_ok = NFis_ok, message = NFmessage}, _) -> - #service_metrics_reply{is_ok = - if NFis_ok =:= undefined -> PFis_ok; - true -> NFis_ok - end, - message = - if NFmessage =:= undefined -> PFmessage; - true -> NFmessage - end}. - -compile({nowarn_unused_function,merge_msg_data/3}). merge_msg_data(#data{device_uuid = PFdevice_uuid, service_name = PFservice_name, at = PFat, tags = PFtags, fields = PFfields}, #data{device_uuid = NFdevice_uuid, service_name = NFservice_name, at = NFat, tags = NFtags, fields = NFfields}, TrUserData) -> @@ -2431,12 +2270,10 @@ verify_msg(Msg, MsgName, Opts) -> auth_reply -> v_msg_auth_reply(Msg, [MsgName], TrUserData); activate_push -> v_msg_activate_push(Msg, [MsgName], TrUserData); deploy -> v_msg_deploy(Msg, [MsgName], TrUserData); - deploy_reply -> v_msg_deploy_reply(Msg, [MsgName], TrUserData); + efka_response -> v_msg_efka_response(Msg, [MsgName], TrUserData); topic_message -> v_msg_topic_message(Msg, [MsgName], TrUserData); service_arguments -> v_msg_service_arguments(Msg, [MsgName], TrUserData); - service_arguments_reply -> v_msg_service_arguments_reply(Msg, [MsgName], TrUserData); service_metrics -> v_msg_service_metrics(Msg, [MsgName], TrUserData); - service_metrics_reply -> v_msg_service_metrics_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); @@ -2507,17 +2344,20 @@ v_msg_deploy(#deploy{task_id = F1, from = F2, service_id = F3}, Path, TrUserData ok; v_msg_deploy(X, Path, _TrUserData) -> mk_type_error({expected_msg, deploy}, 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{is_ok = F1, message = F2}, Path, TrUserData) -> +-compile({nowarn_unused_function,v_msg_efka_response/3}). +-dialyzer({nowarn_function,v_msg_efka_response/3}). +v_msg_efka_response(#efka_response{code = F1, result = F2, message = F3}, Path, TrUserData) -> if F1 == undefined -> ok; - true -> v_type_bool(F1, [is_ok | Path], TrUserData) + true -> v_type_int32(F1, [code | Path], TrUserData) end, if F2 == undefined -> ok; - true -> v_type_string(F2, [message | Path], TrUserData) + true -> v_type_string(F2, [result | Path], TrUserData) + end, + if F3 == undefined -> ok; + true -> v_type_string(F3, [message | Path], TrUserData) end, ok; -v_msg_deploy_reply(X, Path, _TrUserData) -> mk_type_error({expected_msg, deploy_reply}, X, Path). +v_msg_efka_response(X, Path, _TrUserData) -> mk_type_error({expected_msg, efka_response}, X, Path). -compile({nowarn_unused_function,v_msg_topic_message/3}). -dialyzer({nowarn_function,v_msg_topic_message/3}). @@ -2543,18 +2383,6 @@ v_msg_service_arguments(#service_arguments{service_id = F1, args = F2}, Path, Tr ok; v_msg_service_arguments(X, Path, _TrUserData) -> mk_type_error({expected_msg, service_arguments}, X, Path). --compile({nowarn_unused_function,v_msg_service_arguments_reply/3}). --dialyzer({nowarn_function,v_msg_service_arguments_reply/3}). -v_msg_service_arguments_reply(#service_arguments_reply{is_ok = F1, message = F2}, Path, TrUserData) -> - if F1 == undefined -> ok; - true -> v_type_bool(F1, [is_ok | Path], TrUserData) - end, - if F2 == undefined -> ok; - true -> v_type_string(F2, [message | Path], TrUserData) - end, - ok; -v_msg_service_arguments_reply(X, Path, _TrUserData) -> mk_type_error({expected_msg, service_arguments_reply}, X, Path). - -compile({nowarn_unused_function,v_msg_service_metrics/3}). -dialyzer({nowarn_function,v_msg_service_metrics/3}). v_msg_service_metrics(#service_metrics{service_id = F1, metrics = F2}, Path, TrUserData) -> @@ -2567,18 +2395,6 @@ v_msg_service_metrics(#service_metrics{service_id = F1, metrics = F2}, Path, TrU ok; v_msg_service_metrics(X, Path, _TrUserData) -> mk_type_error({expected_msg, service_metrics}, X, Path). --compile({nowarn_unused_function,v_msg_service_metrics_reply/3}). --dialyzer({nowarn_function,v_msg_service_metrics_reply/3}). -v_msg_service_metrics_reply(#service_metrics_reply{is_ok = F1, message = F2}, Path, TrUserData) -> - if F1 == undefined -> ok; - true -> v_type_bool(F1, [is_ok | Path], TrUserData) - end, - if F2 == undefined -> ok; - true -> v_type_string(F2, [message | Path], TrUserData) - end, - ok; -v_msg_service_metrics_reply(X, Path, _TrUserData) -> mk_type_error({expected_msg, service_metrics_reply}, X, Path). - -compile({nowarn_unused_function,v_msg_data/3}). -dialyzer({nowarn_function,v_msg_data/3}). v_msg_data(#data{device_uuid = F1, service_name = F2, at = F3, tags = F4, fields = F5}, Path, TrUserData) -> @@ -2861,12 +2677,13 @@ get_msg_defs() -> [#field{name = task_id, fnum = 1, rnum = 2, type = uint32, occurrence = optional, opts = []}, #field{name = from, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []}, #field{name = service_id, fnum = 3, rnum = 4, type = string, occurrence = optional, opts = []}]}, - {{msg, deploy_reply}, [#field{name = is_ok, fnum = 1, rnum = 2, type = bool, occurrence = optional, opts = []}, #field{name = message, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []}]}, + {{msg, efka_response}, + [#field{name = code, fnum = 1, rnum = 2, type = int32, occurrence = optional, opts = []}, + #field{name = result, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []}, + #field{name = message, fnum = 3, rnum = 4, type = string, occurrence = optional, opts = []}]}, {{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, service_arguments}, [#field{name = service_id, fnum = 1, rnum = 2, type = string, occurrence = optional, opts = []}, #field{name = args, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []}]}, - {{msg, service_arguments_reply}, [#field{name = is_ok, fnum = 1, rnum = 2, type = bool, occurrence = optional, opts = []}, #field{name = message, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []}]}, {{msg, service_metrics}, [#field{name = service_id, fnum = 1, rnum = 2, type = string, occurrence = optional, opts = []}, #field{name = metrics, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []}]}, - {{msg, service_metrics_reply}, [#field{name = is_ok, fnum = 1, rnum = 2, type = bool, occurrence = optional, opts = []}, #field{name = message, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []}]}, {{msg, data}, [#field{name = device_uuid, fnum = 1, rnum = 2, type = string, occurrence = optional, opts = []}, #field{name = service_name, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []}, @@ -2902,14 +2719,13 @@ get_msg_defs() -> {{msg, ai_event}, [#field{name = event_type, fnum = 1, rnum = 2, type = uint32, occurrence = optional, opts = []}, #field{name = params, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []}]}]. -get_msg_names() -> [auth_request, auth_reply, activate_push, deploy, deploy_reply, topic_message, service_arguments, service_arguments_reply, service_metrics, service_metrics_reply, data, ping, service_inform, feedback_phase, event, ai_event]. +get_msg_names() -> [auth_request, auth_reply, activate_push, deploy, efka_response, topic_message, service_arguments, service_metrics, data, ping, service_inform, feedback_phase, event, ai_event]. get_group_names() -> []. -get_msg_or_group_names() -> - [auth_request, auth_reply, activate_push, deploy, deploy_reply, topic_message, service_arguments, service_arguments_reply, service_metrics, service_metrics_reply, data, ping, service_inform, feedback_phase, event, ai_event]. +get_msg_or_group_names() -> [auth_request, auth_reply, activate_push, deploy, efka_response, topic_message, service_arguments, service_metrics, data, ping, service_inform, feedback_phase, event, ai_event]. get_enum_names() -> []. @@ -2941,12 +2757,13 @@ find_msg_def(deploy) -> [#field{name = task_id, fnum = 1, rnum = 2, type = uint32, occurrence = optional, opts = []}, #field{name = from, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []}, #field{name = service_id, fnum = 3, rnum = 4, type = string, occurrence = optional, opts = []}]; -find_msg_def(deploy_reply) -> [#field{name = is_ok, fnum = 1, rnum = 2, type = bool, occurrence = optional, opts = []}, #field{name = message, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []}]; +find_msg_def(efka_response) -> + [#field{name = code, fnum = 1, rnum = 2, type = int32, occurrence = optional, opts = []}, + #field{name = result, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []}, + #field{name = message, fnum = 3, rnum = 4, type = string, occurrence = optional, opts = []}]; 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(service_arguments) -> [#field{name = service_id, fnum = 1, rnum = 2, type = string, occurrence = optional, opts = []}, #field{name = args, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []}]; -find_msg_def(service_arguments_reply) -> [#field{name = is_ok, fnum = 1, rnum = 2, type = bool, occurrence = optional, opts = []}, #field{name = message, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []}]; find_msg_def(service_metrics) -> [#field{name = service_id, fnum = 1, rnum = 2, type = string, occurrence = optional, opts = []}, #field{name = metrics, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []}]; -find_msg_def(service_metrics_reply) -> [#field{name = is_ok, fnum = 1, rnum = 2, type = bool, occurrence = optional, opts = []}, #field{name = message, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []}]; find_msg_def(data) -> [#field{name = device_uuid, fnum = 1, rnum = 2, type = string, occurrence = optional, opts = []}, #field{name = service_name, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []}, @@ -3042,12 +2859,10 @@ 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(<<"Deploy">>) -> deploy; -fqbin_to_msg_name(<<"DeployReply">>) -> deploy_reply; +fqbin_to_msg_name(<<"EfkaResponse">>) -> efka_response; fqbin_to_msg_name(<<"TopicMessage">>) -> topic_message; fqbin_to_msg_name(<<"ServiceArguments">>) -> service_arguments; -fqbin_to_msg_name(<<"ServiceArgumentsReply">>) -> service_arguments_reply; fqbin_to_msg_name(<<"ServiceMetrics">>) -> service_metrics; -fqbin_to_msg_name(<<"ServiceMetricsReply">>) -> service_metrics_reply; fqbin_to_msg_name(<<"Data">>) -> data; fqbin_to_msg_name(<<"Ping">>) -> ping; fqbin_to_msg_name(<<"ServiceInform">>) -> service_inform; @@ -3061,12 +2876,10 @@ 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(deploy) -> <<"Deploy">>; -msg_name_to_fqbin(deploy_reply) -> <<"DeployReply">>; +msg_name_to_fqbin(efka_response) -> <<"EfkaResponse">>; msg_name_to_fqbin(topic_message) -> <<"TopicMessage">>; msg_name_to_fqbin(service_arguments) -> <<"ServiceArguments">>; -msg_name_to_fqbin(service_arguments_reply) -> <<"ServiceArgumentsReply">>; msg_name_to_fqbin(service_metrics) -> <<"ServiceMetrics">>; -msg_name_to_fqbin(service_metrics_reply) -> <<"ServiceMetricsReply">>; msg_name_to_fqbin(data) -> <<"Data">>; msg_name_to_fqbin(ping) -> <<"Ping">>; msg_name_to_fqbin(service_inform) -> <<"ServiceInform">>; @@ -3111,8 +2924,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, deploy, deploy_reply, event, feedback_phase, ping, service_arguments, service_arguments_reply, service_inform, service_metrics, service_metrics_reply, topic_message]; +get_msg_containment("message_pb") -> [ai_event, activate_push, auth_reply, auth_request, data, deploy, efka_response, event, feedback_phase, ping, service_arguments, service_inform, service_metrics, topic_message]; get_msg_containment(P) -> error({gpb_error, {badproto, P}}). @@ -3140,11 +2952,9 @@ 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(<<"TopicMessage">>) -> "message_pb"; get_proto_by_msg_name_as_fqbin(<<"FeedbackPhase">>) -> "message_pb"; +get_proto_by_msg_name_as_fqbin(<<"EfkaResponse">>) -> "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(<<"ServiceMetricsReply">>) -> "message_pb"; -get_proto_by_msg_name_as_fqbin(<<"ServiceArgumentsReply">>) -> "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 2a3f9d4..a88ad12 100644 --- a/message_pb.proto +++ b/message_pb.proto @@ -28,10 +28,11 @@ message Deploy { string service_id = 3; } -// 部署响应 -message DeployReply { - bool is_ok = 1; - string message = 2; +// efka响应 +message EfkaResponse { + int32 code = 1; + string result = 2; + string message = 3; } // 基于pub/sub的机制实现远程调用 @@ -46,22 +47,12 @@ message ServiceArguments { string args = 2; } -message ServiceArgumentsReply { - bool is_ok = 1; - string message = 2; -} - // 服务采集项 message ServiceMetrics { string service_id = 1; string metrics = 2; } -message ServiceMetricsReply { - bool is_ok = 1; - string message = 2; -} - // 数据传输 message Data { string device_uuid = 1;