From 750c80b4192810fb85bfa04e90f213162b876df7 Mon Sep 17 00:00:00 2001 From: anlicheng <244108715@qq.com> Date: Thu, 8 May 2025 22:32:41 +0800 Subject: [PATCH] fix --- apps/efka/include/efka.hrl | 37 ++-- apps/efka/include/message_pb.hrl | 16 +- apps/efka/src/client/efka_client.erl | 21 +- apps/efka/src/efka_agent.erl | 66 ++++--- apps/efka/src/efka_service.erl | 4 + apps/efka/src/efka_transport.erl | 28 +-- apps/efka/src/proto/message_pb.erl | 286 +++++++++------------------ message_pb.proto | 14 +- 8 files changed, 170 insertions(+), 302 deletions(-) diff --git a/apps/efka/include/efka.hrl b/apps/efka/include/efka.hrl index 8d58238..6eeeacf 100644 --- a/apps/efka/include/efka.hrl +++ b/apps/efka/include/efka.hrl @@ -12,40 +12,25 @@ -define(PACKET_REQUEST, 16#01). -define(PACKET_RESPONSE, 16#02). -%% 服务器基于pub/sub的消息 --define(PACKET_PUB, 16#03). -%% push调用不需要返回 --define(PACKET_COMMAND, 16#04). - -%% 服务器端推送消息 --define(PACKET_ASYNC_REQUEST, 16#5). --define(PACKET_ASYNC_RESPONSE, 16#6). - -%% 授权 --define(COMMAND_AUTH, 16#8). - %% 主机端上报数据类型标识 -%% 建立到websocket的register关系 -define(METHOD_AUTH, 16#00). --define(METHOD_CREATE_SESSION, 16#01). - -define(METHOD_DATA, 16#02). -define(METHOD_PING, 16#03). -define(METHOD_INFORM, 16#04). --define(METHOD_FEEDBACK_STEP, 16#05). - -define(METHOD_EVENT, 16#07). -define(METHOD_PHASE, 16#09). - %% 部署微服务 -define(METHOD_DEPLOY, 16#10). -%% 事件类型 --define(EVENT_DEVICE, 16#01). -%% 主机的相关事件 --define(EVENT_HOST, 16#02). -%% ai相关的事件 --define(EVENT_AI, 16#03). +%% 服务器基于pub/sub的消息 +-define(PACKET_PUB, 16#03). -%% 指令相关 --define(DIRECTIVE_ZD_CTRL, 16#01). \ No newline at end of file +%% push调用不需要返回 +-define(PACKET_COMMAND, 16#04). + +%% 授权 +-define(COMMAND_AUTH, 16#08). + +%% 服务器端推送消息 +-define(PACKET_PUSH, 16#05). +-define(PACKET_PUSH_REPLY, 16#06). \ No newline at end of file diff --git a/apps/efka/include/message_pb.hrl b/apps/efka/include/message_pb.hrl index 7f36113..dffdb7c 100644 --- a/apps/efka/include/message_pb.hrl +++ b/apps/efka/include/message_pb.hrl @@ -36,15 +36,6 @@ }). -endif. --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. - -ifndef('PUB_PB_H'). -define('PUB_PB_H', true). -record(pub, @@ -56,15 +47,16 @@ -ifndef('ASYNC_REQUEST_PB_H'). -define('ASYNC_REQUEST_PB_H', true). -record(async_request, - {method = <<>> :: unicode:chardata() | undefined, % = 1, optional - params = <<>> :: unicode:chardata() | undefined % = 2, optional + {service_id = <<>> :: unicode:chardata() | undefined, % = 1, optional + method = <<>> :: unicode:chardata() | undefined, % = 2, optional + params = <<>> :: unicode:chardata() | undefined % = 3, optional }). -endif. -ifndef('ASYNC_RESPONSE_PB_H'). -define('ASYNC_RESPONSE_PB_H', true). -record(async_response, - {code = <<>> :: unicode:chardata() | undefined, % = 1, optional + {code = 0 :: non_neg_integer() | undefined, % = 1, optional, 32 bits result = <<>> :: unicode:chardata() | undefined, % = 2, optional message = <<>> :: unicode:chardata() | undefined % = 3, optional }). diff --git a/apps/efka/src/client/efka_client.erl b/apps/efka/src/client/efka_client.erl index e828696..2ed6a02 100644 --- a/apps/efka/src/client/efka_client.erl +++ b/apps/efka/src/client/efka_client.erl @@ -10,13 +10,6 @@ -behaviour(gen_server). -%% 消息包 --record(efka_packet, { - packet_id :: integer(), - type :: integer(), - message :: any() -}). - %% 请求超时时间 -define(EFKA_REQUEST_TIMEOUT, 5000). @@ -88,8 +81,8 @@ device_offline(DeviceUUID) when is_binary(DeviceUUID) -> device_online(DeviceUUID) when is_binary(DeviceUUID) -> send_event(1, #{<<"device_uuid">> => DeviceUUID, <<"status">> => 1}). --spec send_event(EventType :: integer(), Params :: binary() | map()) -> no_return(). -send_event(EventType, Params) when is_integer(EventType), is_binary(Params); is_map(Params) -> +-spec send_event(EventType :: integer(), Params :: binary()) -> no_return(). +send_event(EventType, Params) when is_integer(EventType), is_binary(Params) -> gen_server:cast(?MODULE, {send_event, EventType, Params}). %%%=================================================================== @@ -109,10 +102,10 @@ await_reply(Ref, Timeout) when is_reference(Ref), is_integer(Timeout) -> end. %% @doc Spawns the server and registers the local name (unique) --spec(start_link(MicroServiceId :: binary(), Host :: string(), Port :: integer()) -> +-spec(start_link(ServiceId :: binary(), Host :: string(), Port :: integer()) -> {ok, Pid :: pid()} | ignore | {error, Reason :: term()}). -start_link(MicroServiceId, Host, Port) when is_binary(MicroServiceId), is_list(Host), is_integer(Port) -> - gen_server:start_link(?MODULE, [MicroServiceId, Host, Port], []). +start_link(ServiceId, Host, Port) when is_binary(ServiceId), is_list(Host), is_integer(Port) -> + gen_server:start_link(?MODULE, [ServiceId, Host, Port], []). %%%=================================================================== %%% gen_server callbacks @@ -123,11 +116,11 @@ start_link(MicroServiceId, Host, Port) when is_binary(MicroServiceId), is_list(H -spec(init(Args :: term()) -> {ok, State :: #state{}} | {ok, State :: #state{}, timeout() | hibernate} | {stop, Reason :: term()} | ignore). -init([MicroServiceId, Host, Port]) -> +init([ServiceId, Host, Port]) -> {ok, Socket} = gen_tcp:connect(Host, Port, [binary, {packet, 4}, {active, true}]), ok = gen_tcp:controlling_process(Socket, self()), - Packet = <<1:32, ?PACKET_REGISTER:8, MicroServiceId/binary>>, + Packet = <<1:32, ?PACKET_REGISTER:8, ServiceId/binary>>, ok = gen_tcp:send(Socket, Packet), lager:debug("[efka_client] will send packet: ~p", [Packet]), receive diff --git a/apps/efka/src/efka_agent.erl b/apps/efka/src/efka_agent.erl index 5c79bc6..cd4de1c 100644 --- a/apps/efka/src/efka_agent.erl +++ b/apps/efka/src/efka_agent.erl @@ -267,6 +267,42 @@ handle_info({server_push_message, PacketId, <>}, State = #state{transport_pid = TransportPid, status = Status}) -> + case {Auth, Status} of + {1, ?STATE_ACTIVATED} -> + {noreply, State}; + {1, ?STATE_DENIED} -> + %% 重新激活, 需要重新校验 + efka_transport:auth_request(TransportPid, 5000), + {noreply, State#state{status = ?STATE_AUTH}}; + {0, _} -> + %% 这个时候的主机应该是受限制的状态，不允许发送消息；但是能够接受服务器推送的消息 + {noreply, State#state{status = ?STATE_RESTRICTED}} + end; + +%% 收到需要回复的指令 +handle_info({pub, Topic, Content}, State = #state{status = ?STATE_ACTIVATED}) -> + efka_logger:debug("[efka_agent] get pub topic: ~p, content: ~p", [Topic, Content]), + %% 消息发送到订阅系统 + efka_subscription:publish(Topic, Content), + + {noreply, State}; + +%% 收到需要回复的指令 +handle_info({async_request, PacketId, AsyncRequest = #async_request{service_id = ServiceId}}, State = #state{transport_pid = TransportPid, status = ?STATE_ACTIVATED}) -> + efka_logger:debug("[efka_agent] get aync_request: ~p", [AsyncRequest]), + %% 消息发送到订阅系统 + case efka_service:get_pid(ServiceId) of + undefined -> + Reply = #async_response{code = 0, message = <<"micro_service not run">>, result = <<>>}, + safe_response(PacketId, message_pb:encode_msg(Reply), State); + ServicePid when is_pid(ServicePid) -> + ok + end, + + {noreply, State}; + %% 收到来自efka_service的回复 handle_info({ems_reply, Ref, EmsReply}, State = #state{inflight = Inflight}) -> case maps:take(Ref, Inflight) of @@ -296,35 +332,7 @@ handle_info({timeout, _, {request_timeout, Ref}}, State = #state{inflight = Infl {noreply, State#state{inflight = NInflight}} end; -%% TODO -handle_info({command, <<8:8, ActivatePush/binary>>}, State = #state{transport_pid = TransportPid, status = Status}) -> - #activate_push{auth = Auth} = message_pb:decode_msg(ActivatePush, activate_push), - case {Auth, Status} of - {true, ?STATE_ACTIVATED} -> - {noreply, State}; - {true, ?STATE_DENIED} -> - %% 重新激活, 需要重新校验 - efka_transport:auth_request(TransportPid, 5000), - {noreply, State#state{status = ?STATE_AUTH}}; - {false, _} -> - %% 这个时候的主机应该是受限制的状态，不允许发送消息；但是能够接受服务器推送的消息 - {noreply, State#state{status = ?STATE_RESTRICTED}} - end; -%% 收到需要回复的指令 -handle_info({pub, PubBin}, State = #state{transport_pid = TransportPid, status = ?STATE_ACTIVATED}) -> - #pub{topic = Topic, content = Content} = message_pb:decode_msg(PubBin, pub), - efka_logger:debug("[efka_agent] get pub topic: ~p, content: ~p", [Topic, Content]), - %% 消息发送到订阅系统 - case PacketId > 0 of - true -> - CallbackFun = fun(Response) -> is_process_alive(TransportPid) andalso efka_transport:response(TransportPid, PacketId, Response) end, - efka_subscription:publish(PacketId, Topic, Content, CallbackFun); - false -> - efka_subscription:publish(Topic, Content) - end, - - {noreply, State}; %% transport进程退出 handle_info({'EXIT', TransportPid, Reason}, State = #state{transport_pid = TransportPid}) -> @@ -360,7 +368,7 @@ code_change(_OldVsn, State = #state{}, _Extra) -> %% 安全回复 -spec safe_response(PacketId :: integer(), Reply :: binary(), State :: #state{}) -> no_return(). safe_response(PacketId, Reply, #state{status = ?STATE_ACTIVATED, transport_pid = TransportPid}) when is_integer(PacketId), is_binary(Reply), is_pid(TransportPid) -> - is_process_alive(TransportPid) andalso efka_transport:response(TransportPid, PacketId, Reply); + is_process_alive(TransportPid) andalso efka_transport:async_response(TransportPid, PacketId, Reply); safe_response(_PacketId, _Reply, #state{}) -> ok. diff --git a/apps/efka/src/efka_service.erl b/apps/efka/src/efka_service.erl index 9041bba..03fbdfc 100644 --- a/apps/efka/src/efka_service.erl +++ b/apps/efka/src/efka_service.erl @@ -73,6 +73,10 @@ push_config(Pid, Ref, ConfigJson) when is_pid(Pid), is_binary(ConfigJson) -> request_config(Pid) when is_pid(Pid) -> gen_server:call(Pid, request_config). +%% todo +async_request(Pid, Method, Params) when is_binary(Method), is_binary(Params) -> + ok. + metric_data(Pid, DeviceUUID, Data) when is_pid(Pid), is_binary(DeviceUUID), is_binary(Data) -> gen_server:cast(Pid, {metric_data, DeviceUUID, Data}). diff --git a/apps/efka/src/efka_transport.erl b/apps/efka/src/efka_transport.erl index e16a974..5037787 100644 --- a/apps/efka/src/efka_transport.erl +++ b/apps/efka/src/efka_transport.erl @@ -15,7 +15,7 @@ %% API -export([start_link/3]). --export([connect/1, auth_request/2, send/3, response/3, stop/1]). +-export([connect/1, auth_request/2, send/3, async_response/3, stop/1]). %% gen_server callbacks -export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2, code_change/3]). @@ -46,9 +46,9 @@ connect(Pid) when is_pid(Pid) -> send(Pid, Method, Packet) when is_pid(Pid), is_integer(Method), is_binary(Packet) -> gen_server:cast(Pid, {send, Method, Packet}). --spec response(Pid :: pid(), PacketId :: integer(), Response :: binary()) -> no_return(). -response(Pid, PacketId, Response) when is_pid(Pid), is_integer(PacketId), is_binary(Response) -> - gen_server:cast(Pid, {response, PacketId, Response}). +-spec async_response(Pid :: pid(), PacketId :: integer(), Response :: binary()) -> no_return(). +async_response(Pid, PacketId, Response) when is_pid(Pid), is_integer(PacketId), is_binary(Response) -> + gen_server:cast(Pid, {async_response, PacketId, Response}). -spec stop(Pid :: pid()) -> ok. stop(Pid) when is_pid(Pid) -> @@ -138,7 +138,7 @@ handle_cast({send, Method, Packet}, State = #state{socket = Socket}) -> ok = ssl:send(Socket, <>), {noreply, State}; -handle_cast({response, PacketId, Response}, State = #state{socket = Socket}) -> +handle_cast({async_response, PacketId, Response}, State = #state{socket = Socket}) -> ok = ssl:send(Socket, <>), {noreply, State}. @@ -149,21 +149,23 @@ handle_cast({response, PacketId, Response}, State = #state{socket = Socket}) -> {noreply, NewState :: #state{}, timeout() | hibernate} | {stop, Reason :: term(), NewState :: #state{}}). %% 服务器主动推送的数据，有packetId的是要求返回的；为0的表示不需要返回值 -handle_info({ssl, Socket, <>}, State = #state{socket = Socket, parent_pid = ParentPid}) -> - efka_logger:debug("[efka_agent] socket get command: ~p", [Command]), - ParentPid ! {command, Command}, +handle_info({ssl, Socket, <>}, State = #state{socket = Socket, parent_pid = ParentPid}) -> + efka_logger:debug("[efka_agent] socket get command_type: ~p, command: ~p", [CommandType, Command]), + ParentPid ! {command, CommandType, Command}, {noreply, State}; handle_info({ssl, Socket, <>}, State = #state{socket = Socket, parent_pid = ParentPid}) -> + #pub{topic = Topic, content = Content} = message_pb:decode_msg(PubBin, pub), efka_logger:debug("[efka_agent] socket get pub: ~p", [PubBin]), - ParentPid ! {pub, PubBin}, + ParentPid ! {pub, Topic, Content}, {noreply, State}; %% 目前推送的消息包括: <>, <<16:8, Directive/binary>> -handle_info({ssl, Socket, <>}, State = #state{socket = Socket, parent_pid = ParentPid}) -> - efka_logger:debug("[efka_agent] socket get message: ~p", [Msg]), - ParentPid ! {async_request, PacketId, Msg}, - {noreply, State#state{}}; +handle_info({ssl, Socket, <>}, State = #state{socket = Socket, parent_pid = ParentPid}) -> + AsyncRequest = message_pb:decode_msg(RequestBin, async_request), + efka_logger:debug("[efka_agent] socket get async request: ~p", [AsyncRequest]), + ParentPid ! {async_request, PacketId, AsyncRequest}, + {noreply, State}; handle_info({ssl_error, Socket, _Reason}, State = #state{socket = Socket}) -> {stop, normal, State}; diff --git a/apps/efka/src/proto/message_pb.erl b/apps/efka/src/proto/message_pb.erl index 5e13d92..601d665 100644 --- a/apps/efka/src/proto/message_pb.erl +++ b/apps/efka/src/proto/message_pb.erl @@ -61,8 +61,6 @@ -type deploy() :: #deploy{}. --type efka_response() :: #efka_response{}. - -type pub() :: #pub{}. -type async_request() :: #async_request{}. @@ -81,9 +79,9 @@ -type event() :: #event{}. --export_type(['auth_request'/0, 'auth_reply'/0, 'deploy'/0, 'efka_response'/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 | efka_response | pub | async_request | async_response | service_config | data | ping | service_inform | feedback_phase | event. --type '$msg'() :: auth_request() | auth_reply() | deploy() | efka_response() | 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, '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(['$msg_name'/0, '$msg'/0]). -if(?OTP_RELEASE >= 24). @@ -113,7 +111,6 @@ encode_msg(Msg, MsgName, Opts) -> auth_request -> encode_msg_auth_request(id(Msg, TrUserData), TrUserData); auth_reply -> encode_msg_auth_reply(id(Msg, TrUserData), TrUserData); deploy -> encode_msg_deploy(id(Msg, TrUserData), TrUserData); - efka_response -> encode_msg_efka_response(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); @@ -238,40 +235,6 @@ encode_msg_deploy(#deploy{task_id = F1, service_id = F2, tar_url = F3}, Bin, TrU end end. -encode_msg_efka_response(Msg, TrUserData) -> encode_msg_efka_response(Msg, <<>>, 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 =:= 0 -> Bin; - true -> e_type_int32(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; - true -> - begin - TrF3 = id(F3, TrUserData), - case is_empty_string(TrF3) of - true -> B2; - false -> e_type_string(TrF3, <>, TrUserData) - end - end - end. - encode_msg_pub(Msg, TrUserData) -> encode_msg_pub(Msg, <<>>, TrUserData). @@ -300,7 +263,7 @@ encode_msg_pub(#pub{topic = F1, content = F2}, Bin, TrUserData) -> encode_msg_async_request(Msg, TrUserData) -> encode_msg_async_request(Msg, <<>>, TrUserData). -encode_msg_async_request(#async_request{method = F1, params = F2}, Bin, TrUserData) -> +encode_msg_async_request(#async_request{service_id = F1, method = F2, params = F3}, Bin, TrUserData) -> B1 = if F1 == undefined -> Bin; true -> begin @@ -311,13 +274,23 @@ encode_msg_async_request(#async_request{method = F1, params = F2}, Bin, TrUserDa 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. @@ -330,9 +303,8 @@ encode_msg_async_response(#async_response{code = F1, result = F2, message = F3}, true -> begin TrF1 = id(F1, TrUserData), - case is_empty_string(TrF1) of - true -> Bin; - false -> e_type_string(TrF1, <>, TrUserData) + if TrF1 =:= 0 -> Bin; + true -> e_varint(TrF1, <>, TrUserData) end end end, @@ -827,7 +799,6 @@ decode_msg_1_catch(Bin, MsgName, TrUserData) -> decode_msg_2_doit(auth_request, Bin, TrUserData) -> id(decode_msg_auth_request(Bin, TrUserData), TrUserData); decode_msg_2_doit(auth_reply, Bin, TrUserData) -> id(decode_msg_auth_reply(Bin, TrUserData), TrUserData); decode_msg_2_doit(deploy, Bin, TrUserData) -> id(decode_msg_deploy(Bin, TrUserData), TrUserData); -decode_msg_2_doit(efka_response, Bin, TrUserData) -> id(decode_msg_efka_response(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); @@ -1021,64 +992,6 @@ 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_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_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_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_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_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_efka_response(<<>>, 0, 0, _, F@_1, F@_2, F@_3, _) -> #efka_response{code = F@_1, result = F@_2, message = F@_3}. - -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_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_efka_response(RestF, 0, 0, F, F@_1, NewFValue, F@_3, 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_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_efka_response(Rest2, 0, 0, F, F@_1, F@_2, F@_3, TrUserData). - -skip_group_efka_response(Bin, _, Z2, FNum, F@_1, F@_2, F@_3, TrUserData) -> - {_, Rest} = read_group(Bin, FNum), - dfp_read_field_def_efka_response(Rest, 0, Z2, FNum, F@_1, F@_2, F@_3, 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_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_pub(Bin, TrUserData) -> dfp_read_field_def_pub(Bin, 0, 0, 0, id(<<>>, TrUserData), id(<<>>, TrUserData), TrUserData). dfp_read_field_def_pub(<<10, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> d_field_pub_topic(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); @@ -1130,60 +1043,67 @@ 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), TrUserData). +decode_msg_async_request(Bin, TrUserData) -> dfp_read_field_def_async_request(Bin, 0, 0, 0, id(<<>>, TrUserData), id(<<>>, TrUserData), id(<<>>, TrUserData), TrUserData). -dfp_read_field_def_async_request(<<10, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> d_field_async_request_method(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); -dfp_read_field_def_async_request(<<18, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> d_field_async_request_params(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); -dfp_read_field_def_async_request(<<>>, 0, 0, _, F@_1, F@_2, _) -> #async_request{method = F@_1, params = F@_2}; -dfp_read_field_def_async_request(Other, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dg_read_field_def_async_request(Other, Z1, Z2, F, F@_1, F@_2, 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). -dg_read_field_def_async_request(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 32 - 7 -> dg_read_field_def_async_request(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); -dg_read_field_def_async_request(<<0:1, X:7, Rest/binary>>, N, Acc, _, 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) -> Key = X bsl N + Acc, case Key of - 10 -> d_field_async_request_method(Rest, 0, 0, 0, F@_1, F@_2, TrUserData); - 18 -> d_field_async_request_params(Rest, 0, 0, 0, F@_1, F@_2, TrUserData); + 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); _ -> case Key band 7 of - 0 -> skip_varint_async_request(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); - 1 -> skip_64_async_request(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); - 2 -> skip_length_delimited_async_request(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); - 3 -> skip_group_async_request(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); - 5 -> skip_32_async_request(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData) + 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) end end; -dg_read_field_def_async_request(<<>>, 0, 0, _, F@_1, F@_2, _) -> #async_request{method = F@_1, params = F@_2}. +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}. -d_field_async_request_method(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> d_field_async_request_method(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); -d_field_async_request_method(<<0:1, X:7, Rest/binary>>, N, Acc, F, _, F@_2, TrUserData) -> +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) -> {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, TrUserData). + dfp_read_field_def_async_request(RestF, 0, 0, F, NewFValue, F@_2, F@_3, TrUserData). -d_field_async_request_params(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> d_field_async_request_params(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); -d_field_async_request_params(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, _, 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) -> {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, TrUserData). + dfp_read_field_def_async_request(RestF, 0, 0, F, F@_1, NewFValue, F@_3, TrUserData). -skip_varint_async_request(<<1:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> skip_varint_async_request(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); -skip_varint_async_request(<<0:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_async_request(Rest, Z1, Z2, F, F@_1, F@_2, 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_length_delimited_async_request(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> skip_length_delimited_async_request(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); -skip_length_delimited_async_request(<<0:1, X:7, Rest/binary>>, N, Acc, 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) -> Length = X bsl N + Acc, <<_:Length/binary, Rest2/binary>> = Rest, - dfp_read_field_def_async_request(Rest2, 0, 0, F, F@_1, F@_2, TrUserData). + dfp_read_field_def_async_request(Rest2, 0, 0, F, F@_1, F@_2, F@_3, TrUserData). -skip_group_async_request(Bin, _, Z2, FNum, F@_1, F@_2, TrUserData) -> +skip_group_async_request(Bin, _, Z2, FNum, F@_1, F@_2, F@_3, TrUserData) -> {_, Rest} = read_group(Bin, FNum), - dfp_read_field_def_async_request(Rest, 0, Z2, FNum, F@_1, F@_2, TrUserData). + dfp_read_field_def_async_request(Rest, 0, Z2, FNum, F@_1, F@_2, F@_3, TrUserData). -skip_32_async_request(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_async_request(Rest, Z1, Z2, F, 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_64_async_request(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_async_request(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). -decode_msg_async_response(Bin, TrUserData) -> dfp_read_field_def_async_response(Bin, 0, 0, 0, id(<<>>, TrUserData), id(<<>>, TrUserData), id(<<>>, TrUserData), 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). -dfp_read_field_def_async_response(<<10, 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(<<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}; @@ -1193,7 +1113,7 @@ dg_read_field_def_async_response(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_ dg_read_field_def_async_response(<<0:1, X:7, Rest/binary>>, N, Acc, _, F@_1, F@_2, F@_3, TrUserData) -> Key = X bsl N + Acc, case Key of - 10 -> d_field_async_response_code(Rest, 0, 0, 0, F@_1, F@_2, F@_3, TrUserData); + 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); _ -> @@ -1209,7 +1129,7 @@ dg_read_field_def_async_response(<<>>, 0, 0, _, F@_1, F@_2, F@_3, _) -> #async_r 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} = begin Len = X bsl N + Acc, <> = Rest, Bytes2 = binary:copy(Bytes), {id(Bytes2, TrUserData), Rest2} end, + {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); @@ -1825,7 +1745,6 @@ merge_msgs(Prev, New, MsgName, Opts) -> auth_request -> merge_msg_auth_request(Prev, New, TrUserData); auth_reply -> merge_msg_auth_reply(Prev, New, TrUserData); deploy -> merge_msg_deploy(Prev, New, TrUserData); - efka_response -> merge_msg_efka_response(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); @@ -1886,21 +1805,6 @@ merge_msg_deploy(#deploy{task_id = PFtask_id, service_id = PFservice_id, tar_url true -> NFtar_url 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_pub/3}). merge_msg_pub(#pub{topic = PFtopic, content = PFcontent}, #pub{topic = NFtopic, content = NFcontent}, _) -> #pub{topic = @@ -1913,8 +1817,12 @@ merge_msg_pub(#pub{topic = PFtopic, content = PFcontent}, #pub{topic = NFtopic, end}. -compile({nowarn_unused_function,merge_msg_async_request/3}). -merge_msg_async_request(#async_request{method = PFmethod, params = PFparams}, #async_request{method = NFmethod, params = NFparams}, _) -> - #async_request{method = +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, @@ -2093,7 +2001,6 @@ verify_msg(Msg, MsgName, Opts) -> auth_request -> v_msg_auth_request(Msg, [MsgName], TrUserData); auth_reply -> v_msg_auth_reply(Msg, [MsgName], TrUserData); deploy -> v_msg_deploy(Msg, [MsgName], TrUserData); - efka_response -> v_msg_efka_response(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); @@ -2155,21 +2062,6 @@ v_msg_deploy(#deploy{task_id = F1, service_id = F2, tar_url = F3}, Path, TrUserD ok; v_msg_deploy(X, Path, _TrUserData) -> mk_type_error({expected_msg, deploy}, X, Path). --compile({nowarn_unused_function,v_msg_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_int32(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) - end, - ok; -v_msg_efka_response(X, Path, _TrUserData) -> mk_type_error({expected_msg, efka_response}, X, Path). - -compile({nowarn_unused_function,v_msg_pub/3}). -dialyzer({nowarn_function,v_msg_pub/3}). v_msg_pub(#pub{topic = F1, content = F2}, Path, TrUserData) -> @@ -2184,12 +2076,15 @@ 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{method = F1, params = F2}, Path, TrUserData) -> +v_msg_async_request(#async_request{service_id = F1, method = F2, params = F3}, Path, TrUserData) -> if F1 == undefined -> ok; - true -> v_type_string(F1, [method | Path], TrUserData) + true -> v_type_string(F1, [service_id | Path], TrUserData) end, if F2 == undefined -> ok; - true -> v_type_string(F2, [params | Path], TrUserData) + true -> v_type_string(F2, [method | Path], TrUserData) + end, + if F3 == undefined -> ok; + true -> v_type_string(F3, [params | Path], TrUserData) end, ok; v_msg_async_request(X, Path, _TrUserData) -> mk_type_error({expected_msg, async_request}, X, Path). @@ -2198,7 +2093,7 @@ v_msg_async_request(X, Path, _TrUserData) -> mk_type_error({expected_msg, async_ -dialyzer({nowarn_function,v_msg_async_response/3}). v_msg_async_response(#async_response{code = F1, result = F2, message = F3}, Path, TrUserData) -> if F1 == undefined -> ok; - true -> v_type_string(F1, [code | Path], TrUserData) + true -> v_type_uint32(F1, [code | Path], TrUserData) end, if F2 == undefined -> ok; true -> v_type_string(F2, [result | Path], TrUserData) @@ -2419,14 +2314,13 @@ get_msg_defs() -> [#field{name = task_id, fnum = 1, rnum = 2, type = uint32, occurrence = optional, opts = []}, #field{name = service_id, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []}, #field{name = tar_url, fnum = 3, rnum = 4, type = string, occurrence = optional, opts = []}]}, - {{msg, 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, 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 = method, fnum = 1, rnum = 2, type = string, occurrence = optional, opts = []}, #field{name = params, 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 = string, occurrence = optional, opts = []}, + [#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, service_config}, @@ -2466,13 +2360,13 @@ get_msg_defs() -> #field{name = params, fnum = 3, rnum = 4, type = string, occurrence = optional, opts = []}]}]. -get_msg_names() -> [auth_request, auth_reply, deploy, efka_response, pub, async_request, async_response, service_config, data, ping, service_inform, feedback_phase, event]. +get_msg_names() -> [auth_request, auth_reply, deploy, pub, async_request, async_response, service_config, data, ping, service_inform, feedback_phase, event]. get_group_names() -> []. -get_msg_or_group_names() -> [auth_request, auth_reply, deploy, efka_response, 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, async_request, async_response, service_config, data, ping, service_inform, feedback_phase, event]. get_enum_names() -> []. @@ -2500,14 +2394,13 @@ find_msg_def(deploy) -> [#field{name = task_id, fnum = 1, rnum = 2, type = uint32, occurrence = optional, opts = []}, #field{name = service_id, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []}, #field{name = tar_url, fnum = 3, rnum = 4, type = string, occurrence = optional, opts = []}]; -find_msg_def(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(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 = method, fnum = 1, rnum = 2, type = string, occurrence = optional, opts = []}, #field{name = params, 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 = string, occurrence = optional, opts = []}, + [#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(service_config) -> @@ -2606,7 +2499,6 @@ service_and_rpc_name_to_fqbins(S, R) -> error({gpb_error, {badservice_or_rpc, {S fqbin_to_msg_name(<<"AuthRequest">>) -> auth_request; fqbin_to_msg_name(<<"AuthReply">>) -> auth_reply; fqbin_to_msg_name(<<"Deploy">>) -> deploy; -fqbin_to_msg_name(<<"EfkaResponse">>) -> efka_response; fqbin_to_msg_name(<<"Pub">>) -> pub; fqbin_to_msg_name(<<"AsyncRequest">>) -> async_request; fqbin_to_msg_name(<<"AsyncResponse">>) -> async_response; @@ -2622,7 +2514,6 @@ fqbin_to_msg_name(E) -> error({gpb_error, {badmsg, E}}). msg_name_to_fqbin(auth_request) -> <<"AuthRequest">>; msg_name_to_fqbin(auth_reply) -> <<"AuthReply">>; msg_name_to_fqbin(deploy) -> <<"Deploy">>; -msg_name_to_fqbin(efka_response) -> <<"EfkaResponse">>; msg_name_to_fqbin(pub) -> <<"Pub">>; msg_name_to_fqbin(async_request) -> <<"AsyncRequest">>; msg_name_to_fqbin(async_response) -> <<"AsyncResponse">>; @@ -2670,7 +2561,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, efka_response, event, feedback_phase, ping, pub, service_config, service_inform]; +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(P) -> error({gpb_error, {badproto, P}}). @@ -2696,7 +2587,6 @@ 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(<<"FeedbackPhase">>) -> "message_pb"; -get_proto_by_msg_name_as_fqbin(<<"EfkaResponse">>) -> "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"; diff --git a/message_pb.proto b/message_pb.proto index 3127a70..057da97 100644 --- a/message_pb.proto +++ b/message_pb.proto @@ -22,13 +22,6 @@ message Deploy { string tar_url = 3; } -// efka响应 -message EfkaResponse { - int32 code = 1; - string result = 2; - string message = 3; -} - // 不需要响应的，基于pub/sub的机制实现远程调用 message Pub { string topic = 1; @@ -37,12 +30,13 @@ message Pub { // 需要响应; 系统内部的调用采用: $sys_前缀 message AsyncRequest { - string method = 1; - string params = 2; + string service_id = 1; + string method = 2; + string params = 3; } message AsyncResponse { - string code = 1; + uint32 code = 1; string result = 2; string message = 3; }