From 9cb4cf3c4adc064f20332309a55fe55c94b0f0e8 Mon Sep 17 00:00:00 2001
From: Connor Rigby <connorrigby@pop-os.localdomain>
Date: Wed, 28 Jun 2023 07:32:37 -0600
Subject: [PATCH] add ability to instance socket connection in order to test
 multiple connections

Signed-off-by: Connor Rigby <connorrigby@pop-os.localdomain>
---
 lib/nerves_hub_link.ex              | 18 +++++++--------
 lib/nerves_hub_link/configurator.ex |  6 +++--
 lib/nerves_hub_link/socket.ex       | 34 +++++++++++++++--------------
 3 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/lib/nerves_hub_link.ex b/lib/nerves_hub_link.ex
index 62860476..afad406d 100644
--- a/lib/nerves_hub_link.ex
+++ b/lib/nerves_hub_link.ex
@@ -6,47 +6,47 @@ defmodule NervesHubLink do
   """
   @spec connected? :: boolean()
   def connected?() do
-    Socket.check_connection(:device)
+    Socket.check_connection(Socket, :device)
   end
 
   def console_connected?() do
-    Socket.check_connection(:console)
+    Socket.check_connection(Socket, :console)
   end
 
   @doc """
   Checks if the device has a socket connection with NervesHub
   """
   def socket_connected?() do
-    Socket.check_connection(:socket)
+    Socket.check_connection(Socket, :socket)
   end
 
   @doc """
   Return whether there's currently an active console session
   """
   @spec console_active?() :: boolean()
-  defdelegate console_active?, to: Socket
+  def console_active?, do: Socket.console_active?(Socket)
 
   @doc """
   Current status of the update manager
   """
   @spec status :: NervesHubLink.UpdateManager.State.status()
-  defdelegate status(), to: NervesHubLink.UpdateManager
+  def status(), do: NervesHubLink.UpdateManager.status(Socket)
 
   @doc """
   Restart the socket and device channel
   """
-  @spec reconnect() :: :ok
-  defdelegate reconnect(), to: Socket
+  @spec reconnect_socket() :: :ok
+  def reconnect_socket(), do: Socket.reconnect_socket(Socket)
 
   @doc """
   Send update progress percentage for display in web
   """
   @spec send_update_progress(non_neg_integer()) :: :ok
-  defdelegate send_update_progress(progress), to: Socket
+  def send_update_progress(progress), do: Socket.send_update_progress(Socket, progress)
 
   @doc """
   Send an update status to web
   """
   @spec send_update_status(String.t() | atom()) :: :ok
-  defdelegate send_update_status(status), to: Socket
+  def send_update_status(status), do: Socket.send_update_status(Socket, status)
 end
diff --git a/lib/nerves_hub_link/configurator.ex b/lib/nerves_hub_link/configurator.ex
index 9ce1aeb8..0acbcf65 100644
--- a/lib/nerves_hub_link/configurator.ex
+++ b/lib/nerves_hub_link/configurator.ex
@@ -18,7 +18,8 @@ defmodule NervesHubLink.Configurator do
               params: %{},
               remote_iex: false,
               socket: [],
-              ssl: []
+              ssl: [],
+              rejoin_after: 5000
 
     @type t() :: %__MODULE__{
             connect: boolean(),
@@ -32,7 +33,8 @@ defmodule NervesHubLink.Configurator do
             params: map(),
             remote_iex: boolean(),
             socket: any(),
-            ssl: [:ssl.tls_client_option()]
+            ssl: [:ssl.tls_client_option()],
+            rejoin_after: pos_integer()
           }
   end
 
diff --git a/lib/nerves_hub_link/socket.ex b/lib/nerves_hub_link/socket.ex
index 417aace0..3da58051 100644
--- a/lib/nerves_hub_link/socket.ex
+++ b/lib/nerves_hub_link/socket.ex
@@ -26,42 +26,44 @@ defmodule NervesHubLink.Socket do
   @console_topic "console"
   @device_topic "device"
 
-  def start_link(config) do
-    GenServer.start_link(__MODULE__, config, name: __MODULE__)
+  def start_link(config, opts \\ [name: __MODULE__]) do
+    GenServer.start_link(__MODULE__, config, opts)
   end
 
-  def reconnect() do
-    GenServer.cast(__MODULE__, :reconnect)
+  @spec reconnect_socket(GenServer.server()) :: :ok
+  def reconnect_socket(socket \\ __MODULE__) do
+    GenServer.cast(socket, :reconnect)
   end
 
-  def send_update_progress(progress) do
-    GenServer.cast(__MODULE__, {:send_update_progress, progress})
+  @spec send_update_progress(GenServer.server()) :: :ok
+  def send_update_progress(socket \\ __MODULE__, progress) do
+    GenServer.cast(socket, {:send_update_progress, progress})
   end
 
-  def send_update_status(status) do
-    GenServer.cast(__MODULE__, {:send_update_status, status})
+  @spec send_update_status(GenServer.server(), atom | String.t()) :: :ok
+  def send_update_status(socket \\ __MODULE__, status) do
+    GenServer.cast(socket, {:send_update_status, status})
   end
 
-  def check_connection(type) do
-    GenServer.call(__MODULE__, {:check_connection, type})
+  @spec check_connection(GenServer.server(), :console | :device | :socket) :: boolean()
+  def check_connection(socket \\ __MODULE__, type) do
+    GenServer.call(socket, {:check_connection, type})
   end
 
   @doc """
   Return whether an IEx or other console session is active
   """
-  @spec console_active?() :: boolean()
-  def console_active?() do
-    GenServer.call(__MODULE__, :console_active?)
+  @spec console_active?(GenServer.server()) :: boolean()
+  def console_active?(socket \\ __MODULE__) do
+    GenServer.call(socket, :console_active?)
   end
 
   @impl Slipstream
   def init(config) do
-    rejoin_after = Application.get_env(:nerves_hub_link, :rejoin_after, 5_000)
-
     opts = [
       mint_opts: [protocols: [:http1], transport_opts: config.ssl],
       uri: config.socket[:url],
-      rejoin_after_msec: [rejoin_after],
+      rejoin_after_msec: [config.rejoin_after],
       reconnect_after_msec: config.socket[:reconnect_after_msec]
     ]