From f810d8dd6496da713e7c70a5e146120de3695774 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Fri, 21 Sep 2018 14:04:20 +0200 Subject: Add the {active, boolean()} Websocket command This command is currently not documented. It allows disabling the reading of incoming data from the socket, and can be used as a poor man's flow control. --- test/handlers/ws_active_commands_h.erl | 30 ++++++++++++++++++++++++++++++ test/ws_handler_SUITE.erl | 14 +++++++++++++- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 test/handlers/ws_active_commands_h.erl (limited to 'test') diff --git a/test/handlers/ws_active_commands_h.erl b/test/handlers/ws_active_commands_h.erl new file mode 100644 index 0000000..4cdb3b1 --- /dev/null +++ b/test/handlers/ws_active_commands_h.erl @@ -0,0 +1,30 @@ +%% This module takes commands from the x-commands header +%% and returns them in the websocket_init/1 callback. + +-module(ws_active_commands_h). +-behavior(cowboy_websocket). + +-export([init/2]). +-export([websocket_init/1]). +-export([websocket_handle/2]). +-export([websocket_info/2]). + +init(Req, RunOrHibernate) -> + {cowboy_websocket, Req, RunOrHibernate}. + +websocket_init(State=run) -> + erlang:send_after(1500, self(), active_true), + {[{active, false}], State}; +websocket_init(State=hibernate) -> + erlang:send_after(1500, self(), active_true), + {[{active, false}], State, hibernate}. + +websocket_handle(Frame, State=run) -> + {[Frame], State}; +websocket_handle(Frame, State=hibernate) -> + {[Frame], State, hibernate}. + +websocket_info(active_true, State=run) -> + {[{active, true}], State}; +websocket_info(active_true, State=hibernate) -> + {[{active, true}], State, hibernate}. diff --git a/test/ws_handler_SUITE.erl b/test/ws_handler_SUITE.erl index 4848847..2caacca 100644 --- a/test/ws_handler_SUITE.erl +++ b/test/ws_handler_SUITE.erl @@ -26,6 +26,7 @@ all() -> [{group, ws}, {group, ws_hibernate}]. +%% @todo Test against HTTP/2 too. groups() -> AllTests = ct_helper:all(?MODULE), [{ws, [parallel], AllTests}, {ws_hibernate, [parallel], AllTests}]. @@ -48,7 +49,8 @@ init_dispatch(Name) -> cowboy_router:compile([{'_', [ {"/init", ws_init_commands_h, RunOrHibernate}, {"/handle", ws_handle_commands_h, RunOrHibernate}, - {"/info", ws_info_commands_h, RunOrHibernate} + {"/info", ws_info_commands_h, RunOrHibernate}, + {"/active", ws_active_commands_h, RunOrHibernate} ]}]). %% Support functions for testing using Gun. @@ -205,3 +207,13 @@ do_many_frames_then_close_frame(Config, Path) -> {ok, {binary, <<"Two frames!">>}} = receive_ws(ConnPid, StreamRef), {ok, close} = receive_ws(ConnPid, StreamRef), gun_down(ConnPid). + +websocket_active_false(Config) -> + doc("The {active, false} command stops receiving data from the socket. " + "The {active, true} command reenables it."), + {ok, ConnPid, StreamRef} = gun_open_ws(Config, "/active", []), + gun:ws_send(ConnPid, {text, <<"Not received until the handler enables active again.">>}), + {error, timeout} = receive_ws(ConnPid, StreamRef), + {ok, {text, <<"Not received until the handler enables active again.">>}} + = receive_ws(ConnPid, StreamRef), + ok. -- cgit v1.2.3