@mottosports/motto-video-player 1.0.1-rc.64 → 1.0.1-rc.66

package/dist/index.mjs

@@ -1185,7 +1185,7 @@ var supportsWidevinePersistentLicenses = () => {
 import initShakaPlayerMux from "@mux/mux-data-shakaplayer";
 
 // package.json
-var version = "1.0.1-rc.64";
+var version = "1.0.1-rc.66";
 
 // src/utils/licenseCache.ts
 var PERSISTENT_LICENSE_PREFIX = "motto_lic_";
@@ -1346,11 +1346,17 @@ var useShakaPlayer = ({
   onPlayerReady,
   muxConfig,
   onMuxReady,
-  onMuxDataUpdate
+  onMuxDataUpdate,
+  publicKey,
+  mottoToken
 }) => {
   const playerRef = useRef(null);
   const [isRetrying, setIsRetrying] = useState(false);
   const videoElementRef = useRef(null);
+  const destroyInProgressRef = useRef(null);
+  const isDestroyingRef = useRef(false);
+  const initSequenceRef = useRef(0);
+  const activeInitIdRef = useRef(null);
   const waitingForKeyTimerRef = useRef(null);
   const waitingForKeyHandlerRef = useRef(null);
   const playbackResumedHandlerRef = useRef(null);
@@ -1374,11 +1380,22 @@ var useShakaPlayer = ({
   }, [src]);
   const initializePlayerInternal = useCallback(async (video) => {
     try {
+      if (destroyInProgressRef.current) {
+        try {
+          await destroyInProgressRef.current;
+        } catch {
+        }
+      }
+      const myInitId = ++initSequenceRef.current;
+      activeInitIdRef.current = myInitId;
       videoElementRef.current = video;
       shaka.polyfill.installAll();
       if (!shaka.Player.isBrowserSupported()) {
         throw new Error("Browser not supported by Shaka Player");
       }
+      if (isDestroyingRef.current) {
+        return;
+      }
       const player = new shaka.Player();
       playerRef.current = player;
       await player.attach(video);
@@ -1389,6 +1406,14 @@ var useShakaPlayer = ({
       let playlistId = src.id;
       const isDRM = Boolean(src.drm);
       storedPersistentThisLoadRef.current = false;
+      if (activeInitIdRef.current !== myInitId || isDestroyingRef.current) {
+        try {
+          await player.destroy();
+        } catch {
+        }
+        if (playerRef.current === player) playerRef.current = null;
+        return;
+      }
       let storedSessionsMetadata = [];
       if (isDRM && playlistId) {
         storedSessionsMetadata = retrievePersistentLicense(playlistId, src.drm.licenseCacheKey ?? "");
@@ -1487,7 +1512,12 @@ var useShakaPlayer = ({
         if (netEngine) {
           netEngine.registerRequestFilter((type, request) => {
             if (type === shaka.net.NetworkingEngine.RequestType.LICENSE) {
-              request.headers["x-dt-auth-token"] = src.drm.token;
+              if (publicKey) {
+                request.headers["authorization"] = `Bearer ${publicKey}`;
+              }
+              if (mottoToken) {
+                request.headers["x-motto-token"] = mottoToken;
+              }
             }
           });
           netEngine.registerResponseFilter((type, response) => {
@@ -1593,6 +1623,14 @@ var useShakaPlayer = ({
           console.error("Failed to initialize Mux Analytics:", error);
         }
       }
+      if (activeInitIdRef.current !== myInitId || isDestroyingRef.current) {
+        try {
+          await player.destroy();
+        } catch {
+        }
+        if (playerRef.current === player) playerRef.current = null;
+        return;
+      }
       await player.load(manifestUrl);
       onPlayerReady?.(player);
       return player;
@@ -1609,8 +1647,11 @@ var useShakaPlayer = ({
     return initializePlayerInternal(video);
   }, [initializePlayerInternal]);
   const destroyPlayer = useCallback(async () => {
-    if (playerRef.current) {
+    const playerInstance = playerRef.current;
+    if (playerInstance) {
       try {
+        isDestroyingRef.current = true;
+        activeInitIdRef.current = null;
         if (videoElementRef.current) {
           try {
             if (waitingForKeyHandlerRef.current) {
@@ -1630,20 +1671,38 @@ var useShakaPlayer = ({
           waitingForKeyTimerRef.current = null;
         }
         try {
-          if (drmExpirationHandlerRef.current && playerRef.current?.removeEventListener) {
-            playerRef.current.removeEventListener("drmsessionupdate", drmExpirationHandlerRef.current);
+          if (drmExpirationHandlerRef.current && playerInstance.removeEventListener) {
+            playerInstance.removeEventListener("drmsessionupdate", drmExpirationHandlerRef.current);
           }
         } catch (e) {
           console.warn("Error removing DRM expiration listener:", e);
         } finally {
           drmExpirationHandlerRef.current = null;
         }
-        await playerRef.current.destroy();
+        const performDestroy = async () => {
+          try {
+            await playerInstance.destroy();
+          } finally {
+            try {
+              if (videoElementRef.current) {
+                videoElementRef.current.removeAttribute("src");
+                videoElementRef.current.load();
+              }
+            } catch {
+            }
+          }
+        };
+        destroyInProgressRef.current = performDestroy();
+        await destroyInProgressRef.current;
       } catch (error) {
         console.warn("Error destroying Shaka Player:", error);
       } finally {
-        playerRef.current = null;
+        if (playerRef.current === playerInstance) {
+          playerRef.current = null;
+        }
         storedPersistentThisLoadRef.current = false;
+        isDestroyingRef.current = false;
+        destroyInProgressRef.current = null;
       }
     }
   }, [playerRef]);
@@ -2149,14 +2208,18 @@ var useShakaUI = (playerRef, containerRef, videoRef, controls, chromecastConfig,
     }
     return ui;
   }, [controls, containerRef, playerRef, videoRef, chromecastConfig, seekbarColors, onSkipBack, onSkipForward, iconSizes, locale]);
-  const destroyUI = useCallback5(() => {
-    if (uiRef.current) {
+  const destroyUI = useCallback5(async () => {
+    const uiInstance = uiRef.current;
+    if (uiInstance) {
       try {
-        uiRef.current.destroy();
+        await uiInstance.destroy();
       } catch (error) {
         console.error("Error destroying UI:", error);
+      } finally {
+        if (uiRef.current === uiInstance) {
+          uiRef.current = null;
+        }
       }
-      uiRef.current = null;
     }
   }, []);
   return {
@@ -3782,6 +3845,8 @@ var Player = forwardRef(
     events,
     locale = "en",
     containerClassName,
+    publicKey,
+    auth,
     ...videoProps
   }, ref) => {
     const videoRef = useRef8(null);
@@ -3798,7 +3863,9 @@ var Player = forwardRef(
       onPlayerReady: events?.onPlayerReady,
       muxConfig,
       onMuxReady: events?.onMuxReady,
-      onMuxDataUpdate: events?.onMuxDataUpdate
+      onMuxDataUpdate: events?.onMuxDataUpdate,
+      publicKey,
+      mottoToken: auth?.mottoToken
     });
     const {
       initializeMux,
@@ -4645,6 +4712,8 @@ var Video = ({
       events,
       locale,
       containerClassName: "w-full h-full",
+      publicKey,
+      auth,
       children
     }
   ) }) });
@@ -4813,7 +4882,9 @@ var Event = ({
           className: twMerge4(className, "peer aspect-video"),
           events,
           locale,
-          containerClassName: "w-full h-full"
+          containerClassName: "w-full h-full",
+          publicKey,
+          auth
         }
       ) }),
       !hideTitle && eventData && /* @__PURE__ */ jsx10(
@@ -5169,7 +5240,9 @@ var CreativeWork = ({
           },
           src: activePlaylist,
           locale,
-          containerClassName: "w-full h-full"
+          containerClassName: "w-full h-full",
+          publicKey,
+          auth
         }
       ),
       !hideTitle && /* @__PURE__ */ jsx11(