From 3138eca6d041aafc5dbee2480b966591f84154f9 Mon Sep 17 00:00:00 2001
From: Ilion Beyst <ilion.beyst@gmail.com>
Date: Sun, 18 Sep 2022 13:16:57 +0200
Subject: [PATCH] show dispatches and timeouts in outputpane

---
 .../src/lib/components/OutputPane.svelte      | 97 +++++++++++++------
 web/pw-server/src/lib/log_parser.ts           | 24 ++++-
 2 files changed, 90 insertions(+), 31 deletions(-)

diff --git a/web/pw-server/src/lib/components/OutputPane.svelte b/web/pw-server/src/lib/components/OutputPane.svelte
index efd0d2c..91ffadc 100644
--- a/web/pw-server/src/lib/components/OutputPane.svelte
+++ b/web/pw-server/src/lib/components/OutputPane.svelte
@@ -6,6 +6,19 @@
 
   let showRawStderr = false;
 
+  const PLURAL_MAP = {
+    dispatch: "dispatches",
+    ship: "ships",
+  };
+
+  function pluralize(num: number, word: string): string {
+    if (num == 1) {
+      return `1 ${word}`;
+    } else {
+      return `${num} ${PLURAL_MAP[word]}`;
+    }
+  }
+
   $: if (matchLog) {
     playerLog = parsePlayerLog(1, matchLog);
   } else {
@@ -16,36 +29,53 @@
 <div class="output">
   <h3 class="output-header">Player log</h3>
   {#if showRawStderr}
-  <div class="output-text stderr-text">
-    {playerLog.flatMap((turn) => turn.stderr).join("\n")}
-  </div>
-  {:else}
-  <div class="output-text">
-    {#each playerLog as logTurn, i}
-    <div class="turn">
-      <div class="turn-header">
-        <span class="turn-header-text">Turn {i}</span>
-        {#if logTurn.action?.type === "bad_command"}
-          <span class="turn-error">invalid command</span>
-        {/if}
-      </div>
-      {#if logTurn.action?.type === "bad_command"}
-      <div class="bad-command-container">
-        <div class="bad-command-text">{logTurn.action.command}</div>
-        <div class="bad-command-error">Parse error: {logTurn.action.error}</div>
-      </div>
-      {/if}
-      {#if logTurn.stderr.length > 0}
-      <div class="stderr-header">stderr</div>
-      <div class="stderr-text-box">
-        {#each logTurn.stderr as stdErrMsg}
-        <div class="stderr-text">{stdErrMsg}</div>
-        {/each}
-      </div>
-      {/if}
+    <div class="output-text stderr-text">
+      {playerLog.flatMap((turn) => turn.stderr).join("\n")}
+    </div>
+  {:else}
+    <div class="output-text">
+      {#each playerLog as logTurn, i}
+        <div class="turn">
+          <div class="turn-header">
+            <span class="turn-header-text">Turn {i}</span>
+            {#if logTurn.action?.type === "dispatches"}
+              {pluralize(logTurn.action.dispatches.length, "dispatch")}
+            {:else if logTurn.action?.type === "timeout"}
+              <span class="turn-error">timeout</span>
+            {:else if logTurn.action?.type === "bad_command"}
+              <span class="turn-error">invalid command</span>
+            {/if}
+          </div>
+          {#if logTurn.action?.type === "dispatches"}
+            <div class="dispatches-container">
+              {#each logTurn.action.dispatches as dispatch}
+                <div class="dispatch">
+                  <div class="dispatch-text">
+                    {pluralize(dispatch.ship_count, "ship")} from {dispatch.origin} to {dispatch.destination}
+                  </div>
+                  {#if dispatch.error}
+                    <span class="dispatch-error">{dispatch.error}</span>
+                  {/if}
+                </div>
+              {/each}
+            </div>
+          {:else if logTurn.action?.type === "bad_command"}
+            <div class="bad-command-container">
+              <div class="bad-command-text">{logTurn.action.command}</div>
+              <div class="bad-command-error">Parse error: {logTurn.action.error}</div>
+            </div>
+          {/if}
+          {#if logTurn.stderr.length > 0}
+            <div class="stderr-header">stderr</div>
+            <div class="stderr-text-box">
+              {#each logTurn.stderr as stdErrMsg}
+                <div class="stderr-text">{stdErrMsg}</div>
+              {/each}
+            </div>
+          {/if}
+        </div>
+      {/each}
     </div>
-    {/each}
-  </div>
   {/if}
 </div>
 
@@ -81,6 +111,15 @@
     color: red;
   }
 
+  .dispatch {
+    display: flex;
+    justify-content: space-between;
+  }
+
+  .dispatch-error {
+    color: red;
+  }
+
   .bad-command-container {
     border-left: 1px solid red;
     margin-left: 4px;
diff --git a/web/pw-server/src/lib/log_parser.ts b/web/pw-server/src/lib/log_parser.ts
index 77c459f..da1d3c0 100644
--- a/web/pw-server/src/lib/log_parser.ts
+++ b/web/pw-server/src/lib/log_parser.ts
@@ -5,7 +5,11 @@ export type PlayerLogTurn = {
   stderr: string[];
 };
 
-type PlayerAction = BadCommand;
+type PlayerAction = Timeout | BadCommand | Dispatches;
+
+type Timeout = {
+  type: "timeout";
+};
 
 type BadCommand = {
   type: "bad_command";
@@ -13,6 +17,18 @@ type BadCommand = {
   error: string;
 };
 
+type Dispatches = {
+  type: "dispatches";
+  dispatches: Dispatch[];
+};
+
+type Dispatch = {
+  origin: string;
+  destination: string;
+  ship_count: number;
+  error?: string;
+};
+
 function createEmptyLogTurn(): PlayerLogTurn {
   return {
     stderr: [],
@@ -43,9 +59,13 @@ export function parsePlayerLog(playerId: number, logText: string): PlayerLog {
         case "stderr": {
           let msg = logMessage["message"];
           turn.stderr.push(msg);
+          break;
         }
-        case "bad_command": {
+        case "timeout":
+        case "bad_command":
+        case "dispatches": {
           turn.action = logMessage;
+          break;
         }
       }
     }