Merge branch 'issue/1878' into 'develop'

[akkoma] / lib / pleroma / http / adapter_helper.ex

diff --git a/lib/pleroma/http/adapter_helper.ex b/lib/pleroma/http/adapter_helper.ex
index 0532ea31d527d10e37e9a2f34aef45d587bfb1a5..9ec3836b057122243b174201eecc08d9db92afb8 100644 (file)
--- a/lib/pleroma/http/adapter_helper.ex
+++ b/lib/pleroma/http/adapter_helper.ex
@@ -8,12 +8,8 @@ defmodule Pleroma.HTTP.AdapterHelper do
   """
   @defaults [pool: :federation]
 
-  @type ip_address :: ipv4_address() | ipv6_address()
-  @type ipv4_address :: {0..255, 0..255, 0..255, 0..255}
-  @type ipv6_address ::
-          {0..65_535, 0..65_535, 0..65_535, 0..65_535, 0..65_535, 0..65_535, 0..65_535, 0..65_535}
   @type proxy_type() :: :socks4 | :socks5
-  @type host() :: charlist() | ip_address()
+  @type host() :: charlist() | :inet.ip_address()
 
   alias Pleroma.Config
   alias Pleroma.HTTP.AdapterHelper
@@ -24,7 +20,6 @@ defmodule Pleroma.HTTP.AdapterHelper do
           | {Connection.proxy_type(), Connection.host(), pos_integer()}
 
   @callback options(keyword(), URI.t()) :: keyword()
-  @callback after_request(keyword()) :: :ok
   @callback get_conn(URI.t(), keyword()) :: {:ok, term()} | {:error, term()}
 
   @spec format_proxy(String.t() | tuple() | nil) :: proxy() | nil
@@ -49,15 +44,17 @@ defmodule Pleroma.HTTP.AdapterHelper do
   @spec options(URI.t(), keyword()) :: keyword()
   def options(%URI{} = uri, opts \\ []) do
     @defaults
-    |> pool_timeout()
+    |> put_timeout()
     |> Keyword.merge(opts)
     |> adapter_helper().options(uri)
   end
 
-  defp pool_timeout(opts) do
+  # For Hackney, this is the time a connection can stay idle in the pool.
+  # For Gun, this is the timeout to receive a message from Gun.
+  defp put_timeout(opts) do
     {config_key, default} =
       if adapter() == Tesla.Adapter.Gun do
-        {:pools, Config.get([:pools, :default, :timeout])}
+        {:pools, Config.get([:pools, :default, :timeout], 5_000)}
       else
         {:hackney_pools, 10_000}
       end
@@ -67,9 +64,6 @@ defmodule Pleroma.HTTP.AdapterHelper do
     Keyword.merge(opts, timeout: timeout)
   end
 
-  @spec after_request(keyword()) :: :ok
-  def after_request(opts), do: adapter_helper().after_request(opts)
-
   def get_conn(uri, opts), do: adapter_helper().get_conn(uri, opts)
   defp adapter, do: Application.get_env(:tesla, :adapter)
 
@@ -118,7 +112,7 @@ defmodule Pleroma.HTTP.AdapterHelper do
     end
   end
 
-  @spec parse_host(String.t() | atom() | charlist()) :: charlist() | ip_address()
+  @spec parse_host(String.t() | atom() | charlist()) :: charlist() | :inet.ip_address()
   def parse_host(host) when is_list(host), do: host
   def parse_host(host) when is_atom(host), do: to_charlist(host)