Improved the work of constructing links to private videos for vimeo e…

…mbed
FOSWLY · Sep 25, 2024 · cd0bb6d · cd0bb6d
1 parent da6546b
commit cd0bb6d
Show file tree

Hide file tree

Showing 280 changed files with 385 additions and 362 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,7 @@
+# 1.3.1
+
+- Improved the work of constructing links to private videos for vimeo embed
+
 # 1.3.0
 
 > [!CAUTION]

diff --git a/dist/client.d.ts.map b/dist/client.d.ts.map
diff --git a/dist/helpers/vimeo.d.ts.map b/dist/helpers/vimeo.d.ts.map
diff --git a/dist/helpers/vimeo.js b/dist/helpers/vimeo.js
@@ -60,9 +60,15 @@ export default class VimeoHelper extends BaseHelper {
             const baseUrl = new URL(cdnUrl);
             const pathLength = Array.from(data.base_url.matchAll(/\.\.\//g)).length + 1;
             const pathFragments = baseUrl.pathname.split("/");
-            baseUrl.pathname = pathFragments
-                .slice(0, pathFragments.length - pathLength)
-                .join("/");
+            let extraPath = data.base_url.replaceAll("../", "");
+            extraPath =
+                extraPath && !extraPath.startsWith("/") ? `/${extraPath}` : extraPath;
+            baseUrl.pathname =
+                pathFragments.slice(0, pathFragments.length - pathLength).join("/") +
+                    extraPath;
+            if (!baseUrl.pathname.endsWith("/")) {
+                baseUrl.pathname += "/";
+            }
             const videoData = data.audio.find((v) => v.mime_type === "audio/mp4" && v.format === "dash");
             if (!videoData) {
                 throw new VideoHelperError("Failed to find video data");
@@ -72,9 +78,9 @@ export default class VimeoHelper extends BaseHelper {
                 throw new VideoHelperError("Failed to find first segment url");
             }
             const [videoName, videoParams] = segmentUrl.split("?", 2);
-            baseUrl.pathname += `/${videoData.base_url}${videoName}`;
             const params = new URLSearchParams(videoParams);
             params.delete("range");
+            baseUrl.pathname += `${videoData.base_url}${videoName}`;
             baseUrl.href = baseUrl.href.split("?")[0] + "?" + params.toString();
             return baseUrl.href;
         }