cloudinary-video-player 4.1.5 → 4.1.6-edge.1

package/lib/playlist-panel.js

@@ -1,7 +1,7 @@
 import { g as getDefaultExportFromCjs } from './_commonjsHelpers.js';
 import { r as requireToNumber } from './toNumber.js';
 import { _ as _vjs } from './_videojs-proxy.js';
-import { P as PLAYER_EVENT, d as skinClassPrefix, p as playerClassPrefix } from './index2.js';
+import { P as PLAYER_EVENT, e as skinClassPrefix, p as playerClassPrefix } from './index2.js';
 
 var toFinite_1;
 var hasRequiredToFinite;

package/lib/playlist.js

@@ -1,4 +1,4 @@
-import { i as isPlainObject, b as camelCase, P as PLAYER_EVENT, s as sliceProperties, g as getCloudinaryUrl } from './index2.js';
+import { i as isPlainObject, d as camelCase, P as PLAYER_EVENT, s as sliceProperties, g as getCloudinaryUrl } from './index2.js';
 import { V as VideoSource } from './video-player.js';
 import { i as isInteger, P as PlaylistLayout } from './playlist-panel.js';
 import { _ as _vjs } from './_videojs-proxy.js';

package/lib/toNumber.js

@@ -1,5 +1,5 @@
 import { a as requireIsObject } from './video-player.const.js';
-import { r as requireIsSymbol } from './index2.js';
+import { a as requireIsSymbol } from './index2.js';
 
 /** Used to match a single whitespace character. */
 

package/lib/video-player.js

@@ -1,6 +1,6 @@
 import { _ as _vjs } from './_videojs-proxy.js';
 import { g as getDefaultExportFromCjs } from './_commonjsHelpers.js';
-import { e as require_baseKeys, h as require_getTag, j as requireIsArguments, k as requireIsArrayLike, l as requireIsBuffer, m as requireIsTypedArray, n as require_isPrototype, q as require_assignValue, t as require_castPath, u as require_toKey, v as require_isIndex, w as require_baseGet, x as requireIsLength, y as require_flatRest, P as PLAYER_EVENT, c as componentUtils, s as sliceProperties, z as isElementInViewport, V as VIDEO_CODEC, A as isKeyInTransformation, B as BaseSource, C as normalizeOptions, S as SOURCE_TYPE, I as ImageSource, T as Transformation, D as isSrcEqual, E as castArray, F as mergeTransformations, G as getTransformationValue, H as sliceAndUnsetProperties, J as setupCloudinaryMiddleware, K as extendCloudinaryConfig, L as omitVideoOnlyTransformations, i as isPlainObject, M as isElement, N as setPosition, O as getPointerPosition, Q as fontFace, p as playerClassPrefix, U as Utils, R as defaults$6, W as ERROR_CODE, a as get } from './index2.js';
+import { h as require_baseKeys, j as require_getTag, k as requireIsArguments, l as requireIsArrayLike, m as requireIsBuffer, n as requireIsTypedArray, q as require_isPrototype, u as require_assignValue, v as require_castPath, w as require_toKey, x as require_isIndex, y as require_baseGet, z as requireIsLength, A as require_flatRest, P as PLAYER_EVENT, c as componentUtils, s as sliceProperties, B as isElementInViewport, V as VIDEO_CODEC, C as isKeyInTransformation, D as BaseSource, E as normalizeOptions, S as SOURCE_TYPE, I as ImageSource, T as Transformation, F as isSrcEqual, G as castArray, H as mergeTransformations, J as getTransformationValue, K as sliceAndUnsetProperties, L as setupCloudinaryMiddleware, M as extendCloudinaryConfig, N as omitVideoOnlyTransformations, i as isPlainObject, O as isElement, Q as setPosition, R as getPointerPosition, U as fontFace, p as playerClassPrefix, r as revokeBlobUrls, t as toCredentialedBlobUrl, W as Utils, X as defaults$6, Y as ERROR_CODE, b as get } from './index2.js';
 import { c as requireIsArray, a as requireIsObject, i as isObject, d as isString, S as SOURCE_PARAMS, C as CROP_MODE, F as FLOATING_TO, e as FLUID_CLASS_NAME, P as PLAYER_PARAMS, A as AUTO_PLAY_MODE } from './video-player.const.js';
 import { i as isFunction, a as isValidPlayerConfig, b as isValidSourceConfig } from './validators-functions.js';
 import { a as appendQueryParams, u as utf8ToBase64, i as isRawUrl, g as getCloudinaryConfigFromOptions, C as CLOUDINARY_CONFIG_PARAM } from './cloudinary-config-from-options.js';
@@ -561,7 +561,7 @@ class TitleBar extends Component {
     const metadataUrl = appendQueryParams(`${urlPrefix}/_applet_/video_service/video_metadata/${deliveryType}/${utf8ToBase64(publicId)}.json`, source.queryParams());
     fetch(metadataUrl, {
       headers: {
-        'X-Cld-Video-Player-Version': "4.1.5"
+        'X-Cld-Video-Player-Version': "4.1.6-edge.1"
       }
     }).then(response => {
       if (!response.ok) throw new Error(`HTTP ${response.status}`);
@@ -3084,9 +3084,6 @@ class CloudinaryContext {
         }
         return srcs;
       }, []);
-      if (src.withCredentials) {
-        this.player.crossOrigin('use-credentials');
-      }
       this.player.src(_sources);
       _lastSource = src;
       if (this.playlist) {
@@ -3213,7 +3210,7 @@ class CloudinaryAnalytics {
       }, {
         ...(isPlainObject(this.analyticsOptions) ? this.analyticsOptions : {}),
         videoPlayerType: 'cloudinary video player',
-        videoPlayerVersion: "4.1.5"
+        videoPlayerVersion: "4.1.6-edge.1"
       });
     } else if (this.currentVideoMetadata.cloudName !== metadata.cloudName || this.currentVideoMetadata.publicId !== metadata.publicId) {
       this.cloudinaryAnalytics.stopManualTracking();
@@ -4552,8 +4549,12 @@ const getTranscriptionFileUrl = function (urlPrefix, deliveryType, publicId) {
 function textTracksManager() {
   const player = this;
   const textTracksData = new WeakMap();
+  const blobUrls = new Set();
   let showingTracks = new Set();
+  let generation = 0;
   const removeAllTextTracks = () => {
+    generation++;
+    revokeBlobUrls(blobUrls);
     const currentTracks = player.remoteTextTracks();
     if (currentTracks) {
       for (let i = currentTracks.tracks_.length - 1; i >= 0; i--) {
@@ -4686,10 +4687,14 @@ function textTracksManager() {
       }
     });
   };
-  const addTextTracks = textTracks => {
-    textTracks.forEach(textTrackConfig => {
-      if (textTrackConfig.src && textTrackConfig.src.endsWith('.vtt')) {
-        addNativeVttTrack(textTrackConfig);
+  const isNativeVtt = textTrackConfig => textTrackConfig.src && textTrackConfig.src.endsWith('.vtt');
+  const addResolvedTextTracks = (textTracks, nativeVttSrcs) => {
+    textTracks.forEach((textTrackConfig, index) => {
+      if (isNativeVtt(textTrackConfig)) {
+        addNativeVttTrack({
+          ...textTrackConfig,
+          src: nativeVttSrcs[index]
+        });
       } else if (textTrackConfig.src && textTrackConfig.src.endsWith('.srt')) {
         addTextTrack('srt', textTrackConfig);
       } else if (!textTrackConfig.src || textTrackConfig.src.endsWith('.transcript')) {
@@ -4699,6 +4704,27 @@ function textTracksManager() {
     syncShowingTracks();
   };
 
+  // Credentialed VTT files are fetched up front, in parallel, so Video.js loads them from
+  // same-origin Blob URLs. Tracks are added only once all are resolved to keep their order,
+  // and skipped when the source changed meanwhile.
+  const addTextTracks = textTracks => {
+    const withCredentials = player.cloudinary.source?.().withCredentials;
+    if (!withCredentials || !textTracks.some(isNativeVtt)) {
+      addResolvedTextTracks(textTracks, textTracks.map(textTrackConfig => textTrackConfig.src));
+      return;
+    }
+    const currentGeneration = generation;
+    const pendingBlobUrls = new Set();
+    Promise.all(textTracks.map(textTrackConfig => isNativeVtt(textTrackConfig) ? toCredentialedBlobUrl(textTrackConfig.src, pendingBlobUrls) : textTrackConfig.src)).then(srcs => {
+      if (currentGeneration !== generation) {
+        revokeBlobUrls(pendingBlobUrls);
+        return;
+      }
+      pendingBlobUrls.forEach(blobUrl => blobUrls.add(blobUrl));
+      addResolvedTextTracks(textTracks, srcs);
+    });
+  };
+
   // Several tracks can show at once (e.g. descriptions + captions), so each one needs its cues loaded
   const syncShowingTracks = () => {
     const textTracks = Array.from(player.textTracks());
@@ -5187,7 +5213,7 @@ class VideoPlayer {
       const analyticsData = getAnalyticsFromPlayerOptions(options);
       const analyticsParams = new URLSearchParams(analyticsData).toString();
       const baseParams = new URLSearchParams({
-        vpVersion: "4.1.5",
+        vpVersion: "4.1.6-edge.1",
         vpInstanceId: this.getVPInstanceId(),
         cloudName: options.cloudinary.cloud_name,
         ...internalAnalyticsMetadata

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudinary-video-player",
-  "version": "4.1.5",
+  "version": "4.1.6-edge.1",
   "description": "Cloudinary Video Player",
   "author": "Cloudinary",
   "license": "MIT",