Merge pull request #134 from qzhuyan/dev/william/quicer-0.0.8

feat: bump to quicer 0.0.8

rebar.config

@@ -23,7 +23,7 @@
     [{test,
         [{deps,
             [{meck, "0.9.2"},
-             {emqx, {git_subdir, "https://github.com/emqx/emqx", {branch, "master"}, "apps/emqx"}},
+             {emqx, {git_subdir, "https://github.com/qzhuyan/emqx", {branch, "dev/william/5.0-quic-support-2"}, "apps/emqx"}},
              {emqx_ct_helpers,  {git, "https://github.com/emqx/emqx-ct-helpers", {branch, "hocon"}}}
             ]},
          {erl_opts, [debug_info]},

rebar.config.script

@@ -40,7 +40,7 @@ Profiles1 = lists:keystore(emqtt, 1, Profiles, {emqtt, NewRelx(emqtt, Profiles)}
 Profiles2 = lists:keystore(emqtt_pkg, 1, Profiles1, {emqtt_pkg, NewRelx(emqtt_pkg, Profiles1)}),
 NewConfig = lists:keystore(profiles, 1, CONFIG, {profiles, Profiles2}),
 
-Quicer = {quicer, {git, "https://github.com/emqx/quic.git", {tag, "0.0.6"}}},
+Quicer = {quicer, {git, "https://github.com/emqx/quic.git", {tag, "0.0.8"}}},
 ExtraDeps = fun(C) ->
                 {deps, Deps0} = lists:keyfind(deps, 1, C),
                     Deps = Deps0 ++

src/emqtt.erl

@@ -1067,11 +1067,18 @@ code_change(_Vsn, State, Data, _Extra) ->
 %%--------------------------------------------------------------------
 %% Internal functions
 %%--------------------------------------------------------------------
+should_ping(emqtt_quic, Sock) ->
+    case emqtt_quic:getstat(Sock, [send_cnt]) of
+        {ok, [{send_cnt, V}]} ->
+            V == put(quic_send_cnt, V) orelse V == undefined;
+        Err ->
+            Err
+    end;
 
 should_ping(ConnMod, Sock) ->
     case ConnMod:getstat(Sock, [send_oct]) of
         {ok, [{send_oct, Val}]} ->
-            OldVal = get(send_oct), put(send_oct, Val),
+            OldVal = put(send_oct, Val),
             OldVal == undefined orelse OldVal == Val;
         Error = {error, _Reason} ->
             Error

src/emqtt_quic.erl

@@ -28,8 +28,9 @@
         ]).
 
 connect(Host, Port, Opts, Timeout) ->
+    KeepAlive =  proplists:get_value(keepalive, Opts, 60),
     ConnOpts = [ {alpn, ["mqtt"]}
-               , {idle_timeout_ms, 60000}
+               , {idle_timeout_ms, timer:seconds(KeepAlive * 3)}
                , {peer_unidi_stream_count, 1}
                , {peer_bidi_stream_count, 10}
                | Opts],
@@ -58,7 +59,7 @@ setopts(Stream, Opts) ->
     ok.
 
 close(Stream) ->
-    quicer:async_close_stream(Stream).
+    quicer:close_stream(Stream, 1000).
 
 sockname(H) ->
     quicer:sockname(H).

test/emqtt_SUITE.erl

@@ -58,7 +58,7 @@ groups() ->
       [basic_test_v3]},
     {mqttv4, [non_parallel_tests],
       [basic_test_v4,
-       anonymous_test,
+       %% anonymous_test,
        retry_interval_test,
        will_message_test,
        will_retain_message_test,
@@ -321,21 +321,24 @@ basic_test_v3(_Config) ->
 basic_test_v4(_Config) ->
     basic_test([{proto_ver, v4}]).
 
-anonymous_test(_Config) ->
-    application:set_env(emqx, allow_anonymous, false),
 
-    process_flag(trap_exit, true),
-    {ok, C1} = emqtt:start_link(),
-    {_,{unauthorized_client,_}} = emqtt:connect(C1),
-    receive {'EXIT', _, _} -> ok
-    after 500 -> error("allow_anonymous")
-    end,
-    process_flag(trap_exit, false),
+%%$ NOTE,  Mask the test anonymous_test for emqx 5.0 since `auth' is moved out of emqx core app
 
-    application:set_env(emqx, allow_anonymous, true),
-    {ok, C2} = emqtt:start_link([{username, <<"test">>}, {password, <<"password">>}]),
-    {ok, _} = emqtt:connect(C2),
-    ok = emqtt:disconnect(C2).
+%% anonymous_test(_Config) ->
+%%     application:set_env(emqx, allow_anonymous, false),
+
+%%     process_flag(trap_exit, true),
+%%     {ok, C1} = emqtt:start_link(),
+%%     {_,{unauthorized_client,_}} = emqtt:connect(C1),
+%%     receive {'EXIT', _, _} -> ok
+%%     after 500 -> error("allow_anonymous")
+%%     end,
+%%     process_flag(trap_exit, false),
+
+%%     application:set_env(emqx, allow_anonymous, true),
+%%     {ok, C2} = emqtt:start_link([{username, <<"test">>}, {password, <<"password">>}]),
+%%     {ok, _} = emqtt:connect(C2),
+%%     ok = emqtt:disconnect(C2).
 
 retry_interval_test(_Config) ->
     {ok, Pub} = emqtt:start_link([{clean_start, true}, {retry_interval, 1}]),

test/quic_server.erl

@@ -36,6 +36,7 @@ server_loop(L) ->
     after 0 ->
             case quicer:accept(L, [], 30000) of
                 {ok, Conn} ->
+                    {ok, Conn} = quicer:handshake(Conn, 1000),
                     {ok, Stm} = quicer:accept_stream(Conn, []),
                     receive
                         {quic, <<"ping">>, _, _, _, _} ->