brotorift 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39731491bf8f75fd3020706e30be5bfeb20ce2ac29278a47c16554092d90724f
-  data.tar.gz: eb54a4e1e1b8925458fe1f33943a595e566360b06d2838d404ac903cc798b7a6
+  metadata.gz: 9ea750ad59e5e8a3a45649decbfaa5e5d1d8626509f8a53d52fe07686e4bb776
+  data.tar.gz: fe20f3f62b599d1e654cc21424dd2fe1b80a63921ccfa7de5e26c93e620ba141
 SHA512:
-  metadata.gz: 7dfae3292bf18d45826429a411f930773b0277fb62051880d10d580d61417362cebcb3dbb6d49a5763734879528aef574b8021646955295efa21ee3096c813ea
-  data.tar.gz: fa60f4a94cc8a8cf060a922d4f3b4310e12c5f225a9a68770b896b6b4a6ee6669fca784cd039790f402139f1cd7917eb30df2d69e79fcd4aa8506e98d9895759
+  metadata.gz: 2eb09be1bc2de4cae9fcc30d56439b800d6160c0b2637a0a3a8c0524460714f31656c1c80f9da233b1b4e6a2d4b167a79a9a24d2b0f75d3d3513bd4d471bd3d6
+  data.tar.gz: bc66679e879bfa9d5bec86b01bf510d9f86346b8a230e5a9a64a85f8d11443fa861adc3c9d989fb95b097598991ab860e8e5288e7afb833fd7ad85fe28dc4b91

data/lib/generators/bot_generator.ex.erb

@@ -14,10 +14,16 @@ defmodule <%= node.namespace %>.<%= node.bot_client %> do
     GenServer.start_link(__MODULE__, args)
   end
 
+  @spec connect(client :: pid()) :: :ok
   def connect(client) do
     GenServer.call(client, :connect, :infinity)
   end
 
+  @spec sleep(client :: pid(), duration :: non_neg_integer()) :: :ok
+  def sleep(client, duration) do
+    GenServer.call(client, {:sleep, duration}, :infinity)
+  end
+
   <% for m in n.out_direction.messages.values %>
   @doc """
   <%= m.doc %>
@@ -51,42 +57,72 @@ defmodule <%= node.namespace %>.<%= node.bot_client %> do
   def init(_args) do
     {:ok, report} = BrotoriftBot.ReportManager.create_report()
     {:ok, tcp_client} = BrotoriftBot.TcpClientSupervisor.create_client(report, self())
-    {:ok, {report, tcp_client}}
+    {:ok, {report, tcp_client, []}}
   end
 
-  def handle_call(:connect, _from, {report, tcp_client}) do
+  def handle_call(:connect, _from, {report, tcp_client, []}) do
     BrotoriftBot.TcpClient.connect(tcp_client, @version)
-    {:reply, :ok, {report, tcp_client}}
+    {:reply, :ok, {report, tcp_client, []}}
+  end
+
+  def handle_call({:sleep, duration}, _from, {report, tcp_client, queued_messages}) do
+    start_time = Time.utc_now()
+    Process.sleep(duration)
+    stop_time = Time.utc_now()
+    BrotoriftBot.Report.sleep(report, duration, start_time, stop_time)
+    {:reply, :ok, {report, tcp_client, queued_messages}}
   end
 
   <% for m in n.in_direction.messages.values %>
-  def handle_call({:receive, :<%= m.bot_name %>}, _from, {report, tcp_client}) do
+  def handle_call({:receive, :<%= m.bot_name %>}, _from, {report, tcp_client, queued_messages}) do
     start_time = Time.utc_now()
-    data = try_receive(<%= m.bot_header_name %>, tcp_client)
+    {data, messages_left} = try_receive(<%= m.bot_header_name %>, tcp_client, queued_messages)
     stop_time = Time.utc_now()
     BrotoriftBot.Report.receive(report, :<%= m.bot_name %>, start_time, stop_time)
 
     content = parse_packet(:<%= m.bot_name %>, data)
-    {:reply, {:ok, content}, {report, tcp_client}}
+    {:reply, {:ok, content}, {report, tcp_client, messages_left}}
   end
   <% end %>
   <% for m in n.out_direction.messages.values %>
-  def handle_cast({:send, {:<%= m.bot_send_name %><%= m.bot_params %>}}, {report, tcp_client}) do
+  def handle_cast({:send, {:<%= m.bot_send_name %><%= m.bot_params %>}}, {report, tcp_client, queued_messages}) do
     data = <<<%= m.bot_header_name %>::32-little>><% for p in m.members %>
     data = <%= p.type.bot_write node, p.bot_name %><% end %>
     time = Time.utc_now()
     :ok = BrotoriftBot.TcpClient.send_packet(tcp_client, data)
     BrotoriftBot.Report.send(report, :<%= m.bot_name %>, time)
-    {:noreply, {report, tcp_client}}
+    {:noreply, {report, tcp_client, queued_messages}}
   end
   <% end %>
 
-  defp try_receive(message, tcp_client) do
-    receive do
-      {^message, value} ->
-        value
-      _ ->
-        try_receive(message, tcp_client)
+  def handle_info({message, value}, {report, tcp_client, queued_messages}) do
+    {:noreply, {report, tcp_client, queued_messages ++ [{message, value}]}}
+  end
+
+  defp try_receive(message, tcp_client, queued_messages) do
+    {value_found, messages_left_reversed} = queued_messages |> Enum.reduce({nil, []}, fn {m, v}, {value_found, messages_left} ->
+      if value_found != nil do
+        {value_found, [{m, v}] ++ messages_left}
+      else
+        if m == message do
+          {v, []}
+        else
+          {nil, []}
+        end
+      end
+    end
+    )
+
+    messages_left = Enum.reverse(messages_left_reversed)
+    if value_found != nil do
+      {value_found, messages_left}
+    else
+      receive do
+        {^message, value} ->
+          {value, messages_left}
+        _ ->
+          try_receive(message, tcp_client, messages_left)
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brotorift
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Peter Ren