diff --git a/apps/efka/include/message_pb.hrl b/apps/efka/include/message_pb.hrl index fde3274..406c027 100644 --- a/apps/efka/include/message_pb.hrl +++ b/apps/efka/include/message_pb.hrl @@ -60,10 +60,19 @@ }). -endif. --ifndef('SESSION_REPLY_PB_H'). --define('SESSION_REPLY_PB_H', true). --record(session_reply, - {a = false :: boolean() | 0 | 1 | undefined % = 1, optional +-ifndef('SERVICE_ARGUMENTS_PB_H'). +-define('SERVICE_ARGUMENTS_PB_H', true). +-record(service_arguments, + {service_id = <<>> :: unicode:chardata() | undefined, % = 1, optional + args = <<>> :: unicode:chardata() | undefined % = 2, optional + }). +-endif. + +-ifndef('SERVICE_METRICS_PB_H'). +-define('SERVICE_METRICS_PB_H', true). +-record(service_metrics, + {service_id = <<>> :: unicode:chardata() | undefined, % = 1, optional + metrics = <<>> :: unicode:chardata() | undefined % = 2, optional }). -endif. @@ -122,7 +131,7 @@ -define('EVENT_PB_H', true). -record(event, {event_type = 0 :: non_neg_integer() | undefined, % = 1, optional, 32 bits - params = <<>> :: iodata() | undefined % = 2, optional + params = <<>> :: unicode:chardata() | undefined % = 2, optional }). -endif. @@ -130,7 +139,7 @@ -define('AI_EVENT_PB_H', true). -record(ai_event, {event_type = 0 :: non_neg_integer() | undefined, % = 1, optional, 32 bits - params = <<>> :: iodata() | undefined % = 2, optional + params = <<>> :: unicode:chardata() | undefined % = 2, optional }). -endif. diff --git a/apps/efka/src/proto/message_pb.erl b/apps/efka/src/proto/message_pb.erl index 1d5c775..3d55d83 100644 --- a/apps/efka/src/proto/message_pb.erl +++ b/apps/efka/src/proto/message_pb.erl @@ -67,7 +67,9 @@ -type topic_message() :: #topic_message{}. --type session_reply() :: #session_reply{}. +-type service_arguments() :: #service_arguments{}. + +-type service_metrics() :: #service_metrics{}. -type data() :: #data{}. @@ -81,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, 'session_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 | session_reply | data | ping | service_inform | feedback_phase | event | ai_event. --type '$msg'() :: auth_request() | auth_reply() | activate_push() | deploy() | deploy_reply() | topic_message() | session_reply() | data() | ping() | service_inform() | feedback_phase() | 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_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 | deploy_reply | topic_message | service_arguments | service_metrics | 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_metrics() | data() | ping() | service_inform() | feedback_phase() | event() | ai_event(). -export_type(['$msg_name'/0, '$msg'/0]). -record('map',{key, value}). @@ -117,7 +119,8 @@ encode_msg(Msg, MsgName, Opts) -> deploy -> encode_msg_deploy(id(Msg, TrUserData), TrUserData); deploy_reply -> encode_msg_deploy_reply(id(Msg, TrUserData), TrUserData); topic_message -> encode_msg_topic_message(id(Msg, TrUserData), TrUserData); - session_reply -> encode_msg_session_reply(id(Msg, TrUserData), TrUserData); + service_arguments -> encode_msg_service_arguments(id(Msg, TrUserData), TrUserData); + service_metrics -> encode_msg_service_metrics(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); @@ -312,16 +315,52 @@ encode_msg_topic_message(#topic_message{topic = F1, content = F2}, Bin, TrUserDa end end. -encode_msg_session_reply(Msg, TrUserData) -> encode_msg_session_reply(Msg, <<>>, TrUserData). +encode_msg_service_arguments(Msg, TrUserData) -> encode_msg_service_arguments(Msg, <<>>, TrUserData). -encode_msg_session_reply(#session_reply{a = F1}, Bin, TrUserData) -> - if F1 == undefined -> Bin; +encode_msg_service_arguments(#service_arguments{service_id = F1, args = 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 - TrF1 = id(F1, TrUserData), - if TrF1 =:= false -> Bin; - true -> e_type_bool(TrF1, <>, TrUserData) + 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). + + +encode_msg_service_metrics(#service_metrics{service_id = F1, metrics = 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. @@ -608,9 +647,9 @@ encode_msg_event(#event{event_type = F1, params = F2}, Bin, TrUserData) -> true -> begin TrF2 = id(F2, TrUserData), - case iolist_size(TrF2) of - 0 -> B1; - _ -> e_type_bytes(TrF2, <>, TrUserData) + case is_empty_string(TrF2) of + true -> B1; + false -> e_type_string(TrF2, <>, TrUserData) end end end. @@ -632,9 +671,9 @@ encode_msg_ai_event(#ai_event{event_type = F1, params = F2}, Bin, TrUserData) -> true -> begin TrF2 = id(F2, TrUserData), - case iolist_size(TrF2) of - 0 -> B1; - _ -> e_type_bytes(TrF2, <>, TrUserData) + case is_empty_string(TrF2) of + true -> B1; + false -> e_type_string(TrF2, <>, TrUserData) end end end. @@ -828,7 +867,8 @@ decode_msg_2_doit(activate_push, Bin, TrUserData) -> id(decode_msg_activate_push 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(topic_message, Bin, TrUserData) -> id(decode_msg_topic_message(Bin, TrUserData), TrUserData); -decode_msg_2_doit(session_reply, Bin, TrUserData) -> id(decode_msg_session_reply(Bin, TrUserData), TrUserData); +decode_msg_2_doit(service_arguments, Bin, TrUserData) -> id(decode_msg_service_arguments(Bin, TrUserData), TrUserData); +decode_msg_2_doit(service_metrics, Bin, TrUserData) -> id(decode_msg_service_metrics(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); @@ -1172,49 +1212,107 @@ skip_32_topic_message(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) skip_64_topic_message(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_topic_message(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData). -decode_msg_session_reply(Bin, TrUserData) -> dfp_read_field_def_session_reply(Bin, 0, 0, 0, id(false, TrUserData), TrUserData). +decode_msg_service_arguments(Bin, TrUserData) -> dfp_read_field_def_service_arguments(Bin, 0, 0, 0, id(<<>>, TrUserData), id(<<>>, TrUserData), TrUserData). -dfp_read_field_def_session_reply(<<8, Rest/binary>>, Z1, Z2, F, F@_1, TrUserData) -> d_field_session_reply_a(Rest, Z1, Z2, F, F@_1, TrUserData); -dfp_read_field_def_session_reply(<<>>, 0, 0, _, F@_1, _) -> #session_reply{a = F@_1}; -dfp_read_field_def_session_reply(Other, Z1, Z2, F, F@_1, TrUserData) -> dg_read_field_def_session_reply(Other, Z1, Z2, F, F@_1, TrUserData). +dfp_read_field_def_service_arguments(<<10, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> d_field_service_arguments_service_id(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); +dfp_read_field_def_service_arguments(<<18, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> d_field_service_arguments_args(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); +dfp_read_field_def_service_arguments(<<>>, 0, 0, _, F@_1, F@_2, _) -> #service_arguments{service_id = F@_1, args = F@_2}; +dfp_read_field_def_service_arguments(Other, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dg_read_field_def_service_arguments(Other, Z1, Z2, F, F@_1, F@_2, TrUserData). -dg_read_field_def_session_reply(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, TrUserData) when N < 32 - 7 -> dg_read_field_def_session_reply(Rest, N + 7, X bsl N + Acc, F, F@_1, TrUserData); -dg_read_field_def_session_reply(<<0:1, X:7, Rest/binary>>, N, Acc, _, F@_1, TrUserData) -> +dg_read_field_def_service_arguments(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 32 - 7 -> dg_read_field_def_service_arguments(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); +dg_read_field_def_service_arguments(<<0:1, X:7, Rest/binary>>, N, Acc, _, F@_1, F@_2, TrUserData) -> Key = X bsl N + Acc, case Key of - 8 -> d_field_session_reply_a(Rest, 0, 0, 0, F@_1, TrUserData); + 10 -> d_field_service_arguments_service_id(Rest, 0, 0, 0, F@_1, F@_2, TrUserData); + 18 -> d_field_service_arguments_args(Rest, 0, 0, 0, F@_1, F@_2, TrUserData); _ -> case Key band 7 of - 0 -> skip_varint_session_reply(Rest, 0, 0, Key bsr 3, F@_1, TrUserData); - 1 -> skip_64_session_reply(Rest, 0, 0, Key bsr 3, F@_1, TrUserData); - 2 -> skip_length_delimited_session_reply(Rest, 0, 0, Key bsr 3, F@_1, TrUserData); - 3 -> skip_group_session_reply(Rest, 0, 0, Key bsr 3, F@_1, TrUserData); - 5 -> skip_32_session_reply(Rest, 0, 0, Key bsr 3, F@_1, TrUserData) + 0 -> skip_varint_service_arguments(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); + 1 -> skip_64_service_arguments(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); + 2 -> skip_length_delimited_service_arguments(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); + 3 -> skip_group_service_arguments(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); + 5 -> skip_32_service_arguments(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData) end end; -dg_read_field_def_session_reply(<<>>, 0, 0, _, F@_1, _) -> #session_reply{a = F@_1}. +dg_read_field_def_service_arguments(<<>>, 0, 0, _, F@_1, F@_2, _) -> #service_arguments{service_id = F@_1, args = F@_2}. -d_field_session_reply_a(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, TrUserData) when N < 57 -> d_field_session_reply_a(Rest, N + 7, X bsl N + Acc, F, F@_1, TrUserData); -d_field_session_reply_a(<<0:1, X:7, Rest/binary>>, N, Acc, F, _, TrUserData) -> - {NewFValue, RestF} = {id(X bsl N + Acc =/= 0, TrUserData), Rest}, - dfp_read_field_def_session_reply(RestF, 0, 0, F, NewFValue, TrUserData). +d_field_service_arguments_service_id(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> d_field_service_arguments_service_id(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); +d_field_service_arguments_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_service_arguments(RestF, 0, 0, F, NewFValue, F@_2, TrUserData). -skip_varint_session_reply(<<1:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, TrUserData) -> skip_varint_session_reply(Rest, Z1, Z2, F, F@_1, TrUserData); -skip_varint_session_reply(<<0:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, TrUserData) -> dfp_read_field_def_session_reply(Rest, Z1, Z2, F, F@_1, TrUserData). +d_field_service_arguments_args(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> d_field_service_arguments_args(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); +d_field_service_arguments_args(<<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(RestF, 0, 0, F, F@_1, NewFValue, TrUserData). -skip_length_delimited_session_reply(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, TrUserData) when N < 57 -> skip_length_delimited_session_reply(Rest, N + 7, X bsl N + Acc, F, F@_1, TrUserData); -skip_length_delimited_session_reply(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, TrUserData) -> +skip_varint_service_arguments(<<1:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> skip_varint_service_arguments(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); +skip_varint_service_arguments(<<0:1, _:7, 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). + +skip_length_delimited_service_arguments(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> skip_length_delimited_service_arguments(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); +skip_length_delimited_service_arguments(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) -> Length = X bsl N + Acc, <<_:Length/binary, Rest2/binary>> = Rest, - dfp_read_field_def_session_reply(Rest2, 0, 0, F, F@_1, TrUserData). + dfp_read_field_def_service_arguments(Rest2, 0, 0, F, F@_1, F@_2, TrUserData). -skip_group_session_reply(Bin, _, Z2, FNum, F@_1, TrUserData) -> +skip_group_service_arguments(Bin, _, Z2, FNum, F@_1, F@_2, TrUserData) -> {_, Rest} = read_group(Bin, FNum), - dfp_read_field_def_session_reply(Rest, 0, Z2, FNum, F@_1, TrUserData). + dfp_read_field_def_service_arguments(Rest, 0, Z2, FNum, F@_1, F@_2, TrUserData). -skip_32_session_reply(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, TrUserData) -> dfp_read_field_def_session_reply(Rest, Z1, Z2, F, F@_1, TrUserData). +skip_32_service_arguments(<<_:32, 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). -skip_64_session_reply(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, TrUserData) -> dfp_read_field_def_session_reply(Rest, Z1, Z2, F, F@_1, TrUserData). +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_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); +dfp_read_field_def_service_metrics(<<18, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> d_field_service_metrics_metrics(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); +dfp_read_field_def_service_metrics(<<>>, 0, 0, _, F@_1, F@_2, _) -> #service_metrics{service_id = F@_1, metrics = F@_2}; +dfp_read_field_def_service_metrics(Other, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dg_read_field_def_service_metrics(Other, Z1, Z2, F, F@_1, F@_2, TrUserData). + +dg_read_field_def_service_metrics(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 32 - 7 -> dg_read_field_def_service_metrics(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); +dg_read_field_def_service_metrics(<<0:1, X:7, Rest/binary>>, N, Acc, _, F@_1, F@_2, TrUserData) -> + Key = X bsl N + Acc, + case Key of + 10 -> d_field_service_metrics_service_id(Rest, 0, 0, 0, F@_1, F@_2, TrUserData); + 18 -> d_field_service_metrics_metrics(Rest, 0, 0, 0, F@_1, F@_2, TrUserData); + _ -> + case Key band 7 of + 0 -> skip_varint_service_metrics(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); + 1 -> skip_64_service_metrics(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); + 2 -> skip_length_delimited_service_metrics(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); + 3 -> skip_group_service_metrics(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); + 5 -> skip_32_service_metrics(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData) + end + end; +dg_read_field_def_service_metrics(<<>>, 0, 0, _, F@_1, F@_2, _) -> #service_metrics{service_id = F@_1, metrics = F@_2}. + +d_field_service_metrics_service_id(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> d_field_service_metrics_service_id(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); +d_field_service_metrics_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_service_metrics(RestF, 0, 0, F, NewFValue, F@_2, TrUserData). + +d_field_service_metrics_metrics(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> d_field_service_metrics_metrics(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); +d_field_service_metrics_metrics(<<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(RestF, 0, 0, F, F@_1, NewFValue, TrUserData). + +skip_varint_service_metrics(<<1:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> skip_varint_service_metrics(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); +skip_varint_service_metrics(<<0:1, _:7, 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). + +skip_length_delimited_service_metrics(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> skip_length_delimited_service_metrics(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); +skip_length_delimited_service_metrics(<<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(Rest2, 0, 0, F, F@_1, F@_2, TrUserData). + +skip_group_service_metrics(Bin, _, Z2, FNum, F@_1, F@_2, TrUserData) -> + {_, Rest} = read_group(Bin, FNum), + dfp_read_field_def_service_metrics(Rest, 0, Z2, FNum, F@_1, F@_2, TrUserData). + +skip_32_service_metrics(<<_:32, 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). + +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_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). @@ -1870,7 +1968,8 @@ merge_msgs(Prev, New, MsgName, Opts) -> deploy -> merge_msg_deploy(Prev, New, TrUserData); deploy_reply -> merge_msg_deploy_reply(Prev, New, TrUserData); topic_message -> merge_msg_topic_message(Prev, New, TrUserData); - session_reply -> merge_msg_session_reply(Prev, New, TrUserData); + service_arguments -> merge_msg_service_arguments(Prev, New, TrUserData); + service_metrics -> merge_msg_service_metrics(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); @@ -1961,12 +2060,27 @@ merge_msg_topic_message(#topic_message{topic = PFtopic, content = PFcontent}, #t true -> NFcontent end}. --compile({nowarn_unused_function,merge_msg_session_reply/3}). -merge_msg_session_reply(#session_reply{a = PFa}, #session_reply{a = NFa}, _) -> - #session_reply{a = - if NFa =:= undefined -> PFa; - true -> NFa - end}. +-compile({nowarn_unused_function,merge_msg_service_arguments/3}). +merge_msg_service_arguments(#service_arguments{service_id = PFservice_id, args = PFargs}, #service_arguments{service_id = NFservice_id, args = NFargs}, _) -> + #service_arguments{service_id = + if NFservice_id =:= undefined -> PFservice_id; + true -> NFservice_id + end, + args = + if NFargs =:= undefined -> PFargs; + true -> NFargs + 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 = + if NFservice_id =:= undefined -> PFservice_id; + true -> NFservice_id + end, + metrics = + if NFmetrics =:= undefined -> PFmetrics; + true -> NFmetrics + 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}, @@ -2137,7 +2251,8 @@ verify_msg(Msg, MsgName, Opts) -> deploy -> v_msg_deploy(Msg, [MsgName], TrUserData); deploy_reply -> v_msg_deploy_reply(Msg, [MsgName], TrUserData); topic_message -> v_msg_topic_message(Msg, [MsgName], TrUserData); - session_reply -> v_msg_session_reply(Msg, [MsgName], TrUserData); + service_arguments -> v_msg_service_arguments(Msg, [MsgName], TrUserData); + service_metrics -> v_msg_service_metrics(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); @@ -2232,14 +2347,29 @@ v_msg_topic_message(#topic_message{topic = F1, content = F2}, Path, TrUserData) ok; v_msg_topic_message(X, Path, _TrUserData) -> mk_type_error({expected_msg, topic_message}, X, Path). --compile({nowarn_unused_function,v_msg_session_reply/3}). --dialyzer({nowarn_function,v_msg_session_reply/3}). -v_msg_session_reply(#session_reply{a = F1}, Path, TrUserData) -> +-compile({nowarn_unused_function,v_msg_service_arguments/3}). +-dialyzer({nowarn_function,v_msg_service_arguments/3}). +v_msg_service_arguments(#service_arguments{service_id = F1, args = F2}, Path, TrUserData) -> if F1 == undefined -> ok; - true -> v_type_bool(F1, [a | Path], TrUserData) + true -> v_type_string(F1, [service_id | Path], TrUserData) + end, + if F2 == undefined -> ok; + true -> v_type_string(F2, [args | Path], TrUserData) end, ok; -v_msg_session_reply(X, Path, _TrUserData) -> mk_type_error({expected_msg, session_reply}, X, Path). +v_msg_service_arguments(X, Path, _TrUserData) -> mk_type_error({expected_msg, service_arguments}, 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) -> + if F1 == undefined -> ok; + true -> v_type_string(F1, [service_id | Path], TrUserData) + end, + if F2 == undefined -> ok; + true -> v_type_string(F2, [metrics | Path], TrUserData) + end, + ok; +v_msg_service_metrics(X, Path, _TrUserData) -> mk_type_error({expected_msg, service_metrics}, X, Path). -compile({nowarn_unused_function,v_msg_data/3}). -dialyzer({nowarn_function,v_msg_data/3}). @@ -2357,7 +2487,7 @@ v_msg_event(#event{event_type = F1, params = F2}, Path, TrUserData) -> true -> v_type_uint32(F1, [event_type | Path], TrUserData) end, if F2 == undefined -> ok; - true -> v_type_bytes(F2, [params | Path], TrUserData) + true -> v_type_string(F2, [params | Path], TrUserData) end, ok; v_msg_event(X, Path, _TrUserData) -> mk_type_error({expected_msg, event}, X, Path). @@ -2369,7 +2499,7 @@ v_msg_ai_event(#ai_event{event_type = F1, params = F2}, Path, TrUserData) -> true -> v_type_uint32(F1, [event_type | Path], TrUserData) end, if F2 == undefined -> ok; - true -> v_type_bytes(F2, [params | Path], TrUserData) + true -> v_type_string(F2, [params | Path], TrUserData) end, ok; v_msg_ai_event(X, Path, _TrUserData) -> mk_type_error({expected_msg, ai_event}, X, Path). @@ -2525,7 +2655,8 @@ get_msg_defs() -> #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, topic_message}, [#field{name = topic, fnum = 1, rnum = 2, type = string, occurrence = optional, opts = []}, #field{name = content, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []}]}, - {{msg, session_reply}, [#field{name = a, fnum = 1, rnum = 2, type = bool, occurrence = optional, opts = []}]}, + {{msg, 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_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, 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 = []}, @@ -2557,17 +2688,17 @@ get_msg_defs() -> #field{name = phase, fnum = 3, rnum = 4, type = string, occurrence = optional, opts = []}, #field{name = code, fnum = 4, rnum = 5, type = uint32, occurrence = optional, opts = []}, #field{name = message, fnum = 5, rnum = 6, type = string, occurrence = optional, opts = []}]}, - {{msg, event}, [#field{name = event_type, fnum = 1, rnum = 2, type = uint32, occurrence = optional, opts = []}, #field{name = params, fnum = 2, rnum = 3, type = bytes, occurrence = optional, opts = []}]}, - {{msg, ai_event}, [#field{name = event_type, fnum = 1, rnum = 2, type = uint32, occurrence = optional, opts = []}, #field{name = params, fnum = 2, rnum = 3, type = bytes, occurrence = optional, opts = []}]}]. + {{msg, 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 = []}]}, + {{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, session_reply, data, ping, service_inform, feedback_phase, event, ai_event]. +get_msg_names() -> [auth_request, auth_reply, activate_push, deploy, deploy_reply, 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, session_reply, data, ping, service_inform, feedback_phase, event, ai_event]. +get_msg_or_group_names() -> [auth_request, auth_reply, activate_push, deploy, deploy_reply, topic_message, service_arguments, service_metrics, data, ping, service_inform, feedback_phase, event, ai_event]. get_enum_names() -> []. @@ -2601,7 +2732,8 @@ find_msg_def(deploy) -> #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(topic_message) -> [#field{name = topic, fnum = 1, rnum = 2, type = string, occurrence = optional, opts = []}, #field{name = content, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []}]; -find_msg_def(session_reply) -> [#field{name = a, fnum = 1, rnum = 2, type = bool, occurrence = optional, opts = []}]; +find_msg_def(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_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(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 = []}, @@ -2633,8 +2765,8 @@ find_msg_def(feedback_phase) -> #field{name = phase, fnum = 3, rnum = 4, type = string, occurrence = optional, opts = []}, #field{name = code, fnum = 4, rnum = 5, type = uint32, occurrence = optional, opts = []}, #field{name = message, fnum = 5, rnum = 6, type = string, occurrence = optional, opts = []}]; -find_msg_def(event) -> [#field{name = event_type, fnum = 1, rnum = 2, type = uint32, occurrence = optional, opts = []}, #field{name = params, fnum = 2, rnum = 3, type = bytes, occurrence = optional, opts = []}]; -find_msg_def(ai_event) -> [#field{name = event_type, fnum = 1, rnum = 2, type = uint32, occurrence = optional, opts = []}, #field{name = params, fnum = 2, rnum = 3, type = bytes, occurrence = optional, opts = []}]; +find_msg_def(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 = []}]; +find_msg_def(ai_event) -> [#field{name = event_type, fnum = 1, rnum = 2, type = uint32, occurrence = optional, opts = []}, #field{name = params, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []}]; find_msg_def(_) -> error. @@ -2699,7 +2831,8 @@ fqbin_to_msg_name(<<"ActivatePush">>) -> activate_push; fqbin_to_msg_name(<<"Deploy">>) -> deploy; fqbin_to_msg_name(<<"DeployReply">>) -> deploy_reply; fqbin_to_msg_name(<<"TopicMessage">>) -> topic_message; -fqbin_to_msg_name(<<"SessionReply">>) -> session_reply; +fqbin_to_msg_name(<<"ServiceArguments">>) -> service_arguments; +fqbin_to_msg_name(<<"ServiceMetrics">>) -> service_metrics; fqbin_to_msg_name(<<"Data">>) -> data; fqbin_to_msg_name(<<"Ping">>) -> ping; fqbin_to_msg_name(<<"ServiceInform">>) -> service_inform; @@ -2715,7 +2848,8 @@ msg_name_to_fqbin(activate_push) -> <<"ActivatePush">>; msg_name_to_fqbin(deploy) -> <<"Deploy">>; msg_name_to_fqbin(deploy_reply) -> <<"DeployReply">>; msg_name_to_fqbin(topic_message) -> <<"TopicMessage">>; -msg_name_to_fqbin(session_reply) -> <<"SessionReply">>; +msg_name_to_fqbin(service_arguments) -> <<"ServiceArguments">>; +msg_name_to_fqbin(service_metrics) -> <<"ServiceMetrics">>; msg_name_to_fqbin(data) -> <<"Data">>; msg_name_to_fqbin(ping) -> <<"Ping">>; msg_name_to_fqbin(service_inform) -> <<"ServiceInform">>; @@ -2760,7 +2894,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_inform, session_reply, topic_message]; +get_msg_containment("message_pb") -> [ai_event, activate_push, auth_reply, auth_request, data, deploy, deploy_reply, event, feedback_phase, ping, service_arguments, service_inform, service_metrics, topic_message]; get_msg_containment(P) -> error({gpb_error, {badproto, P}}). @@ -2781,6 +2915,8 @@ get_enum_containment(P) -> error({gpb_error, {badproto, P}}). get_proto_by_msg_name_as_fqbin(<<"Data">>) -> "message_pb"; +get_proto_by_msg_name_as_fqbin(<<"ServiceMetrics">>) -> "message_pb"; +get_proto_by_msg_name_as_fqbin(<<"ServiceArguments">>) -> "message_pb"; get_proto_by_msg_name_as_fqbin(<<"Event">>) -> "message_pb"; get_proto_by_msg_name_as_fqbin(<<"AuthRequest">>) -> "message_pb"; get_proto_by_msg_name_as_fqbin(<<"AIEvent">>) -> "message_pb"; @@ -2788,7 +2924,6 @@ 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(<<"Ping">>) -> "message_pb"; get_proto_by_msg_name_as_fqbin(<<"ActivatePush">>) -> "message_pb"; -get_proto_by_msg_name_as_fqbin(<<"SessionReply">>) -> "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"; diff --git a/message_pb.proto b/message_pb.proto index c77ae09..d876acb 100644 --- a/message_pb.proto +++ b/message_pb.proto @@ -28,6 +28,7 @@ message Deploy { string service_id = 3; } +// 部署响应 message DeployReply { bool is_ok = 1; string message = 2; @@ -39,8 +40,16 @@ message TopicMessage { string content = 2; } -message SessionReply { - bool a = 1; +// 服务参数 +message ServiceArguments { + string service_id = 1; + string args = 2; +} + +// 服务采集项 +message ServiceMetrics { + string service_id = 1; + string metrics = 2; } // 数据传输 @@ -105,10 +114,10 @@ message FeedbackPhase { message Event { uint32 event_type = 1; - bytes params = 2; + string params = 2; } message AIEvent { uint32 event_type = 1; - bytes params = 2; + string params = 2; } \ No newline at end of file