From a591b82bf0960d563d411554642bc2136cfed268 Mon Sep 17 00:00:00 2001
From: Hizkia Felix Winata <felix@hizkifw.me>
Date: Thu, 17 Mar 2022 15:30:56 +0800
Subject: [PATCH] feat(player): pin version, ping upstream in parallel

---
 player/static/index.html | 10 +++++-----
 player/static/player.js  | 12 ++++--------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/player/static/index.html b/player/static/index.html
index bb27c73..c27424c 100644
--- a/player/static/index.html
+++ b/player/static/index.html
@@ -8,15 +8,15 @@
     <link rel="stylesheet" href="./player.css" />
     <link
       rel="stylesheet"
-      href="https://cdn.jsdelivr.net/npm/video.js@latest/dist/video-js.min.css"
+      href="https://cdn.jsdelivr.net/npm/video.js@7.18.1/dist/video-js.min.css"
     />
     <link
       rel="stylesheet"
-      href="https://cdn.jsdelivr.net/npm/videojs-hls-quality-selector@latest/dist/videojs-hls-quality-selector.css"
+      href="https://cdn.jsdelivr.net/npm/videojs-hls-quality-selector@1.1.4/dist/videojs-hls-quality-selector.css"
     />
-    <script src="https://cdn.jsdelivr.net/npm/video.js@latest/dist/video.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/videojs-contrib-quality-levels@latest/dist/videojs-contrib-quality-levels.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/videojs-hls-quality-selector@latest/dist/videojs-hls-quality-selector.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/video.js@7.18.1/dist/video.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/videojs-contrib-quality-levels@2.1.0/dist/videojs-contrib-quality-levels.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/videojs-hls-quality-selector@1.1.4/dist/videojs-hls-quality-selector.min.js"></script>
     <script src="./player.js"></script>
     <script id="config">
       window.restream_config = {
diff --git a/player/static/player.js b/player/static/player.js
index e308e38..54f82dc 100644
--- a/player/static/player.js
+++ b/player/static/player.js
@@ -86,7 +86,6 @@
     if (window.restream_config.activeURL === playlistURL) return;
 
     console.log('Reloading video from', playlistURL);
-    // videosrc.src = playlistURL;
     if (typeof window.player === 'undefined') {
       window.player = videojs('video', {
         liveui: true,
@@ -94,6 +93,7 @@
       window.player.hlsQualitySelector({
         displayCurrentQuality: true,
       });
+      window.player.volume(0.5);
     }
     window.player.src({
       src: playlistURL,
@@ -166,19 +166,15 @@
   const init = async () => {
     const mirrorSelect = document.getElementById('mirror-select');
     const mirrorPopup = document.getElementById('mirror-popup');
-    const mirrorLoadProgress = document.getElementById('mirror-load-progress');
     const { upstreams } = window.restream_config;
 
     // Set up event listeners
     mirrorSelect.addEventListener('change', () => reloadVideo());
 
     // Measure latency
-    let n = 0;
-    for (const upstream of upstreams) {
-      n += 1;
-      await measureUpstreamLatency(upstream);
-      mirrorLoadProgress.innerText = '(' + n + '/' + upstreams.length + ')';
-    }
+    await Promise.all(
+      upstreams.map((upstream) => measureUpstreamLatency(upstream))
+    );
 
     // Choose the fastest upstream server
     const upstream = upstreams