diff --git a/apps/efka/include/message_pb.hrl b/apps/efka/include/message_pb.hrl index dffdb7c..e8f7ca9 100644 --- a/apps/efka/include/message_pb.hrl +++ b/apps/efka/include/message_pb.hrl @@ -44,21 +44,18 @@ }). -endif. --ifndef('ASYNC_REQUEST_PB_H'). --define('ASYNC_REQUEST_PB_H', true). --record(async_request, +-ifndef('PUSH_PB_H'). +-define('PUSH_PB_H', true). +-record(push, {service_id = <<>> :: unicode:chardata() | undefined, % = 1, optional - method = <<>> :: unicode:chardata() | undefined, % = 2, optional - params = <<>> :: unicode:chardata() | undefined % = 3, optional + payload = <<>> :: unicode:chardata() | undefined % = 2, optional }). -endif. --ifndef('ASYNC_RESPONSE_PB_H'). --define('ASYNC_RESPONSE_PB_H', true). --record(async_response, - {code = 0 :: non_neg_integer() | undefined, % = 1, optional, 32 bits - result = <<>> :: unicode:chardata() | undefined, % = 2, optional - message = <<>> :: unicode:chardata() | undefined % = 3, optional +-ifndef('PUSH_RESPONSE_PB_H'). +-define('PUSH_RESPONSE_PB_H', true). +-record(push_response, + {response = <<>> :: unicode:chardata() | undefined % = 1, optional }). -endif. diff --git a/apps/efka/src/proto/message_pb.erl b/apps/efka/src/proto/message_pb.erl index 601d665..41361de 100644 --- a/apps/efka/src/proto/message_pb.erl +++ b/apps/efka/src/proto/message_pb.erl @@ -63,9 +63,9 @@ -type pub() :: #pub{}. --type async_request() :: #async_request{}. +-type push() :: #push{}. --type async_response() :: #async_response{}. +-type push_response() :: #push_response{}. -type service_config() :: #service_config{}. @@ -79,9 +79,9 @@ -type event() :: #event{}. --export_type(['auth_request'/0, 'auth_reply'/0, 'deploy'/0, 'pub'/0, 'async_request'/0, 'async_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 | async_request | async_response | service_config | data | ping | service_inform | feedback_phase | event. --type '$msg'() :: auth_request() | auth_reply() | deploy() | pub() | async_request() | async_response() | service_config() | data() | ping() | service_inform() | feedback_phase() | 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(['$msg_name'/0, '$msg'/0]). -if(?OTP_RELEASE >= 24). @@ -112,8 +112,8 @@ encode_msg(Msg, MsgName, Opts) -> 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); - async_request -> encode_msg_async_request(id(Msg, TrUserData), TrUserData); - async_response -> encode_msg_async_response(id(Msg, TrUserData), TrUserData); + push -> encode_msg_push(id(Msg, TrUserData), TrUserData); + push_response -> encode_msg_push_response(id(Msg, TrUserData), TrUserData); service_config -> encode_msg_service_config(id(Msg, TrUserData), TrUserData); data -> encode_msg_data(id(Msg, TrUserData), TrUserData); ping -> encode_msg_ping(id(Msg, TrUserData), TrUserData); @@ -260,10 +260,10 @@ encode_msg_pub(#pub{topic = F1, content = F2}, Bin, TrUserData) -> end end. -encode_msg_async_request(Msg, TrUserData) -> encode_msg_async_request(Msg, <<>>, TrUserData). +encode_msg_push(Msg, TrUserData) -> encode_msg_push(Msg, <<>>, TrUserData). -encode_msg_async_request(#async_request{service_id = F1, method = F2, params = F3}, Bin, TrUserData) -> +encode_msg_push(#push{service_id = F1, payload = F2}, Bin, TrUserData) -> B1 = if F1 == undefined -> Bin; true -> begin @@ -274,57 +274,28 @@ encode_msg_async_request(#async_request{service_id = F1, method = F2, params = F end end end, - B2 = if F2 == undefined -> B1; - true -> - begin - TrF2 = id(F2, TrUserData), - case is_empty_string(TrF2) of - true -> B1; - false -> e_type_string(TrF2, <>, TrUserData) - end - end - end, - if F3 == undefined -> B2; + if F2 == undefined -> B1; true -> begin - TrF3 = id(F3, TrUserData), - case is_empty_string(TrF3) of - true -> B2; - false -> e_type_string(TrF3, <>, TrUserData) + TrF2 = id(F2, TrUserData), + case is_empty_string(TrF2) of + true -> B1; + false -> e_type_string(TrF2, <>, TrUserData) end end end. -encode_msg_async_response(Msg, TrUserData) -> encode_msg_async_response(Msg, <<>>, TrUserData). +encode_msg_push_response(Msg, TrUserData) -> encode_msg_push_response(Msg, <<>>, TrUserData). -encode_msg_async_response(#async_response{code = F1, result = F2, message = F3}, Bin, TrUserData) -> - B1 = if F1 == undefined -> Bin; - true -> - begin - TrF1 = id(F1, TrUserData), - if TrF1 =:= 0 -> Bin; - true -> e_varint(TrF1, <>, TrUserData) - end - end - end, - B2 = if F2 == undefined -> B1; - true -> - begin - TrF2 = id(F2, TrUserData), - case is_empty_string(TrF2) of - true -> B1; - false -> e_type_string(TrF2, <>, TrUserData) - end - end - end, - if F3 == undefined -> B2; +encode_msg_push_response(#push_response{response = F1}, Bin, TrUserData) -> + if F1 == undefined -> Bin; true -> begin - TrF3 = id(F3, TrUserData), - case is_empty_string(TrF3) of - true -> B2; - false -> e_type_string(TrF3, <>, TrUserData) + TrF1 = id(F1, TrUserData), + case is_empty_string(TrF1) of + true -> Bin; + false -> e_type_string(TrF1, <>, TrUserData) end end end. @@ -800,8 +771,8 @@ 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(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(async_request, Bin, TrUserData) -> id(decode_msg_async_request(Bin, TrUserData), TrUserData); -decode_msg_2_doit(async_response, Bin, TrUserData) -> id(decode_msg_async_response(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(service_config, Bin, TrUserData) -> id(decode_msg_service_config(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); @@ -1043,121 +1014,100 @@ skip_32_pub(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_rea 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_async_request(Bin, TrUserData) -> dfp_read_field_def_async_request(Bin, 0, 0, 0, id(<<>>, TrUserData), id(<<>>, TrUserData), id(<<>>, TrUserData), TrUserData). +decode_msg_push(Bin, TrUserData) -> dfp_read_field_def_push(Bin, 0, 0, 0, id(<<>>, TrUserData), id(<<>>, TrUserData), TrUserData). -dfp_read_field_def_async_request(<<10, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> d_field_async_request_service_id(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData); -dfp_read_field_def_async_request(<<18, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> d_field_async_request_method(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData); -dfp_read_field_def_async_request(<<26, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> d_field_async_request_params(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData); -dfp_read_field_def_async_request(<<>>, 0, 0, _, F@_1, F@_2, F@_3, _) -> #async_request{service_id = F@_1, method = F@_2, params = F@_3}; -dfp_read_field_def_async_request(Other, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> dg_read_field_def_async_request(Other, Z1, Z2, F, F@_1, F@_2, F@_3, 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). -dg_read_field_def_async_request(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, TrUserData) when N < 32 - 7 -> dg_read_field_def_async_request(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, TrUserData); -dg_read_field_def_async_request(<<0:1, X:7, Rest/binary>>, N, Acc, _, F@_1, F@_2, F@_3, 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) -> Key = X bsl N + Acc, case Key of - 10 -> d_field_async_request_service_id(Rest, 0, 0, 0, F@_1, F@_2, F@_3, TrUserData); - 18 -> d_field_async_request_method(Rest, 0, 0, 0, F@_1, F@_2, F@_3, TrUserData); - 26 -> d_field_async_request_params(Rest, 0, 0, 0, F@_1, F@_2, F@_3, TrUserData); + 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); _ -> case Key band 7 of - 0 -> skip_varint_async_request(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, TrUserData); - 1 -> skip_64_async_request(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, TrUserData); - 2 -> skip_length_delimited_async_request(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, TrUserData); - 3 -> skip_group_async_request(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, TrUserData); - 5 -> skip_32_async_request(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, TrUserData) + 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) end end; -dg_read_field_def_async_request(<<>>, 0, 0, _, F@_1, F@_2, F@_3, _) -> #async_request{service_id = F@_1, method = F@_2, params = F@_3}. +dg_read_field_def_push(<<>>, 0, 0, _, F@_1, F@_2, _) -> #push{service_id = F@_1, payload = F@_2}. -d_field_async_request_service_id(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, TrUserData) when N < 57 -> d_field_async_request_service_id(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, TrUserData); -d_field_async_request_service_id(<<0:1, X:7, Rest/binary>>, N, Acc, F, _, F@_2, F@_3, TrUserData) -> +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) -> {NewFValue, RestF} = begin Len = X bsl N + Acc, <> = Rest, Bytes2 = binary:copy(Bytes), {id(Bytes2, TrUserData), Rest2} end, - dfp_read_field_def_async_request(RestF, 0, 0, F, NewFValue, F@_2, F@_3, TrUserData). + dfp_read_field_def_push(RestF, 0, 0, F, NewFValue, F@_2, TrUserData). -d_field_async_request_method(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, TrUserData) when N < 57 -> d_field_async_request_method(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, TrUserData); -d_field_async_request_method(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, _, F@_3, 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) -> {NewFValue, RestF} = begin Len = X bsl N + Acc, <> = Rest, Bytes2 = binary:copy(Bytes), {id(Bytes2, TrUserData), Rest2} end, - dfp_read_field_def_async_request(RestF, 0, 0, F, F@_1, NewFValue, F@_3, TrUserData). + dfp_read_field_def_push(RestF, 0, 0, F, F@_1, NewFValue, TrUserData). -d_field_async_request_params(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, TrUserData) when N < 57 -> d_field_async_request_params(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, TrUserData); -d_field_async_request_params(<<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_async_request(RestF, 0, 0, F, F@_1, F@_2, 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_async_request(<<1:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> skip_varint_async_request(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData); -skip_varint_async_request(<<0:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> dfp_read_field_def_async_request(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData). - -skip_length_delimited_async_request(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, TrUserData) when N < 57 -> skip_length_delimited_async_request(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, TrUserData); -skip_length_delimited_async_request(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, 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) -> Length = X bsl N + Acc, <<_:Length/binary, Rest2/binary>> = Rest, - dfp_read_field_def_async_request(Rest2, 0, 0, F, F@_1, F@_2, F@_3, TrUserData). + dfp_read_field_def_push(Rest2, 0, 0, F, F@_1, F@_2, TrUserData). -skip_group_async_request(Bin, _, Z2, FNum, F@_1, F@_2, F@_3, TrUserData) -> +skip_group_push(Bin, _, Z2, FNum, F@_1, F@_2, TrUserData) -> {_, Rest} = read_group(Bin, FNum), - dfp_read_field_def_async_request(Rest, 0, Z2, FNum, F@_1, F@_2, F@_3, TrUserData). + dfp_read_field_def_push(Rest, 0, Z2, FNum, F@_1, F@_2, TrUserData). -skip_32_async_request(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> dfp_read_field_def_async_request(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, 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_64_async_request(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> dfp_read_field_def_async_request(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, 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). -decode_msg_async_response(Bin, TrUserData) -> dfp_read_field_def_async_response(Bin, 0, 0, 0, id(0, TrUserData), id(<<>>, TrUserData), id(<<>>, TrUserData), TrUserData). +decode_msg_push_response(Bin, TrUserData) -> dfp_read_field_def_push_response(Bin, 0, 0, 0, id(<<>>, TrUserData), TrUserData). -dfp_read_field_def_async_response(<<8, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> d_field_async_response_code(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData); -dfp_read_field_def_async_response(<<18, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> d_field_async_response_result(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData); -dfp_read_field_def_async_response(<<26, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> d_field_async_response_message(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData); -dfp_read_field_def_async_response(<<>>, 0, 0, _, F@_1, F@_2, F@_3, _) -> #async_response{code = F@_1, result = F@_2, message = F@_3}; -dfp_read_field_def_async_response(Other, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> dg_read_field_def_async_response(Other, Z1, Z2, F, F@_1, F@_2, F@_3, 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). -dg_read_field_def_async_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_async_response(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, TrUserData); -dg_read_field_def_async_response(<<0:1, X:7, Rest/binary>>, N, Acc, _, F@_1, F@_2, F@_3, 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) -> Key = X bsl N + Acc, case Key of - 8 -> d_field_async_response_code(Rest, 0, 0, 0, F@_1, F@_2, F@_3, TrUserData); - 18 -> d_field_async_response_result(Rest, 0, 0, 0, F@_1, F@_2, F@_3, TrUserData); - 26 -> d_field_async_response_message(Rest, 0, 0, 0, F@_1, F@_2, F@_3, TrUserData); + 10 -> d_field_push_response_response(Rest, 0, 0, 0, F@_1, TrUserData); _ -> case Key band 7 of - 0 -> skip_varint_async_response(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, TrUserData); - 1 -> skip_64_async_response(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, TrUserData); - 2 -> skip_length_delimited_async_response(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, TrUserData); - 3 -> skip_group_async_response(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, TrUserData); - 5 -> skip_32_async_response(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, TrUserData) + 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) end end; -dg_read_field_def_async_response(<<>>, 0, 0, _, F@_1, F@_2, F@_3, _) -> #async_response{code = F@_1, result = F@_2, message = F@_3}. +dg_read_field_def_push_response(<<>>, 0, 0, _, F@_1, _) -> #push_response{response = F@_1}. -d_field_async_response_code(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, TrUserData) when N < 57 -> d_field_async_response_code(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, TrUserData); -d_field_async_response_code(<<0:1, X:7, Rest/binary>>, N, Acc, F, _, F@_2, F@_3, TrUserData) -> - {NewFValue, RestF} = {id((X bsl N + Acc) band 4294967295, TrUserData), Rest}, - dfp_read_field_def_async_response(RestF, 0, 0, F, NewFValue, F@_2, F@_3, TrUserData). - -d_field_async_response_result(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, TrUserData) when N < 57 -> d_field_async_response_result(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, TrUserData); -d_field_async_response_result(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, _, F@_3, TrUserData) -> +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) -> {NewFValue, RestF} = begin Len = X bsl N + Acc, <> = Rest, Bytes2 = binary:copy(Bytes), {id(Bytes2, TrUserData), Rest2} end, - dfp_read_field_def_async_response(RestF, 0, 0, F, F@_1, NewFValue, F@_3, TrUserData). + dfp_read_field_def_push_response(RestF, 0, 0, F, NewFValue, TrUserData). -d_field_async_response_message(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, TrUserData) when N < 57 -> d_field_async_response_message(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, TrUserData); -d_field_async_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_async_response(RestF, 0, 0, F, F@_1, F@_2, 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_async_response(<<1:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> skip_varint_async_response(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData); -skip_varint_async_response(<<0:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> dfp_read_field_def_async_response(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData). - -skip_length_delimited_async_response(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, TrUserData) when N < 57 -> skip_length_delimited_async_response(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, TrUserData); -skip_length_delimited_async_response(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, 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) -> Length = X bsl N + Acc, <<_:Length/binary, Rest2/binary>> = Rest, - dfp_read_field_def_async_response(Rest2, 0, 0, F, F@_1, F@_2, F@_3, TrUserData). + dfp_read_field_def_push_response(Rest2, 0, 0, F, F@_1, TrUserData). -skip_group_async_response(Bin, _, Z2, FNum, F@_1, F@_2, F@_3, TrUserData) -> +skip_group_push_response(Bin, _, Z2, FNum, F@_1, TrUserData) -> {_, Rest} = read_group(Bin, FNum), - dfp_read_field_def_async_response(Rest, 0, Z2, FNum, F@_1, F@_2, F@_3, TrUserData). + dfp_read_field_def_push_response(Rest, 0, Z2, FNum, F@_1, TrUserData). -skip_32_async_response(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> dfp_read_field_def_async_response(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, 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_64_async_response(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> dfp_read_field_def_async_response(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, 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). decode_msg_service_config(Bin, TrUserData) -> dfp_read_field_def_service_config(Bin, 0, 0, 0, id(<<>>, TrUserData), id(<<>>, TrUserData), id(0, TrUserData), TrUserData). @@ -1746,8 +1696,8 @@ merge_msgs(Prev, New, MsgName, Opts) -> auth_reply -> merge_msg_auth_reply(Prev, New, TrUserData); deploy -> merge_msg_deploy(Prev, New, TrUserData); pub -> merge_msg_pub(Prev, New, TrUserData); - async_request -> merge_msg_async_request(Prev, New, TrUserData); - async_response -> merge_msg_async_response(Prev, New, TrUserData); + push -> merge_msg_push(Prev, New, TrUserData); + push_response -> merge_msg_push_response(Prev, New, TrUserData); service_config -> merge_msg_service_config(Prev, New, TrUserData); data -> merge_msg_data(Prev, New, TrUserData); ping -> merge_msg_ping(Prev, New, TrUserData); @@ -1816,35 +1766,23 @@ merge_msg_pub(#pub{topic = PFtopic, content = PFcontent}, #pub{topic = NFtopic, true -> NFcontent end}. --compile({nowarn_unused_function,merge_msg_async_request/3}). -merge_msg_async_request(#async_request{service_id = PFservice_id, method = PFmethod, params = PFparams}, #async_request{service_id = NFservice_id, method = NFmethod, params = NFparams}, _) -> - #async_request{service_id = - if NFservice_id =:= undefined -> PFservice_id; - true -> NFservice_id - end, - method = - if NFmethod =:= undefined -> PFmethod; - true -> NFmethod - end, - params = - if NFparams =:= undefined -> PFparams; - true -> NFparams - end}. +-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_async_response/3}). -merge_msg_async_response(#async_response{code = PFcode, result = PFresult, message = PFmessage}, #async_response{code = NFcode, result = NFresult, message = NFmessage}, _) -> - #async_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_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_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}, _) -> @@ -2002,8 +1940,8 @@ verify_msg(Msg, MsgName, Opts) -> auth_reply -> v_msg_auth_reply(Msg, [MsgName], TrUserData); deploy -> v_msg_deploy(Msg, [MsgName], TrUserData); pub -> v_msg_pub(Msg, [MsgName], TrUserData); - async_request -> v_msg_async_request(Msg, [MsgName], TrUserData); - async_response -> v_msg_async_response(Msg, [MsgName], TrUserData); + push -> v_msg_push(Msg, [MsgName], TrUserData); + push_response -> v_msg_push_response(Msg, [MsgName], TrUserData); service_config -> v_msg_service_config(Msg, [MsgName], TrUserData); data -> v_msg_data(Msg, [MsgName], TrUserData); ping -> v_msg_ping(Msg, [MsgName], TrUserData); @@ -2074,35 +2012,26 @@ v_msg_pub(#pub{topic = F1, content = F2}, Path, TrUserData) -> ok; v_msg_pub(X, Path, _TrUserData) -> mk_type_error({expected_msg, pub}, X, Path). --compile({nowarn_unused_function,v_msg_async_request/3}). --dialyzer({nowarn_function,v_msg_async_request/3}). -v_msg_async_request(#async_request{service_id = F1, method = F2, params = F3}, Path, TrUserData) -> +-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) -> if F1 == undefined -> ok; true -> v_type_string(F1, [service_id | Path], TrUserData) end, if F2 == undefined -> ok; - true -> v_type_string(F2, [method | Path], TrUserData) - end, - if F3 == undefined -> ok; - true -> v_type_string(F3, [params | Path], TrUserData) + true -> v_type_string(F2, [payload | Path], TrUserData) end, ok; -v_msg_async_request(X, Path, _TrUserData) -> mk_type_error({expected_msg, async_request}, X, Path). +v_msg_push(X, Path, _TrUserData) -> mk_type_error({expected_msg, push}, X, Path). --compile({nowarn_unused_function,v_msg_async_response/3}). --dialyzer({nowarn_function,v_msg_async_response/3}). -v_msg_async_response(#async_response{code = F1, result = F2, message = F3}, Path, TrUserData) -> +-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) -> if F1 == undefined -> ok; - true -> v_type_uint32(F1, [code | Path], TrUserData) - end, - if F2 == undefined -> ok; - true -> v_type_string(F2, [result | Path], TrUserData) - end, - if F3 == undefined -> ok; - true -> v_type_string(F3, [message | Path], TrUserData) + true -> v_type_string(F1, [response | Path], TrUserData) end, ok; -v_msg_async_response(X, Path, _TrUserData) -> mk_type_error({expected_msg, async_response}, X, Path). +v_msg_push_response(X, Path, _TrUserData) -> mk_type_error({expected_msg, push_response}, X, Path). -compile({nowarn_unused_function,v_msg_service_config/3}). -dialyzer({nowarn_function,v_msg_service_config/3}). @@ -2315,14 +2244,8 @@ get_msg_defs() -> #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, async_request}, - [#field{name = service_id, fnum = 1, rnum = 2, type = string, occurrence = optional, opts = []}, - #field{name = method, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []}, - #field{name = params, fnum = 3, rnum = 4, type = string, occurrence = optional, opts = []}]}, - {{msg, async_response}, - [#field{name = code, fnum = 1, rnum = 2, type = uint32, 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, 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, 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 = []}, @@ -2360,13 +2283,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, async_request, async_response, service_config, data, ping, service_inform, feedback_phase, event]. +get_msg_names() -> [auth_request, auth_reply, deploy, pub, push, push_response, service_config, data, ping, service_inform, feedback_phase, event]. get_group_names() -> []. -get_msg_or_group_names() -> [auth_request, auth_reply, deploy, pub, async_request, async_response, service_config, data, ping, service_inform, feedback_phase, event]. +get_msg_or_group_names() -> [auth_request, auth_reply, deploy, pub, push, push_response, service_config, data, ping, service_inform, feedback_phase, event]. get_enum_names() -> []. @@ -2395,14 +2318,8 @@ find_msg_def(deploy) -> #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(async_request) -> - [#field{name = service_id, fnum = 1, rnum = 2, type = string, occurrence = optional, opts = []}, - #field{name = method, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []}, - #field{name = params, fnum = 3, rnum = 4, type = string, occurrence = optional, opts = []}]; -find_msg_def(async_response) -> - [#field{name = code, fnum = 1, rnum = 2, type = uint32, 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(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(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 = []}, @@ -2500,8 +2417,8 @@ 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(<<"AsyncRequest">>) -> async_request; -fqbin_to_msg_name(<<"AsyncResponse">>) -> async_response; +fqbin_to_msg_name(<<"Push">>) -> push; +fqbin_to_msg_name(<<"PushResponse">>) -> push_response; fqbin_to_msg_name(<<"ServiceConfig">>) -> service_config; fqbin_to_msg_name(<<"Data">>) -> data; fqbin_to_msg_name(<<"Ping">>) -> ping; @@ -2515,8 +2432,8 @@ 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(async_request) -> <<"AsyncRequest">>; -msg_name_to_fqbin(async_response) -> <<"AsyncResponse">>; +msg_name_to_fqbin(push) -> <<"Push">>; +msg_name_to_fqbin(push_response) -> <<"PushResponse">>; msg_name_to_fqbin(service_config) -> <<"ServiceConfig">>; msg_name_to_fqbin(data) -> <<"Data">>; msg_name_to_fqbin(ping) -> <<"Ping">>; @@ -2561,7 +2478,7 @@ get_all_source_basenames() -> ["message_pb.proto"]. get_all_proto_names() -> ["message_pb"]. -get_msg_containment("message_pb") -> [async_request, async_response, auth_reply, auth_request, data, deploy, event, feedback_phase, ping, pub, service_config, service_inform]; +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(P) -> error({gpb_error, {badproto, P}}). @@ -2585,11 +2502,11 @@ 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(<<"AsyncRequest">>) -> "message_pb"; +get_proto_by_msg_name_as_fqbin(<<"PushResponse">>) -> "message_pb"; get_proto_by_msg_name_as_fqbin(<<"FeedbackPhase">>) -> "message_pb"; -get_proto_by_msg_name_as_fqbin(<<"AsyncResponse">>) -> "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(<<"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 057da97..a1679d9 100644 --- a/message_pb.proto +++ b/message_pb.proto @@ -29,16 +29,13 @@ message Pub { } // 需要响应; 系统内部的调用采用: $sys_前缀 -message AsyncRequest { +message Push { string service_id = 1; - string method = 2; - string params = 3; + string payload = 2; } -message AsyncResponse { - uint32 code = 1; - string result = 2; - string message = 3; +message PushResponse { + string response = 1; } // 参数配置