[dap] add option to configure cookie of the project node

apps/els_dap/src/els_dap_general_provider.erl

@@ -86,11 +86,26 @@ handle_request({<<"launch">>, Params}, State) ->
  #{<<"cwd">> := Cwd} = Params,
  ok = file:set_cwd(Cwd),
  Name = filename:basename(Cwd),
+
+ %% start distribution
+ LocalNode = els_distribution_server:node_name(<<"erlang_ls_dap">>, Name),
+ els_distribution_server:start_distribution(LocalNode),
+ ?LOG_INFO("Distribution up on: [~p]", [LocalNode]),
+
+ %% get configuration for project node and cookie
  ProjectNode =
  case Params of
- #{ <<"projectnode">> := Node } -> binary_to_atom(Node, utf8);
+ #{ <<"projectnode">> := ConfNode } -> binary_to_atom(ConfNode, utf8);
  _ -> els_distribution_server:node_name(<<"erlang_ls_dap_project">>, Name)
  end,
+ Cookie =
+ case Params of
+ #{ <<"cookie">> := ConfCookie } -> binary_to_atom(ConfCookie, utf8);
+ _ -> erlang:get_cookie()
+ end,
+ true = erlang:set_cookie(LocalNode, Cookie),
+
+
  case Params of
  #{ <<"runinterminal">> := Cmd
  } ->
@@ -112,14 +127,11 @@ handle_request({<<"launch">>, Params}, State) ->
  , "--sname"
  , ProjectNode
  , "--setcookie"
- , erlang:atom_to_list(erlang:get_cookie())
+ , erlang:atom_to_list(Cookie)
  ]
  )
  end)
  end,
- LocalNode = els_distribution_server:node_name(<<"erlang_ls_dap">>, Name),
- els_distribution_server:start_distribution(LocalNode),
- ?LOG_INFO("Distribution up on: [~p]", [LocalNode]),
 
  els_dap_server:send_event(<<"initialized">>, #{}),
 

apps/els_dap/test/els_dap_general_provider_SUITE.erl

@@ -15,6 +15,7 @@
 -export([
  initialize/1,
  launch_mfa/1,
+ launch_mfa_with_cookie/1,
  configuration_done/1,
  configuration_done_with_breakpoint/1,
  frame_variables/1,
@@ -171,6 +172,19 @@ launch_mfa(Config) ->
  els_dap_test_utils:wait_until_mock_called(els_dap_server, send_event),
  ok.
 
+-spec launch_mfa_with_cookie(config()) -> ok.
+launch_mfa_with_cookie(Config) ->
+ Provider = ?config(provider, Config),
+ DataDir = ?config(data_dir, Config),
+ Node = ?config(node, Config),
+ els_provider:handle_request(Provider, request_initialize(#{})),
+ els_provider:handle_request(
+ Provider,
+ request_launch(DataDir, Node, <<"some_cookie">>, els_dap_test_module, entry, [])
+ ),
+ els_dap_test_utils:wait_until_mock_called(els_dap_server, send_event),
+ ok.
+
 -spec configuration_done(config()) -> ok.
 configuration_done(Config) ->
  Provider = ?config(provider, Config),
@@ -231,7 +245,7 @@ frame_variables(Config) ->
  Provider,
  request_variable(VariableRef)
  ),
- %% at this point there should be only one variable present
+ %% at this point there should be only one variable present,
  ?assertMatch(
  #{
  <<"name">> := <<"N">>,
@@ -410,6 +424,10 @@ request_launch(AppDir, Node, M, F, A) ->
  <<"args">> => unicode:characters_to_binary(io_lib:format("~w", [A]))
  }).
 
+request_launch(AppDir, Node, Cookie, M, F, A) ->
+ {<<"launch">>, Params} = request_launch(AppDir, Node, M, F, A),
+ {<<"launch">>, Params#{<<"cookie">> => Cookie}}.
+
 request_configuration_done(Params) ->
  {<<"configurationDone">>, Params}.