From ed37509156caeb314292bd5e4ec58103101c860f Mon Sep 17 00:00:00 2001 From: anlicheng <244108715@qq.com> Date: Wed, 17 Sep 2025 16:01:58 +0800 Subject: [PATCH] fix --- apps/efka/include/efka.hrl | 15 +- apps/efka/include/message_pb.hrl | 44 +- apps/efka/src/efka_app.erl | 26 +- apps/efka/src/efka_manifest.erl | 124 ---- apps/efka/src/efka_subscription.erl | 27 +- apps/efka/src/efka_transport.erl | 6 +- apps/efka/src/proto/message_pb.erl | 628 +++++++++++++++++-- apps/efka/src/websocket/ws_server.erl | 34 - apps/efka/src/{websocket => }/ws_channel.erl | 30 +- message_pb.proto | 20 +- 10 files changed, 688 insertions(+), 266 deletions(-) delete mode 100644 apps/efka/src/efka_manifest.erl delete mode 100644 apps/efka/src/websocket/ws_server.erl rename apps/efka/src/{websocket => }/ws_channel.erl (85%) diff --git a/apps/efka/include/efka.hrl b/apps/efka/include/efka.hrl index 3585940..e3c3823 100644 --- a/apps/efka/include/efka.hrl +++ b/apps/efka/include/efka.hrl @@ -12,15 +12,18 @@ -define(PACKET_REQUEST, 16#01). -define(PACKET_RESPONSE, 16#02). +%% efka主动发起不需要返回的数据 +-define(PACKET_CAST, 16#03). + %% 服务器基于pub/sub的消息, 消息大类 --define(PACKET_PUB, 16#03). - +-define(PACKET_PUB, 16#04). %% push调用不需要返回, 消息大类 --define(PACKET_COMMAND, 16#04). +-define(PACKET_COMMAND, 16#05). -%% 服务器端推送消息 --define(PACKET_RPC, 16#05). --define(PACKET_RPC_REPLY, 16#06). +%% 服务器主动发起的RPC调用 +%% 服务端不能直接和Service通讯，链路太麻烦了,并且服务端也不知道如何和服务通讯 +-define(PACKET_RPC, 16#10). +-define(PACKET_RPC_REPLY, 16#11). %% ping包，客户端主动发起 -define(PACKET_PING, 16#FF). diff --git a/apps/efka/include/message_pb.hrl b/apps/efka/include/message_pb.hrl index d38524b..007b324 100644 --- a/apps/efka/include/message_pb.hrl +++ b/apps/efka/include/message_pb.hrl @@ -35,11 +35,45 @@ }). -endif. --ifndef('DEPLOY_PB_H'). --define('DEPLOY_PB_H', true). --record(deploy, - {task_id = 0 :: non_neg_integer() | undefined, % = 1, optional, 32 bits - config = <<>> :: unicode:chardata() | undefined % = 2, optional +-ifndef('COMMAND_PB_H'). +-define('COMMAND_PB_H', true). +-record(command, + {command_type = <<>> :: unicode:chardata() | undefined, % = 1, optional + command = <<>> :: iodata() | undefined % = 2, optional + }). +-endif. + +-ifndef('RPC_DEPLOY_PB_H'). +-define('RPC_DEPLOY_PB_H', true). +-record(rpc_deploy, + {packet_id = 0 :: non_neg_integer() | undefined, % = 1, optional, 32 bits + task_id = 0 :: non_neg_integer() | undefined, % = 2, optional, 32 bits + config = <<>> :: unicode:chardata() | undefined % = 3, optional + }). +-endif. + +-ifndef('RPC_START_CONTAINER_PB_H'). +-define('RPC_START_CONTAINER_PB_H', true). +-record(rpc_start_container, + {packet_id = 0 :: non_neg_integer() | undefined, % = 1, optional, 32 bits + container_name = <<>> :: unicode:chardata() | undefined % = 2, optional + }). +-endif. + +-ifndef('RPC_STOP_CONTAINER_PB_H'). +-define('RPC_STOP_CONTAINER_PB_H', true). +-record(rpc_stop_container, + {packet_id = 0 :: non_neg_integer() | undefined, % = 1, optional, 32 bits + container_name = <<>> :: unicode:chardata() | undefined % = 2, optional + }). +-endif. + +-ifndef('RPC_CONFIG_CONTAINER_PB_H'). +-define('RPC_CONFIG_CONTAINER_PB_H', true). +-record(rpc_config_container, + {packet_id = 0 :: non_neg_integer() | undefined, % = 1, optional, 32 bits + container_name = <<>> :: unicode:chardata() | undefined, % = 2, optional + config = <<>> :: iodata() | undefined % = 3, optional }). -endif. diff --git a/apps/efka/src/efka_app.erl b/apps/efka/src/efka_app.erl index 3c3114a..8eb53fa 100644 --- a/apps/efka/src/efka_app.erl +++ b/apps/efka/src/efka_app.erl @@ -13,10 +13,30 @@ start(_StartType, _StartArgs) -> io:setopts([{encoding, unicode}]), %% 加速内存的回收 erlang:system_flag(fullsweep_after, 16), - - ws_server:start_server(), + start_ws_server(), efka_sup:start_link(). stop(_State) -> - ok. \ No newline at end of file + ok. + +start_ws_server() -> + {ok, Props} = application:get_env(efka, ws_server), + Acceptors = proplists:get_value(acceptors, Props, 50), + MaxConnections = proplists:get_value(max_connections, Props, 10240), + Backlog = proplists:get_value(backlog, Props, 1024), + Port = proplists:get_value(port, Props), + + Dispatcher = cowboy_router:compile([ + {'_', [{"/ws", ws_channel, []}]} + ]), + + TransOpts = [ + {port, Port}, + {num_acceptors, Acceptors}, + {backlog, Backlog}, + {max_connections, MaxConnections} + ], + {ok, Pid} = cowboy:start_clear(ws_listener, TransOpts, #{env => #{dispatch => Dispatcher}}), + + lager:debug("[efka_app] websocket server start at: ~p, pid is: ~p", [Port, Pid]). \ No newline at end of file diff --git a/apps/efka/src/efka_manifest.erl b/apps/efka/src/efka_manifest.erl deleted file mode 100644 index f4db6ce..0000000 --- a/apps/efka/src/efka_manifest.erl +++ /dev/null @@ -1,124 +0,0 @@ -%%%------------------------------------------------------------------- -%%% @author anlicheng -%%% @copyright (C) 2025, -%%% @doc -%%% 用于管理manifest.json配置文件 -%%% @end -%%% Created : 05. 5月 2025 22:39 -%%%------------------------------------------------------------------- --module(efka_manifest). --author("anlicheng"). - --record(manifest, { - work_dir = "" :: string(), - id = <<"">> :: binary(), - exec = <<"">>:: binary(), - args = [], - health_check = <<"">> -}). - --type manifest() :: #manifest{}. - --export_type([manifest/0]). - -%% API --export([new/1, startup/1]). - --spec new(ServiceRootDir :: string()) -> {ok, #manifest{}} | {error, Reason :: binary()}. -new(ServiceRootDir) when is_list(ServiceRootDir) -> - WorkDir = ServiceRootDir ++ "/work_dir/", - case file:read_file(WorkDir ++ "manifest.json") of - {ok, ManifestInfo} -> - Settings = catch jiffy:decode(ManifestInfo, [return_maps]), - case check_manifest(Settings) of - {ok, Manifest} -> - {ok, Manifest#manifest{work_dir = WorkDir}}; - {error, Reason} -> - {error, Reason} - end; - {error, Reason} -> - {error, Reason} - end. - --spec startup(Manifest :: #manifest{}) -> {ok, Port :: port()} | {error, Reason :: binary()}. -startup(#manifest{id = Id, work_dir = WorkDir, exec = ExecCmd0, args = Args0}) -> - PortSettings = [ - {cd, WorkDir}, - {args, [binary_to_list(A) || A <- Args0]}, - exit_status - ], - ExecCmd = binary_to_list(ExecCmd0), - RealExecCmd = filename:absname_join(WorkDir, ExecCmd), - lager:debug("[efka_manifest] service_id: ~p, real command is: ~p", [Id, RealExecCmd]), - case catch erlang:open_port({spawn_executable, RealExecCmd}, PortSettings) of - Port when is_port(Port) -> - {ok, Port}; - _Other -> - {error, <<"exec command startup failed">>} - end. - -%% 检查配置是否合法 --spec check_manifest(Manifest :: map()) -> {ok, #manifest{}} | {error, Reason :: binary()}. -check_manifest(Manifest) when is_map(Manifest) -> - RequiredKeys = [<<"id">>, <<"exec">>, <<"args">>, <<"health_check">>], - check_manifest0(RequiredKeys, Manifest, #manifest{}); -check_manifest(_Manifest) -> - {error, <<"invalid manifest json">>}. - -check_manifest0([], _Settings, Manifest) -> - {ok, Manifest}; -check_manifest0([<<"id">>|T], Settings, Manifest) -> - case maps:find(<<"id">>, Settings) of - error -> - {error, <<"miss service_id">>}; - {ok, Id} when is_binary(Id) -> - check_manifest0(T, Settings, Manifest#manifest{id = Id}); - {ok, _} -> - {error, <<"service_id is not string">>} - end; -check_manifest0([<<"health_check">>|T], Settings, Manifest) -> - case maps:find(<<"health_check">>, Settings) of - error -> - {error, <<"miss health_check">>}; - {ok, Url} when is_binary(Url) -> - case is_url(Url) of - true -> - check_manifest0(T, Settings, Manifest#manifest{health_check = Url}); - false -> - {error, <<"health_check is not a invalid url">>} - end; - {ok, _} -> - {error, <<"health_check is not string">>} - end; -check_manifest0([<<"exec">>|T], Settings, Manifest) -> - case maps:find(<<"exec">>, Settings) of - error -> - {error, <<"miss start">>}; - {ok, Exec} when is_binary(Exec) -> - %% 不能包含空格 - case binary:match(Exec, <<" ">>) of - nomatch -> - check_manifest0(T, Settings, Manifest#manifest{exec = Exec}); - _ -> - {error, <<"start cmd cannot contain args">>} - end - end; -check_manifest0([<<"args">>|T], Settings, Manifest) -> - case maps:find(<<"args">>, Settings) of - error -> - check_manifest0(T, Settings, Manifest#manifest{args = []}); - %% 对参数项目不进行检查 - {ok, Args} when is_list(Args) -> - check_manifest0(T, Settings, Manifest#manifest{args = Args}); - {ok, _} -> - {error, <<"args must be list">>} - end. - --spec is_url(binary()) -> boolean(). -is_url(Input) when is_binary(Input) -> - try - uri_string:parse(Input), - true - catch - _:_ -> false - end. \ No newline at end of file diff --git a/apps/efka/src/efka_subscription.erl b/apps/efka/src/efka_subscription.erl index 9ea6e7c..1b0c244 100644 --- a/apps/efka/src/efka_subscription.erl +++ b/apps/efka/src/efka_subscription.erl @@ -41,9 +41,9 @@ %%% API %%%=================================================================== --spec subscribe(Topic :: binary(), SubscriberPid :: pid()) -> no_return(). +-spec subscribe(Topic :: binary(), SubscriberPid :: pid()) -> ok | {error, Reason :: binary()}. subscribe(Topic, SubscriberPid) when is_binary(Topic), is_pid(SubscriberPid) -> - gen_server:cast(?SERVER, {subscribe, Topic, SubscriberPid}). + gen_server:call(?SERVER, {subscribe, Topic, SubscriberPid}). -spec publish(Topic :: binary(), Content :: binary()) -> no_return(). publish(Topic, Content) when is_binary(Topic), is_binary(Content) -> @@ -77,17 +77,8 @@ init([]) -> {noreply, NewState :: #state{}, timeout() | hibernate} | {stop, Reason :: term(), Reply :: term(), NewState :: #state{}} | {stop, Reason :: term(), NewState :: #state{}}). -handle_call(_Request, _From, State = #state{}) -> - {reply, ok, State}. - -%% @private -%% @doc Handling cast messages --spec(handle_cast(Request :: term(), State :: #state{}) -> - {noreply, NewState :: #state{}} | - {noreply, NewState :: #state{}, timeout() | hibernate} | - {stop, Reason :: term(), NewState :: #state{}}). %% 同一个SubscriberPid只能订阅同一个topic一次 -handle_cast({subscribe, Topic, SubscriberPid}, State = #state{subscribers = Subscribers}) -> +handle_call({subscribe, Topic, SubscriberPid}, _From, State = #state{subscribers = Subscribers}) -> Components = of_components(Topic), case is_valid_components(Components) of true -> @@ -95,11 +86,17 @@ handle_cast({subscribe, Topic, SubscriberPid}, State = #state{subscribers = Subs %% 建立到SubscriberPid的monitor，进程退出需要清理订阅 erlang:monitor(process, SubscriberPid), - {noreply, State#state{subscribers = Subscribers ++ [Sub]}}; + {reply, ok, State#state{subscribers = Subscribers ++ [Sub]}}; false -> - {noreply, State} - end; + {reply, {error, <<"invalid topic name">>}, State} + end. +%% @private +%% @doc Handling cast messages +-spec(handle_cast(Request :: term(), State :: #state{}) -> + {noreply, NewState :: #state{}} | + {noreply, NewState :: #state{}, timeout() | hibernate} | + {stop, Reason :: term(), NewState :: #state{}}). %% 发布消息 handle_cast({publish, Topic, Content}, State = #state{subscribers = Subscribers}) -> MatchedSubscribers = match_subscribers(Subscribers, Topic), diff --git a/apps/efka/src/efka_transport.erl b/apps/efka/src/efka_transport.erl index e4eea38..643a216 100644 --- a/apps/efka/src/efka_transport.erl +++ b/apps/efka/src/efka_transport.erl @@ -131,7 +131,7 @@ handle_cast({auth_request, AuthRequestBin}, State = #state{parent_pid = ParentPi end; handle_cast({send, Method, Packet}, State = #state{socket = Socket}) -> - ok = ssl:send(Socket, <>), + ok = ssl:send(Socket, <>), {noreply, State}; %% 服务push的消息的回复 @@ -155,8 +155,8 @@ handle_info({ssl, Socket, <>}, State = #state{socket ParentPid ! {server_pub, Topic, Content}, {noreply, State}; -handle_info({ssl, Socket, <>}, State = #state{socket = Socket, parent_pid = ParentPid}) -> - ParentPid ! {server_rpc, PacketId, AsyncCallBin}, +handle_info({ssl, Socket, <>}, State = #state{socket = Socket, parent_pid = ParentPid}) -> + ParentPid ! {server_rpc, PacketId, RPCRequest}, {noreply, State}; handle_info({ssl_error, Socket, Reason}, State = #state{socket = Socket}) -> diff --git a/apps/efka/src/proto/message_pb.erl b/apps/efka/src/proto/message_pb.erl index 50fa392..80c3673 100644 --- a/apps/efka/src/proto/message_pb.erl +++ b/apps/efka/src/proto/message_pb.erl @@ -61,7 +61,15 @@ -type pub() :: #pub{}. --type deploy() :: #deploy{}. +-type command() :: #command{}. + +-type rpc_deploy() :: #rpc_deploy{}. + +-type rpc_start_container() :: #rpc_start_container{}. + +-type rpc_stop_container() :: #rpc_stop_container{}. + +-type rpc_config_container() :: #rpc_config_container{}. -type fetch_task_log() :: #fetch_task_log{}. @@ -73,9 +81,9 @@ -type ping() :: #ping{}. --export_type(['auth_request'/0, 'auth_reply'/0, 'pub'/0, 'deploy'/0, 'fetch_task_log'/0, 'container_config'/0, 'data'/0, 'event'/0, 'ping'/0]). --type '$msg_name'() :: auth_request | auth_reply | pub | deploy | fetch_task_log | container_config | data | event | ping. --type '$msg'() :: auth_request() | auth_reply() | pub() | deploy() | fetch_task_log() | container_config() | data() | event() | ping(). +-export_type(['auth_request'/0, 'auth_reply'/0, 'pub'/0, 'command'/0, 'rpc_deploy'/0, 'rpc_start_container'/0, 'rpc_stop_container'/0, 'rpc_config_container'/0, 'fetch_task_log'/0, 'container_config'/0, 'data'/0, 'event'/0, 'ping'/0]). +-type '$msg_name'() :: auth_request | auth_reply | pub | command | rpc_deploy | rpc_start_container | rpc_stop_container | rpc_config_container | fetch_task_log | container_config | data | event | ping. +-type '$msg'() :: auth_request() | auth_reply() | pub() | command() | rpc_deploy() | rpc_start_container() | rpc_stop_container() | rpc_config_container() | fetch_task_log() | container_config() | data() | event() | ping(). -export_type(['$msg_name'/0, '$msg'/0]). -if(?OTP_RELEASE >= 24). @@ -105,7 +113,11 @@ 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); pub -> encode_msg_pub(id(Msg, TrUserData), TrUserData); - deploy -> encode_msg_deploy(id(Msg, TrUserData), TrUserData); + command -> encode_msg_command(id(Msg, TrUserData), TrUserData); + rpc_deploy -> encode_msg_rpc_deploy(id(Msg, TrUserData), TrUserData); + rpc_start_container -> encode_msg_rpc_start_container(id(Msg, TrUserData), TrUserData); + rpc_stop_container -> encode_msg_rpc_stop_container(id(Msg, TrUserData), TrUserData); + rpc_config_container -> encode_msg_rpc_config_container(id(Msg, TrUserData), TrUserData); fetch_task_log -> encode_msg_fetch_task_log(id(Msg, TrUserData), TrUserData); container_config -> encode_msg_container_config(id(Msg, TrUserData), TrUserData); data -> encode_msg_data(id(Msg, TrUserData), TrUserData); @@ -217,10 +229,68 @@ encode_msg_pub(#pub{topic = F1, content = F2}, Bin, TrUserData) -> end end. -encode_msg_deploy(Msg, TrUserData) -> encode_msg_deploy(Msg, <<>>, TrUserData). +encode_msg_command(Msg, TrUserData) -> encode_msg_command(Msg, <<>>, TrUserData). -encode_msg_deploy(#deploy{task_id = F1, config = F2}, Bin, TrUserData) -> +encode_msg_command(#command{command_type = F1, command = 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 iolist_size(TrF2) of + 0 -> B1; + _ -> e_type_bytes(TrF2, <>, TrUserData) + end + end + end. + +encode_msg_rpc_deploy(Msg, TrUserData) -> encode_msg_rpc_deploy(Msg, <<>>, TrUserData). + + +encode_msg_rpc_deploy(#rpc_deploy{packet_id = F1, task_id = F2, config = 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), + if TrF2 =:= 0 -> B1; + true -> e_varint(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_rpc_start_container(Msg, TrUserData) -> encode_msg_rpc_start_container(Msg, <<>>, TrUserData). + + +encode_msg_rpc_start_container(#rpc_start_container{packet_id = F1, container_name = F2}, Bin, TrUserData) -> B1 = if F1 == undefined -> Bin; true -> begin @@ -241,6 +311,64 @@ encode_msg_deploy(#deploy{task_id = F1, config = F2}, Bin, TrUserData) -> end end. +encode_msg_rpc_stop_container(Msg, TrUserData) -> encode_msg_rpc_stop_container(Msg, <<>>, TrUserData). + + +encode_msg_rpc_stop_container(#rpc_stop_container{packet_id = F1, container_name = F2}, 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, + if F2 == undefined -> B1; + true -> + begin + TrF2 = id(F2, TrUserData), + case is_empty_string(TrF2) of + true -> B1; + false -> e_type_string(TrF2, <>, TrUserData) + end + end + end. + +encode_msg_rpc_config_container(Msg, TrUserData) -> encode_msg_rpc_config_container(Msg, <<>>, TrUserData). + + +encode_msg_rpc_config_container(#rpc_config_container{packet_id = F1, container_name = F2, config = 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; + true -> + begin + TrF3 = id(F3, TrUserData), + case iolist_size(TrF3) of + 0 -> B2; + _ -> e_type_bytes(TrF3, <>, TrUserData) + end + end + end. + encode_msg_fetch_task_log(Msg, TrUserData) -> encode_msg_fetch_task_log(Msg, <<>>, TrUserData). @@ -649,7 +777,11 @@ 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(pub, Bin, TrUserData) -> id(decode_msg_pub(Bin, TrUserData), TrUserData); -decode_msg_2_doit(deploy, Bin, TrUserData) -> id(decode_msg_deploy(Bin, TrUserData), TrUserData); +decode_msg_2_doit(command, Bin, TrUserData) -> id(decode_msg_command(Bin, TrUserData), TrUserData); +decode_msg_2_doit(rpc_deploy, Bin, TrUserData) -> id(decode_msg_rpc_deploy(Bin, TrUserData), TrUserData); +decode_msg_2_doit(rpc_start_container, Bin, TrUserData) -> id(decode_msg_rpc_start_container(Bin, TrUserData), TrUserData); +decode_msg_2_doit(rpc_stop_container, Bin, TrUserData) -> id(decode_msg_rpc_stop_container(Bin, TrUserData), TrUserData); +decode_msg_2_doit(rpc_config_container, Bin, TrUserData) -> id(decode_msg_rpc_config_container(Bin, TrUserData), TrUserData); decode_msg_2_doit(fetch_task_log, Bin, TrUserData) -> id(decode_msg_fetch_task_log(Bin, TrUserData), TrUserData); decode_msg_2_doit(container_config, Bin, TrUserData) -> id(decode_msg_container_config(Bin, TrUserData), TrUserData); decode_msg_2_doit(data, Bin, TrUserData) -> id(decode_msg_data(Bin, TrUserData), TrUserData); @@ -832,56 +964,274 @@ 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_deploy(Bin, TrUserData) -> dfp_read_field_def_deploy(Bin, 0, 0, 0, id(0, TrUserData), id(<<>>, TrUserData), TrUserData). +decode_msg_command(Bin, TrUserData) -> dfp_read_field_def_command(Bin, 0, 0, 0, id(<<>>, TrUserData), id(<<>>, TrUserData), TrUserData). -dfp_read_field_def_deploy(<<8, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> d_field_deploy_task_id(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); -dfp_read_field_def_deploy(<<18, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> d_field_deploy_config(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); -dfp_read_field_def_deploy(<<>>, 0, 0, _, F@_1, F@_2, _) -> #deploy{task_id = F@_1, config = F@_2}; -dfp_read_field_def_deploy(Other, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dg_read_field_def_deploy(Other, Z1, Z2, F, F@_1, F@_2, TrUserData). +dfp_read_field_def_command(<<10, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> d_field_command_command_type(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); +dfp_read_field_def_command(<<18, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> d_field_command_command(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); +dfp_read_field_def_command(<<>>, 0, 0, _, F@_1, F@_2, _) -> #command{command_type = F@_1, command = F@_2}; +dfp_read_field_def_command(Other, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dg_read_field_def_command(Other, Z1, Z2, F, F@_1, F@_2, TrUserData). -dg_read_field_def_deploy(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 32 - 7 -> dg_read_field_def_deploy(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); -dg_read_field_def_deploy(<<0:1, X:7, Rest/binary>>, N, Acc, _, F@_1, F@_2, TrUserData) -> +dg_read_field_def_command(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 32 - 7 -> dg_read_field_def_command(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); +dg_read_field_def_command(<<0:1, X:7, Rest/binary>>, N, Acc, _, F@_1, F@_2, TrUserData) -> Key = X bsl N + Acc, case Key of - 8 -> d_field_deploy_task_id(Rest, 0, 0, 0, F@_1, F@_2, TrUserData); - 18 -> d_field_deploy_config(Rest, 0, 0, 0, F@_1, F@_2, TrUserData); + 10 -> d_field_command_command_type(Rest, 0, 0, 0, F@_1, F@_2, TrUserData); + 18 -> d_field_command_command(Rest, 0, 0, 0, F@_1, F@_2, TrUserData); _ -> case Key band 7 of - 0 -> skip_varint_deploy(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); - 1 -> skip_64_deploy(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); - 2 -> skip_length_delimited_deploy(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); - 3 -> skip_group_deploy(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); - 5 -> skip_32_deploy(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData) + 0 -> skip_varint_command(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); + 1 -> skip_64_command(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); + 2 -> skip_length_delimited_command(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); + 3 -> skip_group_command(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); + 5 -> skip_32_command(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData) end end; -dg_read_field_def_deploy(<<>>, 0, 0, _, F@_1, F@_2, _) -> #deploy{task_id = F@_1, config = F@_2}. +dg_read_field_def_command(<<>>, 0, 0, _, F@_1, F@_2, _) -> #command{command_type = F@_1, command = F@_2}. -d_field_deploy_task_id(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> d_field_deploy_task_id(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); -d_field_deploy_task_id(<<0:1, X:7, Rest/binary>>, N, Acc, F, _, F@_2, TrUserData) -> - {NewFValue, RestF} = {id((X bsl N + Acc) band 4294967295, TrUserData), Rest}, - dfp_read_field_def_deploy(RestF, 0, 0, F, NewFValue, F@_2, TrUserData). - -d_field_deploy_config(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> d_field_deploy_config(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); -d_field_deploy_config(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, _, TrUserData) -> +d_field_command_command_type(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> d_field_command_command_type(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); +d_field_command_command_type(<<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_deploy(RestF, 0, 0, F, F@_1, NewFValue, TrUserData). + dfp_read_field_def_command(RestF, 0, 0, F, NewFValue, F@_2, TrUserData). -skip_varint_deploy(<<1:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> skip_varint_deploy(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); -skip_varint_deploy(<<0:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_deploy(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData). +d_field_command_command(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> d_field_command_command(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); +d_field_command_command(<<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_command(RestF, 0, 0, F, F@_1, NewFValue, TrUserData). -skip_length_delimited_deploy(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> skip_length_delimited_deploy(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); -skip_length_delimited_deploy(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) -> +skip_varint_command(<<1:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> skip_varint_command(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); +skip_varint_command(<<0:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_command(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData). + +skip_length_delimited_command(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> skip_length_delimited_command(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); +skip_length_delimited_command(<<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_deploy(Rest2, 0, 0, F, F@_1, F@_2, TrUserData). + dfp_read_field_def_command(Rest2, 0, 0, F, F@_1, F@_2, TrUserData). -skip_group_deploy(Bin, _, Z2, FNum, F@_1, F@_2, TrUserData) -> +skip_group_command(Bin, _, Z2, FNum, F@_1, F@_2, TrUserData) -> {_, Rest} = read_group(Bin, FNum), - dfp_read_field_def_deploy(Rest, 0, Z2, FNum, F@_1, F@_2, TrUserData). + dfp_read_field_def_command(Rest, 0, Z2, FNum, F@_1, F@_2, TrUserData). -skip_32_deploy(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_deploy(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData). +skip_32_command(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_command(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData). -skip_64_deploy(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_deploy(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData). +skip_64_command(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_command(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData). + +decode_msg_rpc_deploy(Bin, TrUserData) -> dfp_read_field_def_rpc_deploy(Bin, 0, 0, 0, id(0, TrUserData), id(0, TrUserData), id(<<>>, TrUserData), TrUserData). + +dfp_read_field_def_rpc_deploy(<<8, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> d_field_rpc_deploy_packet_id(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData); +dfp_read_field_def_rpc_deploy(<<16, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> d_field_rpc_deploy_task_id(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData); +dfp_read_field_def_rpc_deploy(<<26, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> d_field_rpc_deploy_config(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData); +dfp_read_field_def_rpc_deploy(<<>>, 0, 0, _, F@_1, F@_2, F@_3, _) -> #rpc_deploy{packet_id = F@_1, task_id = F@_2, config = F@_3}; +dfp_read_field_def_rpc_deploy(Other, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> dg_read_field_def_rpc_deploy(Other, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData). + +dg_read_field_def_rpc_deploy(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, TrUserData) when N < 32 - 7 -> dg_read_field_def_rpc_deploy(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, TrUserData); +dg_read_field_def_rpc_deploy(<<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_rpc_deploy_packet_id(Rest, 0, 0, 0, F@_1, F@_2, F@_3, TrUserData); + 16 -> d_field_rpc_deploy_task_id(Rest, 0, 0, 0, F@_1, F@_2, F@_3, TrUserData); + 26 -> d_field_rpc_deploy_config(Rest, 0, 0, 0, F@_1, F@_2, F@_3, TrUserData); + _ -> + case Key band 7 of + 0 -> skip_varint_rpc_deploy(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, TrUserData); + 1 -> skip_64_rpc_deploy(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, TrUserData); + 2 -> skip_length_delimited_rpc_deploy(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, TrUserData); + 3 -> skip_group_rpc_deploy(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, TrUserData); + 5 -> skip_32_rpc_deploy(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, TrUserData) + end + end; +dg_read_field_def_rpc_deploy(<<>>, 0, 0, _, F@_1, F@_2, F@_3, _) -> #rpc_deploy{packet_id = F@_1, task_id = F@_2, config = F@_3}. + +d_field_rpc_deploy_packet_id(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, TrUserData) when N < 57 -> d_field_rpc_deploy_packet_id(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, TrUserData); +d_field_rpc_deploy_packet_id(<<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_rpc_deploy(RestF, 0, 0, F, NewFValue, F@_2, F@_3, TrUserData). + +d_field_rpc_deploy_task_id(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, TrUserData) when N < 57 -> d_field_rpc_deploy_task_id(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, TrUserData); +d_field_rpc_deploy_task_id(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, _, F@_3, TrUserData) -> + {NewFValue, RestF} = {id((X bsl N + Acc) band 4294967295, TrUserData), Rest}, + dfp_read_field_def_rpc_deploy(RestF, 0, 0, F, F@_1, NewFValue, F@_3, TrUserData). + +d_field_rpc_deploy_config(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, TrUserData) when N < 57 -> d_field_rpc_deploy_config(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, TrUserData); +d_field_rpc_deploy_config(<<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_rpc_deploy(RestF, 0, 0, F, F@_1, F@_2, NewFValue, TrUserData). + +skip_varint_rpc_deploy(<<1:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> skip_varint_rpc_deploy(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData); +skip_varint_rpc_deploy(<<0:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> dfp_read_field_def_rpc_deploy(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData). + +skip_length_delimited_rpc_deploy(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, TrUserData) when N < 57 -> skip_length_delimited_rpc_deploy(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, TrUserData); +skip_length_delimited_rpc_deploy(<<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_rpc_deploy(Rest2, 0, 0, F, F@_1, F@_2, F@_3, TrUserData). + +skip_group_rpc_deploy(Bin, _, Z2, FNum, F@_1, F@_2, F@_3, TrUserData) -> + {_, Rest} = read_group(Bin, FNum), + dfp_read_field_def_rpc_deploy(Rest, 0, Z2, FNum, F@_1, F@_2, F@_3, TrUserData). + +skip_32_rpc_deploy(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> dfp_read_field_def_rpc_deploy(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData). + +skip_64_rpc_deploy(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> dfp_read_field_def_rpc_deploy(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData). + +decode_msg_rpc_start_container(Bin, TrUserData) -> dfp_read_field_def_rpc_start_container(Bin, 0, 0, 0, id(0, TrUserData), id(<<>>, TrUserData), TrUserData). + +dfp_read_field_def_rpc_start_container(<<8, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> d_field_rpc_start_container_packet_id(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); +dfp_read_field_def_rpc_start_container(<<18, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> d_field_rpc_start_container_container_name(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); +dfp_read_field_def_rpc_start_container(<<>>, 0, 0, _, F@_1, F@_2, _) -> #rpc_start_container{packet_id = F@_1, container_name = F@_2}; +dfp_read_field_def_rpc_start_container(Other, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dg_read_field_def_rpc_start_container(Other, Z1, Z2, F, F@_1, F@_2, TrUserData). + +dg_read_field_def_rpc_start_container(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 32 - 7 -> dg_read_field_def_rpc_start_container(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); +dg_read_field_def_rpc_start_container(<<0:1, X:7, Rest/binary>>, N, Acc, _, F@_1, F@_2, TrUserData) -> + Key = X bsl N + Acc, + case Key of + 8 -> d_field_rpc_start_container_packet_id(Rest, 0, 0, 0, F@_1, F@_2, TrUserData); + 18 -> d_field_rpc_start_container_container_name(Rest, 0, 0, 0, F@_1, F@_2, TrUserData); + _ -> + case Key band 7 of + 0 -> skip_varint_rpc_start_container(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); + 1 -> skip_64_rpc_start_container(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); + 2 -> skip_length_delimited_rpc_start_container(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); + 3 -> skip_group_rpc_start_container(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); + 5 -> skip_32_rpc_start_container(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData) + end + end; +dg_read_field_def_rpc_start_container(<<>>, 0, 0, _, F@_1, F@_2, _) -> #rpc_start_container{packet_id = F@_1, container_name = F@_2}. + +d_field_rpc_start_container_packet_id(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> d_field_rpc_start_container_packet_id(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); +d_field_rpc_start_container_packet_id(<<0:1, X:7, Rest/binary>>, N, Acc, F, _, F@_2, TrUserData) -> + {NewFValue, RestF} = {id((X bsl N + Acc) band 4294967295, TrUserData), Rest}, + dfp_read_field_def_rpc_start_container(RestF, 0, 0, F, NewFValue, F@_2, TrUserData). + +d_field_rpc_start_container_container_name(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> d_field_rpc_start_container_container_name(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); +d_field_rpc_start_container_container_name(<<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_rpc_start_container(RestF, 0, 0, F, F@_1, NewFValue, TrUserData). + +skip_varint_rpc_start_container(<<1:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> skip_varint_rpc_start_container(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); +skip_varint_rpc_start_container(<<0:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_rpc_start_container(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData). + +skip_length_delimited_rpc_start_container(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> skip_length_delimited_rpc_start_container(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); +skip_length_delimited_rpc_start_container(<<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_rpc_start_container(Rest2, 0, 0, F, F@_1, F@_2, TrUserData). + +skip_group_rpc_start_container(Bin, _, Z2, FNum, F@_1, F@_2, TrUserData) -> + {_, Rest} = read_group(Bin, FNum), + dfp_read_field_def_rpc_start_container(Rest, 0, Z2, FNum, F@_1, F@_2, TrUserData). + +skip_32_rpc_start_container(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_rpc_start_container(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData). + +skip_64_rpc_start_container(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_rpc_start_container(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData). + +decode_msg_rpc_stop_container(Bin, TrUserData) -> dfp_read_field_def_rpc_stop_container(Bin, 0, 0, 0, id(0, TrUserData), id(<<>>, TrUserData), TrUserData). + +dfp_read_field_def_rpc_stop_container(<<8, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> d_field_rpc_stop_container_packet_id(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); +dfp_read_field_def_rpc_stop_container(<<18, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> d_field_rpc_stop_container_container_name(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); +dfp_read_field_def_rpc_stop_container(<<>>, 0, 0, _, F@_1, F@_2, _) -> #rpc_stop_container{packet_id = F@_1, container_name = F@_2}; +dfp_read_field_def_rpc_stop_container(Other, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dg_read_field_def_rpc_stop_container(Other, Z1, Z2, F, F@_1, F@_2, TrUserData). + +dg_read_field_def_rpc_stop_container(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 32 - 7 -> dg_read_field_def_rpc_stop_container(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); +dg_read_field_def_rpc_stop_container(<<0:1, X:7, Rest/binary>>, N, Acc, _, F@_1, F@_2, TrUserData) -> + Key = X bsl N + Acc, + case Key of + 8 -> d_field_rpc_stop_container_packet_id(Rest, 0, 0, 0, F@_1, F@_2, TrUserData); + 18 -> d_field_rpc_stop_container_container_name(Rest, 0, 0, 0, F@_1, F@_2, TrUserData); + _ -> + case Key band 7 of + 0 -> skip_varint_rpc_stop_container(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); + 1 -> skip_64_rpc_stop_container(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); + 2 -> skip_length_delimited_rpc_stop_container(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); + 3 -> skip_group_rpc_stop_container(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); + 5 -> skip_32_rpc_stop_container(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData) + end + end; +dg_read_field_def_rpc_stop_container(<<>>, 0, 0, _, F@_1, F@_2, _) -> #rpc_stop_container{packet_id = F@_1, container_name = F@_2}. + +d_field_rpc_stop_container_packet_id(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> d_field_rpc_stop_container_packet_id(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); +d_field_rpc_stop_container_packet_id(<<0:1, X:7, Rest/binary>>, N, Acc, F, _, F@_2, TrUserData) -> + {NewFValue, RestF} = {id((X bsl N + Acc) band 4294967295, TrUserData), Rest}, + dfp_read_field_def_rpc_stop_container(RestF, 0, 0, F, NewFValue, F@_2, TrUserData). + +d_field_rpc_stop_container_container_name(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> d_field_rpc_stop_container_container_name(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); +d_field_rpc_stop_container_container_name(<<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_rpc_stop_container(RestF, 0, 0, F, F@_1, NewFValue, TrUserData). + +skip_varint_rpc_stop_container(<<1:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> skip_varint_rpc_stop_container(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); +skip_varint_rpc_stop_container(<<0:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_rpc_stop_container(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData). + +skip_length_delimited_rpc_stop_container(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> skip_length_delimited_rpc_stop_container(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); +skip_length_delimited_rpc_stop_container(<<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_rpc_stop_container(Rest2, 0, 0, F, F@_1, F@_2, TrUserData). + +skip_group_rpc_stop_container(Bin, _, Z2, FNum, F@_1, F@_2, TrUserData) -> + {_, Rest} = read_group(Bin, FNum), + dfp_read_field_def_rpc_stop_container(Rest, 0, Z2, FNum, F@_1, F@_2, TrUserData). + +skip_32_rpc_stop_container(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_rpc_stop_container(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData). + +skip_64_rpc_stop_container(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_rpc_stop_container(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData). + +decode_msg_rpc_config_container(Bin, TrUserData) -> dfp_read_field_def_rpc_config_container(Bin, 0, 0, 0, id(0, TrUserData), id(<<>>, TrUserData), id(<<>>, TrUserData), TrUserData). + +dfp_read_field_def_rpc_config_container(<<8, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> d_field_rpc_config_container_packet_id(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData); +dfp_read_field_def_rpc_config_container(<<18, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> d_field_rpc_config_container_container_name(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData); +dfp_read_field_def_rpc_config_container(<<26, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> d_field_rpc_config_container_config(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData); +dfp_read_field_def_rpc_config_container(<<>>, 0, 0, _, F@_1, F@_2, F@_3, _) -> #rpc_config_container{packet_id = F@_1, container_name = F@_2, config = F@_3}; +dfp_read_field_def_rpc_config_container(Other, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> dg_read_field_def_rpc_config_container(Other, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData). + +dg_read_field_def_rpc_config_container(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, TrUserData) when N < 32 - 7 -> dg_read_field_def_rpc_config_container(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, TrUserData); +dg_read_field_def_rpc_config_container(<<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_rpc_config_container_packet_id(Rest, 0, 0, 0, F@_1, F@_2, F@_3, TrUserData); + 18 -> d_field_rpc_config_container_container_name(Rest, 0, 0, 0, F@_1, F@_2, F@_3, TrUserData); + 26 -> d_field_rpc_config_container_config(Rest, 0, 0, 0, F@_1, F@_2, F@_3, TrUserData); + _ -> + case Key band 7 of + 0 -> skip_varint_rpc_config_container(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, TrUserData); + 1 -> skip_64_rpc_config_container(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, TrUserData); + 2 -> skip_length_delimited_rpc_config_container(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, TrUserData); + 3 -> skip_group_rpc_config_container(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, TrUserData); + 5 -> skip_32_rpc_config_container(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, TrUserData) + end + end; +dg_read_field_def_rpc_config_container(<<>>, 0, 0, _, F@_1, F@_2, F@_3, _) -> #rpc_config_container{packet_id = F@_1, container_name = F@_2, config = F@_3}. + +d_field_rpc_config_container_packet_id(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, TrUserData) when N < 57 -> d_field_rpc_config_container_packet_id(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, TrUserData); +d_field_rpc_config_container_packet_id(<<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_rpc_config_container(RestF, 0, 0, F, NewFValue, F@_2, F@_3, TrUserData). + +d_field_rpc_config_container_container_name(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, TrUserData) when N < 57 -> d_field_rpc_config_container_container_name(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, TrUserData); +d_field_rpc_config_container_container_name(<<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_rpc_config_container(RestF, 0, 0, F, F@_1, NewFValue, F@_3, TrUserData). + +d_field_rpc_config_container_config(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, TrUserData) when N < 57 -> d_field_rpc_config_container_config(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, TrUserData); +d_field_rpc_config_container_config(<<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_rpc_config_container(RestF, 0, 0, F, F@_1, F@_2, NewFValue, TrUserData). + +skip_varint_rpc_config_container(<<1:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> skip_varint_rpc_config_container(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData); +skip_varint_rpc_config_container(<<0:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> dfp_read_field_def_rpc_config_container(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData). + +skip_length_delimited_rpc_config_container(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, TrUserData) when N < 57 -> skip_length_delimited_rpc_config_container(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, TrUserData); +skip_length_delimited_rpc_config_container(<<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_rpc_config_container(Rest2, 0, 0, F, F@_1, F@_2, F@_3, TrUserData). + +skip_group_rpc_config_container(Bin, _, Z2, FNum, F@_1, F@_2, F@_3, TrUserData) -> + {_, Rest} = read_group(Bin, FNum), + dfp_read_field_def_rpc_config_container(Rest, 0, Z2, FNum, F@_1, F@_2, F@_3, TrUserData). + +skip_32_rpc_config_container(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> dfp_read_field_def_rpc_config_container(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData). + +skip_64_rpc_config_container(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> dfp_read_field_def_rpc_config_container(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData). decode_msg_fetch_task_log(Bin, TrUserData) -> dfp_read_field_def_fetch_task_log(Bin, 0, 0, 0, id(0, TrUserData), TrUserData). @@ -1390,7 +1740,11 @@ merge_msgs(Prev, New, MsgName, Opts) -> auth_request -> merge_msg_auth_request(Prev, New, TrUserData); auth_reply -> merge_msg_auth_reply(Prev, New, TrUserData); pub -> merge_msg_pub(Prev, New, TrUserData); - deploy -> merge_msg_deploy(Prev, New, TrUserData); + command -> merge_msg_command(Prev, New, TrUserData); + rpc_deploy -> merge_msg_rpc_deploy(Prev, New, TrUserData); + rpc_start_container -> merge_msg_rpc_start_container(Prev, New, TrUserData); + rpc_stop_container -> merge_msg_rpc_stop_container(Prev, New, TrUserData); + rpc_config_container -> merge_msg_rpc_config_container(Prev, New, TrUserData); fetch_task_log -> merge_msg_fetch_task_log(Prev, New, TrUserData); container_config -> merge_msg_container_config(Prev, New, TrUserData); data -> merge_msg_data(Prev, New, TrUserData); @@ -1443,16 +1797,68 @@ merge_msg_pub(#pub{topic = PFtopic, content = PFcontent}, #pub{topic = NFtopic, true -> NFcontent end}. --compile({nowarn_unused_function,merge_msg_deploy/3}). -merge_msg_deploy(#deploy{task_id = PFtask_id, config = PFconfig}, #deploy{task_id = NFtask_id, config = NFconfig}, _) -> - #deploy{task_id = - if NFtask_id =:= undefined -> PFtask_id; - true -> NFtask_id - end, - config = - if NFconfig =:= undefined -> PFconfig; - true -> NFconfig - end}. +-compile({nowarn_unused_function,merge_msg_command/3}). +merge_msg_command(#command{command_type = PFcommand_type, command = PFcommand}, #command{command_type = NFcommand_type, command = NFcommand}, _) -> + #command{command_type = + if NFcommand_type =:= undefined -> PFcommand_type; + true -> NFcommand_type + end, + command = + if NFcommand =:= undefined -> PFcommand; + true -> NFcommand + end}. + +-compile({nowarn_unused_function,merge_msg_rpc_deploy/3}). +merge_msg_rpc_deploy(#rpc_deploy{packet_id = PFpacket_id, task_id = PFtask_id, config = PFconfig}, #rpc_deploy{packet_id = NFpacket_id, task_id = NFtask_id, config = NFconfig}, _) -> + #rpc_deploy{packet_id = + if NFpacket_id =:= undefined -> PFpacket_id; + true -> NFpacket_id + end, + task_id = + if NFtask_id =:= undefined -> PFtask_id; + true -> NFtask_id + end, + config = + if NFconfig =:= undefined -> PFconfig; + true -> NFconfig + end}. + +-compile({nowarn_unused_function,merge_msg_rpc_start_container/3}). +merge_msg_rpc_start_container(#rpc_start_container{packet_id = PFpacket_id, container_name = PFcontainer_name}, #rpc_start_container{packet_id = NFpacket_id, container_name = NFcontainer_name}, _) -> + #rpc_start_container{packet_id = + if NFpacket_id =:= undefined -> PFpacket_id; + true -> NFpacket_id + end, + container_name = + if NFcontainer_name =:= undefined -> PFcontainer_name; + true -> NFcontainer_name + end}. + +-compile({nowarn_unused_function,merge_msg_rpc_stop_container/3}). +merge_msg_rpc_stop_container(#rpc_stop_container{packet_id = PFpacket_id, container_name = PFcontainer_name}, #rpc_stop_container{packet_id = NFpacket_id, container_name = NFcontainer_name}, _) -> + #rpc_stop_container{packet_id = + if NFpacket_id =:= undefined -> PFpacket_id; + true -> NFpacket_id + end, + container_name = + if NFcontainer_name =:= undefined -> PFcontainer_name; + true -> NFcontainer_name + end}. + +-compile({nowarn_unused_function,merge_msg_rpc_config_container/3}). +merge_msg_rpc_config_container(#rpc_config_container{packet_id = PFpacket_id, container_name = PFcontainer_name, config = PFconfig}, #rpc_config_container{packet_id = NFpacket_id, container_name = NFcontainer_name, config = NFconfig}, _) -> + #rpc_config_container{packet_id = + if NFpacket_id =:= undefined -> PFpacket_id; + true -> NFpacket_id + end, + container_name = + if NFcontainer_name =:= undefined -> PFcontainer_name; + true -> NFcontainer_name + end, + config = + if NFconfig =:= undefined -> PFconfig; + true -> NFconfig + end}. -compile({nowarn_unused_function,merge_msg_fetch_task_log/3}). merge_msg_fetch_task_log(#fetch_task_log{task_id = PFtask_id}, #fetch_task_log{task_id = NFtask_id}, _) -> @@ -1582,7 +1988,11 @@ verify_msg(Msg, MsgName, Opts) -> auth_request -> v_msg_auth_request(Msg, [MsgName], TrUserData); auth_reply -> v_msg_auth_reply(Msg, [MsgName], TrUserData); pub -> v_msg_pub(Msg, [MsgName], TrUserData); - deploy -> v_msg_deploy(Msg, [MsgName], TrUserData); + command -> v_msg_command(Msg, [MsgName], TrUserData); + rpc_deploy -> v_msg_rpc_deploy(Msg, [MsgName], TrUserData); + rpc_start_container -> v_msg_rpc_start_container(Msg, [MsgName], TrUserData); + rpc_stop_container -> v_msg_rpc_stop_container(Msg, [MsgName], TrUserData); + rpc_config_container -> v_msg_rpc_config_container(Msg, [MsgName], TrUserData); fetch_task_log -> v_msg_fetch_task_log(Msg, [MsgName], TrUserData); container_config -> v_msg_container_config(Msg, [MsgName], TrUserData); data -> v_msg_data(Msg, [MsgName], TrUserData); @@ -1637,17 +2047,71 @@ 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_deploy/3}). --dialyzer({nowarn_function,v_msg_deploy/3}). -v_msg_deploy(#deploy{task_id = F1, config = F2}, Path, TrUserData) -> +-compile({nowarn_unused_function,v_msg_command/3}). +-dialyzer({nowarn_function,v_msg_command/3}). +v_msg_command(#command{command_type = F1, command = F2}, Path, TrUserData) -> if F1 == undefined -> ok; - true -> v_type_uint32(F1, [task_id | Path], TrUserData) + true -> v_type_string(F1, [command_type | Path], TrUserData) end, if F2 == undefined -> ok; - true -> v_type_string(F2, [config | Path], TrUserData) + true -> v_type_bytes(F2, [command | Path], TrUserData) end, ok; -v_msg_deploy(X, Path, _TrUserData) -> mk_type_error({expected_msg, deploy}, X, Path). +v_msg_command(X, Path, _TrUserData) -> mk_type_error({expected_msg, command}, X, Path). + +-compile({nowarn_unused_function,v_msg_rpc_deploy/3}). +-dialyzer({nowarn_function,v_msg_rpc_deploy/3}). +v_msg_rpc_deploy(#rpc_deploy{packet_id = F1, task_id = F2, config = F3}, Path, TrUserData) -> + if F1 == undefined -> ok; + true -> v_type_uint32(F1, [packet_id | Path], TrUserData) + end, + if F2 == undefined -> ok; + true -> v_type_uint32(F2, [task_id | Path], TrUserData) + end, + if F3 == undefined -> ok; + true -> v_type_string(F3, [config | Path], TrUserData) + end, + ok; +v_msg_rpc_deploy(X, Path, _TrUserData) -> mk_type_error({expected_msg, rpc_deploy}, X, Path). + +-compile({nowarn_unused_function,v_msg_rpc_start_container/3}). +-dialyzer({nowarn_function,v_msg_rpc_start_container/3}). +v_msg_rpc_start_container(#rpc_start_container{packet_id = F1, container_name = F2}, Path, TrUserData) -> + if F1 == undefined -> ok; + true -> v_type_uint32(F1, [packet_id | Path], TrUserData) + end, + if F2 == undefined -> ok; + true -> v_type_string(F2, [container_name | Path], TrUserData) + end, + ok; +v_msg_rpc_start_container(X, Path, _TrUserData) -> mk_type_error({expected_msg, rpc_start_container}, X, Path). + +-compile({nowarn_unused_function,v_msg_rpc_stop_container/3}). +-dialyzer({nowarn_function,v_msg_rpc_stop_container/3}). +v_msg_rpc_stop_container(#rpc_stop_container{packet_id = F1, container_name = F2}, Path, TrUserData) -> + if F1 == undefined -> ok; + true -> v_type_uint32(F1, [packet_id | Path], TrUserData) + end, + if F2 == undefined -> ok; + true -> v_type_string(F2, [container_name | Path], TrUserData) + end, + ok; +v_msg_rpc_stop_container(X, Path, _TrUserData) -> mk_type_error({expected_msg, rpc_stop_container}, X, Path). + +-compile({nowarn_unused_function,v_msg_rpc_config_container/3}). +-dialyzer({nowarn_function,v_msg_rpc_config_container/3}). +v_msg_rpc_config_container(#rpc_config_container{packet_id = F1, container_name = F2, config = F3}, Path, TrUserData) -> + if F1 == undefined -> ok; + true -> v_type_uint32(F1, [packet_id | Path], TrUserData) + end, + if F2 == undefined -> ok; + true -> v_type_string(F2, [container_name | Path], TrUserData) + end, + if F3 == undefined -> ok; + true -> v_type_bytes(F3, [config | Path], TrUserData) + end, + ok; +v_msg_rpc_config_container(X, Path, _TrUserData) -> mk_type_error({expected_msg, rpc_config_container}, X, Path). -compile({nowarn_unused_function,v_msg_fetch_task_log/3}). -dialyzer({nowarn_function,v_msg_fetch_task_log/3}). @@ -1838,7 +2302,17 @@ get_msg_defs() -> #field{name = timestamp, fnum = 6, rnum = 6, type = uint32, occurrence = optional, opts = []}]}, {{msg, auth_reply}, [#field{name = code, fnum = 1, rnum = 2, type = uint32, occurrence = optional, opts = []}, #field{name = message, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []}]}, {{msg, pub}, [#field{name = topic, fnum = 1, rnum = 2, type = string, occurrence = optional, opts = []}, #field{name = content, fnum = 2, rnum = 3, type = bytes, occurrence = optional, opts = []}]}, - {{msg, deploy}, [#field{name = task_id, fnum = 1, rnum = 2, type = uint32, occurrence = optional, opts = []}, #field{name = config, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []}]}, + {{msg, command}, [#field{name = command_type, fnum = 1, rnum = 2, type = string, occurrence = optional, opts = []}, #field{name = command, fnum = 2, rnum = 3, type = bytes, occurrence = optional, opts = []}]}, + {{msg, rpc_deploy}, + [#field{name = packet_id, fnum = 1, rnum = 2, type = uint32, occurrence = optional, opts = []}, + #field{name = task_id, fnum = 2, rnum = 3, type = uint32, occurrence = optional, opts = []}, + #field{name = config, fnum = 3, rnum = 4, type = string, occurrence = optional, opts = []}]}, + {{msg, rpc_start_container}, [#field{name = packet_id, fnum = 1, rnum = 2, type = uint32, occurrence = optional, opts = []}, #field{name = container_name, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []}]}, + {{msg, rpc_stop_container}, [#field{name = packet_id, fnum = 1, rnum = 2, type = uint32, occurrence = optional, opts = []}, #field{name = container_name, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []}]}, + {{msg, rpc_config_container}, + [#field{name = packet_id, fnum = 1, rnum = 2, type = uint32, occurrence = optional, opts = []}, + #field{name = container_name, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []}, + #field{name = config, fnum = 3, rnum = 4, type = bytes, occurrence = optional, opts = []}]}, {{msg, fetch_task_log}, [#field{name = task_id, fnum = 1, rnum = 2, type = uint32, occurrence = optional, opts = []}]}, {{msg, container_config}, [#field{name = container_name, fnum = 1, rnum = 2, type = string, occurrence = optional, opts = []}, #field{name = config, fnum = 2, rnum = 3, type = bytes, occurrence = optional, opts = []}]}, {{msg, data}, @@ -1866,13 +2340,13 @@ get_msg_defs() -> #field{name = interfaces, fnum = 13, rnum = 14, type = string, occurrence = optional, opts = []}]}]. -get_msg_names() -> [auth_request, auth_reply, pub, deploy, fetch_task_log, container_config, data, event, ping]. +get_msg_names() -> [auth_request, auth_reply, pub, command, rpc_deploy, rpc_start_container, rpc_stop_container, rpc_config_container, fetch_task_log, container_config, data, event, ping]. get_group_names() -> []. -get_msg_or_group_names() -> [auth_request, auth_reply, pub, deploy, fetch_task_log, container_config, data, event, ping]. +get_msg_or_group_names() -> [auth_request, auth_reply, pub, command, rpc_deploy, rpc_start_container, rpc_stop_container, rpc_config_container, fetch_task_log, container_config, data, event, ping]. get_enum_names() -> []. @@ -1897,7 +2371,17 @@ find_msg_def(auth_request) -> #field{name = timestamp, fnum = 6, rnum = 6, type = uint32, occurrence = optional, opts = []}]; find_msg_def(auth_reply) -> [#field{name = code, fnum = 1, rnum = 2, type = uint32, occurrence = optional, opts = []}, #field{name = message, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []}]; find_msg_def(pub) -> [#field{name = topic, fnum = 1, rnum = 2, type = string, occurrence = optional, opts = []}, #field{name = content, fnum = 2, rnum = 3, type = bytes, occurrence = optional, opts = []}]; -find_msg_def(deploy) -> [#field{name = task_id, fnum = 1, rnum = 2, type = uint32, occurrence = optional, opts = []}, #field{name = config, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []}]; +find_msg_def(command) -> [#field{name = command_type, fnum = 1, rnum = 2, type = string, occurrence = optional, opts = []}, #field{name = command, fnum = 2, rnum = 3, type = bytes, occurrence = optional, opts = []}]; +find_msg_def(rpc_deploy) -> + [#field{name = packet_id, fnum = 1, rnum = 2, type = uint32, occurrence = optional, opts = []}, + #field{name = task_id, fnum = 2, rnum = 3, type = uint32, occurrence = optional, opts = []}, + #field{name = config, fnum = 3, rnum = 4, type = string, occurrence = optional, opts = []}]; +find_msg_def(rpc_start_container) -> [#field{name = packet_id, fnum = 1, rnum = 2, type = uint32, occurrence = optional, opts = []}, #field{name = container_name, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []}]; +find_msg_def(rpc_stop_container) -> [#field{name = packet_id, fnum = 1, rnum = 2, type = uint32, occurrence = optional, opts = []}, #field{name = container_name, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []}]; +find_msg_def(rpc_config_container) -> + [#field{name = packet_id, fnum = 1, rnum = 2, type = uint32, occurrence = optional, opts = []}, + #field{name = container_name, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []}, + #field{name = config, fnum = 3, rnum = 4, type = bytes, occurrence = optional, opts = []}]; find_msg_def(fetch_task_log) -> [#field{name = task_id, fnum = 1, rnum = 2, type = uint32, occurrence = optional, opts = []}]; find_msg_def(container_config) -> [#field{name = container_name, fnum = 1, rnum = 2, type = string, occurrence = optional, opts = []}, #field{name = config, fnum = 2, rnum = 3, type = bytes, occurrence = optional, opts = []}]; find_msg_def(data) -> @@ -1984,7 +2468,11 @@ 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(<<"Pub">>) -> pub; -fqbin_to_msg_name(<<"Deploy">>) -> deploy; +fqbin_to_msg_name(<<"Command">>) -> command; +fqbin_to_msg_name(<<"RPCDeploy">>) -> rpc_deploy; +fqbin_to_msg_name(<<"RPCStartContainer">>) -> rpc_start_container; +fqbin_to_msg_name(<<"RPCStopContainer">>) -> rpc_stop_container; +fqbin_to_msg_name(<<"RPCConfigContainer">>) -> rpc_config_container; fqbin_to_msg_name(<<"FetchTaskLog">>) -> fetch_task_log; fqbin_to_msg_name(<<"ContainerConfig">>) -> container_config; fqbin_to_msg_name(<<"Data">>) -> data; @@ -1996,7 +2484,11 @@ 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(pub) -> <<"Pub">>; -msg_name_to_fqbin(deploy) -> <<"Deploy">>; +msg_name_to_fqbin(command) -> <<"Command">>; +msg_name_to_fqbin(rpc_deploy) -> <<"RPCDeploy">>; +msg_name_to_fqbin(rpc_start_container) -> <<"RPCStartContainer">>; +msg_name_to_fqbin(rpc_stop_container) -> <<"RPCStopContainer">>; +msg_name_to_fqbin(rpc_config_container) -> <<"RPCConfigContainer">>; msg_name_to_fqbin(fetch_task_log) -> <<"FetchTaskLog">>; msg_name_to_fqbin(container_config) -> <<"ContainerConfig">>; msg_name_to_fqbin(data) -> <<"Data">>; @@ -2040,7 +2532,7 @@ get_all_source_basenames() -> ["message_pb.proto"]. get_all_proto_names() -> ["message_pb"]. -get_msg_containment("message_pb") -> [auth_reply, auth_request, container_config, data, deploy, event, fetch_task_log, ping, pub]; +get_msg_containment("message_pb") -> [auth_reply, auth_request, command, container_config, data, event, fetch_task_log, ping, pub, rpc_config_container, rpc_deploy, rpc_start_container, rpc_stop_container]; get_msg_containment(P) -> error({gpb_error, {badproto, P}}). @@ -2061,13 +2553,17 @@ 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(<<"RPCStopContainer">>) -> "message_pb"; +get_proto_by_msg_name_as_fqbin(<<"RPCStartContainer">>) -> "message_pb"; +get_proto_by_msg_name_as_fqbin(<<"RPCConfigContainer">>) -> "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(<<"Command">>) -> "message_pb"; get_proto_by_msg_name_as_fqbin(<<"AuthRequest">>) -> "message_pb"; get_proto_by_msg_name_as_fqbin(<<"Ping">>) -> "message_pb"; get_proto_by_msg_name_as_fqbin(<<"FetchTaskLog">>) -> "message_pb"; get_proto_by_msg_name_as_fqbin(<<"ContainerConfig">>) -> "message_pb"; -get_proto_by_msg_name_as_fqbin(<<"Deploy">>) -> "message_pb"; +get_proto_by_msg_name_as_fqbin(<<"RPCDeploy">>) -> "message_pb"; get_proto_by_msg_name_as_fqbin(<<"AuthReply">>) -> "message_pb"; get_proto_by_msg_name_as_fqbin(E) -> error({gpb_error, {badmsg, E}}). diff --git a/apps/efka/src/websocket/ws_server.erl b/apps/efka/src/websocket/ws_server.erl deleted file mode 100644 index 3205907..0000000 --- a/apps/efka/src/websocket/ws_server.erl +++ /dev/null @@ -1,34 +0,0 @@ -%%%------------------------------------------------------------------- -%%% @author anlicheng -%%% @copyright (C) 2025, -%%% @doc -%%% -%%% @end -%%% Created : 26. 8月 2025 14:28 -%%%------------------------------------------------------------------- --module(ws_server). --author("anlicheng"). - -%% API --export([start_server/0]). - -start_server() -> - {ok, Props} = application:get_env(efka, ws_server), - Acceptors = proplists:get_value(acceptors, Props, 50), - MaxConnections = proplists:get_value(max_connections, Props, 10240), - Backlog = proplists:get_value(backlog, Props, 1024), - Port = proplists:get_value(port, Props), - - Dispatcher = cowboy_router:compile([ - {'_', [{"/ws", ws_channel, []}]} - ]), - - TransOpts = [ - {port, Port}, - {num_acceptors, Acceptors}, - {backlog, Backlog}, - {max_connections, MaxConnections} - ], - {ok, Pid} = cowboy:start_clear(ws_listener, TransOpts, #{env => #{dispatch => Dispatcher}}), - - lager:debug("[efka_app] websocket server start at: ~p, pid is: ~p", [Port, Pid]). \ No newline at end of file diff --git a/apps/efka/src/websocket/ws_channel.erl b/apps/efka/src/ws_channel.erl similarity index 85% rename from apps/efka/src/websocket/ws_channel.erl rename to apps/efka/src/ws_channel.erl index aaed115..2e30b98 100644 --- a/apps/efka/src/websocket/ws_channel.erl +++ b/apps/efka/src/ws_channel.erl @@ -49,8 +49,8 @@ websocket_info({topic_broadcast, Topic, Content}, State = #state{}) -> {reply, {binary, Reply}, State}; %% service进程关闭 -websocket_info({'DOWN', _Ref, process, ContainerPid, Reason}, State = #state{service_pid = ContainerPid}) -> - lager:debug("[tcp_channel] container_pid: ~p, exited: ~p", [ContainerPid, Reason]), +websocket_info({'DOWN', _Ref, process, ServicePid, Reason}, State = #state{service_pid = ServicePid}) -> + lager:debug("[tcp_channel] container_pid: ~p, exited: ~p", [ServicePid, Reason]), {stop, State#state{service_pid = undefined}}; websocket_info({timeout, _, {stop, Reason}}, State) -> @@ -89,6 +89,16 @@ handle_request(#{<<"id">> := Id, <<"method">> := <<"register">>, <<"params">> := {stop, State} end; +%% 订阅事件 +handle_request(#{<<"id">> := Id, <<"method">> := <<"subscribe">>, <<"params">> := #{<<"topic">> := Topic}}, State = #state{is_registered = true}) -> + Reply = case efka_subscription:subscribe(Topic, self()) of + ok -> + json_result(Id, <<"ok">>); + {error, Reason} -> + json_error(Id, -1, Reason) + end, + {reply, {binary, <>}, State}; + %% 数据项 handle_request(#{<<"id">> := 0, <<"method">> := <<"metric_data">>, <<"params">> := #{<<"device_uuid">> := DeviceUUID, <<"route_key">> := RouteKey, <<"metric">> := Metric}}, State = #state{service_pid = ServicePid, is_registered = true}) -> @@ -98,13 +108,7 @@ handle_request(#{<<"id">> := 0, <<"method">> := <<"metric_data">>, %% Event事件 handle_request(#{<<"id">> := 0, <<"method">> := <<"event">>, <<"params">> := #{<<"event_type">> := EventType, <<"body">> := Body}}, State = #state{service_pid = ServicePid, is_registered = true}) -> efka_container:send_event(ServicePid, EventType, Body), - {ok, State}; - -%% 订阅事件 -handle_request(#{<<"id">> := Id, <<"method">> := <<"subscribe">>, <<"params">> := #{<<"topic">> := Topic}}, State = #state{is_registered = true}) -> - efka_subscription:subscribe(Topic, self()), - Reply = json_result(Id, <<"ok">>), - {reply, {binary, <>}, State}. + {ok, State}. -spec json_result(Id :: integer(), Result :: term()) -> binary(). json_result(Id, Result) when is_integer(Id) -> @@ -112,4 +116,12 @@ json_result(Id, Result) when is_integer(Id) -> <<"id">> => Id, <<"result">> => Result }, + jiffy:encode(Response, [force_utf8]). + +-spec json_error(Id :: integer(), Code :: integer(), Message :: binary()) -> binary(). +json_error(Id, Code, Message) when is_integer(Id), is_integer(Code), is_binary(Message) -> + Response = #{ + <<"id">> => Id, + <<"error">> => #{<<"code">> => Code, <<"message">> => Message} + }, jiffy:encode(Response, [force_utf8]). \ No newline at end of file diff --git a/message_pb.proto b/message_pb.proto index 046d751..8c7aa67 100644 --- a/message_pb.proto +++ b/message_pb.proto @@ -22,15 +22,33 @@ message Pub { bytes content = 2; } +message Command { + string command_type = 1; + bytes command = 2; +} + ///// 服务器主动推送的消息 // 部署逻辑 -message Deploy { +message RPCDeploy { uint32 task_id = 1; // json string config = 2; } +message RPCStartContainer { + string container_name = 1; +} + +message RPCStopContainer { + string container_name = 1; +} + +message RPCConfigContainer { + string container_name = 1; + bytes config = 2; +} + // 获取task的logs message FetchTaskLog { uint32 task_id = 1;