From cafff9b1557a9bfa1bb4b92ec9bf04a60a904f6c Mon Sep 17 00:00:00 2001 From: VaSeala <12792057+vaseala@users.noreply.github.com> Date: Thu, 31 Aug 2023 16:57:23 +0800 Subject: [PATCH] fixed absolute url in the vtt file (#610) fixed the type file path --- .../src/getVttArray.js | 12 ++++++++---- ...lity.d.ts => artplayer-plugin-vtt-thumbnail.d.ts} | 0 2 files changed, 8 insertions(+), 4 deletions(-) rename packages/artplayer-plugin-vtt-thumbnail/types/{artplayer-plugin-hls-quality.d.ts => artplayer-plugin-vtt-thumbnail.d.ts} (100%) diff --git a/packages/artplayer-plugin-vtt-thumbnail/src/getVttArray.js b/packages/artplayer-plugin-vtt-thumbnail/src/getVttArray.js index 9bda962ef..bff8960ab 100644 --- a/packages/artplayer-plugin-vtt-thumbnail/src/getVttArray.js +++ b/packages/artplayer-plugin-vtt-thumbnail/src/getVttArray.js @@ -43,10 +43,14 @@ export default async function getVttArray(vttUrl = '') { const start = Math.floor(t2d(timeMatch[1])); const end = Math.floor(t2d(timeMatch[2])); - const urlArr = vttUrl.split('/'); - urlArr.pop(); - urlArr.push(textMatch[1]); - const url = urlArr.join('/'); + let url = textMatch[1]; + const isAbsoluteUrl = /^\/|((https?|ftp|file):\/\/)/i.test(url); + if (!isAbsoluteUrl) { + const urlArr = vttUrl.split('/'); + urlArr.pop(); + urlArr.push(url); + url = urlArr.join('/'); + } const result = { start, end, url }; diff --git a/packages/artplayer-plugin-vtt-thumbnail/types/artplayer-plugin-hls-quality.d.ts b/packages/artplayer-plugin-vtt-thumbnail/types/artplayer-plugin-vtt-thumbnail.d.ts similarity index 100% rename from packages/artplayer-plugin-vtt-thumbnail/types/artplayer-plugin-hls-quality.d.ts rename to packages/artplayer-plugin-vtt-thumbnail/types/artplayer-plugin-vtt-thumbnail.d.ts