umgeher/cowboy
0
Fork 0
mirror of https://github.com/ninenines/cowboy.git synced 2025-07-15 12:40:25 +00:00
Code Issues Wiki Activity

Allow websocket handlers to reply more than one frame

Browse source 
Instead of returning {text, Data}, you can now return
[{text, Data}, {text, Data2}, ...].
This commit is contained in:
Loïc Hoguin 2012-10-11 21:46:43 +02:00
parent 160063497c
commit 09914c4693
3 changed files with 166 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/cowboy_websocket.erl
View file

@ -450,11 +450,22 @@ handler_call(State=#state{handler=Handler, opts=Opts}, Req, HandlerState,
{ok, Req2, HandlerState2, hibernate} ->
NextState(State#state{hibernate=true},
Req2, HandlerState2, RemainingData);
{reply, Payload, Req2, HandlerState2} ->
websocket_send(Payload, State),
{reply, Payload, Req2, HandlerState2}
when is_tuple(Payload) ->
ok = websocket_send(Payload, State),
NextState(State, Req2, HandlerState2, RemainingData);
{reply, Payload, Req2, HandlerState2, hibernate} ->
websocket_send(Payload, State),
{reply, Payload, Req2, HandlerState2, hibernate}
when is_tuple(Payload) ->
ok = websocket_send(Payload, State),
NextState(State#state{hibernate=true},
Req2, HandlerState2, RemainingData);
{reply, Payload, Req2, HandlerState2}
when is_list(Payload) ->
ok = websocket_send_many(Payload, State),
NextState(State, Req2, HandlerState2, RemainingData);
{reply, Payload, Req2, HandlerState2, hibernate}
when is_list(Payload) ->
ok = websocket_send_many(Payload, State),
NextState(State#state{hibernate=true},
Req2, HandlerState2, RemainingData);
{shutdown, Req2, HandlerState2} ->
@ -471,14 +482,15 @@ handler_call(State=#state{handler=Handler, opts=Opts}, Req, HandlerState,
websocket_close(State, Req, HandlerState, {error, handler})
end.
-spec websocket_send(binary(), #state{}) -> closed | ignore.
-spec websocket_send({text | binary | ping | pong, binary()}, #state{})
-> ok | {error, atom()}.
%% hixie-76 text frame.
websocket_send({text, Payload}, #state{
socket=Socket, transport=Transport, version=0}) ->
Transport:send(Socket, [0, Payload, 255]);
%% Ignore all unknown frame types for compatibility with hixie 76.
websocket_send(_Any, #state{version=0}) ->
ignore;
ok;
websocket_send({Type, Payload}, #state{socket=Socket, transport=Transport}) ->
Opcode = case Type of
text -> 1;
@ -490,6 +502,14 @@ websocket_send({Type, Payload}, #state{socket=Socket, transport=Transport}) ->
Transport:send(Socket, [<< 1:1, 0:3, Opcode:4, 0:1, Len/bits >>,
Payload]).
-spec websocket_send_many([{text | binary | ping | pong, binary()}], #state{})
-> ok | {error, atom()}.
websocket_send_many([], _) ->
ok;
websocket_send_many([Frame|Tail], State) ->
ok = websocket_send(Frame, State),
websocket_send_many(Tail, State).
-spec websocket_close(#state{}, cowboy_req:req(), any(), {atom(), atom()})
-> closed.
websocket_close(State=#state{socket=Socket, transport=Transport, version=0},