Quick-push checkpoint

- messy, under renovations - IDs for important content (timer, goal progress, username elements) should be final
Scaling method and structure refactor
2025-10-31 07:34:08 -04:00 · 2025-10-31 05:48:40 -04:00 · 2025-10-31 04:15:21 -04:00
4 changed files with 189 additions and 526 deletions
--- a/index.html
+++ b/index.html
@@ -8,16 +8,17 @@
    <link href='https://fonts.googleapis.com/css?family=Inter' rel='stylesheet'>
    <link rel="stylesheet" href="timer.css" />
    <script src="timer.js"></script>
-    <title>Lilac Timer</title>
+    <title>v2 onefont</title>
  </head>
  <body>
    <main>
      <div class='contentContainer'>
        <img id='MainHeart' src='src/youve_got_mail_whiteheart.png'>
        <div class='infoWrap'>
          <div class='infoGroup'>
            <div class='infoBox' id='InfoBox1'>
              <h1 id='Timer'>
-              24:16
+                00:00
              </h1>
              <p id='TimerInfo'>
                !subathon for details
@@ -25,18 +26,20 @@
            </div>
            <div class='infoBox' id='InfoBox2'>
              <h2 id='GoalLabel'>
-              Current Goal:
+                Next Goal:
              </h2>
              <h3 id='GoalName'>
                Discord Watch Party + Puzzles
              </h3>
              <div id='GoalProgressWrap'>
                <p id='GoalProgress'>
-              1524/3000 Points
+                  0000/0000 Points
                </p>
              </div>
            </div>
            <div class='infoBox' id='InfoBox3'>
              <h2 id='TopUsers'>
-              Top 3 Gifters:
+                Top 3:
              </h2>
              <div class='giftUserRow' id='GiftUserRow1'>
                <p class='giftUserNum' id='GiftUserNum1'>
@@ -65,6 +68,7 @@
            </div>
          </div>
        </div>
      </div>
    </main>
  </body>
 </html>
--- a/sample-payload.json
+++ b/sample-payload.json
@@ -1,144 +0,0 @@
 {
 "type": "DO",
 "method": "setTimer",
 "args": {
  "name": "Subathon",
  "end_at": "2025-10-30T19:34:05.867637+00:00",
  "is_running": false,
  "score_table": {
   "bit_score": 0.1,
   "t1_score": 5.0,
   "t2_score": 10.0,
   "t3_score": 20.0,
   "score_time": 10
  },
  "total_contribution": 120.0,
  "total_subpoints": 24,
  "total_bits": 0,
  "goals_met": 4,
  "goals_total": 16,
  "last_goal": {
   "required": 100.0,
   "name": "reveal new sub and bit badges"
  },
  "next_goal": {
   "required": 150.0,
   "name": "discord watch party + puzzles"
  },
  "goals": [
   {
    "required": 25.0,
    "name": "merch reveal! (drops on nov 6 anniversary)"
   },
   {
    "required": 50.0,
    "name": "chat picks my pfp for a week"
   },
   {
    "required": 75.0,
    "name": "make subathon magma board"
   },
   {
    "required": 100.0,
    "name": "reveal new sub and bit badges"
   },
   {
    "required": 150.0,
    "name": "discord watch party + puzzles"
   },
   {
    "required": 200.0,
    "name": "new emotes reveal (static)"
   },
   {
    "required": 300.0,
    "name": "karaoke time"
   },
   {
    "required": 400.0,
    "name": "voicemod on for an hour"
   },
   {
    "required": 500.0,
    "name": "new emotes reveal (animated)"
   },
   {
    "required": 750.0,
    "name": "chat picks a skeb to get"
   },
   {
    "required": 1000.0,
    "name": "chat picks new emote i will draw"
   },
   {
    "required": 1250.0,
    "name": "play peak with mods"
   },
   {
    "required": 1500.0,
    "name": "read voicelines/copypastas/memes that chat picks"
   },
   {
    "required": 1750.0,
    "name": "add bald merch to merch drop"
   },
   {
    "required": 2000.0,
    "name": "play horror game on stream (chat picks)"
   },
   {
    "required": 3000.0,
    "name": "upload a song cover to youtube"
   }
  ],
  "last_contribution": {
   "user_name": null,
   "user_id": null,
   "amount": 25.0,
   "seconds_added": 250,
   "timestamp": "2025-10-30T22:43:53.786952+10:00"
  },
  "leaderboard": [
   {
    "user_name": "Unknown",
    "user_id": 4,
    "amount": 25.0
   },
   {
    "user_name": "Maza1862",
    "user_id": 5,
    "amount": 25.0
   },
   {
    "user_name": "Unknown",
    "user_id": 6,
    "amount": 25.0
   },
   {
    "user_name": "lalzan",
    "user_id": 9,
    "amount": 25.0
   },
   {
    "user_name": "DesmondGTX1",
    "user_id": 10,
    "amount": 5.0
   },
   {
    "user_name": "SokuReload2",
    "user_id": 11,
    "amount": 5.0
   },
   {
    "user_name": "Unknown",
    "user_id": 12,
    "amount": 5.0
   },
   {
    "user_name": "Sum1wiserthanu",
    "user_id": 13,
    "amount": 5.0
   }
  ]
 }
 }
--- a/timer.css
+++ b/timer.css
@@ -18,41 +18,36 @@ html, body {
 }
 main {
-  font-family: "VT323", monospace;
+  font-family: "Silkscreen", sans-serif;
  font-weight: 400;
  font-style: normal;
  font-size: 1em;
  color: #EA4045;
  height: 100%;
 }
 h1 {
  margin: 0;
-  font-size: 68cqh;
+  font-size: 3.4em;
  color: #404145;
  font-weight: normal;
 }
 h2 {
  margin: 0;
-  font-size: 40cqh;
+  font-size: 1.4em;
  color: #404145;
 }
 h3 {
  font-family: "Silkscreen", sans-serif;
  font-weight: 400;
  font-style: normal;
  margin: 0;
-  font-size: 16cqh;
+  font-size: 1em;
  color: #404145;
  font-weight: normal;
 }
 p {
  margin: 0;
-  font-family: "Silkscreen", sans-serif;
+  font-size: 1em;
  font-weight: 400;
  font-style: normal;
  font-size: 20cqh;
 }
 .contentContainer {
@@ -67,7 +62,7 @@ p {
  max-width: 100vw;
 }
-.infoGroup {
+.infoWrap {
  container-type: size;
  height: 100%;
  width: 100%;
@@ -76,77 +71,116 @@ p {
  top: 0px;
  display: grid;
  grid-template-columns: 56% 34% 1fr;
  /*
  grid-template-rows: 11% 28% 16% 16% 1fr;
  */
  grid-template-rows: 11% 1fr 29%;
  place-items: center;
  text-wrap: nowrap;
 }
-.infoBox {
+.infoGroup {
-  container-type: size;
+  display: block;
-  display: grid;
+  height: 100%;
  grid-template-columns: repeat(1, 1fr);
  grid-auto-rows: auto;
  place-items: center;
 }
 #InfoBox1 {
  width: 100%;
  grid-column-start: 2;
  grid-column-end: 2;
  grid-row-start: 2;
  grid-row-end: 2;
 }
 .infoBox {
  height: auto;
  width: 100%;
  /*
  display: grid;
  grid-template-columns: repeat(1, 1fr);
  grid-auto-rows: auto;
  place-items: center;
  */
  font-size: 4cqh;
 }
 #InfoBox1 {
  margin-top: 4cqh;
  /*
  justify-self: left;
  align-self: stretch;
  */
  /*
  transform: translate(-8%, 5%);
  */
 }
 #InfoBox2 {
  /*
  display: grid;
  width: 100%;
  grid-column-start: 2;
  grid-column-end: 2;
  grid-row-start: 3;
  grid-row-end: 3;
  justify-self: left;
  align-self: stretch;
-  transform: translate(6%, -24%);
+  */
  transform: translate(0%, -12%);
 }
 #InfoBox3 {
  width: 100%;
  grid-column-start: 2;
  grid-column-end: 2;
  grid-row-start: 4;
  grid-row-end: 4;
  grid-template-columns: 1fr;
  grid-template-rows: 1fr 23% 23% 23%;
  /*
  justify-self: left;
  align-self: stretch;
  transform: translate(0%, -32%);
  */
 }
 #Timer {
  transform: translate(-9%, 3%) scale(.95, 1.2);
 }
 #TimerInfo {
-  transform: translate(0%, -175%);
+  transform: translate(0%, -60%);
-  font-size: 9cqh;
+  font-size: 1em;
  display: none;
 }
 #GoalLabel {
-  transform: translate(0%, -20%);
+  transform: translate(5%, 0%) scale(1.05, 1.2);
 }
 #GoalName {
-  width: 85%;
+  width: 95%;
-  transform: translate(10%, -110%);
+  transform: translate(8%, -10%) scale(1, 1.4);
  color: #32B993;
  text-wrap: nowrap;
  overflow: hidden;
  mask-image: linear-gradient(to right, black 70%, transparent 100%);
 }
-#GoalProgress {
+#GoalProgressWrap {
-  transform: translate(0%, -75%);
+  width: fit-content;
-  border-radius: 8cqh;
+  padding-left: .5cqh;
-  border: 2cqh solid;
+  padding-right: .5cqh;
  transform: translate(6%, 0%) scale(1, 1.2);
  border-radius: 3cqh;
  border: .4cqh solid;
  border-color: #404145;
  font-size: .9em;
  text-align: center;
  margin: 0 auto 0 auto;
 }
 #GoalProgress {
  /*
  width: fit-content;
  padding-left: .5cqh;
  padding-right: .5cqh;
  transform: translate(6%, 0%) scale(1, 1.2);
  border-radius: 3cqh;
  border: .4cqh solid;
  border-color: #404145;
  font-size: .9em;
  text-align: center;
  margin: 0 auto 0 auto;
  */
 }
 .giftUserRow {
@@ -158,7 +192,7 @@ p {
  overflow: hidden;
  text-align: left;
  justify-self: left;
-  transform: translate(18%, 0%);
+  transform: translate(0%, 0%);
 }
 .giftUserName {
--- a/timer.js
+++ b/timer.js
@@ -1,147 +1,36 @@
 window.addEventListener("DOMContentLoaded", () => {
-  const websocket = new ReconnectingWebSocket("wss://lilac.thewisewolf.dev/tracker/timer/ws");
+  const websocket = new WebSocket("wss://lilac.thewisewolf.dev/tracker/timer/ws");
  websocket.addEventListener("open", () => {
    communicate(websocket);
  });
 });
 class Timer {
-  constructor(renderer, timer_data) {
+  constructor(renderer, end_time, running) {
    this.renderer = renderer;
    this.end_time = end_time;
    this.running = running;
    this.destroying = false;
    this.update_from_data(timer_data);
  }
  update_from_data(timer_data) {
    this.end_at = new Date(timer_data.end_at);
    this.running = timer_data.is_running;
    this.name = timer_data.name;
    this.score_table = timer_data.score_table;
    this.total_contribution = timer_data.total_contribution;
    this.total_subpoints = timer_data.total_subpoints;
    this.total_bits = timer_data.total_bits;
    this.goals_met = timer_data.goals_met;
    this.goals_total = timer_data.goals_total;
    this.last_goal = timer_data.last_goal;
    this.next_goal = timer_data.next_goal;
    this.goals = timer_data.goals;
    this.last_contribution = timer_data.last_contribution;
    this.leaderboard = timer_data.leaderboard;
  }
  render_time() {
-    this.renderer.render_time(
+    // Render timer status to the document
      Math.floor((this.end_at - new Date()) / 1000)
    );
  }
  render() {
    // Render goal
    if (this.next_goal != null) {
      this.renderer.render_current_goal(
        this.next_goal.name,
        this.total_contribution,
        this.next_goal.required,
      );
    } else if (this.last_goal != null) {
      this.renderer.render_current_goal(
        this.last_goal.name,
        this.total_contribution,
        this.last_goal.required,
      );
    } else {
      this.renderer.clear_current_goal();
    }
    // Render leaderboard 
    this.renderer.render_users(this.leaderboard);
    // Render timer 
    this.render_time();
  }
  /**
   * Recursive call run per second to update the rendered timer
   */
  tick() {
    if (!this.destroying) {
      this.render_time();
      if (this.running) {
        setTimeout(this.tick.bind(this), 1000);
      }
    }
  }
 }
 class TimerRenderer {
  constructor() {
    // HH:MM or MM:SS
    this.timer = document.getElementById("Timer");
    // Current Goal:
    this.goal_label = document.getElementById("GoalLabel")
    // Name of the goal to display
    this.goal_name = document.getElementById("GoalName")
    // 1524/3000 Points
    this.goal_progress = document.getElementById("GoalProgress")
    // Top 3 Gifters 
    this.topusers_label = document.getElementById("TopUsers")
    // Leaderboard items 
    // 1. (or points?)
    this.topusers_user1_num = document.getElementById("GiftUserNum1")
    // Name of user 1
    this.topusers_user1_name = document.getElementById("GiftUserName1")
    this.topusers_user2_num = document.getElementById("GiftUserNum2")
    this.topusers_user2_name = document.getElementById("GiftUserName2")
    this.topusers_user3_num = document.getElementById("GiftUserNum3")
    this.topusers_user3_name = document.getElementById("GiftUserName3")
  }
  /**
   * Bring the display into a standard initial state.
   */
  reset() {
    this.timer.textContent = "00:00";
    this.goal_label.textContent = "Current Goal:";
    this.goal_name.textContent = "Be awesome";
    this.goal_progress.textContent = "00/00 Points";
    this.topusers_label.textContent = "Top 3 Gifters";
    this.topusers_user1_num.textContent = "1.";
    this.topusers_user1_name.textContent = "Anonymous";
    this.topusers_user2_num.textContent = "2.";
    this.topusers_user2_name.textContent = "Anonymous";
    this.topusers_user3_num.textContent = "3.";
    this.topusers_user3_name.textContent = "Anonymous";
  }
  /**
   * Render the timer from a time remaining.
   *
   * @param {integer} seconds_remaining - The number of seconds remaining on the timer.
   */
  render_time(seconds_remaining) {
    var timestr;
-    // Render a time remaining given in seconds
+    // How many seconds to the end of time
-    if (seconds_remaining <= 0) {
+    var dur_seconds = Math.floor( (this.end_time - new Date()) / 1000);
    if (dur_seconds < 0) {
      timestr = "00:00";
    } else {
-      var seconds = seconds_remaining % 60;
+      var seconds = dur_seconds % 60;
-      seconds_remaining = seconds_remaining - seconds;
+      dur_seconds = dur_seconds - seconds;
-      var minutes = Math.floor(seconds_remaining / 60);
+      var minutes = Math.floor(dur_seconds / 60);
      var hours = Math.floor(minutes / 60);
      minutes = minutes - 60 * hours;
      // Change rendering mode based on hours or minutes left
      if (hours > 0) {
        timestr = String(hours).padStart(2, '0') + ':' + String(minutes).padStart(2, '0');
@@ -149,180 +38,59 @@ class TimerRenderer {
        timestr = String(minutes).padStart(2, '0') + ':' + String(seconds).padStart(2, '0');
      }
    }
-    this.timer.textContent = timestr;
+
    this.renderer.update_time(timestr);
  }
-  /**
+  tick() {
-    * Render the current goal. 
+    // Recursive call run per second to update and change stage
    *
    * @param {string} name     - The name of the current goal.
    * @param {number} current  - The number of points we currently have.
    * @param {number} required - The number of points to achieve the goal.
    */
  render_current_goal(name, current, required) {
    // TODO: Some kind of end condition, ability to clear a goal etc
    // E.g. if subathon doesn't have a goal at all 
    // Or after we accomplish all goals
-    this.goal_name.textContent = name;
+    if (this.destroying) {
-
+      return
    // Bitwise OR done to convert floats to integers if needed
    this.goal_progress.textContent = String(current | 0) + '/' + String(required | 0) + ' Points'
    }
-
+    this.render_time();
-  /**
+    if (this.running) {
-   * Clear the current goal field.
+      setTimeout(this.tick.bind(this), 1000);
   */
  clear_current_goal() {
    this.goal_name.textContent = "";
    this.goal_progress.textContent = "";
    this.goal_label.textContent = "";
  }
  /**
    * Render the user leaderboard.
    *
    * @param {Object[]} users               - The user leaderboard in descending (points, name) order.
    * @param {integer}  users[].amount      - The number of points this users has contrib.
    * @param {string}   users[].user_name   - The name of this user.
    */
  render_users(users) {
    if (users.length >= 1) {
      this.topusers_user1_num.textContent = "1.";
      this.topusers_user1_name.textContent = users[0].user_name;
    } else {
      this.topusers_user1_num.textContent = "";
      this.topusers_user1_name.textContent = "";
    }
    if (users.length >= 2) {
      this.topusers_user2_num.textContent = "2.";
      this.topusers_user2_name.textContent = users[1].user_name;
    } else {
      this.topusers_user2_num.textContent = "";
      this.topusers_user2_name.textContent = "";
    }
    if (users.length >= 3) {
      this.topusers_user3_num.textContent = "3.";
      this.topusers_user3_name.textContent = users[2].user_name;
    } else {
      this.topusers_user3_num.textContent = "";
      this.topusers_user3_name.textContent = "";
    }
  }
 }
 class ReconnectingWebSocket {
  constructor(url) {
    this.url = url;
    this.ws = null;
    this.attempt = 0;
    this.connect();
    this.closing = false;
    this.onopen = null;
    this.onmessage = null;
    this.onclose = null;
    this.onerror = null;
  }
  connect() {
    this.ws = new WebSocket(this.url);
    this.ws.onopen = () => {
      console.log('WebSocket connected');
      this.attempt = 0;
      if (this.onopen != null) {
        this.onopen();
      }
    };
    this.ws.onmessage = (msg) => {
      console.log('Received:', msg.data);
      if (this.onmessage != null) {
        this.onmessage(msg);
      }
    };
    this.ws.onclose = () => {
      if (this.closing) {
        console.log('Closing Websocket.')
      } {
        console.warn('WebSocket closed. Reconnecting...');
        this.reconnect();
      }
    };
    this.ws.onerror = (err) => {
      console.error('WebSocket error:', err);
      if (this.onerror != null) {
        this.onerror();
      }
      this.close();
    };
  }
  reconnect() {
    const delay = this.getBackoffDelay(this.attempt);
    console.log(`Reconnecting in ${delay}ms`);
    setTimeout(() => {
      this.attempt++;
      this.connect();
    }, delay);
  }
  close() {
    this.closing = true;
    this.ws.close();
    if (this.onclose != null) {
      this.onclose();
    }
  }
  getBackoffDelay(attempt) {
    const base = 500; // 0.5 second
    const max = 30000; // 30 seconds
    const jitter = Math.random() * 1000;
    return Math.min(base * 2 ** attempt + jitter, max);
  }
  send(data) {
    if (this.ws.readyState === WebSocket.OPEN) {
      this.ws.send(data);
    } else {
      console.warn('WebSocket not connected');
    }
  }
 }
 class TimerRenderer {
  constructor (){
    this.background = document.getElementsByClassName("timer-bg")[0];
    this.time_element = document.getElementsByClassName("timer-time")[0];
    this.bg_width = parseInt(
      window.getComputedStyle(
        this.background, null
      ).getPropertyValue('width'),
      10
    );
    this.bg_height = parseInt(
      window.getComputedStyle(
        this.background, null
      ).getPropertyValue('height'),
      10
    )
  }
  update_time (timestr) {
    this.time_element.textContent = timestr;
  }
 }
 function communicate(websocket) {
  console.log("Communicating");
  const params = new URLSearchParams(window.location.search);
  websocket.send(JSON.stringify({type: "init", channel: "SubTimer", community: params.get('community')}));
  var renderer = new TimerRenderer();
  let timer;
-  websocket.onopen = () => {
+  websocket.addEventListener("message", ({ data }) => {
-    websocket.send(
+    console.log("Rec Event " + data);
      JSON.stringify(
        {
          type: "init",
          channel: "SubTimer",
          community: params.get('community')
        }
      )
    );
    renderer.reset();
  };
  websocket.onmessage = ({ data }) => {
    const event = JSON.parse(data);
    switch (event.type) {
      case "DO":
@@ -331,24 +99,25 @@ function communicate(websocket) {
        // Call the specified method
        switch (event.method) {
          case "setTimer":
-            if (timer == null) {
+            if (timer != null) {
-              timer = new Timer(renderer, args);
+              timer.destroying = true;
            } else {
              timer.update_from_data(args);
            }
-            timer.render();
+            timer = new Timer(
              renderer, 
              new Date(args.end_at),
              args.running
            )
            timer.tick();
            break;
          case "noTimer":
            if (timer != null) {
              timer.renderer.update_time("--:--")
              timer.destroying = true;
              timer = null;
            }
            renderer.reset();
          case "endTimer":
            if (timer != null) {
              timer.renderer.update_time("00:00")
              timer.destroying = true;
              timer = null;
            }
          default:
            throw new Error(`Unsupported method requested: ${event.method}.`)
@@ -357,5 +126,5 @@ function communicate(websocket) {
      default:
        throw new Error(`Unsupported event type: ${event.type}.`);
    }
-  };
+  });
 }