Replace gun with mint

Signed-off-by: Mario Uher <[email protected]>

Author: ream88

mix.exs

@@ -11,7 +11,7 @@ defmodule Bypass.Mixfile do
       elixir: "~> 1.6",
       description: description(),
       package: package(),
-      deps: deps(Mix.env()),
+      deps: deps(),
       docs: docs()
     ]
   end
@@ -28,30 +28,18 @@ defmodule Bypass.Mixfile do
     [
       {:plug_cowboy, "~> 1.0 or ~> 2.0"},
       {:plug, "~> 1.7"},
+      {:cowlib, "~> 1.0.1"},
+      {:ranch, "~> 1.3.2"},
       {:ex_doc, "> 0.0.0", only: :dev},
-      {:espec, "~> 1.6", only: [:dev, :test]}
+      {:espec, "~> 1.6", only: [:dev, :test]},
+      {:mint, "~> 1.1", only: :test}
     ]
   end
 
   defp env do
     [enable_debug_log: false]
   end
 
-  # We need to work around the fact that gun would pull in cowlib/ranch from git, while cowboy/plug
-  # depend on them from hex. In order to resolve this we need to override those dependencies. But
-  # since you can't publish to hex with overriden dependencies this ugly hack only pulls the
-  # dependencies in when in the test env.
-  defp deps(:test) do
-    deps() ++
-      [
-        {:cowlib, "~> 1.0.1", override: true},
-        {:ranch, "~> 1.2.0", override: true},
-        {:gun, github: "PSPDFKit-labs/gun", only: :test}
-      ]
-  end
-
-  defp deps(_), do: deps()
-
   defp docs do
     [
       main: "Bypass",

mix.lock

@@ -1,17 +1,18 @@
 %{
-  "cowboy": {:hex, :cowboy, "1.1.2", "61ac29ea970389a88eca5a65601460162d370a70018afe6f949a29dca91f3bb0", [:rebar3], [{:cowlib, "~> 1.0.2", [hex: :cowlib, repo: "hexpm", optional: false]}, {:ranch, "~> 1.3.2", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm"},
-  "cowlib": {:hex, :cowlib, "1.0.2", "9d769a1d062c9c3ac753096f868ca121e2730b9a377de23dec0f7e08b1df84ee", [:make], [], "hexpm"},
-  "earmark": {:hex, :earmark, "1.3.0", "17f0c38eaafb4800f746b457313af4b2442a8c2405b49c645768680f900be603", [:mix], [], "hexpm"},
-  "espec": {:hex, :espec, "1.6.3", "d9355788e508b82743a1b1b9aa5ac64ba37b0547c6210328d909e8a6eb56d42e", [:mix], [{:meck, "0.8.12", [hex: :meck, repo: "hexpm", optional: false]}], "hexpm"},
-  "ex_doc": {:hex, :ex_doc, "0.19.1", "519bb9c19526ca51d326c060cb1778d4a9056b190086a8c6c115828eaccea6cf", [:mix], [{:earmark, "~> 1.1", [hex: :earmark, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.7", [hex: :makeup_elixir, repo: "hexpm", optional: false]}], "hexpm"},
+  "cowboy": {:hex, :cowboy, "1.1.2", "61ac29ea970389a88eca5a65601460162d370a70018afe6f949a29dca91f3bb0", [:rebar3], [{:cowlib, "~> 1.0.2", [hex: :cowlib, repo: "hexpm", optional: false]}, {:ranch, "~> 1.3.2", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm", "f4763bbe08233eceed6f24bc4fcc8d71c17cfeafa6439157c57349aa1bb4f17c"},
+  "cowlib": {:hex, :cowlib, "1.0.2", "9d769a1d062c9c3ac753096f868ca121e2730b9a377de23dec0f7e08b1df84ee", [:make], [], "hexpm", "db622da03aa039e6366ab953e31186cc8190d32905e33788a1acb22744e6abd2"},
+  "earmark": {:hex, :earmark, "1.3.0", "17f0c38eaafb4800f746b457313af4b2442a8c2405b49c645768680f900be603", [:mix], [], "hexpm", "f8b8820099caf0d5e72ae6482d2b0da96f213cbbe2b5b2191a37966e119eaa27"},
+  "espec": {:hex, :espec, "1.6.3", "d9355788e508b82743a1b1b9aa5ac64ba37b0547c6210328d909e8a6eb56d42e", [:mix], [{:meck, "0.8.12", [hex: :meck, repo: "hexpm", optional: false]}], "hexpm", "235ef9931fc6ae8066272b77dc11c462e72af0aa50c6023643acd22b09326d21"},
+  "ex_doc": {:hex, :ex_doc, "0.19.1", "519bb9c19526ca51d326c060cb1778d4a9056b190086a8c6c115828eaccea6cf", [:mix], [{:earmark, "~> 1.1", [hex: :earmark, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.7", [hex: :makeup_elixir, repo: "hexpm", optional: false]}], "hexpm", "dc87f778d8260da0189a622f62790f6202af72f2f3dee6e78d91a18dd2fcd137"},
   "gun": {:git, "https://github.com/PSPDFKit-labs/gun.git", "0462585ec7b0bcb2ca4b8b91e6d2624a45324b6e", []},
-  "makeup": {:hex, :makeup, "0.5.5", "9e08dfc45280c5684d771ad58159f718a7b5788596099bdfb0284597d368a882", [:mix], [{:nimble_parsec, "~> 0.4", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm"},
-  "makeup_elixir": {:hex, :makeup_elixir, "0.10.0", "0f09c2ddf352887a956d84f8f7e702111122ca32fbbc84c2f0569b8b65cbf7fa", [:mix], [{:makeup, "~> 0.5.5", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm"},
-  "meck": {:hex, :meck, "0.8.12", "1f7b1a9f5d12c511848fec26bbefd09a21e1432eadb8982d9a8aceb9891a3cf2", [:rebar3], [], "hexpm"},
-  "mime": {:hex, :mime, "1.3.0", "5e8d45a39e95c650900d03f897fbf99ae04f60ab1daa4a34c7a20a5151b7a5fe", [:mix], [], "hexpm"},
-  "nimble_parsec": {:hex, :nimble_parsec, "0.4.0", "ee261bb53214943679422be70f1658fff573c5d0b0a1ecd0f18738944f818efe", [:mix], [], "hexpm"},
-  "plug": {:hex, :plug, "1.7.0", "cd8c8de89bd9de55eba1c918bf0e7f319737e109b6014875104af025a623e16e", [:mix], [{:mime, "~> 1.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_crypto, "~> 1.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}], "hexpm"},
-  "plug_cowboy": {:hex, :plug_cowboy, "1.0.0", "2e2a7d3409746d335f451218b8bb0858301c3de6d668c3052716c909936eb57a", [:mix], [{:cowboy, "~> 1.0", [hex: :cowboy, repo: "hexpm", optional: false]}, {:plug, "~> 1.7", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm"},
-  "plug_crypto": {:hex, :plug_crypto, "1.0.0", "18e49317d3fa343f24620ed22795ec29d4a5e602d52d1513ccea0b07d8ea7d4d", [:mix], [], "hexpm"},
-  "ranch": {:hex, :ranch, "1.3.2", "e4965a144dc9fbe70e5c077c65e73c57165416a901bd02ea899cfd95aa890986", [:rebar3], [], "hexpm"},
+  "makeup": {:hex, :makeup, "0.5.5", "9e08dfc45280c5684d771ad58159f718a7b5788596099bdfb0284597d368a882", [:mix], [{:nimble_parsec, "~> 0.4", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "d7152ff93f2eac07905f510dfa03397134345ba4673a00fbf7119bab98632940"},
+  "makeup_elixir": {:hex, :makeup_elixir, "0.10.0", "0f09c2ddf352887a956d84f8f7e702111122ca32fbbc84c2f0569b8b65cbf7fa", [:mix], [{:makeup, "~> 0.5.5", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "4a36dd2d0d5c5f98d95b3f410d7071cd661d5af310472229dd0e92161f168a44"},
+  "meck": {:hex, :meck, "0.8.12", "1f7b1a9f5d12c511848fec26bbefd09a21e1432eadb8982d9a8aceb9891a3cf2", [:rebar3], [], "hexpm", "7a6ab35a42e6c846636e8ecd6fdf2cc2e3f09dbee1abb15c1a7c705c10775787"},
+  "mime": {:hex, :mime, "1.3.0", "5e8d45a39e95c650900d03f897fbf99ae04f60ab1daa4a34c7a20a5151b7a5fe", [:mix], [], "hexpm", "5e839994289d60326aa86020c4fbd9c6938af188ecddab2579f07b66cd665328"},
+  "mint": {:hex, :mint, "1.1.0", "1fd0189edd9e3ffdbd7fcd8bc3835902b987a63ec6c4fd1aa8c2a56e2165f252", [:mix], [{:castore, "~> 0.1.0", [hex: :castore, repo: "hexpm", optional: true]}], "hexpm", "5bfd316c3789340b682d5679a8116bcf2112e332447bdc20c1d62909ee45f48d"},
+  "nimble_parsec": {:hex, :nimble_parsec, "0.4.0", "ee261bb53214943679422be70f1658fff573c5d0b0a1ecd0f18738944f818efe", [:mix], [], "hexpm", "ebb595e19456a72786db6dcd370d320350cb624f0b6203fcc7e23161d49b0ffb"},
+  "plug": {:hex, :plug, "1.7.0", "cd8c8de89bd9de55eba1c918bf0e7f319737e109b6014875104af025a623e16e", [:mix], [{:mime, "~> 1.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_crypto, "~> 1.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}], "hexpm", "e21e0ea7cbf87ecbc6ab6a9418db78fa1285dc12c8e0586f44dd6dfa842a190b"},
+  "plug_cowboy": {:hex, :plug_cowboy, "1.0.0", "2e2a7d3409746d335f451218b8bb0858301c3de6d668c3052716c909936eb57a", [:mix], [{:cowboy, "~> 1.0", [hex: :cowboy, repo: "hexpm", optional: false]}, {:plug, "~> 1.7", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "01d201427a8a1f4483be2465a98b45f5e82263327507fe93404a61c51eb9e9a8"},
+  "plug_crypto": {:hex, :plug_crypto, "1.0.0", "18e49317d3fa343f24620ed22795ec29d4a5e602d52d1513ccea0b07d8ea7d4d", [:mix], [], "hexpm", "73c1682f0e414cfb5d9b95c8e8cd6ffcfdae699e3b05e1db744e58b7be857759"},
+  "ranch": {:hex, :ranch, "1.3.2", "e4965a144dc9fbe70e5c077c65e73c57165416a901bd02ea899cfd95aa890986", [:rebar3], [], "hexpm", "6e56493a862433fccc3aca3025c946d6720d8eedf6e3e6fb911952a7071c357f"},
 }

test/bypass_test.exs

@@ -71,7 +71,7 @@ defmodule BypassTest do
     assert {:ok, 200, ""} = request(bypass.port)
 
     Bypass.down(bypass)
-    assert {:error, :noconnect} = request(bypass.port)
+    assert {:error, %Mint.TransportError{reason: :econnrefused}} = request(bypass.port)
   end
 
   test "Bypass.up opens the socket again" do
@@ -84,7 +84,7 @@ defmodule BypassTest do
     assert {:ok, 200, ""} = request(bypass.port)
 
     Bypass.down(bypass)
-    assert {:error, :noconnect} = request(bypass.port)
+    assert {:error, %Mint.TransportError{reason: :econnrefused}} = request(bypass.port)
 
     Bypass.up(bypass)
     assert {:ok, 200, ""} = request(bypass.port)
@@ -136,7 +136,8 @@ defmodule BypassTest do
     ])
 
     capture_log(fn ->
-      assert {:error, {:closed, 'The connection was lost.'}} = request(bypass.port)
+      assert {:error, _conn, %Mint.TransportError{reason: :closed}, _responses} =
+               request(bypass.port)
     end)
   end
 
@@ -161,7 +162,8 @@ defmodule BypassTest do
       end
     ])
 
-    assert {:error, {:closed, 'The connection was lost.'}} == request(bypass.port)
+    assert {:error, _conn, %Mint.TransportError{reason: :closed}, _responses} =
+             request(bypass.port)
   end
 
   test "Bypass.down waits for plug process to terminate before shutting it down with expect" do
@@ -449,45 +451,44 @@ defmodule BypassTest do
   closed error and not a failed to connect error, when we test Bypass.down
   """
   def request(port, path \\ "/example_path", method \\ :post) do
-    {:ok, conn} = :gun.start_link(self(), '127.0.0.1', port, %{retry: 0})
-
-    try do
-      case :gun.await_up(conn, 250) do
-        {:ok, _protocol} ->
-          stream =
-            case method do
-              :post -> :gun.post(conn, path, [], "")
-              :get -> :gun.get(conn, path, [])
-            end
-
-          case :gun.await(conn, stream, 250) do
-            {:response, :fin, status, _headers} ->
-              {:ok, status, ""}
-
-            {:response, :nofin, status, _headers} ->
-              case :gun.await_body(conn, stream, 250) do
-                {:ok, data} -> {:ok, status, data}
-                {:error, _} = error -> error
-              end
-
-            {:error, _} = error ->
-              error
-          end
+    method = method |> Atom.to_string() |> String.upcase()
 
-        {:error, :timeout} ->
-          raise "Expected gun to die, but it didn't."
+    with {:ok, conn} <- Mint.HTTP.connect(:http, "127.0.0.1", port),
+         {:ok, conn, ref} = Mint.HTTP.request(conn, method, path, [], "") do
+      result = receive_responses(conn, ref)
+      {:ok, _conn} = Mint.HTTP.close(conn)
+      result
+    end
+  end
 
-        {:error, :normal} ->
-          # `await_up` monitors gun and errors only if gun died (or after `timeout`). That happens
-          # when gun can't connect and is out of retries (immediately in our case) so we know that
-          # gun is dead.
-          {:error, :noconnect}
-      end
-    after
-      Process.unlink(conn)
-      monitor = Process.monitor(conn)
-      Process.exit(conn, :kill)
-      assert_receive {:DOWN, ^monitor, :process, ^conn, _}
+  defp receive_responses(conn, ref, result \\ %{done: false, status: 100, body: []}) do
+    receive do
+      message ->
+        with {:ok, conn, responses} <- Mint.HTTP.stream(conn, message),
+             %{} = result <-
+               Enum.reduce(responses, result, fn response, result ->
+                 case response do
+                   {:status, ^ref, status} ->
+                     %{result | status: status}
+
+                   {:headers, ^ref, _headers} ->
+                     result
+
+                   {:data, ^ref, data} ->
+                     %{result | body: result.body ++ [data]}
+
+                   {:done, ^ref} ->
+                     %{result | done: true}
+
+                   {:error, ^ref, _reason} = error ->
+                     error
+                 end
+               end) do
+          case result do
+            %{done: true} -> {:ok, result.status, Enum.join(result.body)}
+            %{done: false} -> receive_responses(conn, ref, result)
+          end
+        end
     end
   end