test: Keep player event streams open

[lmno-server] / empathy.js

diff --git a/empathy.js b/empathy.js
index 3728a0e5dc318904c488f264773e41abe8263213..5e59dd20ef4fb710e242850fd1dc34fa1f06d218 100644 (file)
--- a/empathy.js
+++ b/empathy.js
@@ -49,7 +49,7 @@ class Empathy extends Game {
 
   reset() {
 
-    /* Before closing out the current round, we accumulate that score
+    /* Before closing out the current round, we accumulate the score
      * for each player into their runnning total. */
     for (let score of this.state.scores.scores) {
       const player = this.players.find(p => p.name === score.player);
@@ -261,9 +261,26 @@ class Empathy extends Game {
       return a.toLowerCase().localeCompare(b.toLowerCase());
     });
 
+    if (this.judging_start_time_ms === 0) {
+      this.judging_start_time_ms = Date.now();
+    }
+
     this.broadcast_event_object('ambiguities', this.state.ambiguities);
   }
 
+  reset_judging_timeout() {
+    if (this.judging_idle_timer) {
+      clearTimeout(this.judging_idle_timer);
+      this.judging_idle_timer = 0;
+    }
+    if (! this.state.judging_idle) {
+      this.judging_idle_timer = setTimeout(() => {
+        this.state.judging_idle = true;
+        this.broadcast_event_object('judging-idle', true);
+      }, PHASE_IDLE_TIMEOUT * 1000);
+    }
+  }
+
   receive_judged(prompt_id, session_id, word_groups) {
     const player = this.players_by_session[session_id];
     if (! player)
@@ -276,6 +293,8 @@ class Empathy extends Game {
     if (prompt !== this.state.active_prompt)
       return { valid: false, message: "Prompt no longer active" };
 
+    this.reset_judging_timeout();
+
     /* Each player submits some number of groups of answers that
      * should be considered equivalent. The server expands that into
      * the set of pair-wise equivalencies that are expressed. The
@@ -315,7 +334,7 @@ class Empathy extends Game {
     this.state.players_judging.delete(player.name);
     this.state.players_judged.push(player.name);
 
-    /* And notify all players this this player has judged. */
+    /* And notify all players that this player has judged. */
     this.broadcast_event_object('player-judged', player.name);
 
     /* If no players are left in the judging list then we don't need
@@ -336,6 +355,7 @@ class Empathy extends Game {
   }
 
   receive_judging(prompt_id, session_id) {
+
     const player = this.players_by_session[session_id];
     if (! player)
       return { valid: false, message: "Player not found" };
@@ -347,21 +367,9 @@ class Empathy extends Game {
     if (prompt !== this.state.active_prompt)
       return { valid: false, message: "Prompt no longer active" };
 
-    if (this.judging_idle_timer) {
-      clearTimeout(this.judging_idle_timer);
-      this.judging_idle_timer = 0;
-    }
-    if (! this.state.judging_idle) {
-      this.judging_idle_timer = setTimeout(() => {
-        this.state.judging_idle = true;
-        this.broadcast_event_object('judging-idle', true);
-      }, PHASE_IDLE_TIMEOUT * 1000);
-    }
-
-    if (this.judging_start_time_ms === 0)
-      this.judging_start_time_ms = Date.now();
+    this.reset_judging_timeout();
 
-    /* Notify all players this this player is actively judging. */
+    /* Notify all players that this player is actively judging. */
     this.state.players_judging.add(player.name);
     this.broadcast_event_object('player-judging', player.name);