fix
This commit is contained in:
parent
6c204d8c36
commit
5be57b1ae3
@ -93,20 +93,17 @@ handle_call(_Request, _From, State) ->
|
||||
%% 发送消息, 基于pub/sub机制
|
||||
handle_cast({pub, Topic, Qos, Content}, State = #state{transport = Transport, socket = Socket}) ->
|
||||
Encoded = message_pb:encode_msg(#'Pub'{topic = Topic, qos = Qos, content = Content}),
|
||||
EncPub = <<?MESSAGE_PUB, Encoded/binary>>,
|
||||
Transport:send(Socket, <<?PACKET_CAST, EncPub/binary>>),
|
||||
Transport:send(Socket, <<?PACKET_CAST, ?MESSAGE_PUB, Encoded/binary>>),
|
||||
{noreply, State};
|
||||
|
||||
%% 发送Command消息
|
||||
handle_cast({command, CommandType, Command}, State = #state{transport = Transport, socket = Socket}) ->
|
||||
Encoded = message_pb:encode_msg(#'Command'{command_type = CommandType, command = Command}),
|
||||
EncCommand = <<?MESSAGE_COMMAND, Encoded/binary>>,
|
||||
Transport:send(Socket, <<?PACKET_CAST, EncCommand/binary>>),
|
||||
Transport:send(Socket, <<?PACKET_CAST, ?MESSAGE_COMMAND, Encoded/binary>>),
|
||||
{noreply, State};
|
||||
|
||||
%% 推送消息
|
||||
handle_cast({jsonrpc_call, ReceiverPid, Ref, {Method, Params}}, State = #state{transport = Transport, socket = Socket, packet_id = PacketId, inflight = Inflight})
|
||||
when is_binary(Method) ->
|
||||
handle_cast({jsonrpc_call, ReceiverPid, Ref, {Method, Params}}, State = #state{transport = Transport, socket = Socket, packet_id = PacketId, inflight = Inflight}) ->
|
||||
case next_packet_id(PacketId, Inflight) of
|
||||
{ok, NPacketId, NextPacketId} ->
|
||||
Encoded = message_pb:encode_msg(#'JsonRpcRequest'{
|
||||
@ -117,10 +114,8 @@ handle_cast({jsonrpc_call, ReceiverPid, Ref, {Method, Params}}, State = #state{t
|
||||
EncRequest = <<?MESSAGE_JSONRPC_REQUEST, Encoded/binary>>,
|
||||
TimerRef = erlang:start_timer(?INFLIGHT_TIMEOUT, self(), {jsonrpc_timeout, NPacketId}),
|
||||
Transport:send(Socket, <<?PACKET_REQUEST, NPacketId:32, EncRequest/binary>>),
|
||||
{noreply, State#state{
|
||||
packet_id = NextPacketId,
|
||||
inflight = maps:put(NPacketId, {ReceiverPid, Ref, TimerRef}, Inflight)
|
||||
}};
|
||||
|
||||
{noreply, State#state{packet_id = NextPacketId, inflight = maps:put(NPacketId, {ReceiverPid, Ref, TimerRef}, Inflight)}};
|
||||
{error, inflight_full} ->
|
||||
logger:warning("[ws_channel] uuid: ~p, inflight requests exhausted", [State#state.uuid]),
|
||||
{noreply, State}
|
||||
@ -176,22 +171,18 @@ handle_info({tcp, Socket, <<?PACKET_REQUEST, _PacketId:32, MsgType:8, _/binary>>
|
||||
{stop, State};
|
||||
|
||||
handle_info({tcp, Socket, <<?PACKET_CAST, ?MESSAGE_DATA, CastBin/binary>>}, State = #state{socket = Socket, host_pid = HostPid}) when is_pid(HostPid) ->
|
||||
CastMessage = message_pb:decode_msg(CastBin, 'Data'),
|
||||
case CastMessage of
|
||||
#'Data'{} = Data ->
|
||||
iot_host:handle(HostPid, {data, Data})
|
||||
end,
|
||||
Data = message_pb:decode_msg(CastBin, 'Data'),
|
||||
iot_host:handle(HostPid, {data, Data}),
|
||||
{noreply, State};
|
||||
|
||||
handle_info({tcp, Socket, <<?PACKET_CAST, ?MESSAGE_EVENT_STREAM, CastBin/binary>>}, State = #state{socket = Socket, host_pid = HostPid}) when is_pid(HostPid) ->
|
||||
CastMessage = message_pb:decode_msg(CastBin, 'TaskEventStream'),
|
||||
case CastMessage of
|
||||
#'TaskEventStream'{task_id = TaskId, type = Type0, stream = Reason0} when Type0 =:= <<"close">>; Type0 =:= [<<"close">>] ->
|
||||
#'TaskEventStream'{task_id = TaskId, type = Type0, stream = Reason0} when Type0 =:= <<"close">> ->
|
||||
iot_event_stream_observer:stream_close(TaskId, iolist_to_binary(Reason0));
|
||||
#'TaskEventStream'{task_id = TaskId, type = Type, stream = Stream} ->
|
||||
TypeBin = iolist_to_binary(Type),
|
||||
StreamBin = iolist_to_binary(Stream),
|
||||
logger:debug("[tcp_channel] get task_id: ~p, type: ~ts, stream: ~ts", [TaskId, TypeBin, StreamBin]),
|
||||
iot_event_stream_observer:stream_data(TaskId, TypeBin, StreamBin)
|
||||
logger:debug("[tcp_channel] get task_id: ~p, type: ~ts, stream: ~ts", [TaskId, Type, Stream]),
|
||||
iot_event_stream_observer:stream_data(TaskId, Type, Stream)
|
||||
end,
|
||||
{noreply, State};
|
||||
handle_info({tcp, Socket, <<?PACKET_CAST, MsgType:8, _/binary>>}, State = #state{socket = Socket}) ->
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user