From 071fe0ba86d8a302a5f9ce889e07e9606923350e Mon Sep 17 00:00:00 2001
From: Shiny Nematoda <snematoda.751k2@aleeas.com>
Date: Wed, 10 Jul 2024 15:29:50 +0000
Subject: [PATCH] improve player

- feat: add option to prefer HLS over DASH
- feat: add skip +/- 10sec to statusbar
- enhancement: tweek shaka config
---
 src/assets/base.css          |  4 ++++
 src/assets/version.json      |  2 +-
 src/components/Player.vue    |  7 ++++++
 src/components/Prefs.vue     | 18 +++++++++++++++-
 src/components/StatusBar.vue | 42 ++++++++++++++++++++++--------------
 src/locales/en.json          |  3 ++-
 src/scripts/util.js          |  6 +++---
 7 files changed, 60 insertions(+), 22 deletions(-)

diff --git a/src/assets/base.css b/src/assets/base.css
index 9f6c485..26104ad 100644
--- a/src/assets/base.css
+++ b/src/assets/base.css
@@ -293,6 +293,10 @@ input[type='search']::-webkit-search-cancel-button:hover {
   text-transform: capitalize;
 }
 
+.hidden {
+  visibility: hidden;
+}
+
 .textbox {
   padding: 0.5rem 1rem;
   color: var(--color-text);
diff --git a/src/assets/version.json b/src/assets/version.json
index d34c1ab..285191d 100644
--- a/src/assets/version.json
+++ b/src/assets/version.json
@@ -1,3 +1,3 @@
 {
-  "date": "2024-07-07"
+  "date": "2024-07-10"
 }
diff --git a/src/components/Player.vue b/src/components/Player.vue
index c7b5fe1..1739c53 100644
--- a/src/components/Player.vue
+++ b/src/components/Player.vue
@@ -80,10 +80,17 @@ async function Stream() {
         preferredAudioCodecs: codecs ? codecs.split(':') : ['opus', 'mp4a'],
         manifest: {
           disableVideo: true,
+          disableThumbnails: true,
         },
         streaming: {
           segmentPrefetchLimit: 2,
+          bufferBehind: 50,
+          rebufferingGoal: 1,
+          stallEnabled: true,
         },
+        dash: {
+          ignoreMinBufferTime: true,
+        }
       });
 
       window.audioPlayer = audioPlayer;
diff --git a/src/components/Prefs.vue b/src/components/Prefs.vue
index f611999..b8e4409 100644
--- a/src/components/Prefs.vue
+++ b/src/components/Prefs.vue
@@ -24,6 +24,7 @@ const { t, setupLocale } = useI18n(),
   instances = ref([]),
   hypInstances = ref([]),
   next = ref(false),
+  hls = ref(false),
   compact = ref(false),
   prm = ref(false),
   cc = ref(false),
@@ -136,6 +137,7 @@ const verifyApi = computed(() =>
 onMounted(() => {
   getRestoreUrl();
   getStoreBool('next', next, true);
+  getStoreBool('hls', hls, false);
   getStoreBool('compact', compact, false);
   getStoreBool('prm', prm, false);
   getStoreBool('cc', cc, false);
@@ -248,6 +250,17 @@ onMounted(() => {
     </select>
   </div>
 
+  <div class="left pt">
+    <input
+      type="checkbox"
+      name="pref-chk-hls"
+      id="pref-chk-hls"
+      class="input"
+      @change="setStore('hls', $event.target.checked)"
+      v-model="hls" />
+    <label for="pref-chk-next">{{ t('pref.hls') }}</label>
+  </div>
+
   <div class="left">
     <label for="pref-quality">{{ t('pref.quality') }}</label>
     <select
@@ -291,7 +304,7 @@ onMounted(() => {
       }" />
   </div>
 
-  <div class="left">
+  <div class="left pt">
     <input
       type="checkbox"
       name="pref-chk-preserve-pitch"
@@ -499,6 +512,9 @@ label[for^='pref-chk'] {
 .left + .left {
   padding: 0;
 }
+.left.pt {
+  padding-top: 1rem;
+}
 .table-wrap {
   overflow-x: auto;
   margin-bottom: 2rem;
diff --git a/src/components/StatusBar.vue b/src/components/StatusBar.vue
index 755a87f..f206ade 100644
--- a/src/components/StatusBar.vue
+++ b/src/components/StatusBar.vue
@@ -127,20 +127,25 @@ async function Like() {
       </div>
       <div class="statusbar-control-item center">
         <button
-          :style="{
-            visibility:
-              data.state.urls[
-                data.state.urls.map(s => s.url).indexOf(data.state.url) - 1
-              ] ||
-              (player.state.loop == 1 && data.state.urls.length > 1)
-                ? 'visible'
-                : 'hidden',
+          :class="{
+            hidden: data.state.urls[
+                data.state.urls.findIndex((s) => s.url == data.state.url) - 1
+              ] == undefined &&
+              (player.state.loop != 1 || data.state.urls.length == 0),
           }"
           id="btn-previoustrack"
           aria-label="Play previous track"
           class="bi bi-chevron-bar-left clickable"
           @click="data.prevTrack"></button>
 
+        <button
+          :class="{ hidden: player.state.duration == 0 }"
+          id="btn-rewind"
+          aria-label="Rewind 10 seconds"
+          class="bi bi-chevron-left clickable"
+          @click="player.state.currentTime =
+            Math.max(0, player.state.currentTime - 10)"></button>
+
         <button
           id="btn-play-pause"
           aria-label="Play or Pause"
@@ -149,14 +154,19 @@ async function Like() {
           @click="player.toggle('play')"></button>
 
         <button
-          :style="{
-            visibility:
-              data.state.urls[
-                data.state.urls.map(s => s.url).indexOf(data.state.url) + 1
-              ] ||
-              (player.state.loop == 1 && data.state.urls.length > 1)
-                ? 'visible'
-                : 'hidden',
+          :class="{ hidden: player.state.duration == 0 }"
+          id="btn-forward"
+          aria-label="Forward 10 seconds"
+          class="bi bi-chevron-right clickable"
+          @click="player.state.currentTime =
+            Math.min(player.state.duration, player.state.currentTime + 10)"></button>
+
+        <button
+          :class="{
+            hidden: data.state.urls[
+                data.state.urls.findIndex((s) => s.url == data.state.url) + 1
+              ] == undefined &&
+              (player.state.loop != 1 || data.state.urls.length == 0),
           }"
           id="btn-nexttrack"
           :aria-label="t('action.play_next_track')"
diff --git a/src/locales/en.json b/src/locales/en.json
index b4de6e8..385e800 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -95,7 +95,8 @@
     "charts": "Charts",
     "library": "Library",
     "playback_rate": "Playback Rate",
-    "preserves_pitch": "Preserve Pitch"
+    "preserves_pitch": "Preserve Pitch",
+    "hls": "Prefer HLS over DASH"
   },
   "info": {
     "see_all": "See All",
diff --git a/src/scripts/util.js b/src/scripts/util.js
index 79d3319..0ccda33 100644
--- a/src/scripts/util.js
+++ b/src/scripts/util.js
@@ -111,11 +111,11 @@ export function useMetadata(now, data) {
 export async function useManifest({ streams, duration, hls }) {
   let url, mime;
 
-  const mse = window.MediaSource || window.ManagedMediaSource;
+  const mse = window.MediaSource || window.ManagedMediaSource !== undefined;
+  const prefer_hls = useStore().getItem('hls') == 'true';
 
-  if (mse !== undefined && streams.length > 0) {
+  if (mse && streams.length > 0 && !prefer_hls) {
     const { useDash } = await import('./dash.js');
-
     const dash = useDash(streams, duration);
 
     url = 'data:application/dash+xml;charset=utf-8;base64,' + btoa(dash);