feat(listener): enforce reload conn and stream opts (#346)

* feat(listener): support reload conn and stream opts

* chore: listener_opts type

Author: qzhuyan

src/quicer.erl

@@ -184,8 +184,7 @@
     probe_res/0
 ]).
 
--type connection_opts() :: proplists:proplist() | conn_opts().
--type listener_opts() :: proplists:proplist() | listen_opts().
+-type listener_opts() :: quicer_listener:listener_opts().
 
 %% @doc Return ABI version of the library.
 -spec abi_version() -> quicer_nif:abi_version().
@@ -316,7 +315,7 @@ stop_listener(Handle) ->
 -spec spawn_listener(
     Appname :: atom() | listener_handle(),
     listen_on(),
-    {listener_opts(), connection_opts(), stream_opts() | user_opts()}
+    listener_opts()
 ) ->
     {ok, pid()} | {error, any()}.
 spawn_listener(AppName, Port, Options) when is_atom(AppName) ->

src/quicer_listener.erl

@@ -17,6 +17,8 @@
 
 -behaviour(gen_server).
 
+-include("quicer_types.hrl").
+
 %% API
 -export([
     start_link/3,
@@ -49,10 +51,19 @@
     opts_tab :: ets:tid()
 }).
 
--export_type([listener_name/0]).
+-export_type([
+    listener_name/0,
+    listener_opts/0
+]).
 
 -type listener_name() :: atom().
 
+-type listener_opts() :: {
+    listen_opts() | proplists:proplist(),
+    conn_opts() | proplists:proplist(),
+    stream_opts() | proplists:proplist()
+}.
+
 %%%===================================================================
 %%% API
 %%%===================================================================
@@ -101,7 +112,7 @@ reload(Pid, NewConf) ->
 %% @NOTE: the acceptor opts and stream opts are not reloaded.
 %%%       if you want to reload them, you should restart the listener (terminate and spawn).
 %% @end
--spec reload(pid(), quicer:listen_on(), NewConf :: map() | {map(), map(), map()}) ->
+-spec reload(pid(), quicer:listen_on(), NewConf :: listener_opts()) ->
     ok | {error, _}.
 reload(Pid, ListenOn, NewConf) ->
     gen_server:call(Pid, {reload, ListenOn, NewConf}, infinity).
@@ -116,7 +127,7 @@ count_conns(Pid) ->
     gen_server:call(Pid, count_conns, infinity).
 
 %% @doc get the listener configuration
--spec get_conf(pid(), timeout()) -> {map(), map(), map()}.
+-spec get_conf(pid(), timeout()) -> listener_opts().
 get_conf(Pid, Timeout) ->
     gen_server:call(Pid, get_conf, Timeout).
 
@@ -262,14 +273,14 @@ terminate(_Reason, #state{listener = L}) ->
     _ = quicer:close_listener(L),
     ok.
 
--spec do_reload(quicer:listen_on(), map() | {map(), map(), map()}, #state{}) ->
+-spec do_reload(quicer:listen_on(), listener_opts(), #state{}) ->
     {ok | {error, any()}, #state{}}.
-do_reload(ListenOn, NewConf, #state{opts_tab = OptsTab} = State) ->
+do_reload(ListenOn, {LOpts, _, _} = NewConf, #state{opts_tab = OptsTab} = State) ->
     _ = quicer:stop_listener(State#state.listener),
     Res = quicer:start_listener(
         State#state.listener,
         ListenOn,
-        NewConf
+        LOpts
     ),
     case Res of
         ok ->
@@ -291,9 +302,7 @@ conf_tab_refresh(Tab, {LOpts, COpts, SOpts}) ->
         {l_opts, to_map(LOpts)},
         {c_opts, to_map(COpts)},
         {s_opts, to_map(SOpts)}
-    ]);
-conf_tab_refresh(Tab, LOpts) ->
-    ets:insert(Tab, {l_opts, to_map(LOpts)}).
+    ]).
 
 to_map(Opts) when is_list(Opts) ->
     maps:from_list(Opts);

test/quicer_listener_SUITE.erl

@@ -528,7 +528,7 @@ tc_listener_conf_reload(Config) ->
         {cacertfile, filename:join(DataDir, "other-ca.pem")}
     ],
     NewListenerOpts = ListenerOpts ++ NewCerts,
-    ok = quicer_listener:reload(QuicApp, NewListenerOpts),
+    ok = quicer_listener:reload(QuicApp, {NewListenerOpts, ConnectionOpts, StreamOpts}),
     %% THEN: the listener handle is unchanged
     ?assertEqual({ok, LHandle}, quicer_listener:get_handle(QuicApp, 5000)),
 
@@ -619,7 +619,7 @@ tc_listener_conf_reload_listen_on(Config) ->
     {ok, LHandle} = quicer_listener:get_handle(QuicApp, 5000),
     %% WHEN: the listener is reloaded with ListenOn (new bind address)
     NewPort = select_port(),
-    ok = quicer_listener:reload(QuicApp, NewPort, ListenerOpts),
+    ok = quicer_listener:reload(QuicApp, NewPort, Options),
     %% THEN: the listener handle is unchanged
     %%
     ?assertEqual({ok, LHandle}, quicer_listener:get_handle(QuicApp, 5000)),
@@ -702,7 +702,7 @@ tc_listener_conf_reload_listen_on_neg(Config) ->
     %% WHEN: the listener is reloaded with ListenOn (new invalid bind address)
     NewPort = 1,
     %% THEN: We get error
-    {error, _, _} = quicer_listener:reload(QuicApp, NewPort, ListenerOpts),
+    {error, _, _} = quicer_listener:reload(QuicApp, NewPort, Options),
     %% THEN: the listener handle is unchanged
     ?assertEqual({ok, LHandle}, quicer_listener:get_handle(QuicApp, 5000)),