@mottosports/motto-video-player 1.0.1-rc.65 → 1.0.1-rc.67

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.65";
+var version = "1.0.1-rc.67";
 
 // src/utils/licenseCache.ts
 var PERSISTENT_LICENSE_PREFIX = "motto_lic_";
@@ -1353,6 +1353,10 @@ var useShakaPlayer = ({
   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);
@@ -1376,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);
@@ -1391,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 ?? "");
@@ -1488,13 +1511,19 @@ var useShakaPlayer = ({
         const netEngine = player.getNetworkingEngine();
         if (netEngine) {
           netEngine.registerRequestFilter((type, request) => {
-            if (type === shaka.net.NetworkingEngine.RequestType.LICENSE) {
-              if (publicKey) {
-                request.headers["authorization"] = `Bearer ${publicKey}`;
-              }
-              if (mottoToken) {
-                request.headers["x-motto-token"] = mottoToken;
-              }
+            switch (type) {
+              case shaka.net.NetworkingEngine.RequestType.LICENSE:
+                if (publicKey) {
+                  request.headers["authorization"] = `Bearer ${publicKey}`;
+                }
+                if (mottoToken) {
+                  request.headers["x-motto-token"] = mottoToken;
+                }
+                break;
+              case shaka.net.NetworkingEngine.RequestType.MANIFEST:
+              case shaka.net.NetworkingEngine.RequestType.SEGMENT:
+                request.allowCrossSiteCredentials = true;
+                break;
             }
           });
           netEngine.registerResponseFilter((type, response) => {
@@ -1600,6 +1629,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;
@@ -1619,6 +1656,8 @@ var useShakaPlayer = ({
     const playerInstance = playerRef.current;
     if (playerInstance) {
       try {
+        isDestroyingRef.current = true;
+        activeInitIdRef.current = null;
         if (videoElementRef.current) {
           try {
             if (waitingForKeyHandlerRef.current) {
@@ -1646,7 +1685,21 @@ var useShakaPlayer = ({
         } finally {
           drmExpirationHandlerRef.current = null;
         }
-        await playerInstance.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 {
@@ -1654,6 +1707,8 @@ var useShakaPlayer = ({
           playerRef.current = null;
         }
         storedPersistentThisLoadRef.current = false;
+        isDestroyingRef.current = false;
+        destroyInProgressRef.current = null;
       }
     }
   }, [playerRef]);