Update cachebust version

Update editorconfig if using LF endings
fuck it, converting the rest to unix line endings
2023-02-02 06:38:45 +00:00 · 2023-02-02 06:36:01 +00:00 · 2023-02-01 20:29:47 -05:00 · 2023-02-01 20:20:07 -05:00 · 2022-07-12 20:21:36 +00:00 · 2022-04-29 23:50:35 +01:00
23 changed files with 2331 additions and 2187 deletions
--- a/.editorconfig
+++ b/.editorconfig
@ -3,7 +3,7 @@ root = true
 [*]
 indent_style = space
 indent_size = 2
-end_of_line = crlf
+end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = false
 insert_final_newline = true
--- a/frontend/create.html
+++ b/frontend/create.html
@ -3,7 +3,7 @@
  <head>
    <meta charset="utf-8" />
    <title>watch party :D</title>
-    <link rel="stylesheet" href="/styles.css?v=048af96" />
+    <link rel="stylesheet" href="/styles.css?v=4b61c4" />
  </head>

  <body>
@ -47,6 +47,6 @@
      </form>
    </div>

-    <script type="module" src="/create.mjs?v=048af96"></script>
+    <script type="module" src="/create.mjs?v=4b61c4"></script>
  </body>
 </html>
--- a/frontend/create.mjs
+++ b/frontend/create.mjs
@ -1,4 +1,4 @@
-import { setupCreateSessionForm } from "./lib/create-session.mjs?v=048af96";
+import { setupCreateSessionForm } from "./lib/create-session.mjs?v=4b61c4";

 const main = () => {
  setupCreateSessionForm();
--- a/frontend/emojis/blobcat.png
+++ b/frontend/emojis/blobcat.png
--- a/frontend/index.html
+++ b/frontend/index.html
@ -3,7 +3,8 @@
  <head>
    <meta charset="utf-8" />
    <title>watch party :D</title>
-    <link rel="stylesheet" href="/styles.css?v=048af96" />
+    <link rel="stylesheet" href="/lib/plyr-3.7.3.css" />
+    <link rel="stylesheet" href="/styles.css?v=4b61c4" />
  </head>

  <body>
@ -30,8 +31,10 @@
          required
        />

-        <label for="join-session-colour">Colour:</label>
-        <input type="color" id="join-session-colour" value="#7ed0ff" required />
+        <label id="join-session-colour-label" for="join-session-colour">
+          Personal Colour:
+        </label>
+        <input type="color" id="join-session-colour" value="#ffffff" required />

        <label for="join-session-id">Session ID:</label>
        <input
@ -64,6 +67,19 @@
      </form>
    </div>

-    <script type="module" src="/main.mjs?v=048af96"></script>
+    <script type="module" src="/main.mjs?v=4b61c4"></script>
+    <script>
+      const updateColourLabel = () => {
+        const colour = document.querySelector("#join-session-colour").value;
+        document.querySelector(
+          "#join-session-colour-label"
+        ).textContent = `Personal Colour: ${colour}`;
+      };
+
+      document
+        .querySelector("#join-session-colour")
+        .addEventListener("input", updateColourLabel);
+      updateColourLabel();
+    </script>
  </body>
 </html>
--- a/frontend/lib/chat.mjs
+++ b/frontend/lib/chat.mjs
@ -2,9 +2,13 @@ import {
  setDebounce,
  setVideoTime,
  setPlaying,
-} from "./watch-session.mjs?v=048af96";
-import { emojify, findEmojis } from "./emojis.mjs?v=048af96";
-import { linkify } from "./links.mjs";
+  sync,
+} from "./watch-session.mjs?v=4b61c4";
+import { emojify, findEmojis } from "./emojis.mjs?v=4b61c4";
+import { linkify } from "./links.mjs?v=4b61c4";
+import { joinSession } from "./watch-session.mjs?v=4b61c4";
+import { pling } from "./pling.mjs?v=4b61c4";
+import { state } from "./state.mjs";

 function setCaretPosition(elem, caretPos) {
  if (elem.createTextRange) {
@ -41,7 +45,7 @@ const setupChatboxEvents = (socket) => {
      emojiAutocomplete.textContent = "";
      autocompleting = true;
      let text = messageInput.value.slice(0, messageInput.selectionStart);
-      const match = text.match(/(:[^\s:]+)?:([^\s:]*)$/);
+      const match = text.match(/(:[^\s:]+)?:([^\s:]{2,})$/);
      if (!match || match[1]) return (autocompleting = false); // We don't need to autocomplete.
      const prefix = text.slice(0, match.index);
      const search = text.slice(match.index + 1);
@ -130,7 +134,7 @@ const setupChatboxEvents = (socket) => {
      selected.classList.add("selected");
      selected.scrollIntoView({ scrollMode: "if-needed", block: "nearest" });
    }
-    if (event.key == "Tab") {
+    if (event.key == "Tab" || event.key == "Enter") {
      let selected = document.querySelector(".emoji-option.selected");
      if (!selected) return;
      event.preventDefault();
@ -161,14 +165,7 @@ const setupChatboxEvents = (socket) => {
            handled = true;
            break;
          case "/sync":
-            const sessionId = window.location.hash.slice(1);
-            const { current_time_ms, is_playing } = await fetch(
-              `/sess/${sessionId}`
-            ).then((r) => r.json());
-
-            setDebounce();
-            setPlaying(is_playing);
-            setVideoTime(current_time_ms);
+            await sync();

            const syncMessageContent = document.createElement("span");
            syncMessageContent.appendChild(
@ -189,6 +186,11 @@ const setupChatboxEvents = (socket) => {
            );
            handled = true;
            break;
+          case "/join":
+            state().sessionId = args;
+            joinSession();
+            handled = true;
+            break;
          case "/help":
            const helpMessageContent = document.createElement("span");
            helpMessageContent.innerHTML =
@ -196,7 +198,8 @@ const setupChatboxEvents = (socket) => {
              "&emsp;<code>/help</code> - display this help message<br>" +
              "&emsp;<code>/ping [message]</code> - ping all viewers<br>" +
              "&emsp;<code>/sync</code> - resyncs you with other viewers<br>" +
-              "&emsp;<code>/shrug</code> - appends ¯\\_(ツ)_/¯ to your message";
+              "&emsp;<code>/shrug</code> - appends ¯\\_(ツ)_/¯ to your message<br>" +
+              "&emsp;<code>/join [session id]</code> - joins another session";

            printChatMessage(
              "command-message",
@ -294,7 +297,7 @@ const matpad = (n) => {
 * @param {string?} user
 * @param {Node?} content
 */
-const printChatMessage = (eventType, user, colour, content) => {
+export const printChatMessage = (eventType, user, colour, content) => {
  const chatMessage = document.createElement("div");
  chatMessage.classList.add("chat-message");
  chatMessage.classList.add(eventType);
@ -409,28 +412,29 @@ export const logEventToChat = async (event) => {
      }

      printChatMessage("ping", event.user, event.colour, messageContent);
-      beep();
+      pling();
+      if ("Notification" in window) {
+        const title = "watch party :)";
+        const options = {
+          body: event.data
+            ? `${event.user} pinged saying: ${event.data}`
+            : `${event.user} pinged`,
+        };
+        if (Notification.permission === "granted") {
+          new Notification(title, options);
+        } else if (Notification.permission !== "denied") {
+          Notification.requestPermission().then(function (permission) {
+            if (permission === "granted") {
+              new Notification(title, options);
+            }
+          });
+        }
+      }
      break;
    }
  }
 };

-const beep = () => {
-  const context = new AudioContext();
-
-  const gain = context.createGain();
-  gain.connect(context.destination);
-  gain.gain.value = 0.1;
-
-  const oscillator = context.createOscillator();
-  oscillator.connect(gain);
-  oscillator.frequency.value = 520;
-  oscillator.type = "square";
-
-  oscillator.start(context.currentTime);
-  oscillator.stop(context.currentTime + 0.22);
-};
-
 export const updateViewerList = (viewers) => {
  const listContainer = document.querySelector("#viewer-list");

--- a/frontend/lib/create-session.mjs
+++ b/frontend/lib/create-session.mjs
@ -1,4 +1,4 @@
-import { createSession } from "./watch-session.mjs?v=048af96";
+import { createSession } from "./watch-session.mjs?v=4b61c4";

 export const setupCreateSessionForm = () => {
  const form = document.querySelector("#create-session-form");
--- a/frontend/lib/emojis.mjs
+++ b/frontend/lib/emojis.mjs
@ -32,7 +32,15 @@ export async function emojify(text) {
 const emojis = {};

 export const emojisLoaded = Promise.all([
-  fetch("/emojis")
+  fetch("/emojis/unicode.json")
+    .then((e) => e.json())
+    .then((a) => {
+      for (let e of a) {
+        emojis[e[0][0]] = emojis[e[0][0]] || [];
+        emojis[e[0][0]].push([e[0], e[1], null, e[0]]);
+      }
+    }),
+  fetch("/emojos")
    .then((e) => e.json())
    .then((a) => {
      for (let e of a) {
@ -42,14 +50,6 @@ export const emojisLoaded = Promise.all([
        emojis[lower[0]].push([name, ":" + name + ":", e.slice(-4), lower]);
      }
    }),
-  fetch("/emojis/unicode.json")
-    .then((e) => e.json())
-    .then((a) => {
-      for (let e of a) {
-        emojis[e[0][0]] = emojis[e[0][0]] || [];
-        emojis[e[0][0]].push([e[0], e[1], null, e[0]]);
-      }
-    }),
 ]);

 export async function findEmojis(search) {
@ -68,5 +68,5 @@ export async function findEmojis(search) {
      }
    }
  }
-  return [...groups[0], ...groups[1]];
+  return [...groups[1], ...groups[0]];
 }
--- a/frontend/lib/join-session.mjs
+++ b/frontend/lib/join-session.mjs
@ -1,4 +1,5 @@
-import { joinSession } from "./watch-session.mjs?v=048af96";
+import { joinSession } from "./watch-session.mjs?v=4b61c4";
+import { state } from "./state.mjs";

 /**
 * @param {HTMLInputElement} field
@ -53,11 +54,13 @@ const displayPostCreateMessage = () => {
  if (params.get("created") == "true") {
    document.querySelector("#post-create-message").style["display"] = "block";
    window.history.replaceState({}, document.title, `/${window.location.hash}`);
+    return true;
  }
+  return false;
 };

 export const setupJoinSessionForm = () => {
-  displayPostCreateMessage();
+  const created = displayPostCreateMessage();

  const form = document.querySelector("#join-session-form");
  const nickname = form.querySelector("#join-session-nickname");
@ -80,11 +83,10 @@ export const setupJoinSessionForm = () => {
    saveNickname(nickname);
    saveColour(colour);
    try {
-      await joinSession(
-        nickname.value,
-        sessionId.value,
-        colour.value.replace(/^#/, "")
-      );
+      state().nickname = nickname.value;
+      state().sessionId = sessionId.value;
+      state().colour = colour.value.replace(/^#/, "");
+      await joinSession(created);
    } catch (e) {
      alert(e.message);
      button.disabled = false;
--- a/frontend/lib/links.mjs
+++ b/frontend/lib/links.mjs
@ -1,3 +1,6 @@
+import { joinSession } from "./watch-session.mjs?v=4b61c4";
+import { state } from "./state.mjs";
+
 export async function linkify(
  text,
  next = async (t) => [document.createTextNode(t)]
@ -29,9 +32,12 @@ export async function linkify(
          ) {
            nodes.push(
              Object.assign(document.createElement("a"), {
-                href: url.href,
                textContent: "Join Session",
                className: "chip join-chip",
+                onclick: () => {
+                  state().sessionId = url.hash.substring(1);
+                  joinSession();
+                },
              })
            );
          } else if (
--- a/frontend/lib/pling.mjs
+++ b/frontend/lib/pling.mjs
@ -0,0 +1,79 @@
+export const pling = () => {
+  const maxGain = 0.3;
+  const duration = 0.22;
+  const fadeDuration = 0.1;
+  const secondBeepOffset = 0.05;
+  const thirdBeepOffset = 2 * secondBeepOffset;
+
+  const ctx = new AudioContext();
+
+  const firstBeepGain = ctx.createGain();
+  firstBeepGain.connect(ctx.destination);
+  firstBeepGain.gain.setValueAtTime(0.01, ctx.currentTime);
+  firstBeepGain.gain.exponentialRampToValueAtTime(
+    maxGain,
+    ctx.currentTime + fadeDuration
+  );
+  firstBeepGain.gain.setValueAtTime(
+    maxGain,
+    ctx.currentTime + (duration - fadeDuration)
+  );
+  firstBeepGain.gain.exponentialRampToValueAtTime(
+    0.01,
+    ctx.currentTime + duration
+  );
+
+  const firstBeep = ctx.createOscillator();
+  firstBeep.connect(firstBeepGain);
+  firstBeep.frequency.value = 400;
+  firstBeep.type = "sine";
+
+  const secondBeepGain = ctx.createGain();
+  secondBeepGain.connect(ctx.destination);
+  secondBeepGain.gain.setValueAtTime(0.01, ctx.currentTime + secondBeepOffset);
+  secondBeepGain.gain.exponentialRampToValueAtTime(
+    maxGain,
+    ctx.currentTime + secondBeepOffset + fadeDuration
+  );
+  secondBeepGain.gain.setValueAtTime(
+    maxGain,
+    ctx.currentTime + secondBeepOffset + (duration - fadeDuration)
+  );
+  secondBeepGain.gain.exponentialRampToValueAtTime(
+    0.01,
+    ctx.currentTime + secondBeepOffset + duration
+  );
+
+  const secondBeep = ctx.createOscillator();
+  secondBeep.connect(secondBeepGain);
+  secondBeep.frequency.value = 600;
+  secondBeep.type = "sine";
+
+  const thirdBeepGain = ctx.createGain();
+  thirdBeepGain.connect(ctx.destination);
+  thirdBeepGain.gain.setValueAtTime(0.01, ctx.currentTime + thirdBeepOffset);
+  thirdBeepGain.gain.exponentialRampToValueAtTime(
+    maxGain,
+    ctx.currentTime + thirdBeepOffset + fadeDuration
+  );
+  thirdBeepGain.gain.setValueAtTime(
+    maxGain,
+    ctx.currentTime + thirdBeepOffset + (duration - fadeDuration)
+  );
+  thirdBeepGain.gain.exponentialRampToValueAtTime(
+    0.01,
+    ctx.currentTime + thirdBeepOffset + duration
+  );
+
+  const thirdBeep = ctx.createOscillator();
+  thirdBeep.connect(thirdBeepGain);
+  thirdBeep.frequency.value = 900;
+  thirdBeep.type = "sine";
+
+  firstBeep.start(ctx.currentTime);
+  firstBeep.stop(ctx.currentTime + duration);
+  secondBeep.start(ctx.currentTime + secondBeepOffset);
+  secondBeep.stop(ctx.currentTime + (secondBeepOffset + duration));
+  thirdBeep.start(ctx.currentTime + thirdBeepOffset);
+  thirdBeep.stop(ctx.currentTime + (thirdBeepOffset + duration));
+};
--- a/frontend/lib/plyr-3.7.3.css
+++ b/frontend/lib/plyr-3.7.3.css
--- a/frontend/lib/plyr-3.7.3.min.esm.js
+++ b/frontend/lib/plyr-3.7.3.min.esm.js
--- a/frontend/lib/reconnecting-web-socket.mjs
+++ b/frontend/lib/reconnecting-web-socket.mjs
@ -11,6 +11,7 @@ export default class ReconnectingWebSocket {
    this._lastConnect = 0;
    this._socket = null;
    this._unsent = [];
+    this._closing = false;
    this._connect(true);
  }
  _connect(first) {
@ -40,6 +41,7 @@ export default class ReconnectingWebSocket {
    });
  }
  _reconnect() {
+    if (this._closing) return;
    if (this._reconnecting) return;
    this._eventTarget.dispatchEvent(new Event("reconnecting"));
    this._reconnecting = true;
@ -56,6 +58,10 @@ export default class ReconnectingWebSocket {
      this._unsent.push(message);
    }
  }
+  close() {
+    this._closing = true;
+    this._socket.close();
+  }
  addEventListener(...a) {
    return this._eventTarget.addEventListener(...a);
  }
--- a/frontend/lib/state.mjs
+++ b/frontend/lib/state.mjs
@ -0,0 +1,7 @@
+let instance = null;
+export const state = () => {
+  if (!instance) {
+    instance = {};
+  }
+  return instance;
+};
--- a/frontend/lib/video.mjs
+++ b/frontend/lib/video.mjs
@ -1,105 +1,56 @@
-const loadVolume = () => {
-  try {
-    const savedVolume = localStorage.getItem("watch-party-volume");
-    if (savedVolume != null && savedVolume != "") {
-      return +savedVolume;
-    }
-  } catch (_err) {
-    // Sometimes localStorage is blocked from use
-  }
-  // default
-  return 0.5;
-};
-
-/**
- * @param {number} volume
- */
-const saveVolume = (volume) => {
-  try {
-    localStorage.setItem("watch-party-volume", volume);
-  } catch (_err) {
-    // see loadVolume
-  }
-};
-
-const loadCaptionTrack = () => {
-  try {
-    const savedTrack = localStorage.getItem("watch-party-captions");
-    if (savedTrack != null && savedTrack != "") {
-      return +savedTrack;
-    }
-  } catch (_err) {
-    // Sometimes localStorage is blocked from use
-  }
-  // default
-  return -1;
-};
-
-/**
- * @param {number} track
- */
-const saveCaptionsTrack = (track) => {
-  try {
-    localStorage.setItem("watch-party-captions", track);
-  } catch (_err) {
-    // see loadCaptionsTrack
-  }
-};
+import Plyr from "./plyr-3.7.3.min.esm.js";

 /**
 * @param {string} videoUrl
 * @param {{name: string, url: string}[]} subtitles
 */
-const createVideoElement = (videoUrl, subtitles) => {
+const createVideoElement = (videoUrl, subtitles, created) => {
+  const oldVideo = document.getElementById(".plyr");
+  if (oldVideo) {
+    oldVideo.remove();
+  }
  const video = document.createElement("video");
-  video.controls = true;
-  video.autoplay = false;
-  video.volume = loadVolume();
+  video.id = "video";
  video.crossOrigin = "anonymous";

-  video.addEventListener("volumechange", async () => {
-    saveVolume(video.volume);
-  });
-
  const source = document.createElement("source");
  source.src = videoUrl;

  video.appendChild(source);

-  const storedTrack = loadCaptionTrack();
-  let id = 0;
  for (const { name, url } of subtitles) {
    const track = document.createElement("track");
    track.label = name;
+    track.srclang = "xx-" + name.toLowerCase();
    track.src = url;
    track.kind = "captions";
-
-    if (id == storedTrack) {
-      track.default = true;
-    }
-
    video.appendChild(track);
-    id++;
  }

-  video.textTracks.addEventListener("change", async () => {
-    let id = 0;
-    for (const track of video.textTracks) {
-      if (track.mode != "disabled") {
-        saveCaptionsTrack(id);
-        return;
-      }
-      id++;
-    }
-    saveCaptionsTrack(-1);
+  const videoContainer = document.querySelector("#video-container");
+  videoContainer.style.display = "block";
+  videoContainer.appendChild(video);
+
+  const player = new Plyr(video, {
+    clickToPlay: false,
+    settings: ["captions", "quality"],
+    autopause: false,
  });
-
-  // watch for attribute changes on the video object to detect hiding/showing of controls
-  // as far as i can tell this is the least hacky solutions to get control visibility change events
-  const observer = new MutationObserver(async (mutations) => {
-    for (const mutation of mutations) {
-      if (mutation.attributeName == "controls") {
-        if (video.controls) {
+  player.elements.controls.insertAdjacentHTML(
+    "afterbegin",
+    `<button type="button" aria-pressed="false" class="plyr__controls__item plyr__control lock-controls"><svg aria-hidden="true" focusable="false" viewBox="0 0 24 24"><path d="M18 8h-1V6c0-2.76-2.24-5-5-5S7 3.24 7 6v2H6c-1.1 0-2 .9-2 2v10c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V10c0-1.1-.9-2-2-2zm-6 9c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2zM9 8V6c0-1.66 1.34-3 3-3s3 1.34 3 3v2H9z"></path></svg><span class="label--pressed plyr__sr-only">Unlock controls</span><span class="label--not-pressed plyr__sr-only">Lock controls</span></button>`
+  );
+  const lockButton = player.elements.controls.children[0];
+  let controlsEnabled = created;
+  const setControlsEnabled = (enabled) => {
+    controlsEnabled = enabled;
+    lockButton.setAttribute("aria-pressed", enabled);
+    lockButton.classList.toggle("plyr__control--pressed", enabled);
+    player.elements.buttons.play[0].disabled =
+      player.elements.buttons.play[1].disabled =
+      player.elements.inputs.seek.disabled =
+        !enabled;
+    if (!enabled) {
      // enable media button support
      navigator.mediaSession.setActionHandler("play", null);
      navigator.mediaSession.setActionHandler("pause", null);
@ -120,13 +71,14 @@ const createVideoElement = (videoUrl, subtitles) => {
      navigator.mediaSession.setActionHandler("previoustrack", () => {});
      navigator.mediaSession.setActionHandler("nexttrack", () => {});
    }
-        return;
-      }
-    }
-  });
-  observer.observe(video, { attributes: true });
+  };
+  setControlsEnabled(controlsEnabled);
+  lockButton.addEventListener("click", () =>
+    setControlsEnabled(!controlsEnabled)
+  );
+  window.__plyr = player;

-  return video;
+  return player;
 };

 /**
@ -135,24 +87,26 @@ const createVideoElement = (videoUrl, subtitles) => {
 * @param {number} currentTime
 * @param {boolean} playing
 */
-export const setupVideo = async (videoUrl, subtitles, currentTime, playing) => {
+export const setupVideo = async (
+  videoUrl,
+  subtitles,
+  currentTime,
+  playing,
+  created
+) => {
  document.querySelector("#pre-join-controls").style["display"] = "none";
-  const video = createVideoElement(videoUrl, subtitles);
-  const videoContainer = document.querySelector("#video-container");
-  videoContainer.style.display = "block";
-  videoContainer.appendChild(video);
-
-  video.currentTime = currentTime / 1000.0;
+  const player = createVideoElement(videoUrl, subtitles, created);
+  player.currentTime = currentTime / 1000.0;

  try {
    if (playing) {
-      await video.play();
+      player.play();
    } else {
-      video.pause();
+      player.pause();
    }
  } catch (err) {
    // Auto-play is probably disabled, we should uhhhhhhh do something about it
  }

-  return video;
+  return player;
 };
--- a/frontend/lib/watch-session.mjs
+++ b/frontend/lib/watch-session.mjs
@ -1,21 +1,23 @@
-import { setupVideo } from "./video.mjs?v=048af96";
+import { setupVideo } from "./video.mjs?v=4b61c4";
 import {
  setupChat,
  logEventToChat,
  updateViewerList,
-} from "./chat.mjs?v=048af96";
+  printChatMessage,
+} from "./chat.mjs?v=4b61c4";
 import ReconnectingWebSocket from "./reconnecting-web-socket.mjs";
-
+import { state } from "./state.mjs";
+let player;
 /**
 * @param {string} sessionId
 * @param {string} nickname
 * @returns {ReconnectingWebSocket}
 */
-const createWebSocket = (sessionId, nickname, colour) => {
+const createWebSocket = () => {
  const wsUrl = new URL(
-    `/sess/${sessionId}/subscribe` +
-      `?nickname=${encodeURIComponent(nickname)}` +
-      `&colour=${encodeURIComponent(colour)}`,
+    `/sess/${state().sessionId}/subscribe` +
+      `?nickname=${encodeURIComponent(state().nickname)}` +
+      `&colour=${encodeURIComponent(state().colour)}`,
    window.location.href
  );
  wsUrl.protocol = "ws" + window.location.protocol.slice(4);
@ -40,26 +42,18 @@ export const setDebounce = () => {
  }, 500);
 };

-export const setVideoTime = (time, video = null) => {
-  if (video == null) {
-    video = document.querySelector("video");
-  }
-
+export const setVideoTime = (time) => {
  const timeSecs = time / 1000.0;
-  if (Math.abs(video.currentTime - timeSecs) > 0.5) {
-    video.currentTime = timeSecs;
+  if (Math.abs(player.currentTime - timeSecs) > 0.5) {
+    player.currentTime = timeSecs;
  }
 };

-export const setPlaying = async (playing, video = null) => {
-  if (video == null) {
-    video = document.querySelector("video");
-  }
-
+export const setPlaying = async (playing) => {
  if (playing) {
-    await video.play();
+    await player.play();
  } else {
-    video.pause();
+    player.pause();
  }
 };

@ -67,7 +61,7 @@ export const setPlaying = async (playing, video = null) => {
 * @param {HTMLVideoElement} video
 * @param {ReconnectingWebSocket} socket
 */
-const setupIncomingEvents = (video, socket) => {
+const setupIncomingEvents = (player, socket) => {
  socket.addEventListener("message", async (messageEvent) => {
    try {
      const event = JSON.parse(messageEvent.data);
@ -77,16 +71,16 @@ const setupIncomingEvents = (video, socket) => {
            setDebounce();

            if (event.data.playing) {
-              await video.play();
+              await player.play();
            } else {
-              video.pause();
+              player.pause();
            }

-            setVideoTime(event.data.time, video);
+            setVideoTime(event.data.time);
            break;
          case "SetTime":
            setDebounce();
-            setVideoTime(event.data, video);
+            setVideoTime(event.data);
            break;
          case "UpdateViewerList":
            updateViewerList(event.data);
@ -100,19 +94,19 @@ const setupIncomingEvents = (video, socket) => {
 };

 /**
- * @param {HTMLVideoElement} video
+ * @param {Plyr} player
 * @param {ReconnectingWebSocket} socket
 */
-const setupOutgoingEvents = (video, socket) => {
-  const currentVideoTime = () => (video.currentTime * 1000) | 0;
+const setupOutgoingEvents = (player, socket) => {
+  const currentVideoTime = () => (player.currentTime * 1000) | 0;

-  video.addEventListener("pause", async (event) => {
-    if (outgoingDebounce || !video.controls) {
+  player.on("pause", async () => {
+    if (outgoingDebounce || player.elements.inputs.seek.disabled) {
      return;
    }

    // don't send a pause event for the video ending
-    if (video.currentTime == video.duration) {
+    if (player.currentTime == player.duration) {
      return;
    }

@ -127,8 +121,8 @@ const setupOutgoingEvents = (video, socket) => {
    );
  });

-  video.addEventListener("play", (event) => {
-    if (outgoingDebounce || !video.controls) {
+  player.on("play", () => {
+    if (outgoingDebounce || player.elements.inputs.seek.disabled) {
      return;
    }

@ -144,14 +138,14 @@ const setupOutgoingEvents = (video, socket) => {
  });

  let firstSeekComplete = false;
-  video.addEventListener("seeked", async (event) => {
+  player.on("seeked", async (event) => {
    if (!firstSeekComplete) {
      // The first seeked event is performed by the browser when the video is loading
      firstSeekComplete = true;
      return;
    }

-    if (outgoingDebounce || !video.controls) {
+    if (outgoingDebounce || player.elements.inputs.seek.disabled) {
      return;
    }

@ -166,19 +160,29 @@ const setupOutgoingEvents = (video, socket) => {
  });
 };

-/**
- * @param {string} nickname
- * @param {string} sessionId
- */
-export const joinSession = async (nickname, sessionId, colour) => {
+export const joinSession = async (created) => {
+  if (state().activeSession) {
+    if (state().activeSession === state().sessionId) {
+      // we are already in this session, dont rejoin
+      return;
+    }
+    // we are joining a new session from an existing session
+    const messageContent = document.createElement("span");
+    messageContent.appendChild(document.createTextNode("joining new session "));
+    messageContent.appendChild(document.createTextNode(state().sessionId));
+
+    printChatMessage("join-session", "watch-party", "#fffff", messageContent);
+  }
+  state().activeSession = state().sessionId;
+
  // try { // we are handling errors in the join form.
  const genericConnectionError = new Error(
    "There was an issue getting the session information."
  );
-  window.location.hash = sessionId;
+  window.location.hash = state().sessionId;
  let response, video_url, subtitle_tracks, current_time_ms, is_playing;
  try {
-    response = await fetch(`/sess/${sessionId}`);
+    response = await fetch(`/sess/${state().sessionId}`);
  } catch (e) {
    console.error(e);
    throw genericConnectionError;
@ -202,24 +206,27 @@ export const joinSession = async (nickname, sessionId, colour) => {
    throw genericConnectionError;
  }

-  const socket = createWebSocket(sessionId, nickname, colour);
+  if (state().socket) {
+    state().socket.close();
+    state().socket = null;
+  }
+  const socket = createWebSocket();
+  state().socket = socket;
  socket.addEventListener("open", async () => {
-    const video = await setupVideo(
+    player = await setupVideo(
      video_url,
      subtitle_tracks,
      current_time_ms,
-      is_playing
+      is_playing,
+      created
    );

-    // By default, we should disable video controls if the video is already playing.
-    // This solves an issue where Safari users join and seek to 00:00:00 because of
-    // outgoing events.
-    if (current_time_ms != 0) {
-      video.controls = false;
-    }
+    player.on("canplay", () => {
+      sync();
+    });

-    setupOutgoingEvents(video, socket);
-    setupIncomingEvents(video, socket);
+    setupOutgoingEvents(player, socket);
+    setupIncomingEvents(player, socket);
    setupChat(socket);
  });
  socket.addEventListener("reconnecting", (e) => {
@ -249,3 +256,15 @@ export const createSession = async (videoUrl, subtitleTracks) => {

  window.location = `/?created=true#${id}`;
 };
+
+export const sync = async () => {
+  setDebounce();
+  await setPlaying(false);
+  const { current_time_ms, is_playing } = await fetch(
+    `/sess/${state().sessionId}`
+  ).then((r) => r.json());
+
+  setDebounce();
+  setVideoTime(current_time_ms);
+  if (is_playing) await setPlaying(is_playing);
+};
--- a/frontend/main.mjs
+++ b/frontend/main.mjs
@ -1,4 +1,4 @@
-import { setupJoinSessionForm } from "./lib/join-session.mjs?v=048af96";
+import { setupJoinSessionForm } from "./lib/join-session.mjs?v=4b61c4";

 const main = () => {
  setupJoinSessionForm();
--- a/frontend/styles.css
+++ b/frontend/styles.css
@ -25,6 +25,14 @@
    ),
    linear-gradient(var(--bg), var(--bg));
  --accent-transparent: rgba(var(--accent-rgb), 0.25);
+  --plyr-color-main: var(--accent);
+  --plyr-control-radius: 6px;
+  --plyr-menu-radius: 6px;
+  --plyr-menu-background: var(--autocomplete-bg);
+  --plyr-menu-color: var(--fg);
+  --plyr-menu-arrow-color: var(--fg);
+  --plyr-menu-back-border-color: var(--fg-transparent);
+  --plyr-menu-back-border-shadow-color: transparent;
 }

 html {
@ -49,11 +57,41 @@ body {
  flex-direction: column;
 }

-video {
-  display: block;
+.lock-controls.plyr__control--pressed svg {
+  opacity: 0.5;
+}
+
+.plyr {
  width: 100%;
  height: 100%;
-  object-fit: contain;
+}
+
+.plyr__menu__container {
+  --plyr-video-control-background-hover: var(--fg-transparent);
+  --plyr-video-control-color-hover: var(--fg);
+  --plyr-control-radius: 4px;
+  --plyr-control-spacing: calc(0.25rem / 0.7);
+  --plyr-font-size-menu: 0.75rem;
+  --plyr-menu-arrow-size: 0;
+  margin-bottom: 0.48rem;
+  max-height: 27vmin;
+  clip-path: inset(0 0 0 0 round 4px);
+  scrollbar-width: thin;
+}
+
+.plyr__menu__container .plyr__control[role="menuitemradio"]::after {
+  left: 10px;
+}
+
+.plyr__menu__container
+  .plyr__control[role="menuitemradio"][aria-checked="true"].plyr__tab-focus::before,
+.plyr__menu__container
+  .plyr__control[role="menuitemradio"][aria-checked="true"]:hover::before {
+  background: var(--accent);
+}
+
+[data-plyr="language"] .plyr__menu__value {
+  display: none;
 }

 #video-container {
@ -131,7 +169,7 @@ input[type="text"] {
  overflow-y: scroll;
 }

-button {
+button:not(.plyr button) {
  background-color: var(--accent);
  border: var(--accent);
  border-radius: 6px;
@ -226,7 +264,8 @@ button.small-button {
 }

 .chat-message.set-time,
-.chat-message.set-playing {
+.chat-message.set-playing,
+.chat-message.join-session {
  font-style: italic;
  text-align: right;
  font-size: 0.85em;
@ -237,7 +276,8 @@ button.small-button {
 }

 .chat-message.set-time > strong,
-.chat-message.set-playing > strong {
+.chat-message.set-playing > strong,
+.chat-message.join-session > strong {
  color: unset !important;
 }

@ -301,7 +341,7 @@ button.small-button {
  display: none;
 }

-.emoji-option {
+.emoji-option:not(:root) {
  background: transparent;
  font-size: 0.75rem;
  text-align: left;
@ -357,10 +397,19 @@ button.small-button {
  cursor: pointer;
 }

-input[type="color"]::-moz-color-swatch,
-input[type="color"]::-webkit-color-swatch,
+input[type="color"]::-moz-color-swatch {
+  border: none;
+  margin: 0;
+  padding: 0;
+}
+
+input[type="color"]::-webkit-color-swatch {
+  border: none;
+  margin: 0;
+  padding: 0;
+}
+
 input[type="color"]::-webkit-color-swatch-wrapper {
-  /* This *should* be working in Chrome, but it doesn't for reasons that are beyond me. */
  border: none;
  margin: 0;
  padding: 0;
--- a/src/main.rs
+++ b/src/main.rs
@ -62,7 +62,7 @@ async fn main() {
            warb::reply::json(&json!({ "id": session_uuid.to_string(), "session": session_view }))
        });

-    let get_emoji_route = warb::path!("emojis").and_then(get_emoji_list);
+    let get_emoji_route = warb::path!("emojos").and_then(get_emoji_list);

    enum RequestedSession {
        Session(Uuid, WatchSession),
Author	SHA1	Message	Date
Charlotte Som	e6d09b14c5	Update cachebust version	2023-02-02 06:38:45 +00:00
Charlotte Som	4b61c44d6a	Update editorconfig if using LF endings	2023-02-02 06:36:01 +00:00
easrng	f3ee2ecc83	fuck it, converting the rest to unix line endings	2023-02-01 20:29:47 -05:00
easrng	1bd7071cec	use plyr for video controls	2023-02-01 20:20:07 -05:00
easrng	e43184ab49	fix the color input styles on chrome	2022-07-12 20:21:36 +00:00
Charlotte Som	61c456eceb	Default captions to enabled	2022-04-29 23:50:35 +01:00
Charlotte Som	0fc8953a69	Textual feedback for personal colour	2022-04-29 23:41:33 +01:00
Charlotte Som	8e19d7b34d	Don't allow controls by default	2022-04-29 23:28:11 +01:00
Charlotte Som	8717e0dff2	Bust cache	2022-04-29 23:25:31 +01:00
Charlotte Som	bfdcf2afed	Default personal colour to white	2022-04-29 23:24:37 +01:00
Charlotte Som	8531c83574	Sort unicode emoji before emojos, let enter fill an emoji	2022-04-29 23:22:23 +01:00
Charlotte Som	0d555adf21	Remove blobcat.png It should be gitignored anyway	2022-04-29 23:08:10 +01:00
maia arson crimew	b72a7d11d7	bust cache	2022-03-30 16:28:10 +02:00
maia arson crimew	ee93fb84af	turn the beep into a pling	2022-03-30 16:26:34 +02:00
maia arson crimew	40b20b2157	Improve global state handling	2022-03-30 15:02:08 +02:00
maia arson crimew	9a2ac1c432	make pings send browser notifications	2022-03-30 13:45:59 +02:00
maia arson crimew	2197d2b757	make the ping sound a lot more tolerable	2022-03-30 13:28:35 +02:00
maia arson crimew	3d4ea0773d	Clicking the join chip will directly join the session without a reload also adds a /join command (most likely still requires some further debugging)	2022-03-30 13:17:44 +02:00