Merge branch 'use-custom-hackney-pool'

Author: keathley

lib/twirp/client.ex

@@ -38,15 +38,37 @@ defmodule Twirp.Client do
       end)
 
     quote do
+      def start(adapter_opts \\ []) do
+        default_opts = [
+          timeout: 150_000,
+          max_connections: 60
+        ]
+
+        opts = Keyword.merge(default_opts, Keyword.take(adapter_opts, [:timeout, :max_connections]))
+               # |> IO.inspect(label: "Pool options")
+        name = Keyword.get(adapter_opts, :pool_name, __MODULE__.Pool)
+
+        :hackney_pool.start_pool(name, opts)
+      end
+
       # TODO - This should also allow you to configure the adapter
       # Maybe we should allow people to pass in the client or whatever as well.
-      def client(content_type \\ :proto, base_url, middleware) when is_binary(base_url) do
+      def client(content_type \\ :proto, base_url, middleware, adapter_opts) when is_binary(base_url) do
         base_middleware = [
           {Tesla.Middleware.BaseUrl, base_url},
           {Tesla.Middleware.Headers, [{"Content-Type", Twirp.Encoder.type(content_type)}]},
         ]
 
-        Tesla.client(middleware ++ base_middleware, Tesla.Adapter.Hackney)
+        default_adapter_opts = [
+          recv_timeout: 1_000,
+          pool: __MODULE__.Pool,
+          connect_timeout: 500
+        ]
+
+        adapter_opts = Keyword.merge(default_adapter_opts, adapter_opts)
+                       # |> IO.inspect(label: "Adapter options")
+
+        Tesla.client(middleware ++ base_middleware, {Tesla.Adapter.Hackney, adapter_opts})
       end
 
       def rpc(client, method, req, opts \\ []) do

lib/twirp/client/http.ex

@@ -16,10 +16,8 @@ defmodule Twirp.Client.HTTP do
     encoded_payload = Encoder.encode(req, rpcdef.input, content_type)
 
     case Tesla.post(client, path, encoded_payload, [opts: opts]) do
-      {:error, :timeout} ->
-        meta = %{
-          timeout: Integer.to_string(get_in(opts, [:adapter, :recv_timeout]))
-        }
+      {:error, error} when error in [:timeout, :connect_timeout, :checkout_timeout] ->
+        meta = %{error_type: Atom.to_string(error)}
         {:error, Error.deadline_exceeded("Deadline to receive data from the service was exceeded", meta)}
 
       {:error, :econnrefused} ->

test/twirp/client_test.exs

@@ -12,7 +12,7 @@ defmodule Twirp.ClientTest do
   setup do
     service = Bypass.open()
     base_url = "http://localhost:#{service.port}"
-    client = Client.client(base_url, [])
+    client = Client.client(base_url, [], [])
 
     {:ok, service: service, client: client}
   end
@@ -53,15 +53,15 @@ defmodule Twirp.ClientTest do
       |> Plug.Conn.resp(200, ~s|{"msg": "Test"}|)
     end)
 
-    client = Client.client(:json, "http://localhost:#{service.port}", [])
+    client = Client.client(:json, "http://localhost:#{service.port}", [], [])
 
     assert {:ok, resp} = Client.echo(client, Req.new(msg: "Test"))
     assert match?(%Resp{}, resp)
     assert resp.msg == "Test"
   end
 
   test "if rpc is not defined return an error" do
-    client = Client.client("", [])
+    client = Client.client("", [], [])
     {:error, resp} = Client.rpc(client, :Undefined, Req.new(msg: "test"))
     assert match?(%Twirp.Error{code: :bad_route}, resp)
   end
@@ -150,4 +150,12 @@ defmodule Twirp.ClientTest do
     assert {:error, resp} = Client.echo(client, Req.new(msg: "test"))
     assert resp.code == :unavailable
   end
+
+  describe "pools" do
+    test "start/1 starts a dedicated hackney pool" do
+      assert :ok == Client.start()
+      assert pid = :hackney_pool.find_pool(Client.Pool)
+      assert is_pid(pid)
+    end
+  end
 end

test/twirp_test.exs

@@ -38,7 +38,7 @@ defmodule TwirpTest do
   end
 
   setup do
-    client = Client.client("http://localhost:4002", [])
+    client = Client.client("http://localhost:4002", [], [])
 
     {:ok, client: client}
   end
@@ -55,10 +55,6 @@ defmodule TwirpTest do
 
     assert {:error, resp} = Client.slow_echo(client, req, timeout: 5)
     assert resp.code == :deadline_exceeded
-    assert resp.meta.timeout == "5"
+    assert resp.meta.error_type == "timeout"
   end
-
-  # test "test what happens if the client hits a service endpoint that doesn't exist" do
-  #   flunk "Not Implemented"
-  # end
 end