This commit is contained in:
anlicheng 2025-04-22 14:37:46 +08:00
parent 66d78e1929
commit 3279ff2ebd
3 changed files with 119 additions and 24 deletions

View File

@ -28,6 +28,13 @@
}).
-endif.
-ifndef('ACTIVATE_PUSH_PB_H').
-define('ACTIVATE_PUSH_PB_H', true).
-record(activate_push,
{auth = false :: boolean() | 0 | 1 | undefined % = 1, optional
}).
-endif.
-ifndef('SESSION_REQUEST_PB_H').
-define('SESSION_REQUEST_PB_H', true).
-record(session_request,

View File

@ -240,7 +240,7 @@ handle_event({call, From}, {publish_message, ReceiverPid, CommandType, Command},
%% websocket发送请求
lager:debug("[iot_host] host: ~p, will publish message: ~p", [UUID, Command]),
Ref = ws_channel:publish(ChannelPid, ReceiverPid, <<CommandType:8, Command/binary>>),
Ref = tcp_channel:publish(ChannelPid, ReceiverPid, <<CommandType:8, Command/binary>>),
{keep_state, State, [{reply, From, {ok, Ref}}]};
@ -254,7 +254,7 @@ handle_event({call, From}, {publish_directive, ReceiverPid, Directive}, ?STATE_A
lager:debug("[iot_host] host: ~p, will publish_directive: ~p", [UUID, Directive]),
%% websocket发送请求
Ref = ws_channel:publish(ChannelPid, ReceiverPid, <<16:8, Directive/binary>>),
Ref = tcp_channel:publish(ChannelPid, ReceiverPid, <<16:8, Directive/binary>>),
{keep_state, State, [{reply, From, {ok, Ref}}]};
@ -269,7 +269,7 @@ handle_event({call, From}, {send_directive, Directive}, ?STATE_ACTIVATED,
lager:debug("[iot_host] host: ~p, will publish_directive: ~p", [UUID, Directive]),
%% websocket发送请求
ws_channel:send(ChannelPid, <<16:8, Directive/binary>>),
tcp_channel:send(ChannelPid, <<16:8, Directive/binary>>),
{keep_state, State, [{reply, From, ok}]};
@ -279,27 +279,30 @@ handle_event({call, From}, {send_directive, Directive}, _, State = #state{uuid =
{keep_state, State, [{reply, From, {error, <<"主机离线,发送指令失败"/utf8>>}}]};
%%
handle_event({call, From}, {activate, true}, _, State = #state{uuid = UUID, channel_pid = ChannelPid}) when is_pid(ChannelPid) ->
BinReply = jiffy:encode(#{<<"auth">> => true, <<"aes">> => Aes}, [force_utf8]),
ws_channel:send(ChannelPid, <<8:8, BinReply/binary>>),
handle_event({call, From}, {activate, true}, _, State = #state{uuid = UUID, channel_pid = ChannelPid}) ->
case is_pid(ChannelPid) of
true ->
BinReply = message_pb:encode_msg(#activate_push{auth = true}),
tcp_channel:send(ChannelPid, <<8:8, BinReply/binary>>);
false ->
lager:debug("[iot_host] uuid: ~p, activate: true, no channel", [UUID])
end,
lager:debug("[iot_host] uuid: ~p, activate: true, will send message: ~p", [UUID, BinReply]),
{next_state, ?STATE_ACTIVATED, State, [{reply, From, ok}]};
handle_event({call, From}, {activate, true}, _, State = #state{uuid = UUID, channel_pid = undefined}) ->
lager:debug("[iot_host] uuid: ~p, activate: true, no channel", [UUID]),
{next_state, ?STATE_ACTIVATED, State, [{reply, From, ok}]};
%%
handle_event({call, From}, {activate, false}, _, State = #state{uuid = UUID, channel_pid = ChannelPid}) when is_pid(ChannelPid) ->
BinReply = jiffy:encode(#{<<"auth">> => false}, [force_utf8]),
ws_channel:send(ChannelPid, <<8:8, BinReply/binary>>),
ws_channel:stop(ChannelPid, closed),
handle_event({call, From}, {activate, false}, _, State = #state{uuid = UUID, channel_pid = ChannelPid}) ->
case is_pid(ChannelPid) of
true ->
BinReply = message_pb:encode_msg(#activate_push{auth = false}),
tcp_channel:send(ChannelPid, <<8:8, BinReply/binary>>),
tcp_channel:stop(ChannelPid, closed);
false ->
lager:debug("[iot_host] uuid: ~p, activate: false, no channel", [UUID])
end,
lager:debug("[iot_host] uuid: ~p, activate: false, will send message: ~p", [UUID, BinReply]),
{next_state, ?STATE_DENIED, State#state{channel_pid = undefined, has_session = false}, [{reply, From, ok}]};
handle_event({call, From}, {activate, false}, _, State = #state{uuid = UUID, channel_pid = undefined}) ->
lager:debug("[iot_host] uuid: ~p, activate: false, no channel", [UUID]),
{next_state, ?STATE_DENIED, State#state{has_session = false}, [{reply, From, ok}]};
%% channel
handle_event({call, From}, {attach_channel, ChannelPid}, ?STATE_ACTIVATED, State = #state{uuid = UUID, channel_pid = undefined}) ->
erlang:monitor(process, ChannelPid),
@ -466,7 +469,7 @@ handle_event(info, {timeout, _, heartbeat_ticker}, _, State = #state{uuid = UUID
end,
%% channel
is_pid(ChannelPid) andalso ws_channel:stop(ChannelPid, closed),
is_pid(ChannelPid) andalso tcp_channel:stop(ChannelPid, closed),
erlang:start_timer(?HEARTBEAT_INTERVAL, self(), heartbeat_ticker),
{keep_state, State#state{channel_pid = undefined, has_session = false, heartbeat_counter = 0}};

View File

@ -59,6 +59,8 @@
-type auth_reply() :: #auth_reply{}.
-type activate_push() :: #activate_push{}.
-type session_request() :: #session_request{}.
-type session_reply() :: #session_reply{}.
@ -79,9 +81,9 @@
-type directive() :: #directive{}.
-export_type(['auth_request'/0, 'auth_reply'/0, 'session_request'/0, 'session_reply'/0, 'data'/0, 'ping'/0, 'service_inform'/0, 'feedback_step'/0, 'feedback_result'/0, 'event'/0, 'ai_event'/0, 'directive'/0]).
-type '$msg_name'() :: auth_request | auth_reply | session_request | session_reply | data | ping | service_inform | feedback_step | feedback_result | event | ai_event | directive.
-type '$msg'() :: auth_request() | auth_reply() | session_request() | session_reply() | data() | ping() | service_inform() | feedback_step() | feedback_result() | event() | ai_event() | directive().
-export_type(['auth_request'/0, 'auth_reply'/0, 'activate_push'/0, 'session_request'/0, 'session_reply'/0, 'data'/0, 'ping'/0, 'service_inform'/0, 'feedback_step'/0, 'feedback_result'/0, 'event'/0, 'ai_event'/0, 'directive'/0]).
-type '$msg_name'() :: auth_request | auth_reply | activate_push | session_request | session_reply | data | ping | service_inform | feedback_step | feedback_result | event | ai_event | directive.
-type '$msg'() :: auth_request() | auth_reply() | activate_push() | session_request() | session_reply() | data() | ping() | service_inform() | feedback_step() | feedback_result() | event() | ai_event() | directive().
-export_type(['$msg_name'/0, '$msg'/0]).
-record('map<string,string>',{key, value}).
@ -111,6 +113,7 @@ encode_msg(Msg, MsgName, Opts) ->
case MsgName of
auth_request -> encode_msg_auth_request(id(Msg, TrUserData), TrUserData);
auth_reply -> encode_msg_auth_reply(id(Msg, TrUserData), TrUserData);
activate_push -> encode_msg_activate_push(id(Msg, TrUserData), TrUserData);
session_request -> encode_msg_session_request(id(Msg, TrUserData), TrUserData);
session_reply -> encode_msg_session_reply(id(Msg, TrUserData), TrUserData);
data -> encode_msg_data(id(Msg, TrUserData), TrUserData);
@ -212,6 +215,20 @@ encode_msg_auth_reply(#auth_reply{code = F1, message = F2, repository_url = F3},
end
end.
encode_msg_activate_push(Msg, TrUserData) -> encode_msg_activate_push(Msg, <<>>, TrUserData).
encode_msg_activate_push(#activate_push{auth = F1}, Bin, TrUserData) ->
if F1 == undefined -> Bin;
true ->
begin
TrF1 = id(F1, TrUserData),
if TrF1 =:= false -> Bin;
true -> e_type_bool(TrF1, <<Bin/binary, 8>>, TrUserData)
end
end
end.
encode_msg_session_request(_Msg, _TrUserData) -> <<>>.
encode_msg_session_reply(Msg, TrUserData) -> encode_msg_session_reply(Msg, <<>>, TrUserData).
@ -837,6 +854,7 @@ 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(activate_push, Bin, TrUserData) -> id(decode_msg_activate_push(Bin, TrUserData), TrUserData);
decode_msg_2_doit(session_request, Bin, TrUserData) -> id(decode_msg_session_request(Bin, TrUserData), TrUserData);
decode_msg_2_doit(session_reply, Bin, TrUserData) -> id(decode_msg_session_reply(Bin, TrUserData), TrUserData);
decode_msg_2_doit(data, Bin, TrUserData) -> id(decode_msg_data(Bin, TrUserData), TrUserData);
@ -980,6 +998,50 @@ skip_32_auth_reply(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserDat
skip_64_auth_reply(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> dfp_read_field_def_auth_reply(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData).
decode_msg_activate_push(Bin, TrUserData) -> dfp_read_field_def_activate_push(Bin, 0, 0, 0, id(false, TrUserData), TrUserData).
dfp_read_field_def_activate_push(<<8, Rest/binary>>, Z1, Z2, F, F@_1, TrUserData) -> d_field_activate_push_auth(Rest, Z1, Z2, F, F@_1, TrUserData);
dfp_read_field_def_activate_push(<<>>, 0, 0, _, F@_1, _) -> #activate_push{auth = F@_1};
dfp_read_field_def_activate_push(Other, Z1, Z2, F, F@_1, TrUserData) -> dg_read_field_def_activate_push(Other, Z1, Z2, F, F@_1, TrUserData).
dg_read_field_def_activate_push(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, TrUserData) when N < 32 - 7 -> dg_read_field_def_activate_push(Rest, N + 7, X bsl N + Acc, F, F@_1, TrUserData);
dg_read_field_def_activate_push(<<0:1, X:7, Rest/binary>>, N, Acc, _, F@_1, TrUserData) ->
Key = X bsl N + Acc,
case Key of
8 -> d_field_activate_push_auth(Rest, 0, 0, 0, F@_1, TrUserData);
_ ->
case Key band 7 of
0 -> skip_varint_activate_push(Rest, 0, 0, Key bsr 3, F@_1, TrUserData);
1 -> skip_64_activate_push(Rest, 0, 0, Key bsr 3, F@_1, TrUserData);
2 -> skip_length_delimited_activate_push(Rest, 0, 0, Key bsr 3, F@_1, TrUserData);
3 -> skip_group_activate_push(Rest, 0, 0, Key bsr 3, F@_1, TrUserData);
5 -> skip_32_activate_push(Rest, 0, 0, Key bsr 3, F@_1, TrUserData)
end
end;
dg_read_field_def_activate_push(<<>>, 0, 0, _, F@_1, _) -> #activate_push{auth = F@_1}.
d_field_activate_push_auth(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, TrUserData) when N < 57 -> d_field_activate_push_auth(Rest, N + 7, X bsl N + Acc, F, F@_1, TrUserData);
d_field_activate_push_auth(<<0:1, X:7, Rest/binary>>, N, Acc, F, _, TrUserData) ->
{NewFValue, RestF} = {id(X bsl N + Acc =/= 0, TrUserData), Rest},
dfp_read_field_def_activate_push(RestF, 0, 0, F, NewFValue, TrUserData).
skip_varint_activate_push(<<1:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, TrUserData) -> skip_varint_activate_push(Rest, Z1, Z2, F, F@_1, TrUserData);
skip_varint_activate_push(<<0:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, TrUserData) -> dfp_read_field_def_activate_push(Rest, Z1, Z2, F, F@_1, TrUserData).
skip_length_delimited_activate_push(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, TrUserData) when N < 57 -> skip_length_delimited_activate_push(Rest, N + 7, X bsl N + Acc, F, F@_1, TrUserData);
skip_length_delimited_activate_push(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, TrUserData) ->
Length = X bsl N + Acc,
<<_:Length/binary, Rest2/binary>> = Rest,
dfp_read_field_def_activate_push(Rest2, 0, 0, F, F@_1, TrUserData).
skip_group_activate_push(Bin, _, Z2, FNum, F@_1, TrUserData) ->
{_, Rest} = read_group(Bin, FNum),
dfp_read_field_def_activate_push(Rest, 0, Z2, FNum, F@_1, TrUserData).
skip_32_activate_push(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, TrUserData) -> dfp_read_field_def_activate_push(Rest, Z1, Z2, F, F@_1, TrUserData).
skip_64_activate_push(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, TrUserData) -> dfp_read_field_def_activate_push(Rest, Z1, Z2, F, F@_1, TrUserData).
decode_msg_session_request(Bin, TrUserData) -> dfp_read_field_def_session_request(Bin, 0, 0, 0, TrUserData).
dfp_read_field_def_session_request(<<>>, 0, 0, _, _) -> #session_request{};
@ -1856,6 +1918,7 @@ merge_msgs(Prev, New, MsgName, Opts) ->
case MsgName of
auth_request -> merge_msg_auth_request(Prev, New, TrUserData);
auth_reply -> merge_msg_auth_reply(Prev, New, TrUserData);
activate_push -> merge_msg_activate_push(Prev, New, TrUserData);
session_request -> merge_msg_session_request(Prev, New, TrUserData);
session_reply -> merge_msg_session_reply(Prev, New, TrUserData);
data -> merge_msg_data(Prev, New, TrUserData);
@ -1906,6 +1969,13 @@ merge_msg_auth_reply(#auth_reply{code = PFcode, message = PFmessage, repository_
true -> NFrepository_url
end}.
-compile({nowarn_unused_function,merge_msg_activate_push/3}).
merge_msg_activate_push(#activate_push{auth = PFauth}, #activate_push{auth = NFauth}, _) ->
#activate_push{auth =
if NFauth =:= undefined -> PFauth;
true -> NFauth
end}.
-compile({nowarn_unused_function,merge_msg_session_request/3}).
merge_msg_session_request(_Prev, New, _TrUserData) -> New.
@ -2131,6 +2201,7 @@ verify_msg(Msg, MsgName, Opts) ->
case MsgName of
auth_request -> v_msg_auth_request(Msg, [MsgName], TrUserData);
auth_reply -> v_msg_auth_reply(Msg, [MsgName], TrUserData);
activate_push -> v_msg_activate_push(Msg, [MsgName], TrUserData);
session_request -> v_msg_session_request(Msg, [MsgName], TrUserData);
session_reply -> v_msg_session_reply(Msg, [MsgName], TrUserData);
data -> v_msg_data(Msg, [MsgName], TrUserData);
@ -2181,6 +2252,15 @@ v_msg_auth_reply(#auth_reply{code = F1, message = F2, repository_url = F3}, Path
ok;
v_msg_auth_reply(X, Path, _TrUserData) -> mk_type_error({expected_msg, auth_reply}, X, Path).
-compile({nowarn_unused_function,v_msg_activate_push/3}).
-dialyzer({nowarn_function,v_msg_activate_push/3}).
v_msg_activate_push(#activate_push{auth = F1}, Path, TrUserData) ->
if F1 == undefined -> ok;
true -> v_type_bool(F1, [auth | Path], TrUserData)
end,
ok;
v_msg_activate_push(X, Path, _TrUserData) -> mk_type_error({expected_msg, activate_push}, X, Path).
-compile({nowarn_unused_function,v_msg_session_request/3}).
-dialyzer({nowarn_function,v_msg_session_request/3}).
v_msg_session_request(#session_request{}, _Path, _) -> ok;
@ -2518,6 +2598,7 @@ get_msg_defs() ->
[#field{name = code, fnum = 1, rnum = 2, type = uint32, occurrence = optional, opts = []},
#field{name = message, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []},
#field{name = repository_url, fnum = 3, rnum = 4, type = string, occurrence = optional, opts = []}]},
{{msg, activate_push}, [#field{name = auth, fnum = 1, rnum = 2, type = bool, occurrence = optional, opts = []}]},
{{msg, session_request}, []},
{{msg, session_reply}, [#field{name = a, fnum = 1, rnum = 2, type = bool, occurrence = optional, opts = []}]},
{{msg, data},
@ -2565,13 +2646,13 @@ get_msg_defs() ->
#field{name = directive, fnum = 5, rnum = 6, type = bytes, occurrence = optional, opts = []}]}].
get_msg_names() -> [auth_request, auth_reply, session_request, session_reply, data, ping, service_inform, feedback_step, feedback_result, event, ai_event, directive].
get_msg_names() -> [auth_request, auth_reply, activate_push, session_request, session_reply, data, ping, service_inform, feedback_step, feedback_result, event, ai_event, directive].
get_group_names() -> [].
get_msg_or_group_names() -> [auth_request, auth_reply, session_request, session_reply, data, ping, service_inform, feedback_step, feedback_result, event, ai_event, directive].
get_msg_or_group_names() -> [auth_request, auth_reply, activate_push, session_request, session_reply, data, ping, service_inform, feedback_step, feedback_result, event, ai_event, directive].
get_enum_names() -> [].
@ -2598,6 +2679,7 @@ 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 = []},
#field{name = repository_url, fnum = 3, rnum = 4, type = string, occurrence = optional, opts = []}];
find_msg_def(activate_push) -> [#field{name = auth, fnum = 1, rnum = 2, type = bool, occurrence = optional, opts = []}];
find_msg_def(session_request) -> [];
find_msg_def(session_reply) -> [#field{name = a, fnum = 1, rnum = 2, type = bool, occurrence = optional, opts = []}];
find_msg_def(data) ->
@ -2703,6 +2785,7 @@ 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(<<"ActivatePush">>) -> activate_push;
fqbin_to_msg_name(<<"SessionRequest">>) -> session_request;
fqbin_to_msg_name(<<"SessionReply">>) -> session_reply;
fqbin_to_msg_name(<<"Data">>) -> data;
@ -2718,6 +2801,7 @@ 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(activate_push) -> <<"ActivatePush">>;
msg_name_to_fqbin(session_request) -> <<"SessionRequest">>;
msg_name_to_fqbin(session_reply) -> <<"SessionReply">>;
msg_name_to_fqbin(data) -> <<"Data">>;
@ -2766,7 +2850,7 @@ get_all_source_basenames() -> ["message_pb.proto"].
get_all_proto_names() -> ["message_pb"].
get_msg_containment("message_pb") -> [ai_event, auth_reply, auth_request, data, directive, event, feedback_result, feedback_step, ping, service_inform, session_reply, session_request];
get_msg_containment("message_pb") -> [ai_event, activate_push, auth_reply, auth_request, data, directive, event, feedback_result, feedback_step, ping, service_inform, session_reply, session_request];
get_msg_containment(P) -> error({gpb_error, {badproto, P}}).
@ -2795,6 +2879,7 @@ get_proto_by_msg_name_as_fqbin(<<"AuthRequest">>) -> "message_pb";
get_proto_by_msg_name_as_fqbin(<<"AIEvent">>) -> "message_pb";
get_proto_by_msg_name_as_fqbin(<<"Directive">>) -> "message_pb";
get_proto_by_msg_name_as_fqbin(<<"Ping">>) -> "message_pb";
get_proto_by_msg_name_as_fqbin(<<"ActivatePush">>) -> "message_pb";
get_proto_by_msg_name_as_fqbin(<<"SessionReply">>) -> "message_pb";
get_proto_by_msg_name_as_fqbin(<<"AuthReply">>) -> "message_pb";
get_proto_by_msg_name_as_fqbin(<<"ServiceInform">>) -> "message_pb";