web/js: update page to allow users to read the "Why am I seeing this?", complete with a button to send them through after challenge completed, and a 30s timeout that does the same.

web/js/main.mjs

@@ -7,13 +7,9 @@ const algorithms = {
   "slow": processSlow,
 };
 
-// from Xeact
 const u = (url = "", params = {}) => {
   let result = new URL(url, window.location.href);
-  Object.entries(params).forEach((kv) => {
+  Object.entries(params).forEach(([k, v]) => result.searchParams.set(k, v));
-    let [k, v] = kv;
-    result.searchParams.set(k, v);
-  });
   return result.toString();
 };
 
@@ -33,16 +29,69 @@ const dependencies = [
   },
 ];
 
+function showContinueBar(hash, nonce, t0, t1) {
+  const barContainer = document.createElement("div");
+  barContainer.style.marginTop = "1rem";
+  barContainer.style.width = "100%";
+  barContainer.style.maxWidth = "32rem";
+  barContainer.style.background = "#3c3836";
+  barContainer.style.borderRadius = "4px";
+  barContainer.style.overflow = "hidden";
+  barContainer.style.cursor = "pointer";
+  barContainer.style.height = "2rem";
+  barContainer.style.marginLeft = "auto";
+  barContainer.style.marginRight = "auto";
+  barContainer.title = "Click to continue";
+
+  const barInner = document.createElement("div");
+  barInner.className = "bar-inner";
+  barInner.style.display = "flex";
+  barInner.style.alignItems = "center";
+  barInner.style.justifyContent = "center";
+  barInner.style.color = "white";
+  barInner.style.fontWeight = "bold";
+  barInner.style.height = "100%";
+  barInner.style.width = "0";
+  barInner.innerText = "I've finished reading, continue →";
+
+  barContainer.appendChild(barInner);
+  document.body.appendChild(barContainer);
+
+  requestAnimationFrame(() => {
+    barInner.style.width = "100%";
+  });
+
+  barContainer.onclick = () => {
+    const redir = window.location.href;
+    window.location.replace(
+      u("/.within.website/x/cmd/anubis/api/pass-challenge", {
+        response: hash,
+        nonce,
+        redir,
+        elapsedTime: t1 - t0
+      })
+    );
+  };
+}
+
 (async () => {
   const status = document.getElementById('status');
   const image = document.getElementById('image');
   const title = document.getElementById('title');
   const progress = document.getElementById('progress');
   const anubisVersion = JSON.parse(document.getElementById('anubis_version').textContent);
+  const details = document.querySelector('details');
+  let userReadDetails = false;
 
-  const ohNoes = ({
+  if (details) {
-    titleMsg, statusMsg, imageSrc,
+    details.addEventListener("toggle", () => {
-  }) => {
+      if (details.open) {
+        userReadDetails = true;
+      }
+    });
+  }
+  
+  const ohNoes = ({ titleMsg, statusMsg, imageSrc }) => {
     title.innerHTML = titleMsg;
     status.innerHTML = statusMsg;
     image.src = imageSrc;
@@ -52,43 +101,27 @@ const dependencies = [
   if (!window.isSecureContext) {
     ohNoes({
       titleMsg: "Your context is not secure!",
-      statusMsg: `Try connecting over HTTPS or let the admin know to set up HTTPS. For more information, see <a href="https://developer.mozilla.org/en-US/docs/Web/Security/Secure_Contexts#when_is_a_context_considered_secure">MDN</a>.`,
+      statusMsg: `Try connecting over HTTPS or let the admin know to set up HTTPS.`,
       imageSrc: imageURL("sad", anubisVersion),
     });
     return;
   }
 
-  // const testarea = document.getElementById('testarea');
-
-  // const videoWorks = await testVideo(testarea);
-  // console.log(`videoWorks: ${videoWorks}`);
-
-  // if (!videoWorks) {
-  //   title.innerHTML = "Oh no!";
-  //   status.innerHTML = "Checks failed. Please check your browser's settings and try again.";
-  //   image.src = imageURL("sad");
-  //   progress.style.display = "none";
-  //   return;
-  // }
-
   status.innerHTML = 'Calculating...';
 
-  for (const val of dependencies) {
+  for (const { value, name, msg } of dependencies) {
-    const { value, name, msg } = val;
     if (!value) {
       ohNoes({
         titleMsg: `Missing feature ${name}`,
         statusMsg: msg,
         imageSrc: imageURL("sad", anubisVersion),
-      })
+      });
     }
   }
 
   const { challenge, rules } = await fetch("/.within.website/x/cmd/anubis/api/make-challenge", { method: "POST" })
     .then(r => {
-      if (!r.ok) {
+      if (!r.ok) throw new Error("Failed to fetch config");
-        throw new Error("Failed to fetch config");
-      }
       return r.json();
     })
     .catch(err => {
@@ -104,7 +137,7 @@ const dependencies = [
   if (!process) {
     ohNoes({
       titleMsg: "Challenge error!",
-      statusMsg: `Failed to resolve check algorithm. You may want to reload the page.`,
+      statusMsg: `Failed to resolve check algorithm.`,
       imageSrc: imageURL("sad", anubisVersion),
     });
     return;
@@ -113,15 +146,13 @@ const dependencies = [
   status.innerHTML = `Calculating...<br/>Difficulty: ${rules.report_as}, `;
   progress.style.display = "inline-block";
 
-  // the whole text, including "Speed:", as a single node, because some browsers
-  // (Firefox mobile) present screen readers with each node as a separate piece
-  // of text.
   const rateText = document.createTextNode("Speed: 0kH/s");
   status.appendChild(rateText);
 
   let lastSpeedUpdate = 0;
   let showingApology = false;
   const likelihood = Math.pow(16, -rules.report_as);
+
   try {
     const t0 = Date.now();
     const { hash, nonce } = await process(
@@ -130,17 +161,11 @@ const dependencies = [
       null,
       (iters) => {
         const delta = Date.now() - t0;
-        // only update the speed every second so it's less visually distracting
         if (delta - lastSpeedUpdate > 1000) {
           lastSpeedUpdate = delta;
           rateText.data = `Speed: ${(iters / delta).toFixed(3)}kH/s`;
         }
 
-        // the probability of still being on the page is (1 - likelihood) ^ iters.
-        // by definition, half of the time the progress bar only gets to half, so
-        // apply a polynomial ease-out function to move faster in the beginning
-        // and then slow down as things get increasingly unlikely. quadratic felt
-        // the best in testing, but this may need adjustment in the future.
         const probability = Math.pow(1 - likelihood, iters);
         const distance = (1 - Math.pow(probability, 2)) * 100;
         progress["aria-valuenow"] = distance;
@@ -165,18 +190,54 @@ const dependencies = [
     image.src = imageURL("happy", anubisVersion);
     progress.style.display = "none";
 
-    setTimeout(() => {
+    if (userReadDetails) {
-      const redir = window.location.href;
+      const container = document.getElementById("progress");
-
+    
-      window.location.replace(
+      // Style progress bar as a continue button
-        u("/.within.website/x/cmd/anubis/api/pass-challenge", {
+      container.style.display = "flex";
-          response: hash,
+      container.style.alignItems = "center";
-          nonce,
+      container.style.justifyContent = "center";
-          redir,
+      container.style.height = "2rem";
-          elapsedTime: t1 - t0
+      container.style.borderRadius = "1rem";
-        }),
+      container.style.cursor = "pointer";
-      );
+      container.style.background = "#b16286";
-    }, 250);
+      container.style.color = "white";
+      container.style.fontWeight = "bold";
+      container.style.outline = "4px solid #b16286";
+      container.style.outlineOffset = "2px";
+      container.style.width = "min(20rem, 90%)";
+      container.style.margin = "1rem auto 2rem";
+      container.innerHTML = "I've finished reading, continue →";
+    
+      function onDetailsExpand() {
+        const redir = window.location.href;
+        window.location.replace(
+          u("/.within.website/x/cmd/anubis/api/pass-challenge", {
+            response: hash,
+            nonce,
+            redir,
+            elapsedTime: t1 - t0
+          }),
+        );
+      }
+    
+      container.onclick = onDetailsExpand;
+      setTimeout(onDetailsExpand, 30000);
+    
+    } else {
+      setTimeout(() => {
+        const redir = window.location.href;
+        window.location.replace(
+          u("/.within.website/x/cmd/anubis/api/pass-challenge", {
+            response: hash,
+            nonce,
+            redir,
+            elapsedTime: t1 - t0
+          }),
+        );
+      }, 250);
+    }
+    
   } catch (err) {
     ohNoes({
       titleMsg: "Calculation error!",