处理响应数据

This commit is contained in:
anlicheng 2023-06-14 19:41:32 +08:00
parent 60530aac02
commit 360d47d60c
6 changed files with 63 additions and 178 deletions

View File

@ -111,12 +111,12 @@ handle_request("POST", "/host/activate", _, #{<<"uuid">> := UUID, <<"auth">> :=
lager:debug("[host_handler] activate host_id: ~p, failed with reason: ~p", [UUID, Reason]),
{ok, 200, iot_util:json_error(400, <<"host not found">>)};
{ok, Pid} when is_pid(Pid) ->
lager:debug("[host_handler] reload host_id: ~p, success", [UUID]),
lager:debug("[host_handler] activate host_id: ~p, start", [UUID]),
%%
{ok, Assoc, ReplyTopic} = iot_mqtt_reply_subscriber:make_assoc(UUID),
{ok, Assoc, Aes, ReplyTopic} = iot_host:make_assoc(Pid),
Reply = case Auth of
true ->
#{<<"auth">> => true, <<"aes">> => iot_host:get_aes(Pid), <<"reply">> => #{<<"topic">> => ReplyTopic, <<"assoc">> => Assoc}};
#{<<"auth">> => true, <<"aes">> => Aes, <<"reply">> => #{<<"topic">> => ReplyTopic, <<"assoc">> => Assoc}};
false ->
#{<<"auth">> => false, <<"aes">> => <<"">>, <<"reply">> => #{ <<"topic">> => ReplyTopic, <<"assoc">> => Assoc}}
end,

View File

@ -18,7 +18,7 @@
%% API
-export([start_link/2, get_name/1, get_pid/1, handle/2, reload/1, activate/1]).
-export([get_metric/1, build_command/3, downstream_topic/1, upstream_topic/1, get_aes/1]).
-export([get_metric/1, build_command/3, downstream_topic/1, upstream_topic/1, get_aes/1, make_assoc/1]).
%% gen_server callbacks
-export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2, code_change/3]).
@ -46,7 +46,12 @@
is_activated :: boolean(),
%%
has_session = false :: boolean()
has_session = false :: boolean(),
%% id
increment_id = 1,
%%
assoc_map = #{}
}).
%%%===================================================================
@ -84,6 +89,10 @@ reload(Pid) when is_pid(Pid) ->
get_aes(Pid) when is_pid(Pid) ->
gen_server:call(Pid, get_aes).
-spec make_assoc(Pid :: pid()) -> {ok, Assoc :: binary(), Aes :: binary(), Topic :: binary()}.
make_assoc(Pid) when is_pid(Pid) ->
gen_server:call(Pid, {make_assoc, self()}).
%%
-spec activate(Pid :: pid()) -> ok.
activate(Pid) when is_pid(Pid) ->
@ -142,6 +151,12 @@ handle_call(get_metric, _From, State = #state{metrics = Metrics}) ->
handle_call(get_aes, _From, State = #state{aes = Aes}) ->
{reply, {ok, Aes}, State};
handle_call({make_assoc, ReceivePid}, _From, State = #state{uuid = UUID, increment_id = IncrementId, assoc_map = AssocMap, aes = Aes}) ->
BinIncrementId = erlang:integer_to_binary(IncrementId),
Assoc = <<UUID/binary, ":assoc:", BinIncrementId/binary>>,
{reply, {ok, Assoc, Aes, upstream_topic(UUID)}, State#state{assoc_map = maps:put(Assoc, ReceivePid, AssocMap), increment_id = IncrementId + 1}};
%%
handle_call(reload, _From, State = #state{uuid = UUID}) ->
%%
@ -294,6 +309,16 @@ handle_message(#{<<"method">> := <<"ping">>, <<"params">> := CipherMetric}, Stat
lager:debug("[iot_host] host_id uuid: ~p, get ping: ~p", [UUID, Metrics]),
State#state{metrics = Metrics};
%% , : {"code": 0|1, "message": "", "assoc": string}
handle_message(Msg = #{<<"code">> := _Code, <<"assoc">> := Assoc}, State = #state{assoc_map = AssocMap}) ->
case maps:take(Assoc, AssocMap) of
error ->
{noreply, State};
{ReceiverPid, NAssocMap} ->
ReceiverPid ! {host_reply, Assoc, Msg},
{noreply, State#state{assoc_map = NAssocMap}}
end;
handle_message(Message, State = #state{uuid = UUID, has_session = HasSession}) ->
lager:warning("[iot_host] host_id uuid: ~p, get a unknown message: ~p, session: ~p", [UUID, Message, HasSession]),
State.

View File

@ -1,156 +0,0 @@
%%%-------------------------------------------------------------------
%%% @author aresei
%%% @copyright (C) 2023, <COMPANY>
%%% @doc
%%% 1.
%%% 2. host进程不能直接去监听topic线
%%% @end
%%% Created : 12. 3 2023 21:27
%%%-------------------------------------------------------------------
-module(iot_mqtt_reply_subscriber).
-author("aresei").
-include("iot.hrl").
-behaviour(gen_server).
%% API
-export([start_link/0]).
-export([make_assoc/1]).
%% gen_server callbacks
-export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2, code_change/3]).
-define(SERVER, ?MODULE).
%%
-define(Topic, <<"host/reply">>).
-record(state, {
conn_pid :: pid(),
%%
assoc_map = #{},
%% id
increment_id = 1
}).
%%%===================================================================
%%% API
%%%===================================================================
make_assoc(UUID) when is_binary(UUID) ->
gen_server:call(?MODULE, {make_assoc, UUID, self()}).
%% @doc Spawns the server and registers the local name (unique)
-spec(start_link() ->
{ok, Pid :: pid()} | ignore | {error, Reason :: term()}).
start_link() ->
gen_server:start_link({local, ?MODULE}, ?MODULE, [], []).
%%%===================================================================
%%% gen_server callbacks
%%%===================================================================
%% @private
%% @doc Initializes the server
-spec(init(Args :: term()) ->
{ok, State :: #state{}} | {ok, State :: #state{}, timeout() | hibernate} |
{stop, Reason :: term()} | ignore).
init([]) ->
%% emqx服务器的连接
Opts = iot_config:emqt_opts(<<"reply-subscriber">>),
{ok, ConnPid} = emqtt:start_link(Opts),
%% host相关的全部事件
{ok, _} = emqtt:connect(ConnPid),
lager:debug("[iot_mqtt_reply_subscriber] connect success, pid: ~p", [ConnPid]),
SubscribeResult = emqtt:subscribe(ConnPid, [{?Topic, 1}]),
lager:debug("[iot_mqtt_reply_subscriber] subscribe topics: ~p, result is: ~p", [?Topic, SubscribeResult]),
{ok, #state{conn_pid = ConnPid}}.
%% @private
%% @doc Handling call messages
-spec(handle_call(Request :: term(), From :: {pid(), Tag :: term()},
State :: #state{}) ->
{reply, Reply :: term(), NewState :: #state{}} |
{reply, Reply :: term(), NewState :: #state{}, timeout() | hibernate} |
{noreply, NewState :: #state{}} |
{noreply, NewState :: #state{}, timeout() | hibernate} |
{stop, Reason :: term(), Reply :: term(), NewState :: #state{}} |
{stop, Reason :: term(), NewState :: #state{}}).
handle_call({make_assoc, UUID, ReceivePid}, _From, State = #state{increment_id = IncrementId, assoc_map = AssocMap}) ->
BinIncrementId = erlang:integer_to_binary(IncrementId),
Assoc = <<UUID/binary, ":assoc:", BinIncrementId/binary>>,
{reply, {ok, Assoc, ?Topic}, State#state{assoc_map = maps:put(Assoc, ReceivePid, AssocMap)}}.
%% @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(_Request, State = #state{}) ->
{noreply, State}.
%% @private
%% @doc Handling all non call/cast messages
-spec(handle_info(Info :: timeout() | term(), State :: #state{}) ->
{noreply, NewState :: #state{}} |
{noreply, NewState :: #state{}, timeout() | hibernate} |
{stop, Reason :: term(), NewState :: #state{}}).
handle_info({disconnect, ReasonCode, Properties}, State = #state{}) ->
lager:debug("[iot_mqtt_reply_subscriber] Recv a DISONNECT packet - ReasonCode: ~p, Properties: ~p", [ReasonCode, Properties]),
{stop, disconnected, State};
handle_info({publish, #{payload := Payload, qos := Qos, topic := ?Topic}}, State = #state{assoc_map = AssocMap}) ->
lager:debug("[iot_mqtt_reply_subscriber] Recv a reply packet: ~p, qos: ~p", [Payload, Qos]),
case catch jiffy:decode(Payload, [return_maps]) of
Msg = #{<<"assoc">> := Assoc} ->
case maps:take(Assoc, AssocMap) of
error ->
{noreply, State};
{ReceiverPid, NAssocMap} ->
ReceiverPid ! {host_reply, Assoc, Msg},
{noreply, State#state{assoc_map = NAssocMap}}
end;
_ ->
{noreply, State}
end;
handle_info({puback, Packet = #{packet_id := _PacketId}}, State = #state{}) ->
lager:debug("[iot_mqtt_reply_subscriber] receive puback packet: ~p", [Packet]),
{noreply, State};
handle_info(Info, State = #state{}) ->
lager:debug("[iot_mqtt_reply_subscriber] get info: ~p", [Info]),
{noreply, State}.
%% @private
%% @doc This function is called by a gen_server when it is about to
%% terminate. It should be the opposite of Module:init/1 and do any
%% necessary cleaning up. When it returns, the gen_server terminates
%% with Reason. The return value is ignored.
-spec(terminate(Reason :: (normal | shutdown | {shutdown, term()} | term()),
State :: #state{}) -> term()).
terminate(Reason, _State = #state{conn_pid = ConnPid}) when is_pid(ConnPid) ->
%% topic的订阅
{ok, _Props, _ReasonCode} = emqtt:unsubscribe(ConnPid, #{}, ?Topic),
ok = emqtt:disconnect(ConnPid),
lager:debug("[iot_mqtt_reply_subscriber] terminate with reason: ~p", [Reason]),
ok;
terminate(Reason, _State) ->
lager:debug("[iot_mqtt_reply_subscriber] terminate with reason: ~p", [Reason]),
ok.
%% @private
%% @doc Convert process state when code is changed
-spec(code_change(OldVsn :: term() | {down, term()}, State :: #state{},
Extra :: term()) ->
{ok, NewState :: #state{}} | {error, Reason :: term()}).
code_change(_OldVsn, State = #state{}, _Extra) ->
{ok, State}.
%%%===================================================================
%%% Internal functions
%%%===================================================================

View File

@ -46,15 +46,6 @@ init([]) ->
modules => ['iot_mqtt_subscriber']
},
#{
id => 'iot_mqtt_reply_subscriber',
start => {'iot_mqtt_reply_subscriber', start_link, []},
restart => permanent,
shutdown => 2000,
type => worker,
modules => ['iot_mqtt_reply_subscriber']
},
#{
id => 'iot_mqtt_sys_subscriber',
start => {'iot_mqtt_sys_subscriber', start_link, []},

View File

@ -153,7 +153,7 @@ handle_info({disconnect, ReasonCode, Properties}, State = #state{}) ->
{stop, disconnected, State};
%% json反序列需要在host进程进行
handle_info({publish, #{payload := Payload, qos := Qos, topic := FromTopic}},
State = #state{topic = Topic, pub_key = PubKey, pri_key = PrivateKey}) ->
State = #state{topic = Topic, pub_key = PubKey, pri_key = PrivateKey, aes = Aes0}) ->
lager:debug("[host_mocker] Recv a publish packet: ~p, qos: ~p, from topic: ~p", [Payload, Qos, FromTopic]),
case Payload of
@ -182,8 +182,23 @@ handle_info({publish, #{payload := Payload, qos := Qos, topic := FromTopic}},
end,
{noreply, State};
<<Type:8, Command0/binary>> ->
%% 10rsa加密的数据aesaes加密的
<<10:8, Command0/binary>> ->
Command = iot_cipher_rsa:decode(Command0, PrivateKey),
case jiffy:decode(Command, [return_maps]) of
#{<<"aes">> := Aes, <<"a">> := true} ->
%% ping
% erlang:start_timer(?TICKER_INTERVAL, self(), ping_ticker),
%%
% erlang:start_timer(?TICKER_INTERVAL + 1000, self(), data_ticker),
{noreply, State#state{aes = Aes}};
_ ->
lager:debug("[host_mocker] auth failed")
end;
<<Type:8, Command0/binary>> ->
Command = iot_cipher_aes:decrypt(Aes0, Command0),
CommandJson = jiffy:decode(Command, [return_maps]),
lager:debug("[host_mocker] get command: ~p, json: ~p, type: ~p", [Command, CommandJson, Type]),
@ -308,12 +323,20 @@ code_change(_OldVsn, State = #state{}, _Extra) ->
%%% Internal functions
%%%===================================================================
handle_command(10, #{<<"aes">> := Aes, <<"a">> := true}, State) ->
%% ping
erlang:start_timer(?TICKER_INTERVAL, self(), ping_ticker),
handle_command(8, #{<<"aes">> := Aes, <<"auth">> := true, <<"reply">> := #{<<"topic">> := Topic, <<"assoc">> := Assoc}}, State) ->
Msg = jiffy:encode(#{
<<"code">> => 1,
<<"message">> => "",
<<"assoc">> => Assoc
}, [force_utf8]),
%%
erlang:start_timer(?TICKER_INTERVAL + 1000, self(), data_ticker),
{ok, Ref} = iot_mqtt_publisher:publish(Topic, Msg, 1),
receive
{ok, Ref, PacketId} ->
lager:debug("[host_mocker] send reply success, packet_id: ~p", [PacketId]);
{error, Reason} ->
lager:debug("[host_mocker] send reply failed, reason: ~p", [Reason])
end,
State#state{aes = Aes}.

View File

@ -74,6 +74,8 @@ t = 8
```json
// 数据采用之前协商的aes加密
{
"auth": true/false, // true表示授权此时aes的值不为空false表示取消授权
"aes": "",
@ -87,7 +89,7 @@ t = 8
{
"code": 0 | 1, // 0表示操作失败1表示成功
messge: "",
message: "",
assoc: "下发给你值"
}