From: Christopher <chris@entropealabs.com>
Date: Fri, 21 Feb 2020 04:03:28 +0000 (-0600)
Subject: clean up Role interface
X-Git-Url: http://git.entropealabs.com/?a=commitdiff_plain;h=96693c8a7d3ad58b71d79deba6161e4d0bfe9753;p=wampex_client.git

clean up Role interface
---

diff --git a/coveralls.json b/coveralls.json
index e3bafe7..f01db40 100644
--- a/coveralls.json
+++ b/coveralls.json
@@ -1,6 +1,6 @@
 {
   "coverage_options": {
-    "minimum_coverage": 83.6
+    "minimum_coverage": 83.0
   },
   "skip_files": [
     "test/support"
diff --git a/lib/wampex/role.ex b/lib/wampex/role.ex
index 672a1d0..5e68ce8 100644
--- a/lib/wampex/role.ex
+++ b/lib/wampex/role.ex
@@ -1,7 +1,6 @@
 defmodule Wampex.Role do
   @moduledoc "Behaviour for Roles"
   @callback add(map()) :: map()
-  @callback handle(message :: Wampex.message(), data :: StatesLanguage.t()) ::
-              {StatesLanguage.t(), [:gen_statem.action()], integer() | nil,
-               Wampex.handle_response()}
+  @callback handle(message :: Wampex.message()) ::
+              {[:gen_statem.action()], integer() | nil, Wampex.handle_response()}
 end
diff --git a/lib/wampex/roles/callee.ex b/lib/wampex/roles/callee.ex
index 3962eb4..351bb9f 100644
--- a/lib/wampex/roles/callee.ex
+++ b/lib/wampex/roles/callee.ex
@@ -12,6 +12,7 @@ defmodule Wampex.Role.Callee do
   @unregistered 67
   @invocation 68
   @yield 70
+  @interrupt 69
 
   defmodule Register do
     @moduledoc false
@@ -68,28 +69,33 @@ defmodule Wampex.Role.Callee do
   end
 
   @impl true
-  def handle([@unregistered, request_id], sl) do
-    {sl, [{:next_event, :internal, :established}], request_id, {:ok, request_id}}
+  def handle([@unregistered, request_id]) do
+    {[{:next_event, :internal, :established}], request_id, {:ok, request_id}}
   end
 
   @impl true
-  def handle([@registered, request_id, id], sl) do
-    {sl, [{:next_event, :internal, :established}], request_id, {:ok, id}}
+  def handle([@registered, request_id, id]) do
+    {[{:next_event, :internal, :established}], request_id, {:ok, id}}
   end
 
   @impl true
-  def handle([@invocation, id, reg_id, dets], sl) do
-    handle([@invocation, id, reg_id, dets, [], %{}], sl)
+  def handle([@invocation, id, reg_id, dets]) do
+    handle([@invocation, id, reg_id, dets, [], %{}])
   end
 
   @impl true
-  def handle([@invocation, id, reg_id, dets, arg_l], sl) do
-    handle([@invocation, id, dets, reg_id, arg_l, %{}], sl)
+  def handle([@invocation, id, reg_id, dets, arg_l]) do
+    handle([@invocation, id, dets, reg_id, arg_l, %{}])
   end
 
   @impl true
-  def handle([@invocation, id, reg_id, dets, arg_l, arg_kw], sl) do
-    {sl, [{:next_event, :internal, :invocation}], id,
+  def handle([@invocation, id, reg_id, dets, arg_l, arg_kw]) do
+    {[{:next_event, :internal, :invocation}], id,
      {:update, :invocation, {:invocation, id, reg_id, dets, arg_l, arg_kw}}}
   end
+
+  @impl true
+  def handle([@interrupt, id, opts]) do
+    {[{:next_event, :internal, :interrupt}], id, {:interupt, id, opts}}
+  end
 end
diff --git a/lib/wampex/roles/caller.ex b/lib/wampex/roles/caller.ex
index 9612135..8b514a7 100644
--- a/lib/wampex/roles/caller.ex
+++ b/lib/wampex/roles/caller.ex
@@ -33,17 +33,17 @@ defmodule Wampex.Role.Caller do
   end
 
   @impl true
-  def handle([@result, id, dets], sl) do
-    handle([@result, id, dets, [], %{}], sl)
+  def handle([@result, id, dets]) do
+    handle([@result, id, dets, [], %{}])
   end
 
   @impl true
-  def handle([@result, id, dets, arg_l], sl) do
-    handle([@result, id, dets, arg_l, %{}], sl)
+  def handle([@result, id, dets, arg_l]) do
+    handle([@result, id, dets, arg_l, %{}])
   end
 
   @impl true
-  def handle([@result, id, _dets, arg_l, arg_kw], sl) do
-    {sl, [{:next_event, :internal, :established}], id, {:ok, arg_l, arg_kw}}
+  def handle([@result, id, _dets, arg_l, arg_kw]) do
+    {[{:next_event, :internal, :established}], id, {:ok, arg_l, arg_kw}}
   end
 end
diff --git a/lib/wampex/roles/peer.ex b/lib/wampex/roles/peer.ex
index 6ac2e2d..714cbdc 100644
--- a/lib/wampex/roles/peer.ex
+++ b/lib/wampex/roles/peer.ex
@@ -70,37 +70,37 @@ defmodule Wampex.Role.Peer do
   end
 
   @impl true
-  def handle([@welcome, session_id, _dets], sl) do
-    {sl, [{:next_event, :internal, :established}], nil, {:update, :id, session_id}}
+  def handle([@welcome, session_id, _dets]) do
+    {[{:next_event, :internal, :established}], nil, {:update, :id, session_id}}
   end
 
   @impl true
-  def handle([@abort, _dets, reason], sl) do
-    {sl, [{:next_event, :internal, :abort}], nil, {:update, :error, reason}}
+  def handle([@abort, _dets, reason]) do
+    {[{:next_event, :internal, :abort}], nil, {:update, :error, reason}}
   end
 
   @impl true
-  def handle([@goodbye, _dets, reason], sl) do
-    {sl, [{:next_event, :internal, :goodbye}], nil, {:update, :goodbye, reason}}
+  def handle([@goodbye, _dets, reason]) do
+    {[{:next_event, :internal, :goodbye}], nil, {:update, :goodbye, reason}}
   end
 
   @impl true
-  def handle([@challenge, auth_method, extra], sl) do
-    {sl, [{:next_event, :internal, :challenge}], nil, {:update, :challenge, {auth_method, extra}}}
+  def handle([@challenge, auth_method, extra]) do
+    {[{:next_event, :internal, :challenge}], nil, {:update, :challenge, {auth_method, extra}}}
   end
 
   @impl true
-  def handle([@error, type, id, dets, error], sl) do
-    handle([@error, type, id, dets, error, [], %{}], sl)
+  def handle([@error, type, id, dets, error]) do
+    handle([@error, type, id, dets, error, [], %{}])
   end
 
   @impl true
-  def handle([@error, type, id, dets, error, arg_l], sl) do
-    handle([@error, type, id, dets, error, arg_l, %{}], sl)
+  def handle([@error, type, id, dets, error, arg_l]) do
+    handle([@error, type, id, dets, error, arg_l, %{}])
   end
 
   @impl true
-  def handle([@error, type, id, _dets, error, arg_l, arg_kw], sl) do
-    {sl, [{:next_event, :internal, :established}], id, {:error, type, error, arg_l, arg_kw}}
+  def handle([@error, type, id, _dets, error, arg_l, arg_kw]) do
+    {[{:next_event, :internal, :established}], id, {:error, type, error, arg_l, arg_kw}}
   end
 end
diff --git a/lib/wampex/roles/publisher.ex b/lib/wampex/roles/publisher.ex
index 2e61c97..ddc00fd 100644
--- a/lib/wampex/roles/publisher.ex
+++ b/lib/wampex/roles/publisher.ex
@@ -33,7 +33,7 @@ defmodule Wampex.Role.Publisher do
   end
 
   @impl true
-  def handle([@published, request_id, id], sl) do
-    {sl, [{:next_event, :internal, :established}], request_id, {:ok, id}}
+  def handle([@published, request_id, id]) do
+    {[{:next_event, :internal, :established}], request_id, {:ok, id}}
   end
 end
diff --git a/lib/wampex/roles/subscriber.ex b/lib/wampex/roles/subscriber.ex
index abbef1a..0d600e7 100644
--- a/lib/wampex/roles/subscriber.ex
+++ b/lib/wampex/roles/subscriber.ex
@@ -49,28 +49,28 @@ defmodule Wampex.Role.Subscriber do
   end
 
   @impl true
-  def handle([@subscribed, request_id, id], sl) do
-    {sl, [{:next_event, :internal, :established}], request_id, {:ok, id}}
+  def handle([@subscribed, request_id, id]) do
+    {[{:next_event, :internal, :established}], request_id, {:ok, id}}
   end
 
   @impl true
-  def handle([@unsubscribed, request_id], sl) do
-    {sl, [{:next_event, :internal, :established}], request_id, :ok}
+  def handle([@unsubscribed, request_id]) do
+    {[{:next_event, :internal, :established}], request_id, :ok}
   end
 
   @impl true
-  def handle([@event, sub_id, pub_id, dets], sl) do
-    handle([@event, sub_id, pub_id, dets, [], %{}], sl)
+  def handle([@event, sub_id, pub_id, dets]) do
+    handle([@event, sub_id, pub_id, dets, [], %{}])
   end
 
   @impl true
-  def handle([@event, sub_id, pub_id, dets, arg_l], sl) do
-    handle([@event, sub_id, pub_id, dets, arg_l, %{}], sl)
+  def handle([@event, sub_id, pub_id, dets, arg_l]) do
+    handle([@event, sub_id, pub_id, dets, arg_l, %{}])
   end
 
   @impl true
-  def handle([@event, sub_id, pub_id, dets, arg_l, arg_kw], sl) do
-    {sl, [{:next_event, :internal, :event}], nil,
+  def handle([@event, sub_id, pub_id, dets, arg_l, arg_kw]) do
+    {[{:next_event, :internal, :event}], nil,
      {:update, :event, {:event, sub_id, pub_id, dets, arg_l, arg_kw}}}
   end
 end
diff --git a/lib/wampex/session.ex b/lib/wampex/session.ex
index 0d8b4e4..299d82b 100644
--- a/lib/wampex/session.ex
+++ b/lib/wampex/session.ex
@@ -183,11 +183,11 @@ defmodule Wampex.Session do
         %SL{data: %Sess{message: msg, requests: requests, roles: roles}} = data
       ) do
     Logger.debug("Handling Message #{inspect(msg)}")
-    {data, actions, id, response} = handle_message(msg, data, roles)
-    {data, response} = maybe_update_response(data, response)
+    {actions, id, response} = handle_message(msg, roles)
+    {%SL{data: sess} = data, response} = maybe_update_response(data, response)
     {requests, actions} = resp = handle_response(id, actions, requests, response)
     Logger.debug("Response: #{inspect(resp)}")
-    {:ok, %SL{data | data: %Sess{data.data | requests: requests}}, actions}
+    {:ok, %SL{data | data: %Sess{sess | requests: requests}}, actions}
   end
 
   @impl true
@@ -285,12 +285,6 @@ defmodule Wampex.Session do
      [{:next_event, :internal, :message_received}]}
   end
 
-  defp maybe_update_response(data, {:update, key, resp}) do
-    {%SL{data | data: Map.put(data.data, key, resp)}, resp}
-  end
-
-  defp maybe_update_response(data, resp), do: {data, resp}
-
   defp handle_response(nil, actions, requests, _), do: {requests, actions}
 
   defp handle_response(id, actions, requests, response) do
@@ -306,6 +300,12 @@ defmodule Wampex.Session do
     end)
   end
 
+  defp maybe_update_response(data, {:update, key, resp}) do
+    {%SL{data | data: Map.put(data.data, key, resp)}, resp}
+  end
+
+  defp maybe_update_response(data, resp), do: {data, resp}
+
   defp do_send(r_id, tt, t, message) do
     {request_id, message} = maybe_inject_request_id(r_id, message)
     tt.send_request(t, remove_nil_values(message))
@@ -362,10 +362,10 @@ defmodule Wampex.Session do
     end)
   end
 
-  defp handle_message(msg, data, roles) do
+  defp handle_message(msg, roles) do
     Enum.reduce_while(roles, nil, fn r, _ ->
       try do
-        res = r.handle(msg, data)
+        res = r.handle(msg)
         {:halt, res}
       rescue
         FunctionClauseError -> {:cont, nil}