From 43e63d28d266431b91301268cbfc19209e3f02d0 Mon Sep 17 00:00:00 2001
From: Nilstrieb <48135649+Nilstrieb@users.noreply.github.com>
Date: Fri, 25 Nov 2022 22:54:09 +0100
Subject: [PATCH] use the query parameter to store the bisection id to allow
 refreshes

---
 index.html  | 110 ++++++++++++++++++++++++++++++++++++----------------
 src/main.rs |   6 +--
 2 files changed, 79 insertions(+), 37 deletions(-)

diff --git a/index.html b/index.html
index 38a8af3..93abc24 100644
--- a/index.html
+++ b/index.html
@@ -85,18 +85,45 @@ impl&lt;T&gt; Struct&lt;T&gt; {
     ></textarea>
 
     <script>
-      let BASE_URL = `${document.location}`;
+      let BASE_URL = `${document.location}`.split("?")[0];
       if (!BASE_URL.endsWith("/")) {
         // ugh, i hate url paths and their subtle interactions with things
         BASE_URL = `${BASE_URL}/`;
       }
 
-
+      // The important HTML elements.
       const htmlStatus = document.getElementById("status");
       const htmlResult = document.getElementById("result");
+      const htmlCode = document.getElementById("code");
+
+      // A list of all ongoing fetches in fetchAndUpdate.
+      const fetches = [];
 
       let bisecting = false;
 
+      initialLoad();
+
+      document.getElementById("bisect-form").addEventListener("submit", (e) => {
+        e.preventDefault();
+        submitForm();
+      });
+
+      async function initialLoad() {
+        const params = document.location.search;
+        const urlParams = new URLSearchParams(params);
+        const bisection = urlParams.get("bisection");
+
+        if (bisection) {
+          const response = await fetchAndUpdate(bisection);
+          if (!response) {
+            fatal(`Bisection with ID \`${bisection}\` not found.`);
+            return;
+          }
+          code.value = response.code;
+        }
+      }
+
+      // Report a fatal error to the console and screen.
       function fatal(err, ...extra) {
         console.error(err, ...(extra || []));
         htmlStatus.innerHTML = `ERROR: ${err}`;
@@ -123,16 +150,13 @@ impl&lt;T&gt; Struct&lt;T&gt; {
         bisect(options);
       }
 
-      document.getElementById("bisect-form").addEventListener("submit", (e) => {
-        e.preventDefault();
-        submitForm();
-      });
-
       async function bisect(options) {
         if (bisecting) {
           return;
         }
 
+        fetches.forEach((fetchId) => clearTimeout(fetchId));
+
         bisecting = true;
 
         htmlStatus.classList.remove("error");
@@ -167,6 +191,11 @@ impl&lt;T&gt; Struct&lt;T&gt; {
           }
           const data = await fetched.json();
           jobId = data?.job_id;
+
+          const urlParams = new URLSearchParams(window.location.search);
+          urlParams.set("bisection", jobId);
+          window.location.search = urlParams;
+
           if (!jobId) {
             fatal("Received invalid response", data);
             return;
@@ -176,38 +205,51 @@ impl&lt;T&gt; Struct&lt;T&gt; {
           return;
         }
 
-        async function tryFetch() {
-          let response;
-          try {
-            const fetched = await fetch(`${BASE_URL}bisect/${jobId}`);
-            if (!fetched.ok) {
-              fatal("Failed to fetch", fetched);
-              return;
-            }
-            response = await fetched.json();
-          } catch (e) {
-            fatal(e);
+        fetchAndUpdate(jobId);
+      }
+
+      async function fetchAndUpdate(jobId) {
+        htmlStatus.innerHTML = `Waiting for result, job id=${jobId}`;
+        htmlStatus.classList.remove("hidden");
+
+        let response;
+        try {
+          const fetched = await fetch(`${BASE_URL}bisect/${jobId}`);
+          if (!fetched.ok) {
+            fatal("Failed to fetch bisection.", fetched);
             return;
           }
-
-          if (response.status.status !== "InProgress") {
-            bisecting = false;
-            console.log(response.status.output);
-
-            htmlStatus.classList.add("hidden");
-            htmlResult.classList.remove("hidden");
-
-            htmlResult.value = response.status.output;
-            htmlStatus.innerHTML = `Bisected job ${jobId}`;
-          } else {
-            console.log("Waiting for bisection", response.status.status);
-            setTimeout(tryFetch, 3000);
-          }
+          response = await fetched.json();
+        } catch (e) {
+          fatal(e);
+          return;
         }
 
-        tryFetch();
+        if (!response) {
+          console.log("Waiting for bisection", response.status.status);
+          const timeout = setTimeout(() => fetchAndUpdate(jobId), 3000);
+          fetches.push(timeout);
+          return response;
+        }
 
-        htmlStatus.innerHTML = `Waiting for result, job id=${jobId}`;
+        const status = response.status;
+
+        if (response.status.status !== "InProgress") {
+          bisecting = false;
+          console.log(response.status.output);
+
+          htmlStatus.classList.add("hidden");
+          htmlResult.classList.remove("hidden");
+
+          htmlResult.value = response.status.output;
+          htmlStatus.innerHTML = `Bisected job ${jobId}`;
+        } else {
+          console.log("Waiting for bisection", response.status.status);
+          const timeout = setTimeout(() => fetchAndUpdate(jobId), 3000);
+          fetches.push(timeout);
+        }
+
+        return response;
       }
     </script>
   </body>
diff --git a/src/main.rs b/src/main.rs
index daff821..340911e 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -22,7 +22,7 @@ use tracing::{error, info, metadata::LevelFilter};
 use tracing_subscriber::EnvFilter;
 use uuid::Uuid;
 
-type SendChannel = Arc<Mutex<mpsc::Sender<Job>>>;
+type SendChannel = Arc<Mutex<mpsc::SyncSender<Job>>>;
 type Conn = Arc<Mutex<Connection>>;
 
 #[tokio::main]
@@ -37,7 +37,7 @@ async fn main() -> color_eyre::Result<()> {
         )
         .init();
 
-    let (job_queue_send, job_queue_recv) = mpsc::channel(); // FIXME: make this a sync_channel because bounds are cool
+    let (job_queue_send, job_queue_recv) = mpsc::sync_channel(10);
 
     let sqlite_db = env::var("SQLITE_DB").unwrap_or_else(|_| "bisect.sqlite".to_string());
 
@@ -62,7 +62,7 @@ async fn main() -> color_eyre::Result<()> {
 
     std::thread::spawn(|| bisect::bisect_worker(job_queue_recv, worker_conn));
 
-    info!("Starting up server");
+    info!("Starting up server on port 4000");
 
     axum::Server::bind(&"0.0.0.0:4000".parse().unwrap())
         .serve(app.into_make_service())