A variety of fixes

Author: dazuma

.dockerignore

@@ -4,5 +4,5 @@
 /apps/tanx_web/priv/static/
 /apps/tanx_web/test/
 /deps/
-/kube/
 /test/
+/tmp/

README.md

@@ -148,6 +148,7 @@ Now we'll set up Google Kubernetes Engine to host an online tanx server.
 3.  Configure gcloud to use your cluster as default so you don't have to
     specify it every time for the remaining gcloud commands.
 
+        gcloud container clusters get-credentials tanx-cluster-1
         gcloud config set container/cluster tanx-cluster-1
 
     Replace the name if you named your cluster differently.

apps/tanx/lib/tanx/cluster.ex

@@ -13,6 +13,8 @@ defmodule Tanx.Cluster do
     Supervisor.stop(Tanx.Cluster.Supervisor)
   end
 
+  def connect_node(:""), do: nil
+
   def connect_node(node) do
     Horde.Cluster.join_hordes(Tanx.HordeHandoff, {Tanx.HordeHandoff, node})
     Horde.Cluster.join_hordes(Tanx.HordeSupervisor, {Tanx.HordeSupervisor, node})

apps/tanx/lib/tanx/continuous_game/impl.ex

@@ -1,5 +1,5 @@
 defmodule Tanx.ContinuousGame.Impl do
-  @default_player_timeout 7200.0
+  @default_player_timeout 3600.0
 
   defstruct(
     maze: nil,
@@ -373,6 +373,10 @@ defimpl Tanx.Game.Variant, for: Tanx.ContinuousGame.Impl do
     {data, [], []}
   end
 
+  def stats(data, _arena, _time) do
+    %{player_count: Enum.count(data.player_handles)}
+  end
+
   def stop(_data, _arena, _time) do
     %{}
   end

apps/tanx/lib/tanx/game/main.ex

@@ -36,9 +36,9 @@ defmodule Tanx.Game do
     defstruct(
       id: nil,
       running: false,
-      display_name: "",
       node: nil,
-      data: nil
+      settings: %{},
+      stats: %{}
     )
   end
 

apps/tanx/lib/tanx/game/manager.ex

@@ -1,12 +1,6 @@
 defmodule Tanx.Game.Manager do
   def start_link(game_id, opts \\ []) do
-    process_opts =
-      case Keyword.fetch(opts, :game_address) do
-        {:ok, addr} -> [name: addr]
-        :error -> []
-      end
-
-    GenServer.start(__MODULE__, {game_id, opts}, process_opts)
+    GenServer.start(__MODULE__, {game_id, opts})
   end
 
   use GenServer
@@ -29,13 +23,13 @@ defmodule Tanx.Game.Manager do
       handoff: nil,
       opts: [],
       node: nil,
-      display_name: "",
       data: nil,
       arena: nil,
       commands: [],
       sent_commands: [],
       callbacks: %{},
-      time: 0.0
+      time: 0.0,
+      settings: %{}
     )
   end
 
@@ -62,11 +56,13 @@ defmodule Tanx.Game.Manager do
   end
 
   def handle_call({:meta}, _from, state) do
+    stats = Tanx.Game.Variant.stats(state.data, state.arena, state.time)
     meta = %Tanx.Game.Meta{
       id: state.game_id,
       running: state.running,
-      display_name: state.display_name,
-      node: Node.self()
+      node: Node.self(),
+      settings: state.settings,
+      stats: stats
     }
 
     {:reply, {:ok, meta}, state}
@@ -182,6 +178,8 @@ defmodule Tanx.Game.Manager do
   def flatten_and_reverse(output, cmd), do: [cmd | output]
 
   defp state_from_handoff(base_state, handoff_state) do
+    Horde.Registry.register(Tanx.HordeRegistry, handoff_state.game_id)
+
     opts =
       Keyword.update!(handoff_state.opts, :time_config, fn
         tc when is_integer(tc) -> Tanx.Util.SystemTime.updated_offset(handoff_state.time)
@@ -228,7 +226,7 @@ defmodule Tanx.Game.Manager do
       running: false,
       handoff: handoff,
       opts: opts,
-      display_name: display_name,
+      settings: %{display_name: display_name},
       node: Node.self()
     }
   end
@@ -250,6 +248,8 @@ defmodule Tanx.Game.Manager do
       Tanx.Util.Handoff.unrequest(base_state.handoff, base_state.game_id)
     end
 
+    Horde.Registry.register(Tanx.HordeRegistry, base_state.game_id)
+
     opts = base_state.opts
     time_config = Keyword.get(opts, :time_config, Tanx.Util.SystemTime.cur_offset())
     opts = Keyword.put(opts, :time_config, time_config)
@@ -308,7 +308,7 @@ defmodule Tanx.Game.Manager do
       running: false,
       handoff: state.handoff,
       opts: state.opts,
-      display_name: state.display_name,
+      settings: state.settings,
       node: Node.self()
     }
   end

apps/tanx/lib/tanx/game/variant.ex

@@ -2,5 +2,6 @@ defprotocol Tanx.Game.Variant do
   def init_arena(data, time)
   def control(data, arena, time, params)
   def event(data, event)
+  def stats(data, arena, time)
   def stop(data, arena, time)
 end

apps/tanx/lib/tanx/util/handoff.ex

@@ -18,7 +18,7 @@ defmodule Tanx.Util.Handoff do
   end
 
   def store(handoff, name, data) do
-    GenServer.cast(handoff, {:store, name, data})
+    GenServer.call(handoff, {:store, name, data})
   end
 
   use GenServer
@@ -84,6 +84,7 @@ defmodule Tanx.Util.Handoff do
   end
 
   def handle_call({:join_hordes, other_horde}, from, state) do
+    Logger.info("**** Handoff requesting join hordes")
     GenServer.cast(
       other_horde,
       {:request_to_join_hordes, {state.node_id, state.members_pid, from}}
@@ -104,10 +105,12 @@ defmodule Tanx.Util.Handoff do
           {:operation, {:remove, [name]}}
         )
 
+        Logger.info("**** Handoff fulfilling request for: #{inspect(name)}")
         :ets.delete(state.ets_table, name)
         {:reply, {:ok, :data, data}, state}
 
       _ ->
+        Logger.info("**** Handoff deferring request for: #{inspect(name)}")
         requests = Map.put(state.requests, name, {pid, message})
         {:reply, {:ok, :requested}, %State{state | requests: requests}}
     end
@@ -118,10 +121,11 @@ defmodule Tanx.Util.Handoff do
     {:reply, :ok, %State{state | requests: requests}}
   end
 
-  def handle_cast({:store, name, data}, state) do
+  def handle_call({:store, name, data}, _from, state) do
+    Logger.info("**** Handoff storing data for: #{inspect(name)}")
     case Map.get(state.requests, name) do
       nil ->
-        GenServer.cast(
+        GenServer.call(
           state.processes_pid,
           {:operation, {:add, [name, data]}}
         )
@@ -132,25 +136,27 @@ defmodule Tanx.Util.Handoff do
         send(pid, {message, data})
     end
 
-    {:noreply, state}
+    {:reply, :ok, state}
   end
 
   def handle_cast(
         {:request_to_join_hordes, {_other_node_id, other_members_pid, reply_to}},
         state
       ) do
+    Logger.info("**** Handoff receiving join hordes")
     Kernel.send(state.members_pid, {:add_neighbours, [other_members_pid]})
     GenServer.reply(reply_to, true)
     {:noreply, state}
   end
 
   def handle_info({:processes_updated, reply_to}, state) do
-    processes = DeltaCrdt.CausalCrdt.read(state.processes_pid, 30_000)
+    processes = DeltaCrdt.CausalCrdt.read(state.processes_pid, 2000)
 
     :ets.insert(state.ets_table, Map.to_list(processes))
 
     all_keys = :ets.match(state.ets_table, {:"$1", :_}) |> MapSet.new(fn [x] -> x end)
     new_keys = Map.keys(processes) |> MapSet.new()
+    Logger.info("**** Handoff received data update: #{inspect(MapSet.to_list(new_keys))}")
     to_delete_keys = MapSet.difference(all_keys, new_keys)
 
     to_delete_keys |> Enum.each(fn key -> :ets.delete(state.ets_table, key) end)
@@ -166,6 +172,7 @@ defmodule Tanx.Util.Handoff do
 
           data ->
             send(pid, {message, data})
+            Logger.info("**** Handoff sending message for: #{inspect(name)}")
 
             GenServer.cast(
               state.processes_pid,
@@ -184,7 +191,7 @@ defmodule Tanx.Util.Handoff do
   end
 
   def handle_info({:members_updated, reply_to}, state) do
-    members = DeltaCrdt.CausalCrdt.read(state.members_pid, 30_000)
+    members = DeltaCrdt.CausalCrdt.read(state.members_pid, 2000)
 
     member_pids =
       MapSet.new(members, fn {_key, {members_pid, _processes_pid}} -> members_pid end)
@@ -194,6 +201,8 @@ defmodule Tanx.Util.Handoff do
       MapSet.new(state.members, fn {_key, {members_pid, _processes_pid}} -> members_pid end)
       |> MapSet.delete(nil)
 
+    Logger.info("**** Handoff received members updated: #{inspect(Enum.count(state_member_pids))} -> #{inspect(Enum.count(member_pids))}")
+
     # if there are any new pids in `member_pids`
     if MapSet.difference(member_pids, state_member_pids) |> Enum.any?() do
       processes_pids =
@@ -213,14 +222,16 @@ defmodule Tanx.Util.Handoff do
   end
 
   def handle_info(whatevah, state) do
-    Logger.warn("**** Received unexpected message: #{inspect(whatevah)}")
+    Logger.warn("**** Handoff received unexpected message: #{inspect(whatevah)}")
     {:noreply, state}
   end
 
   def terminate(reason, state) do
     Logger.info("**** Terminating handoff due to #{inspect(reason)}")
 
-    GenServer.cast(
+    GenServer.call(state.processes_pid, :sync)
+
+    GenServer.call(
       state.members_pid,
       {:operation, {:remove, [state.node_id]}}
     )

apps/tanx_web/assets/js/arena/animate.js

@@ -3,9 +3,9 @@ import ArenaRender from "js/arena/render"
 
 const NUM_TIMESTAMPS = 10;
 const INITIAL_BUFFER_LEN = 2;
-const MAX_BUFFER_LEN = 6;
-const TARGET_FPS_LO = 30;
-const TARGET_FPS_HI = 50;
+const MAX_BUFFER_LEN = 3;
+const TARGET_FPS_LO = 20;
+const TARGET_FPS_HI = 40;
 const MEASUREMENT_INTERVAL = 2000;
 
 

apps/tanx_web/assets/js/lobby.js

@@ -1,5 +1,6 @@
-const JOIN_RETRY_INTERVAL = 100;
+const JOIN_RETRY_INTERVAL = 200;
 const JOIN_RETRY_COUNT = 10;
+const REJOIN_RETRY_COUNT = 20;
 
 
 class Lobby {
@@ -14,10 +15,15 @@ class Lobby {
     this._leaveCallbacks = [];
     this._rejoinCallbacks = [];
     this._gameInfo = {};
+    this._rejoinRetries = REJOIN_RETRY_COUNT;
 
     this._setupControls();
 
     this._setupGameList();
+
+    $(window).on('beforeunload', () => {
+      this.leave();
+    });
   }
 
 
@@ -44,6 +50,7 @@ class Lobby {
     this._leaveCallbacks.forEach(callback => {
       callback(gameId, gameChannel);
     });
+    gameChannel.push('leave', {});
     gameChannel.leave();
   }
 
@@ -101,8 +108,6 @@ class Lobby {
         event.stopPropagation();
       });
 
-
-
     this.leave();
   }
 
@@ -165,47 +170,61 @@ class Lobby {
     let playerName = $('#tanx-name-field').val();
     let gameChannel = this._socket.channel("game:" + gameId, {name: playerName});
     gameChannel.onError(reason => {
-      console.log("received error on game channel");
-      this._gameChannel = null;
+      console.log("Received error on game channel");
+      //this._gameChannel = null;
     });
 
     let gameJoiner = gameChannel.join();
     gameJoiner.receive("ok", reply => {
       this._joinPayload = gameJoiner.payload;
       this._gameChannel = gameChannel;
       if (this._gameId == null) {
-        gameJoiner.payload.id = reply.i;
-        this._finishJoin(gameId);
+        this._joinPayload.id = reply.i;
+        this._finishJoin(reply.g);
       } else {
-        this._finishRejoin();
+        this._finishRejoin(reply.g);
       }
+      this._rejoinRetries = REJOIN_RETRY_COUNT;
     });
     gameJoiner.receive("error", reply => {
       if (this._gameId == null) {
+        console.log("Error on join");
+        gameChannel.leave();
         window.setTimeout(() => {
           this._joinGameWithRetry(gameId, remaining - 1);
         }, JOIN_RETRY_INTERVAL);
+      } else {
+        console.log("Error on rejoin");
+        this._rejoinRetries--;
+        if (reply.e == "player_not_found") {
+          console.log("Leaving due to player not found");
+          this.leave();
+        } else if (this._rejoinRetries <= 0) {
+          console.log("Leaving due to too many failed rejoins");
+          this.leave();
+        }
       }
     });
   }
 
 
-  _finishJoin(gameId) {
-    let game = this._gameInfo[gameId];
+  _finishJoin(game) {
+    console.log("Joining game channel for game " + game.i);
     $('#game-name-span').text(game.n || "(untitled game)");
     $('#game-node-span').text(game.d);
 
     $('#tanx-game-list').hide();
     $('#tanx-game-info').show();
 
-    this._gameId = gameId;
+    this._gameId = game.i;
     this._joinCallbacks.forEach(callback => {
-      callback(gameId, this._gameChannel);
+      callback(game.i, this._gameChannel);
     });
   }
 
 
-  _finishRejoin() {
+  _finishRejoin(game) {
+    console.log("Rejoining game channel for game " + game.i);
     this._rejoinCallbacks.forEach(callback => {
       callback(this._gameId, this._gameChannel);
     });