@grfzhl/vue-hls-player 1.1.4 → 1.1.6

package/dist/VideoPlayer/BasePlayer.vue

@@ -144,21 +144,17 @@ const isFullscreen = ref(false);
 const orientation = ref(null)
 const autoHideIntroTitle = ref(false);
 const initialPlayButton = ref(false);
-const hideInitialPlayButton = ref(false)
-const transcriptRef = ref(null)
-const link = toRef(props, 'link');
+const hideInitialPlayButton = ref(false);
+const transcriptRef = ref(null);
 const previewImageLink = toRef(props, 'previewImageLink');
+const link = toRef(props, 'link');
 let currentTime = 0
 let hls = null
 
 const videoElement = defineModel()
 
 onMounted(() => {
-  prepareVideoPlayer()
-})
-
-onUpdated(() => {
-
+  prepareVideoPlayer(props.link)
 })
 
 onUnmounted(() => {
@@ -178,7 +174,11 @@ const mutedAttr = computed(() => {
 const currentSubtitle = computed(() => {
   if(props.subtitles) {
     const current = props.subtitles.filter((subt) => {
-      return subt.lang === currentSubtitleLang.value
+      if(currentSubtitleLang.value) {
+        return subt.lang === currentSubtitleLang.value
+      } else {
+        return subt.lang === "en"
+      }
     })
     return current.length ? current[0] : null
   }
@@ -195,10 +195,11 @@ watch([props, videoElement], (a) => {
   }
 })
 
-watch(link, (newLink, oldLink) => {
+watch(
+  () => props.link,
+  (newLink, oldLink) => {
   if (newLink !== oldLink) {
-    console.log("prepare new src " + newLink)
-    prepareVideoPlayer();
+    prepareVideoPlayer(newLink);
   }
 })
 
@@ -307,15 +308,18 @@ function seekVideo(time) {
   video.value.play()
 }
 
-function prepareVideoPlayer() {
+function prepareVideoPlayer(link) {
+  let initiallyLoaded = true;
   if (video.value) {
     if (hls) {
+      hls.detachMedia();
       hls.destroy();
+      initiallyLoaded = false;
     }
     hls = new Hls();
-    let stream = props.link
-    hls.loadSource(stream)
+    hls.loadSource(link)
     hls.attachMedia(video.value)
+    hls.recoverMediaError()
 
     video.value.muted = props.isMuted
     video.value.currentTime = props.progress

package/dist/VideoPlayer/SubtitleBlock.vue

@@ -28,7 +28,7 @@
             <span
               v-for="(word, wordIndex) in txtCue.dialog[0].text.split('')"
               :key="wordIndex"
-              :class="{ 'active-word': isWordActive(txtCue, word, wordIndex, index) && isTxtCueActive(txtCue) }"
+              :class="{ 'active-word': isWordActive(txtCue, word, wordIndex, index, currentCue) && isTxtCueActive(txtCue) }"
             >
               {{ word }}
             </span>
@@ -111,7 +111,7 @@
 </style>
 
 <script setup>
-import { onMounted, watch, ref } from 'vue';
+import { onMounted, watch, ref, nextTick } from 'vue';
 
 const props = defineProps({
   subtitle: {
@@ -137,6 +137,7 @@ const subtitlesContainer = ref(null);
 const vttCues = ref([]);
 const txtCues = ref([]);
 const currentCue = ref(null);
+const videoCursor = ref(0);
 
 
 const loadCues = async () => {
@@ -158,8 +159,9 @@ watch(
 );
 
 const onTimeUpdate = (video) => {
-  if (video) {
+  if (video && txtCues?.value?.length && vttCues?.value?.length) {
     const currentTime = video.currentTime;
+    videoCursor.value = currentTime;
     props.cursor = currentTime;
     highlightActiveCue(currentTime);
     checkCurrentCue(currentTime);
@@ -195,7 +197,7 @@ function seekTo(time) {
  * @param txtCue 
  */
 function isTxtCueActive(txtCue) {
-  return props.cursor >= txtCue.start && props.cursor <= txtCue.end;
+  return videoCursor.value >= txtCue.start && videoCursor.value <= txtCue.end;
 }
 
 /**
@@ -206,24 +208,23 @@ function isTxtCueActive(txtCue) {
  * @param wordIndex 
  * @param txtIndex 
  */
-function isWordActive(txtCue, word, wordIndex, txtIndex) {
-  console.log("check word active ", txtCue, word, wordIndex, currentCue.value)
-  if(!currentCue.value || !word || !txtCue) {
+function isWordActive(txtCue, word, wordIndex, txtIndex, currentCue) {
+  if(!currentCue || !word || !txtCue) {
     return false
   }
-  const startPos = txtCue.dialog[0].text.indexOf(currentCue.value)
-  const endPos = startPos + currentCue.value.length
-  console.log("can word marked", startPos, endPos, wordIndex)
+  const startPos = txtCue.dialog[0].text.indexOf(currentCue)
+  const endPos = startPos + currentCue.length
   if(wordIndex >= startPos && wordIndex < endPos) {
     return true;
   }
   return false;
 }
 
-function checkCurrentCue(currentCursor) {
-  Array.from(vttCues.value).forEach((a, index) => {
-    if(currentCursor >= a.start && currentCursor <= a.end) {
+async function checkCurrentCue(currentCursor) {
+  Array.from(vttCues.value).forEach(async (a, index) => {
+    if(videoCursor.value >= a.start && videoCursor.value <= a.end) {
       currentCue.value = a.text
+      await nextTick()
     }
   });
 }
@@ -237,7 +238,7 @@ async function parseVTT(fileUrl) {
   const response = await fetch(fileUrl);
   const text = await response.text();
   const cues = [];
-  const lines = text.split('\n');
+  const lines = text.replace(/\r/g, '').split('\n');
   let cue = null;
 
   for (let i = 0; i < lines.length; i++) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@grfzhl/vue-hls-player",
   "private": false,
-  "version": "1.1.4",
+  "version": "1.1.6",
   "type": "module",
   "files": [
     "dist"