diff --git a/apps/emqx/rebar.config.script b/apps/emqx/rebar.config.script index d68998c4c..8f9de344c 100644 --- a/apps/emqx/rebar.config.script +++ b/apps/emqx/rebar.config.script @@ -24,7 +24,7 @@ IsQuicSupp = fun() -> end, Bcrypt = {bcrypt, {git, "https://github.com/emqx/erlang-bcrypt.git", {tag, "0.6.0"}}}, -Quicer = {quicer, {git, "https://github.com/emqx/quic.git", {tag, "0.0.303"}}}. +Quicer = {quicer, {git, "https://github.com/emqx/quic.git", {tag, "0.0.308"}}}. Dialyzer = fun(Config) -> {dialyzer, OldDialyzerConfig} = lists:keyfind(dialyzer, 1, Config), diff --git a/apps/emqx/src/emqx_quic_connection.erl b/apps/emqx/src/emqx_quic_connection.erl index e081dc5cf..b75137e05 100644 --- a/apps/emqx/src/emqx_quic_connection.erl +++ b/apps/emqx/src/emqx_quic_connection.erl @@ -47,13 +47,15 @@ handle_info/2 ]). +-export_type([cb_state/0, cb_ret/0]). + -type cb_state() :: #{ %% connecion owner pid conn_pid := pid(), %% Pid of ctrl stream ctrl_pid := undefined | pid(), %% quic connecion handle - conn := undefined | quicer:conneciton_handle(), + conn := undefined | quicer:connection_handle(), %% Data streams that handoff from this process %% these streams could die/close without effecting the connecion/session. %@TODO type? @@ -85,7 +87,7 @@ init(#{stream_opts := SOpts} = S) when is_list(SOpts) -> init(ConnOpts) when is_map(ConnOpts) -> {ok, init_cb_state(ConnOpts)}. --spec closed(quicer:conneciton_handle(), quicer:conn_closed_props(), cb_state()) -> +-spec closed(quicer:connection_handle(), quicer:conn_closed_props(), cb_state()) -> {stop, normal, cb_state()}. closed(_Conn, #{is_peer_acked := _} = Prop, S) -> ?SLOG(debug, Prop), diff --git a/apps/emqx/src/emqx_quic_data_stream.erl b/apps/emqx/src/emqx_quic_data_stream.erl index 254e6e2a3..48d8ddd2e 100644 --- a/apps/emqx/src/emqx_quic_data_stream.erl +++ b/apps/emqx/src/emqx_quic_data_stream.erl @@ -124,7 +124,7 @@ send_complete(_Stream, false, S) -> send_complete(_Stream, true = _IsCanceled, S) -> {ok, S}. --spec send_shutdown_complete(stream_handle(), error_code(), cb_state()) -> cb_ret(). +-spec send_shutdown_complete(stream_handle(), IsGraceful :: boolean(), cb_state()) -> cb_ret(). send_shutdown_complete(_Stream, _Flags, S) -> {ok, S}. @@ -321,7 +321,7 @@ serialize_packet(Packet, Serialize) -> -spec init_state( quicer:stream_handle(), quicer:connection_handle(), - quicer:new_stream_props() + non_neg_integer() ) -> % @TODO map(). diff --git a/mix.exs b/mix.exs index d7aa8885f..21a07dee4 100644 --- a/mix.exs +++ b/mix.exs @@ -64,7 +64,7 @@ defmodule EMQXUmbrella.MixProject do {:pbkdf2, github: "emqx/erlang-pbkdf2", tag: "2.0.4", override: true}, # maybe forbid to fetch quicer {:emqtt, - github: "emqx/emqtt", tag: "1.10.0", override: true, system_env: maybe_no_quic_env()}, + github: "emqx/emqtt", tag: "1.10.1", override: true, system_env: maybe_no_quic_env()}, {:rulesql, github: "emqx/rulesql", tag: "0.1.7"}, {:observer_cli, "1.7.1"}, {:system_monitor, github: "ieQu1/system_monitor", tag: "3.0.3"}, @@ -800,7 +800,7 @@ defmodule EMQXUmbrella.MixProject do defp quicer_dep() do if enable_quicer?(), # in conflict with emqx and emqtt - do: [{:quicer, github: "emqx/quic", tag: "0.0.303", override: true}], + do: [{:quicer, github: "emqx/quic", tag: "0.0.308", override: true}], else: [] end diff --git a/rebar.config b/rebar.config index fffbf202b..830ffc051 100644 --- a/rebar.config +++ b/rebar.config @@ -78,7 +78,7 @@ , {ecpool, {git, "https://github.com/emqx/ecpool", {tag, "0.5.4"}}} , {replayq, {git, "https://github.com/emqx/replayq.git", {tag, "0.3.7"}}} , {pbkdf2, {git, "https://github.com/emqx/erlang-pbkdf2.git", {tag, "2.0.4"}}} - , {emqtt, {git, "https://github.com/emqx/emqtt", {tag, "1.10.0"}}} + , {emqtt, {git, "https://github.com/emqx/emqtt", {tag, "1.10.1"}}} , {rulesql, {git, "https://github.com/emqx/rulesql", {tag, "0.1.7"}}} , {observer_cli, "1.7.1"} % NOTE: depends on recon 2.5.x , {system_monitor, {git, "https://github.com/ieQu1/system_monitor", {tag, "3.0.3"}}} diff --git a/rebar.config.erl b/rebar.config.erl index 37f041bf6..7ab693979 100644 --- a/rebar.config.erl +++ b/rebar.config.erl @@ -39,7 +39,7 @@ bcrypt() -> {bcrypt, {git, "https://github.com/emqx/erlang-bcrypt.git", {tag, "0.6.1"}}}. quicer() -> - {quicer, {git, "https://github.com/emqx/quic.git", {tag, "0.0.303"}}}. + {quicer, {git, "https://github.com/emqx/quic.git", {tag, "0.0.308"}}}. jq() -> {jq, {git, "https://github.com/emqx/jq", {tag, "v0.3.12"}}}.