Merge pull request #3 from revelrylabs/bug/timeout-exit

fix: trap timeout exits and turn them into errors

Author: jwietelmann

.travis.yml

@@ -14,7 +14,10 @@ install:
   - mix local.hex --force
   - mix local.rebar --force
   - mix deps.get
-  - (cd test/js/ && npm install)
+  - npm install
+  - cd test/js
+  - npm install
+  - cd ../..
 script:
   - MIX_ENV=test mix coveralls.travis --pro
 deploy:

lib/nodejs/supervisor.ex

@@ -51,10 +51,16 @@ defmodule NodeJS.Supervisor do
   def call(module, args, opts) when is_tuple(module) and is_list(args) do
     timeout = Keyword.get(opts, :timeout, @timeout)
 
-    module
-    |> to_transaction(args, opts)
-    |> Task.async()
-    |> Task.await(timeout)
+    task =
+      module
+      |> to_transaction(args, opts)
+      |> Task.async()
+
+    try do
+      Task.await(task, timeout)
+    catch
+      :exit, {:timeout, _} -> {:error, "Call timed out."}
+    end
   end
 
   def call!(module, args \\ [], opts \\ []) do

mix.exs

@@ -4,7 +4,7 @@ defmodule NodeJS.MixProject do
   def project do
     [
       app: :nodejs,
-      version: "0.2.2",
+      version: "0.2.3",
       elixir: "~> 1.6",
       start_permanent: Mix.env() == :prod,
       deps: deps(),