feat(quic): bump to quicer 0.0.200 and emqtt 1.9.0

This commit is contained in:
William Yang 2023-09-20 12:07:26 +02:00
parent bc6edac45f
commit da626f6d29
10 changed files with 15 additions and 14 deletions

View File

@ -45,7 +45,7 @@
{meck, "0.9.2"}, {meck, "0.9.2"},
{proper, "1.4.0"}, {proper, "1.4.0"},
{bbmustache, "1.10.0"}, {bbmustache, "1.10.0"},
{emqtt, {git, "https://github.com/emqx/emqtt", {tag, "1.8.7"}}} {emqtt, {git, "https://github.com/emqx/emqtt", {tag, "1.9.0"}}}
]}, ]},
{extra_src_dirs, [{"test", [recursive]}, {extra_src_dirs, [{"test", [recursive]},
{"integration_test", [recursive]}]} {"integration_test", [recursive]}]}
@ -55,7 +55,7 @@
{meck, "0.9.2"}, {meck, "0.9.2"},
{proper, "1.4.0"}, {proper, "1.4.0"},
{bbmustache, "1.10.0"}, {bbmustache, "1.10.0"},
{emqtt, {git, "https://github.com/emqx/emqtt", {tag, "1.8.7"}}} {emqtt, {git, "https://github.com/emqx/emqtt", {tag, "1.9.0"}}}
]}, ]},
{extra_src_dirs, [{"test", [recursive]}]} {extra_src_dirs, [{"test", [recursive]}]}
]} ]}

View File

@ -24,7 +24,7 @@ IsQuicSupp = fun() ->
end, end,
Bcrypt = {bcrypt, {git, "https://github.com/emqx/erlang-bcrypt.git", {tag, "0.6.0"}}}, 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.114"}}}. Quicer = {quicer, {git, "https://github.com/emqx/quic.git", {tag, "0.0.200"}}}.
Dialyzer = fun(Config) -> Dialyzer = fun(Config) ->
{dialyzer, OldDialyzerConfig} = lists:keyfind(dialyzer, 1, Config), {dialyzer, OldDialyzerConfig} = lists:keyfind(dialyzer, 1, Config),

View File

@ -335,7 +335,7 @@ do_stop_listener(Type, Id, #{bind := ListenOn}) when Type == ws; Type == wss ->
Error Error
end; end;
do_stop_listener(quic, Id, _Conf) -> do_stop_listener(quic, Id, _Conf) ->
quicer:stop_listener(Id). quicer:terminate_listener(Id).
wait_listener_stopped(ListenOn) -> wait_listener_stopped(ListenOn) ->
% NOTE % NOTE
@ -461,7 +461,7 @@ do_start_listener(quic, ListenerName, #{bind := Bind} = Opts) ->
Id = listener_id(quic, ListenerName), Id = listener_id(quic, ListenerName),
add_limiter_bucket(Id, Limiter), add_limiter_bucket(Id, Limiter),
quicer:start_listener( quicer:spawn_listener(
Id, Id,
ListenOn, ListenOn,
{maps:from_list(ListenOpts), ConnectionOpts, StreamOpts} {maps:from_list(ListenOpts), ConnectionOpts, StreamOpts}

View File

@ -229,10 +229,9 @@ streams_available(_C, {BidirCnt, UnidirCnt}, S) ->
%% @doc callback for handling request when remote wants for more streams %% @doc callback for handling request when remote wants for more streams
%% should cope with rate limiting %% should cope with rate limiting
%% @TODO this is not going to get triggered in current version -spec peer_needs_streams(quicer:connection_handle(), atom(), cb_state()) ->
%% ref: https://github.com/microsoft/msquic/issues/3120 cb_ret().
-spec peer_needs_streams(quicer:connection_handle(), undefined, cb_state()) -> cb_ret(). peer_needs_streams(_C, _StreamType, S) ->
peer_needs_streams(_C, undefined, S) ->
?SLOG(info, #{ ?SLOG(info, #{
msg => "ignore: peer need more streames", info => maps:with([conn_pid, ctrl_pid], S) msg => "ignore: peer need more streames", info => maps:with([conn_pid, ctrl_pid], S)
}), }),

View File

@ -30,7 +30,7 @@
{profiles, [ {profiles, [
{test, [ {test, [
{deps, [ {deps, [
{emqtt, {git, "https://github.com/emqx/emqtt", {tag, "1.8.7"}}} {emqtt, {git, "https://github.com/emqx/emqtt", {tag, "1.9.0"}}}
]} ]}
]} ]}
]}. ]}.

View File

@ -0,0 +1 @@
Updated to quicer version 0.0.200 in preparation for enabling openssl3 support for QUIC transport.

View File

@ -0,0 +1 @@
升级至 quicer 版本 0.0.200,为启用 OpenSSL3 以支持 QUIC 传输做准备。

View File

@ -64,7 +64,7 @@ defmodule EMQXUmbrella.MixProject do
{:pbkdf2, github: "emqx/erlang-pbkdf2", tag: "2.0.4", override: true}, {:pbkdf2, github: "emqx/erlang-pbkdf2", tag: "2.0.4", override: true},
# maybe forbid to fetch quicer # maybe forbid to fetch quicer
{:emqtt, {:emqtt,
github: "emqx/emqtt", tag: "1.8.7", override: true, system_env: maybe_no_quic_env()}, github: "emqx/emqtt", tag: "1.9.0", override: true, system_env: maybe_no_quic_env()},
{:rulesql, github: "emqx/rulesql", tag: "0.1.7"}, {:rulesql, github: "emqx/rulesql", tag: "0.1.7"},
{:observer_cli, "1.7.1"}, {:observer_cli, "1.7.1"},
{:system_monitor, github: "ieQu1/system_monitor", tag: "3.0.3"}, {:system_monitor, github: "ieQu1/system_monitor", tag: "3.0.3"},
@ -835,7 +835,7 @@ defmodule EMQXUmbrella.MixProject do
defp quicer_dep() do defp quicer_dep() do
if enable_quicer?(), if enable_quicer?(),
# in conflict with emqx and emqtt # in conflict with emqx and emqtt
do: [{:quicer, github: "emqx/quic", tag: "0.0.114", override: true}], do: [{:quicer, github: "emqx/quic", tag: "0.0.200", override: true}],
else: [] else: []
end end

View File

@ -69,7 +69,7 @@
, {ecpool, {git, "https://github.com/emqx/ecpool", {tag, "0.5.4"}}} , {ecpool, {git, "https://github.com/emqx/ecpool", {tag, "0.5.4"}}}
, {replayq, {git, "https://github.com/emqx/replayq.git", {tag, "0.3.7"}}} , {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"}}} , {pbkdf2, {git, "https://github.com/emqx/erlang-pbkdf2.git", {tag, "2.0.4"}}}
, {emqtt, {git, "https://github.com/emqx/emqtt", {tag, "1.8.7"}}} , {emqtt, {git, "https://github.com/emqx/emqtt", {tag, "1.9.0"}}}
, {rulesql, {git, "https://github.com/emqx/rulesql", {tag, "0.1.7"}}} , {rulesql, {git, "https://github.com/emqx/rulesql", {tag, "0.1.7"}}}
, {observer_cli, "1.7.1"} % NOTE: depends on recon 2.5.x , {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"}}} , {system_monitor, {git, "https://github.com/ieQu1/system_monitor", {tag, "3.0.3"}}}

View File

@ -39,7 +39,7 @@ bcrypt() ->
{bcrypt, {git, "https://github.com/emqx/erlang-bcrypt.git", {tag, "0.6.1"}}}. {bcrypt, {git, "https://github.com/emqx/erlang-bcrypt.git", {tag, "0.6.1"}}}.
quicer() -> quicer() ->
{quicer, {git, "https://github.com/emqx/quic.git", {tag, "0.0.114"}}}. {quicer, {git, "https://github.com/emqx/quic.git", {tag, "0.0.200"}}}.
jq() -> jq() ->
{jq, {git, "https://github.com/emqx/jq", {tag, "v0.3.10"}}}. {jq, {git, "https://github.com/emqx/jq", {tag, "v0.3.10"}}}.