@grfzhl/vue-hls-player 1.0.3 → 1.0.5

package/README.md

@@ -120,6 +120,16 @@ it can show and hide the video control panel
 subtitles to add as tracks to the video
 
 ### Last release:
+v1.0.5
+1. Load transcriptions additionally to subtitles
+2. Add styled transcription block for better readability
+3. Improve interaction and dynamic params
+
+v1.0.4
+1. Make subtitles dynamic
+2. Add new switch to disable the subtitle block
+3. Fix some minor issues
+
 v1.0.3
 1. Removed controls in favour of themable overlay by `player.style`.
 2. Updated hls library

package/dist/VideoPlayer/BasePlayer.vue

@@ -1,15 +1,18 @@
 <template>
   <div class="video-container">
-    <media-theme-sutro>
+    <media-theme-sutro class="video-player-theme-container">
       <video
+        class="hls-player"
         slot="media"
         @pause="pause"
-        @ended="pause"
         @keyup="changeSpeed"
+        @ended="onVideoEnd"
+        @seek="seekVideo"
         ref="video"
         :poster="previewImageLink"
         :controls="false"
         :title="title"
+        :isFullscreen="isFullscreen"
         controlslist="nodownload"
         playsinline
         crossorigin
@@ -27,13 +30,21 @@
           :label="subtitle.label" :default="i === 0" />
       </video>
     </media-theme-sutro>
-    <div ref="subtitlesContainer" class="custom-subtitles"></div>
+    <div class="custom-subtitles" v-show="!showTranscriptBlock">
+      <div class="subtitle-text" ref="subtitlesContainer" style="display: none;"></div>
+    </div>
   </div>
-  <SubtitleBlock :vttFile="subtitles[0]" :cursor="videoCursor"></SubtitleBlock>
+  <SubtitleBlock
+    :subtitle="currentSubtitle"
+    :cursor="videoCursor" 
+    :showTranscriptBlock="showTranscriptBlock"
+    @seek="seekVideo"
+    @toggleTranscript="toggleTranscript">
+  </SubtitleBlock>
 </template>
 
 <script setup>
-import { onMounted, onUpdated, ref, onUnmounted } from 'vue'
+import { onMounted, onUpdated, ref, onUnmounted, computed } from 'vue'
 import Hls from 'hls.js'
 import 'player.style/sutro';
 import SubtitleBlock from './SubtitleBlock.vue';
@@ -67,18 +78,35 @@ const props = defineProps({
   subtitles: {
     type: Array,
     default: []
+  },
+  /**
+   * true, if showing separate
+   * block with transcripts
+   */
+  showTranscriptBlock: {
+    type: Boolean,
+    default: true
+  },
+  isFullscreen: {
+    type: Boolean,
+    default: false
   }
 })
 
-const emit = defineEmits(['pause', 'test'])
+const emit = defineEmits(['pause', 'video-ended', 'video-fullscreen-change'])
 const video = ref(null)
 const subtitlesContainer = ref(null)
+const currentSubtitleLang = ref(null)
 const videoCursor = ref(0)
+const isFullscreen = ref(false);
 
 onMounted(() => {
+console.log("mounted current - - changed")
   prepareVideoPlayer()
   if (video.value) {
+    checkFullscreen();
     video.value.addEventListener('timeupdate', updateCurrentTime);
+    document.addEventListener('fullscreenchange', onFullscreenChange);
   }
 })
 
@@ -88,13 +116,43 @@ onUpdated(() => {
 onUnmounted(() => {
   if (video.value) {
     video.value.removeEventListener('timeupdate', updateCurrentTime);
+    document.removeEventListener('fullscreenchange', onFullscreenChange);
   }
 });
 
+const currentSubtitle = computed(() => {
+  if(props.subtitles) {
+    const current = props.subtitles.filter((subt) => {
+      return subt.lang === currentSubtitleLang.value
+    })
+    return current.length ? current[0] : null
+  }
+  return null
+})
+
+function checkFullscreen() {
+  isFullscreen.value = document.fullscreenElement === video.value;
+};
+
+function onFullscreenChange() {
+  checkFullscreen();
+  emit('video-fullscreen-change', isFullscreen)
+};
+
+
 function updateCurrentTime() {
   videoCursor.value = video.value.currentTime;
 }
 
+function toggleTranscript() {
+  props.showTranscriptBlock = !props.showTranscriptBlock
+}
+
+function seekVideo(time) {
+  video.value.currentTime = time;
+  video.play()
+}
+
 function prepareVideoPlayer() {
   let hls = new Hls()
   let stream = props.link
@@ -111,6 +169,7 @@ function prepareVideoPlayer() {
       Array.from(textTracks).forEach((track, index) => {
         track.addEventListener("cuechange", () => {
           const activeCues = track.activeCues;
+          currentSubtitleLang.value = track.language
           if (activeCues && activeCues.length > 0) {
             subtitlesContainer.value.textContent = activeCues[0].text
             subtitlesContainer.value.style.display = "block";
@@ -119,9 +178,9 @@ function prepareVideoPlayer() {
           }
         });
         if (track.mode !== previousModes[index]) {
-          console.log(`Track mode changed: ${track.mode}`);
           if (track.mode === "showing") {
             const activeCues = track.activeCues;
+            currentSubtitleLang.value = track.language
             if (activeCues && activeCues.length > 0) {
               subtitlesContainer.value.style.display = "block";
               subtitlesContainer.value.textContent = activeCues[0].text
@@ -141,10 +200,15 @@ function prepareVideoPlayer() {
 
 function pause() {
   const currentTime = video?.value?.currentTime || 0
-
   emit('pause', currentTime)
 }
 
+function onVideoEnd() {
+  const currentTime = video?.value?.currentTime || 0
+  pause()
+  emit('video-ended', { currentTime: currentTime, video });
+}
+
 function changeSpeed(e) {
   if (e.key === 'w' && video && video.value) {
     video.value.playbackRate = video.value.playbackRate + 0.25
@@ -165,17 +229,26 @@ function changeSpeed(e) {
     position: absolute;
     left: 50%;
     width: auto;
-    max-width: 90%;
+    max-width: 95%;
     text-align: center;
     background: rgba(0, 0, 0, 0.7);
+    border-radius: 6px;
+    box-shadow: 0 4px 10px rgba(0, 0, 0, 0.3);
+    transform: translate(-50%) translateY(calc(-100% - 60px));
+  }
+  .custom-subtitles .subtitle-text {
     color: white;
-    font-size: 16px;
+    font-size: 14px;
     font-family: Arial, sans-serif;
     line-height: 1.5;
-    padding: 10px 20px;
-    border-radius: 10px;
-    box-shadow: 0 4px 10px rgba(0, 0, 0, 0.3);
-    margin-top: -120px;
-    transform: translateX(-50%) translateY(-100%);
+    padding: 8px 10px;
+  }
+
+  .video-player-theme-container, .hls-player {
+    width: 100%;
+  }
+
+  .video-container {
+    position: relative;
   }
 </style>

package/dist/VideoPlayer/SubtitleBlock.vue

@@ -1,73 +1,246 @@
 <template>
-  <div class="transcript-container"
-    ref="subtitlesContainer">
-    <ul v-if="cues.length" class="subtitles">
-      <li v-for="cue of cues" :class="{'current-highlight': cursor >= cue.start && cursor <= cue.end}">
-        <span class="seconds">{{ secondsToTime(cue.start) }} - {{ secondsToTime(cue.end) }}</span>
-        <span class="text">{{ cue.text }}</span>
+  <div class="transcript-container" ref="subtitlesContainer">
+    <div class="transcript-toggle">
+      <button data-headlessui-state="open" @click="toggleTranscript()">
+        <div class="icon">
+          <svg v-if="!showTranscriptBlock" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-chevron-right-icon duration-200 h-4 w-4 text-gray-900 stroke-1"><path d="m9 18 6-6-6-6"></path></svg>
+          <svg v-if="showTranscriptBlock" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-chevron-right-icon rotate-90 transform duration-200 h-4 w-4 text-gray-900 stroke-1"><path d="m9 18 6-6-6-6"></path></svg>
+        </div>
+        Transcript
+      </button>
+    </div>
+    <ul v-if="txtCues.length && showTranscriptBlock" class="subtitles">
+      <li
+        v-for="(txtCue, index) in txtCues"
+        :key="index"
+        :class="{ 'current-highlight': isTxtCueActive(txtCue) }"
+        @click="seekTo(txtCue.start)"
+      >
+        <div class="play-icon">
+          <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-square-play lucide transform duration-200 h-4 w-4 text-gray-900 stroke-1"><rect width="18" height="18" x="3" y="3" rx="2"/><path d="m9 8 6 4-6 4Z"/></svg>
+        </div>
+        <div class="content">
+          <span class="meta">
+            <span class="seconds">{{ secondsToTime(txtCue.start) }} - {{ secondsToTime(txtCue.end) }}</span>
+            <span class="narrator">{{ txtCue.dialog[0].speaker }}</span>
+          </span>
+          <span class="text">
+            <span
+              v-for="(word, wordIndex) in txtCue.dialog[0].text.split('')"
+              :key="wordIndex"
+              :class="{ 'active-word': isWordActive(txtCue, word, wordIndex, index) && isTxtCueActive(txtCue) }"
+            >
+              {{ word }}
+            </span>
+          </span>
+        </div>
       </li>
     </ul>
   </div>
 </template>
 
 <style lang="css" scoped>
-  .subtitles li.current-highlight {
-    font-weight: bold;
-  }
+.transcript-toggle {
+  font-weight: bold;
+}
+.transcript-toggle button {
+  display: flex;
+}
+.transcript-toggle button .icon {
+  padding: 3px;
+}
+.transcript-container {
+  max-height: 400px;
+  overflow-y: scroll;
+  border-radius: 8px;
+  border: 1px solid var(--outline-gray-1);
+  padding: 10px;
+  font-family: Arial, sans-serif;
+}
+
+.subtitles {
+  list-style: none;
+  padding: 0;
+  margin: 0;
+}
+
+.subtitles li {
+  padding: 5px;
+  cursor: pointer;
+  display: flex;
+}
+
+.subtitles li .play-icon {
+  min-width: 24px;
+  padding-top: 4px;
+}
+
+.subtitles li .content .meta {
+  display: flex;
+  padding-bottom: 4px;
+}
+.subtitles li .content .meta .seconds {
+  font-weight: 500;
+}
+
+.subtitles li .content .meta .narrator {
+  padding-left: 10px;
+  font-weight: 500;
+}
+
+.subtitles li.current-highlight {
+}
+
+.subtitles li .active-word {
+  background-color: var(--outline-gray-1);
+}
+
+.subtitles li .seconds {
+  display: block;
+}
+
+.subtitles li .text .narrator {
+  display: block;
+  color: #333;
+}
 </style>
 
 <script setup>
-import { onMounted, onUpdated, ref } from 'vue'
+import { onMounted, watch, ref } from 'vue';
 
 const props = defineProps({
-  vttFile: {
-    type: String,
-    default: ''
+  subtitle: {
+    type: Object,
+    default: null,
   },
   cursor: {
     type: Number,
-    default: 0
+    default: 0,
   },
-})
+  showTranscriptBlock: {
+    type: Boolean,
+    default: true
+  }
+});
+
+const emit = defineEmits(['seek', 'toggleTranscript']);
+const subtitlesContainer = ref(null);
+const vttCues = ref([]);
+const txtCues = ref([]);
+const currentCue = ref(null);
 
-const emit = defineEmits(['pause', 'test'])
-const subtitlesContainer = ref(null)
-const cues = ref([])
 
-onMounted(async () => {
-  cues.value = await parseVTT(props.vttFile.link)
-  console.log(cues.value)
-})
+const loadCues = async () => {
+  if (props.subtitle) {
+    const vttPath = props.subtitle.link;
+    const txtPath = vttPath.replace(/\.vtt$/, '.txt');
 
-onUpdated(async () => {
-  // auto scroll text
-  if(subtitlesContainer) {
-    const activeSubtitle = subtitlesContainer?.value?.querySelectorAll('li.current-highlight')[0];
+    vttCues.value = await parseVTT(vttPath);
+    txtCues.value = await parseTXT(txtPath);
+  }
+};
+
+onMounted(loadCues);
+
+watch(
+  () => props.subtitle,
+  async (newSubtitle) => {
+    if (newSubtitle) await loadCues();
+  }
+);
+
+watch(
+  () => props.cursor,
+  (currentTime) => {
+    highlightActiveCue(currentTime);
+    checkCurrentCue(currentTime)
+  }
+);
+
+/**
+ * highlgiht the current transcript part
+ * and keep it scrolled up
+ * @param currentTime 
+ */
+function highlightActiveCue(currentTime) {
+  if (subtitlesContainer.value) {
+    const activeSubtitle = subtitlesContainer.value.querySelectorAll('li.current-highlight')[0];
     if (activeSubtitle) {
-      subtitlesContainer.value.scrollTop = activeSubtitle.offsetTop - subtitlesContainer.value.offsetTop;
+      subtitlesContainer.value.scrollTop =
+        activeSubtitle.offsetTop - subtitlesContainer.value.offsetTop;
     }
   }
-})
+}
 
+function toggleTranscript() {
+  emit('toggleTranscript', null)
+}
+
+function seekTo(time) {
+  emit('seek', time);
+}
+
+/**
+ * returns true, if the given txt
+ * is currently played
+ * @param txtCue 
+ */
+function isTxtCueActive(txtCue) {
+  return props.cursor >= txtCue.start && props.cursor <= txtCue.end;
+}
+
+/**
+ * true if the word part can be highlighed
+ * as currently active
+ * @param txtCue 
+ * @param word 
+ * @param wordIndex 
+ * @param txtIndex 
+ */
+function isWordActive(txtCue, word, wordIndex, txtIndex) {
+  if(!currentCue.value || !word || !txtCue) {
+    return false
+  }
+  const startPos = txtCue.dialog[0].text.indexOf(currentCue.value)
+  const endPos = startPos + currentCue.value.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) {
+      currentCue.value = a.text
+    }
+  });
+}
+
+/**
+ * get subtitles from the
+ * vtt files
+ * @param fileUrl
+ */
 async function parseVTT(fileUrl) {
   const response = await fetch(fileUrl);
   const text = await response.text();
   const cues = [];
-  const lines = text.split("\n");
+  const lines = text.split('\n');
   let cue = null;
 
   for (let i = 0; i < lines.length; i++) {
     const line = lines[i].trim();
     if (!line) continue;
 
-    if (line.includes("-->")) {
-      const [start, end] = line.split(" --> ");
-      cue = { start: timeToSeconds(start), end: timeToSeconds(end), text: "" };
+    if (line.includes('-->')) {
+      const [start, end] = line.split(' --> ');
+      cue = { start: timeToSeconds(start), end: timeToSeconds(end), text: '' };
     } else if (cue) {
-      cue.text += line + " ";
+      cue.text += line + ' ';
     }
-    if (cue && (!lines[i + 1] || lines[i + 1].includes("-->"))) {
+
+    if (cue && (!lines[i + 1] || lines[i + 1].includes('-->'))) {
       cues.push(cue);
       cue = null;
     }
@@ -75,8 +248,54 @@ async function parseVTT(fileUrl) {
   return cues;
 }
 
+/**
+ * get the raw transcriptions
+ * from the txt files
+ * @param fileUrl 
+ */
+async function parseTXT(fileUrl) {
+  const response = await fetch(fileUrl);
+  const text = await response.text();
+  const cues = [];
+  const lines = text.split('\n');
+  let cue = null;
+  let dialog = null;
+  for (let i = 0; i < lines.length; i++) {
+    const line = lines[i].trim();
+    if (!line) continue;
+
+    /**
+     * extract every transcript part by time
+     */
+    if (line.match(/^\d{2}:\d{2}:\d{2}:\d{2} - \d{2}:\d{2}:\d{2}:\d{2}/)) {
+      const [start, end] = line.split(' - ');
+      cue = {
+        start: timeToSeconds(start),
+        end: timeToSeconds(end),
+        dialog: []
+      };
+      dialog = {
+        text: '',
+        speaker: ''
+      }
+    } else if (cue && dialog.text == '' && dialog.speaker == '') {
+      dialog.speaker = line;
+    } else if (cue && dialog.speaker !== '') {
+      dialog.text += line + ' ';
+    }
+
+    if (cue && (!lines[i + 1] || lines[i + 1].match(/^\d{2}:\d{2}:\d{2}:\d{2} - \d{2}:\d{2}:\d{2}:\d{2}/))) {
+      cue.dialog.push(dialog);
+      cues.push(cue);
+      cue = null;
+    }
+  }
+  return cues;
+}
+
+// Hilfsfunktionen
 function timeToSeconds(timestamp) {
-  const [hours, minutes, seconds] = timestamp.split(":").map(parseFloat);
+  const [hours, minutes, seconds] = timestamp.split(':').map(parseFloat);
   return hours * 3600 + minutes * 60 + seconds;
 }
 
@@ -87,7 +306,4 @@ function secondsToTime(seconds) {
   const pad = (num) => String(num).padStart(2, '0');
   return `${pad(hours)}:${pad(minutes)}:${pad(secs)}`;
 }
-</script>
-
-
-
+</script>

package/dist/VideoPlayer/VDefaultVideoPlayer.vue

@@ -5,14 +5,19 @@
     :progress="progress"
     :isMuted="isMuted"
     :isControls="isControls"
+    :onVideoEnd="onVideoEnd"
+    :isFullscreen="isFullscreen"
+    :showTranscriptBlock="showTranscriptBlock"
     @pause="pause"
+    @video-ended="onVideoEnd"
+    @video-fullscreen-change="onFullscreenChange"
   />
 </template>
 
 <script setup>
 import BasePlayer from './BasePlayer.vue'
 
-const emit = defineEmits(['pause'])
+const emit = defineEmits(['pause', 'video-ended', 'video-fullscreen-change'])
 
 defineProps({
   previewImageLink: {
@@ -35,9 +40,26 @@ defineProps({
     type: Boolean,
     default: true
   },
+  isFullscreen: {
+    type: Boolean,
+    default: false
+  },
+  showTranscriptBlock: {
+    type: Boolean,
+    default: true
+  }
 })
 
 function pause(currentTime) {
   emit('pause', currentTime)
 }
+
+function onVideoEnd(data) {
+  pause()
+  emit('video-ended', data);
+}
+
+function onFullscreenChange(data) {
+  emit('video-fullscreen-change', data);
+}
 </script>

package/dist/VideoPlayer/index.vue

@@ -2,11 +2,14 @@
   <VDefaultVideoPlayer
     v-if="type === 'default'"
     @pause="pause"
+    @video-fullscreen-change="onVideoFullScreenChange"
+    @video-ended="onVideoEnd"
     :previewImageLink="previewImageLink"
+    :showTranscriptBlock="showTranscriptBlock"
+    :isFullscreen="isFullscreen"
     :link="link"
     :progress="progress"
     :isMuted="isMuted"
-    :isControls="isControls"
   />
 
   <VPreviewVideoPlayer
@@ -20,7 +23,7 @@
 import VDefaultVideoPlayer from './VDefaultVideoPlayer.vue'
 import VPreviewVideoPlayer from './VPreviewVideoPlayer.vue'
 
-const emit = defineEmits(['pause'])
+const emit = defineEmits(['pause', 'video-ended', 'video-fullscreen-change'])
 
 defineProps({
   previewImageLink: {
@@ -47,9 +50,24 @@ defineProps({
     type: Boolean,
     default: true
   },
+  isFullscreen: {
+    type: Boolean,
+    default: false
+  },
+  showTranscriptBlock: {
+    type: Boolean,
+    default: true
+  }
 })
+console.log("abc <<<<<<<<<<<<<")
 
 function pause(currentTime) {
   emit('pause', currentTime)
 }
+function onVideoFullScreenChange(data) {
+  emit('video-fullscreen-change', data)
+}
+function onVideoEnd(data) {
+  emit('video-ended', data);
+}
 </script>

package/package.json

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