open conn in separate task

4 files changed, 117 insertions, 96 deletions

diff --git a/test/gun/gun_test.exs b/test/gun/gun_test.exs
index 7f185617c..9f3e0f938 100644
--- a/test/gun/gun_test.exs
+++ b/test/gun/gun_test.exs
@@ -19,6 +19,12 @@ defmodule Pleroma.GunTest do
     assert json = receive_response(conn, ref)
 
     assert %{"args" => %{"a" => "b", "c" => "d"}} = Jason.decode!(json)
+
+    {:ok, pid} = Task.start(fn -> Process.sleep(50) end)
+
+    :ok = :gun.set_owner(conn, pid)
+
+    assert :gun.info(conn).owner == pid
   end
 
   defp receive_response(conn, ref, acc \\ "") do
diff --git a/test/http/adapter/gun_test.exs b/test/http/adapter/gun_test.exs
index ef1b4a882..a8dcbae04 100644
--- a/test/http/adapter/gun_test.exs
+++ b/test/http/adapter/gun_test.exs
@@ -7,6 +7,7 @@ defmodule Pleroma.HTTP.Adapter.GunTest do
   use Pleroma.Tests.Helpers
   import ExUnit.CaptureLog
   alias Pleroma.Config
+  alias Pleroma.Gun.Conn
   alias Pleroma.HTTP.Adapter.Gun
   alias Pleroma.Pool.Connections
 
@@ -72,7 +73,7 @@ defmodule Pleroma.HTTP.Adapter.GunTest do
 
     test "receive conn by default" do
       uri = URI.parse("http://another-domain.com")
-      :ok = Connections.open_conn(uri, :gun_connections)
+      :ok = Conn.open(uri, :gun_connections)
 
       received_opts = Gun.options(uri)
       assert received_opts[:close_conn] == false
@@ -81,7 +82,7 @@ defmodule Pleroma.HTTP.Adapter.GunTest do
 
     test "don't receive conn if receive_conn is false" do
       uri = URI.parse("http://another-domain2.com")
-      :ok = Connections.open_conn(uri, :gun_connections)
+      :ok = Conn.open(uri, :gun_connections)
 
       opts = [receive_conn: false]
       received_opts = Gun.options(opts, uri)
@@ -118,7 +119,7 @@ defmodule Pleroma.HTTP.Adapter.GunTest do
     test "default ssl adapter opts with connection" do
       uri = URI.parse("https://some-domain.com")
 
-      :ok = Connections.open_conn(uri, :gun_connections)
+      :ok = Conn.open(uri, :gun_connections)
 
       opts = Gun.options(uri)
 
@@ -167,7 +168,7 @@ defmodule Pleroma.HTTP.Adapter.GunTest do
   describe "after_request/1" do
     test "body_as not chunks" do
       uri = URI.parse("http://some-domain.com")
-      :ok = Connections.open_conn(uri, :gun_connections)
+      :ok = Conn.open(uri, :gun_connections)
       opts = Gun.options(uri)
       :ok = Gun.after_request(opts)
       conn = opts[:conn]
@@ -185,7 +186,7 @@ defmodule Pleroma.HTTP.Adapter.GunTest do
 
     test "body_as chunks" do
       uri = URI.parse("http://some-domain.com")
-      :ok = Connections.open_conn(uri, :gun_connections)
+      :ok = Conn.open(uri, :gun_connections)
       opts = Gun.options([body_as: :chunks], uri)
       :ok = Gun.after_request(opts)
       conn = opts[:conn]
@@ -205,7 +206,7 @@ defmodule Pleroma.HTTP.Adapter.GunTest do
     test "with no connection" do
       uri = URI.parse("http://uniq-domain.com")
 
-      :ok = Connections.open_conn(uri, :gun_connections)
+      :ok = Conn.open(uri, :gun_connections)
 
       opts = Gun.options([body_as: :chunks], uri)
       conn = opts[:conn]
@@ -227,7 +228,7 @@ defmodule Pleroma.HTTP.Adapter.GunTest do
 
     test "with ipv4" do
       uri = URI.parse("http://127.0.0.1")
-      :ok = Connections.open_conn(uri, :gun_connections)
+      :ok = Conn.open(uri, :gun_connections)
       opts = Gun.options(uri)
       send(:gun_connections, {:gun_up, opts[:conn], :http})
       :ok = Gun.after_request(opts)
@@ -246,7 +247,7 @@ defmodule Pleroma.HTTP.Adapter.GunTest do
 
     test "with ipv6" do
       uri = URI.parse("http://[2a03:2880:f10c:83:face:b00c:0:25de]")
-      :ok = Connections.open_conn(uri, :gun_connections)
+      :ok = Conn.open(uri, :gun_connections)
       opts = Gun.options(uri)
       send(:gun_connections, {:gun_up, opts[:conn], :http})
       :ok = Gun.after_request(opts)
diff --git a/test/http/connection_test.exs b/test/http/connection_test.exs
index c1ff0cc21..53ccbc9cd 100644
--- a/test/http/connection_test.exs
+++ b/test/http/connection_test.exs
@@ -124,7 +124,7 @@ defmodule Pleroma.HTTP.ConnectionTest do
       uri = URI.parse("https://some-domain.com")
 
       pid = Process.whereis(:federation)
-      :ok = Pleroma.Pool.Connections.open_conn(uri, :gun_connections, genserver_pid: pid)
+      :ok = Pleroma.Gun.Conn.open(uri, :gun_connections, genserver_pid: pid)
 
       opts = Connection.options(uri)
 
diff --git a/test/pool/connections_test.exs b/test/pool/connections_test.exs
index d0d711c55..f766e3b5f 100644
--- a/test/pool/connections_test.exs
+++ b/test/pool/connections_test.exs
@@ -45,7 +45,7 @@ defmodule Pleroma.Pool.ConnectionsTest do
     url = "http://some-domain.com"
     key = "http:some-domain.com:80"
     refute Connections.checkin(url, name)
-    :ok = Connections.open_conn(url, name)
+    :ok = Conn.open(url, name)
 
     conn = Connections.checkin(url, name)
     assert is_pid(conn)
@@ -110,7 +110,7 @@ defmodule Pleroma.Pool.ConnectionsTest do
     url = "http://ですsome-domain.com"
     refute Connections.checkin(url, name)
 
-    :ok = Connections.open_conn(url, name)
+    :ok = Conn.open(url, name)
 
     conn = Connections.checkin(url, name)
     assert is_pid(conn)
@@ -139,7 +139,7 @@ defmodule Pleroma.Pool.ConnectionsTest do
 
     refute Connections.checkin(url, name)
 
-    :ok = Connections.open_conn(url, name)
+    :ok = Conn.open(url, name)
 
     conn = Connections.checkin(url, name)
     assert is_pid(conn)
@@ -182,7 +182,7 @@ defmodule Pleroma.Pool.ConnectionsTest do
 
     refute Connections.checkin(url, name)
 
-    :ok = Connections.open_conn(url, name)
+    :ok = Conn.open(url, name)
 
     conn = Connections.checkin(url, name)
     assert is_pid(conn)
@@ -209,7 +209,7 @@ defmodule Pleroma.Pool.ConnectionsTest do
   test "up and down ipv4", %{name: name} do
     self = self()
     url = "http://127.0.0.1"
-    :ok = Connections.open_conn(url, name)
+    :ok = Conn.open(url, name)
     conn = Connections.checkin(url, name)
     send(name, {:gun_down, conn, nil, nil, nil})
     send(name, {:gun_up, conn, nil})
@@ -229,7 +229,7 @@ defmodule Pleroma.Pool.ConnectionsTest do
   test "up and down ipv6", %{name: name} do
     self = self()
     url = "http://[2a03:2880:f10c:83:face:b00c:0:25de]"
-    :ok = Connections.open_conn(url, name)
+    :ok = Conn.open(url, name)
     conn = Connections.checkin(url, name)
     send(name, {:gun_down, conn, nil, nil, nil})
     send(name, {:gun_up, conn, nil})
@@ -253,13 +253,13 @@ defmodule Pleroma.Pool.ConnectionsTest do
     https_key = "https:some-domain.com:443"
 
     refute Connections.checkin(http_url, name)
-    :ok = Connections.open_conn(http_url, name)
+    :ok = Conn.open(http_url, name)
     conn = Connections.checkin(http_url, name)
     assert is_pid(conn)
     assert Process.alive?(conn)
 
     refute Connections.checkin(https_url, name)
-    :ok = Connections.open_conn(https_url, name)
+    :ok = Conn.open(https_url, name)
     https_conn = Connections.checkin(https_url, name)
 
     refute conn == https_conn
@@ -288,17 +288,17 @@ defmodule Pleroma.Pool.ConnectionsTest do
     url = "http://gun-not-up.com"
 
     assert capture_log(fn ->
-             :ok = Connections.open_conn(url, name)
+             refute Conn.open(url, name)
              refute Connections.checkin(url, name)
            end) =~
-             "Received error on opening connection http://gun-not-up.com: {:error, :timeout}"
+             "Received error on opening connection http://gun-not-up.com {:error, :timeout}"
   end
 
   test "process gun_down message and then gun_up", %{name: name} do
     self = self()
     url = "http://gun-down-and-up.com"
     key = "http:gun-down-and-up.com:80"
-    :ok = Connections.open_conn(url, name)
+    :ok = Conn.open(url, name)
     conn = Connections.checkin(url, name)
 
     assert is_pid(conn)
@@ -347,7 +347,7 @@ defmodule Pleroma.Pool.ConnectionsTest do
 
   test "async processes get same conn for same domain", %{name: name} do
     url = "http://some-domain.com"
-    :ok = Connections.open_conn(url, name)
+    :ok = Conn.open(url, name)
 
     tasks =
       for _ <- 1..5 do
@@ -381,8 +381,8 @@ defmodule Pleroma.Pool.ConnectionsTest do
     self = self()
     http_url = "http://some-domain.com"
     https_url = "https://some-domain.com"
-    :ok = Connections.open_conn(https_url, name)
-    :ok = Connections.open_conn(http_url, name)
+    :ok = Conn.open(https_url, name)
+    :ok = Conn.open(http_url, name)
 
     conn1 = Connections.checkin(https_url, name)
 
@@ -413,7 +413,7 @@ defmodule Pleroma.Pool.ConnectionsTest do
     :ok = Connections.checkout(conn1, self, name)
 
     another_url = "http://another-domain.com"
-    :ok = Connections.open_conn(another_url, name)
+    :ok = Conn.open(another_url, name)
     conn = Connections.checkin(another_url, name)
 
     %Connections{
@@ -437,9 +437,19 @@ defmodule Pleroma.Pool.ConnectionsTest do
       Pleroma.Config.put(API, Pleroma.Gun)
     end
 
+    test "opens connection and change owner", %{name: name} do
+      url = "https://httpbin.org"
+      :ok = Conn.open(url, name)
+      conn = Connections.checkin(url, name)
+
+      pid = Process.whereis(name)
+
+      assert :gun.info(conn).owner == pid
+    end
+
     test "opens connection and reuse it on next request", %{name: name} do
       url = "http://httpbin.org"
-      :ok = Connections.open_conn(url, name)
+      :ok = Conn.open(url, name)
       Process.sleep(250)
       conn = Connections.checkin(url, name)
 
@@ -462,7 +472,7 @@ defmodule Pleroma.Pool.ConnectionsTest do
 
     test "opens ssl connection and reuse it on next request", %{name: name} do
       url = "https://httpbin.org"
-      :ok = Connections.open_conn(url, name)
+      :ok = Conn.open(url, name)
       Process.sleep(1_000)
       conn = Connections.checkin(url, name)
 
@@ -488,8 +498,8 @@ defmodule Pleroma.Pool.ConnectionsTest do
       https1 = "https://www.google.com"
       https2 = "https://httpbin.org"
 
-      :ok = Connections.open_conn(https1, name)
-      :ok = Connections.open_conn(https2, name)
+      :ok = Conn.open(https1, name)
+      :ok = Conn.open(https2, name)
       Process.sleep(1_500)
       conn = Connections.checkin(https1, name)
 
@@ -513,7 +523,7 @@ defmodule Pleroma.Pool.ConnectionsTest do
       :ok = Connections.checkout(conn, self, name)
       http = "http://httpbin.org"
       Process.sleep(1_000)
-      :ok = Connections.open_conn(http, name)
+      :ok = Conn.open(http, name)
       conn = Connections.checkin(http, name)
 
       %Connections{
@@ -535,8 +545,8 @@ defmodule Pleroma.Pool.ConnectionsTest do
 
       https1 = "https://www.google.com"
       https2 = "https://httpbin.org"
-      :ok = Connections.open_conn(https1, name)
-      :ok = Connections.open_conn(https2, name)
+      :ok = Conn.open(https1, name)
+      :ok = Conn.open(https2, name)
       Process.sleep(1_500)
 
       Connections.checkin(https1, name)
@@ -563,7 +573,7 @@ defmodule Pleroma.Pool.ConnectionsTest do
       :ok = Connections.checkout(conn, self, name)
 
       http = "http://httpbin.org"
-      :ok = Connections.open_conn(http, name)
+      :ok = Conn.open(http, name)
       Process.sleep(1_000)
 
       conn = Connections.checkin(http, name)
@@ -587,8 +597,8 @@ defmodule Pleroma.Pool.ConnectionsTest do
 
       https1 = "https://www.google.com"
       https2 = "https://httpbin.org"
-      :ok = Connections.open_conn(https1, name)
-      :ok = Connections.open_conn(https2, name)
+      :ok = Conn.open(https1, name)
+      :ok = Conn.open(https2, name)
       Process.sleep(1_000)
       Connections.checkin(https1, name)
       conn1 = Connections.checkin(https1, name)
@@ -639,8 +649,8 @@ defmodule Pleroma.Pool.ConnectionsTest do
       https1 = "https://www.google.com"
       https2 = "https://httpbin.org"
 
-      :ok = Connections.open_conn(https1, name)
-      :ok = Connections.open_conn(https2, name)
+      :ok = Conn.open(https1, name)
+      :ok = Conn.open(https2, name)
       Process.sleep(1_500)
       Connections.checkin(https1, name)
       Connections.checkin(https2, name)
@@ -694,7 +704,7 @@ defmodule Pleroma.Pool.ConnectionsTest do
       } = Connections.get_state(name)
 
       http = "http://httpbin.org"
-      :ok = Connections.open_conn(http, name)
+      :ok = Conn.open(http, name)
       Process.sleep(1_000)
       conn = Connections.checkin(http, name)
 
@@ -725,7 +735,7 @@ defmodule Pleroma.Pool.ConnectionsTest do
     test "as ip", %{name: name} do
       url = "http://proxy-string.com"
       key = "http:proxy-string.com:80"
-      :ok = Connections.open_conn(url, name, proxy: {{127, 0, 0, 1}, 8123})
+      :ok = Conn.open(url, name, proxy: {{127, 0, 0, 1}, 8123})
 
       conn = Connections.checkin(url, name)
 
@@ -745,7 +755,7 @@ defmodule Pleroma.Pool.ConnectionsTest do
 
     test "as host", %{name: name} do
       url = "http://proxy-tuple-atom.com"
-      :ok = Connections.open_conn(url, name, proxy: {'localhost', 9050})
+      :ok = Conn.open(url, name, proxy: {'localhost', 9050})
       conn = Connections.checkin(url, name)
 
       %Connections{
@@ -765,7 +775,7 @@ defmodule Pleroma.Pool.ConnectionsTest do
     test "as ip and ssl", %{name: name} do
       url = "https://proxy-string.com"
 
-      :ok = Connections.open_conn(url, name, proxy: {{127, 0, 0, 1}, 8123})
+      :ok = Conn.open(url, name, proxy: {{127, 0, 0, 1}, 8123})
       conn = Connections.checkin(url, name)
 
       %Connections{
@@ -784,7 +794,7 @@ defmodule Pleroma.Pool.ConnectionsTest do
 
     test "as host and ssl", %{name: name} do
       url = "https://proxy-tuple-atom.com"
-      :ok = Connections.open_conn(url, name, proxy: {'localhost', 9050})
+      :ok = Conn.open(url, name, proxy: {'localhost', 9050})
       conn = Connections.checkin(url, name)
 
       %Connections{
@@ -804,7 +814,7 @@ defmodule Pleroma.Pool.ConnectionsTest do
     test "with socks type", %{name: name} do
       url = "http://proxy-socks.com"
 
-      :ok = Connections.open_conn(url, name, proxy: {:socks5, 'localhost', 1234})
+      :ok = Conn.open(url, name, proxy: {:socks5, 'localhost', 1234})
 
       conn = Connections.checkin(url, name)
 
@@ -825,7 +835,7 @@ defmodule Pleroma.Pool.ConnectionsTest do
     test "with socks4 type and ssl", %{name: name} do
       url = "https://proxy-socks.com"
 
-      :ok = Connections.open_conn(url, name, proxy: {:socks4, 'localhost', 1234})
+      :ok = Conn.open(url, name, proxy: {:socks4, 'localhost', 1234})
 
       conn = Connections.checkin(url, name)
 
@@ -892,71 +902,75 @@ defmodule Pleroma.Pool.ConnectionsTest do
   end
 
   describe "get_unused_conns/1" do
-    test "crf is equalent, sorting by reference" do
-      conns = %{
-        "1" => %Conn{
-          conn_state: :idle,
-          last_reference: now() - 1
-        },
-        "2" => %Conn{
-          conn_state: :idle,
-          last_reference: now()
-        }
-      }
-
-      assert [{"1", _unused_conn} | _others] = Connections.get_unused_conns(conns)
+    test "crf is equalent, sorting by reference", %{name: name} do
+      Connections.add_conn(name, "1", %Conn{
+        conn_state: :idle,
+        last_reference: now() - 1
+      })
+
+      Connections.add_conn(name, "2", %Conn{
+        conn_state: :idle,
+        last_reference: now()
+      })
+
+      assert [{"1", _unused_conn} | _others] = Connections.get_unused_conns(name)
     end
 
-    test "reference is equalent, sorting by crf" do
-      conns = %{
-        "1" => %Conn{
-          conn_state: :idle,
-          crf: 1.999
-        },
-        "2" => %Conn{
-          conn_state: :idle,
-          crf: 2
-        }
-      }
+    test "reference is equalent, sorting by crf", %{name: name} do
+      Connections.add_conn(name, "1", %Conn{
+        conn_state: :idle,
+        crf: 1.999
+      })
+
+      Connections.add_conn(name, "2", %Conn{
+        conn_state: :idle,
+        crf: 2
+      })
 
-      assert [{"1", _unused_conn} | _others] = Connections.get_unused_conns(conns)
+      assert [{"1", _unused_conn} | _others] = Connections.get_unused_conns(name)
     end
 
-    test "higher crf and lower reference" do
-      conns = %{
-        "1" => %Conn{
-          conn_state: :idle,
-          crf: 3,
-          last_reference: now() - 1
-        },
-        "2" => %Conn{
-          conn_state: :idle,
-          crf: 2,
-          last_reference: now()
-        }
-      }
+    test "higher crf and lower reference", %{name: name} do
+      Connections.add_conn(name, "1", %Conn{
+        conn_state: :idle,
+        crf: 3,
+        last_reference: now() - 1
+      })
+
+      Connections.add_conn(name, "2", %Conn{
+        conn_state: :idle,
+        crf: 2,
+        last_reference: now()
+      })
 
-      assert [{"2", _unused_conn} | _others] = Connections.get_unused_conns(conns)
+      assert [{"2", _unused_conn} | _others] = Connections.get_unused_conns(name)
     end
 
-    test "lower crf and lower reference" do
-      conns = %{
-        "1" => %Conn{
-          conn_state: :idle,
-          crf: 1.99,
-          last_reference: now() - 1
-        },
-        "2" => %Conn{
-          conn_state: :idle,
-          crf: 2,
-          last_reference: now()
-        }
-      }
+    test "lower crf and lower reference", %{name: name} do
+      Connections.add_conn(name, "1", %Conn{
+        conn_state: :idle,
+        crf: 1.99,
+        last_reference: now() - 1
+      })
 
-      assert [{"1", _unused_conn} | _others] = Connections.get_unused_conns(conns)
+      Connections.add_conn(name, "2", %Conn{
+        conn_state: :idle,
+        crf: 2,
+        last_reference: now()
+      })
+
+      assert [{"1", _unused_conn} | _others] = Connections.get_unused_conns(name)
     end
   end
 
+  test "count/1", %{name: name} do
+    assert Connections.count(name) == 0
+    Connections.add_conn(name, "1", %Conn{conn: self()})
+    assert Connections.count(name) == 1
+    Connections.remove_conn(name, "1")
+    assert Connections.count(name) == 0
+  end
+
   defp now do
     :os.system_time(:second)
   end