Merge pull request #32 from utkarshkukreti/handle-timeout

Fix crash due to TCP receive timeout
utkarshkukreti · Sep 15, 2024 · 550265e · 550265e
2 parents 5e879df + 1b84b1f
commit 550265e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## v0.3.1
+
+- Fix crash when TCP receive times out (`Whois.lookup/2` now correctly returns `{:error, :timed_out}`)
+
 ## v0.3.0
 
 - Add support for custom timeouts via the `:connect_timeout` and `:recv_timeout`

diff --git a/lib/whois.ex b/lib/whois.ex
@@ -122,7 +122,7 @@ defmodule Whois do
 
     case :gen_tcp.recv(socket, 0, timeout) do
       {:ok, data} -> recv(socket, acc <> data, opts)
-      {:error, :etimedout} -> {:error, :timed_out}
+      {:error, timeout} when timeout in [:etimedout, :timeout] -> {:error, :timed_out}
       {:error, :closed} -> acc
     end
   end

diff --git a/mix.exs b/mix.exs
@@ -7,7 +7,7 @@ defmodule Whois.Mixfile do
   def project do
     [
       app: :whois,
-      version: "0.3.0",
+      version: "0.3.1",
       elixir: "~> 1.12",
       consolidate_protocols: Mix.env() != :test,
       elixirc_paths: elixirc_paths(Mix.env()),

diff --git a/test/whois_test.exs b/test/whois_test.exs
@@ -88,6 +88,11 @@ defmodule WhoisTest do
     assert %NaiveDateTime{} = record.expires_at
   end
 
+  @tag :live
+  test "lookup/1 handles timeouts" do
+    assert {:error, :timed_out} = Whois.lookup("google.com", recv_timeout: 0)
+  end
+
   defp wait, do: Process.sleep(2500)
 end