修改代码

2025-10-22 16:32:09 +08:00 · 2025-10-22 16:32:09 +08:00 · 2db671d0df
commit 2db671d0df
parent 146113c08a
4 changed files with 22 additions and 109 deletions
--- a/apps/sdlan/src/sdlan.app.src
+++ b/apps/sdlan/src/sdlan.app.src
@ -11,7 +11,6 @@
    ranch,
    poolboy,
    mysql,
-    esockd,
    jiffy,
    hackney,
    gpb,
--- a/apps/sdlan/src/sdlan_app.erl
+++ b/apps/sdlan/src/sdlan_app.erl
@ -61,18 +61,15 @@ start_tcp_server() ->
    Backlog = proplists:get_value(backlog, Props, 1024),
    Port = proplists:get_value(port, Props),

-    TransOpts = [
-        {tcp_options, [
-            binary,
-            {reuseaddr, true},
-            {active, false},
-            {packet, 2},
+    TransOpts = #{
+        num_acceptors => Acceptors,
+        max_connections => MaxConnections,
+        socket_opts => [
+            {port, Port},
            {nodelay, false},
            {backlog, Backlog}
-        ]},
-        {acceptors, Acceptors},
-        {max_connections, MaxConnections}
-    ],
-    {ok, _} = esockd:open('sdlan/tcp_server', Port, TransOpts, {sdlan_channel, start_link, []}),
+        ]
+    },
+    {ok, _} = ranch:start_listener('sdlan/tcp_server', ranch_tcp, TransOpts, sdlan_channel, []),

    lager:debug("[sdlan_app] the tcp server start at: ~p", [Port]).
--- a/apps/sdlan/src/sdlan_channel.erl
+++ b/apps/sdlan/src/sdlan_channel.erl
@ -35,7 +35,7 @@
 -define(UPGRADE_FORCE, 2).

 %% API
-export([start_link/2]).
+-export([start_link/4]).
 -export([publish_command/4, send_event/3, stop/2, move_network/3]).

 -export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2, code_change/3]).
@ -97,19 +97,15 @@ stop(Pid, Reason) when is_pid(Pid) ->
 %% esockd callback
 %%--------------------------------------------------------------------

-start_link(Transport, Sock) ->
-    {ok, proc_lib:spawn_link(?MODULE, init, [[Transport, Sock]])}.
+start_link(Ref, _Socket, Transport, Opts) ->
+    {ok, proc_lib:spawn_link(?MODULE, init, [[Ref, Transport, Opts]])}.

-init([Transport, Sock]) ->
-    lager:debug("[sdlan_channel] get a new connection: ~p", [Sock]),
-    case Transport:wait(Sock) of
-        {ok, NewSock} ->
-            Transport:setopts(Sock, [{active, true}]),
-            erlang:start_timer(?PING_TICKER, self(), ping_ticker),
-            gen_server:enter_loop(?MODULE, [], #state{transport = Transport, socket = NewSock});
-        {error, Reason} ->
-            {stop, Reason}
-    end.
+init([Ref, Transport, _Opts = []]) ->
+    {ok, Socket} = ranch:handshake(Ref),
+    lager:debug("[sdlan_channel] get a new connection: ~p", [Socket]),
+    Transport:setopts(Socket, [{active, true}, {packet, 2}]),
+    erlang:start_timer(?PING_TICKER, self(), ping_ticker),
+    gen_server:enter_loop(?MODULE, [], #state{transport = Transport, socket = Socket}).

 handle_call(_Request, _From, State) ->
    {reply, ok, State}.
@ -117,8 +113,9 @@ handle_call(_Request, _From, State) ->
 handle_cast(_Msg, State) ->
    {noreply, State}.

+%% 带上token或者网络id来注册
 handle_info({tcp, Sock, <<PacketId:32, ?PACKET_REGISTER_SUPER, Body/binary>>}, State=#state{transport = Transport, socket = Sock}) ->
-    #sdl_register_super{version = Version, client_id = ClientId, dev_addr = #sdl_dev_addr{net_addr = NetAddr0, mac = Mac}, token = Token, network_code = NetworkCode, pub_key = PubKey} = sdlan_pb:decode_msg(Body, sdl_register_super),
+    #sdl_register_super{version = Version, client_id = ClientId, dev_addr = #sdl_dev_addr{net_addr = NetAddr0, mac = Mac}, network_code = NetworkCode, token = Token, pub_key = PubKey} = sdlan_pb:decode_msg(Body, sdl_register_super),

    %% 参数检查
    lager:debug("[sdlan_channel] client_id: ~p, public_key: ~p", [ClientId, PubKey]),
@ -130,8 +127,9 @@ handle_info({tcp, Sock, <<PacketId:32, ?PACKET_REGISTER_SUPER, Body/binary>>}, S
                     Token /= <<>> ->
                         sdlan_api:auth_token(ClientId, Token, Version);
                     NetworkCode /= <<>> ->
-                         sdlan_api:check_network_code(ClientId, NetworkCode, Version)
+                         sdlan_api:auth_network_code(ClientId, NetworkCode, Version)
                 end,
+
    case AuthResult of
        {ok, #{<<"result">> := #{<<"network_id">> := NetworkId, <<"upgrade_type">> := UpgradeType, <<"upgrade_prompt">> := UpgradePrompt, <<"upgrade_address">> := UpgradeAddress}}} when is_integer(NetworkId) ->
            lager:debug("[sdlan_channel] client_id: ~p, mac: ~p, token: ~p, version: ~p, registerd, alloc network_id: ~p", [ClientId, sdlan_util:format_mac(Mac), Token, Version, NetworkId]),
@ -232,7 +230,7 @@ handle_info({tcp, Sock, <<PacketId:32, ?PACKET_QUERY_INFO, Body/binary>>}, State
    end;

 handle_info({tcp, _Sock, <<0:32, ?PACKET_PING>>}, State = #state{transport = Transport, socket = Sock, client_id = ClientId,  ping_counter = PingCounter}) ->
-    lager:debug("[sdlan_channel] client_id: ~p, get ping", [ClientId]),
+    %lager:debug("[sdlan_channel] client_id: ~p, get ping", [ClientId]),
    Transport:send(Sock, <<0:32, ?PACKET_PONG>>),
    {noreply, State#state{ping_counter = PingCounter + 1}};

--- a/rebar.lock
+++ b/rebar.lock
@ -1,81 +0,0 @@
-{"1.2.0",
-[{<<"certifi">>,{pkg,<<"certifi">>,<<"2.5.2">>},1},
- {<<"cowboy">>,
-  {git,"https://github.com/ninenines/cowboy.git",
-       {ref,"3ea8395eb8f53a57acb5d3c00b99c70296e7cdbd"}},
-  0},
- {<<"cowlib">>,
-  {git,"https://github.com/ninenines/cowlib",
-       {ref,"1eb7f4293a652adcfe43b1835d22c58d8def839f"}},
-  1},
- {<<"esockd">>,
-  {git,"https://github.com/emqx/esockd.git",
-       {ref,"d9ce4024cc42a65e9a05001997031e743442f955"}},
-  0},
- {<<"fs">>,{pkg,<<"fs">>,<<"6.1.1">>},1},
- {<<"goldrush">>,{pkg,<<"goldrush">>,<<"0.1.9">>},1},
- {<<"gpb">>,
-  {git,"https://github.com/tomas-abrahamsson/gpb.git",
-       {ref,"a53bc4909b3dc5a78b996263d92db38fed9d4782"}},
-  0},
- {<<"hackney">>,
-  {git,"https://github.com/benoitc/hackney.git",
-       {ref,"f3e9292db22c807e73f57a8422402d6b423ddf5f"}},
-  0},
- {<<"idna">>,{pkg,<<"idna">>,<<"6.0.1">>},1},
- {<<"jiffy">>,
-  {git,"https://github.com/davisp/jiffy.git",
-       {ref,"9ea1b35b6e60ba21dfd4adbd18e7916a831fd7d4"}},
-  0},
- {<<"lager">>,
-  {git,"https://github.com/erlang-lager/lager.git",
-       {ref,"459a3b2cdd9eadd29e5a7ce5c43932f5ccd6eb88"}},
-  0},
- {<<"metrics">>,{pkg,<<"metrics">>,<<"1.0.1">>},1},
- {<<"mimerl">>,{pkg,<<"mimerl">>,<<"1.2.0">>},1},
- {<<"mysql">>,
-  {git,"https://github.com/mysql-otp/mysql-otp",
-       {ref,"caf5ff96c677a8fe0ce6f4082bc036c8fd27dd62"}},
-  0},
- {<<"parse_trans">>,
-  {git,"https://github.com/uwiger/parse_trans",
-       {ref,"6f3645afb43c7c57d61b54ef59aecab288ce1013"}},
-  0},
- {<<"poolboy">>,
-  {git,"https://github.com/devinus/poolboy.git",
-       {ref,"3bb48a893ff5598f7c73731ac17545206d259fac"}},
-  0},
- {<<"ranch">>,
-  {git,"https://github.com/ninenines/ranch",
-       {ref,"a692f44567034dacf5efcaa24a24183788594eb7"}},
-  1},
- {<<"ssl_verify_fun">>,{pkg,<<"ssl_verify_fun">>,<<"1.1.6">>},1},
- {<<"sync">>,
-  {git,"https://github.com/rustyio/sync.git",
-       {ref,"7dc303ed4ce8d26db82e171dbbd7c41067852c65"}},
-  0},
- {<<"throttle">>,
-  {git,"https://github.com/lambdaclass/throttle.git",
-       {ref,"4f5fb17c9d4a86ba016e7011648ae5dfe539ac01"}},
-  0},
- {<<"unicode_util_compat">>,{pkg,<<"unicode_util_compat">>,<<"0.5.0">>},2}]}.
-[
-{pkg_hash,[
- {<<"certifi">>, <<"B7CFEAE9D2ED395695DD8201C57A2D019C0C43ECAF8B8BCB9320B40D6662F340">>},
- {<<"fs">>, <<"9D147B944D60CFA48A349F12D06C8EE71128F610C90870BDF9A6773206452ED0">>},
- {<<"goldrush">>, <<"F06E5D5F1277DA5C413E84D5A2924174182FB108DABB39D5EC548B27424CD106">>},
- {<<"idna">>, <<"1D038FB2E7668CE41FBF681D2C45902E52B3CB9E9C77B55334353B222C2EE50C">>},
- {<<"metrics">>, <<"25F094DEA2CDA98213CECC3AEFF09E940299D950904393B2A29D191C346A8486">>},
- {<<"mimerl">>, <<"67E2D3F571088D5CFD3E550C383094B47159F3EEE8FFA08E64106CDF5E981BE3">>},
- {<<"ssl_verify_fun">>, <<"CF344F5692C82D2CD7554F5EC8FD961548D4FD09E7D22F5B62482E5AEAEBD4B0">>},
- {<<"unicode_util_compat">>, <<"8516502659002CEC19E244EBD90D312183064BE95025A319A6C7E89F4BCCD65B">>}]},
-{pkg_hash_ext,[
- {<<"certifi">>, <<"3B3B5F36493004AC3455966991EAF6E768CE9884693D9968055AEEEB1E575040">>},
- {<<"fs">>, <<"EF94E95FFE79916860649FED80AC62B04C322B0BB70F5128144C026B4D171F8B">>},
- {<<"goldrush">>, <<"99CB4128CFFCB3227581E5D4D803D5413FA643F4EB96523F77D9E6937D994CEB">>},
- {<<"idna">>, <<"A02C8A1C4FD601215BB0B0324C8A6986749F807CE35F25449EC9E69758708122">>},
- {<<"metrics">>, <<"69B09ADDDC4F74A40716AE54D140F93BEB0FB8978D8636EADED0C31B6F099F16">>},
- {<<"mimerl">>, <<"F278585650AA581986264638EBF698F8BB19DF297F66AD91B18910DFC6E19323">>},
- {<<"ssl_verify_fun">>, <<"BDB0D2471F453C88FF3908E7686F86F9BE327D065CC1EC16FA4540197EA04680">>},
- {<<"unicode_util_compat">>, <<"D48D002E15F5CC105A696CF2F1BBB3FC72B4B770A184D8420C8DB20DA2674B38">>}]}
-].