@mottosports/motto-video-player 1.0.1-rc.38 → 1.0.1-rc.40

package/dist/index.mjs

@@ -1151,14 +1151,15 @@ var isChrome64PlusOnMacOrWindows = () => {
   }
   const isMacOS = /Mac OS X|Macintosh/.test(userAgent);
   const isWindows = /Windows/.test(userAgent);
-  return isMacOS || isWindows;
+  const isAndroid = /Android/.test(userAgent);
+  return isMacOS || isWindows || isAndroid;
 };
 
 // src/hooks/useShakaPlayer.ts
 import initShakaPlayerMux from "@mux/mux-data-shakaplayer";
 
 // package.json
-var version = "1.0.1-rc.38";
+var version = "1.0.1-rc.40";
 
 // src/utils/licenseCache.ts
 var PERSISTENT_LICENSE_PREFIX = "motto_lic_";
@@ -1303,8 +1304,10 @@ var clearAllPersistentLicenses = () => {
       localStorage.removeItem(key);
     }
     console.log(`Cleared ${keys.length} persistent license cache entries`);
+    return keys.length;
   } catch (error) {
     console.error("Failed to clear persistent licenses:", error);
+    return 0;
   }
 };
 
@@ -1364,6 +1367,10 @@ var useShakaPlayer = ({
             "com.microsoft.playready": src.drm.playready?.licenseUrl,
             "com.apple.fps": src.drm.fairplay?.licenseUrl
           },
+          keySystemsMapping: {
+            // Fall back or reroute to the platform’s recommended PlayReady CDM if needed
+            "com.microsoft.playready": "com.microsoft.playready.recommendation"
+          },
           ...src.drm.fairplay && {
             advanced: {
               "com.apple.fps": {
@@ -1377,17 +1384,26 @@ var useShakaPlayer = ({
           "com.widevine.alpha": {
             ...drmConfig2.advanced?.["com.widevine.alpha"],
             // set to `persistent-license` only on Chrome 64+ on MacOS/Windows: https://shaka-player-demo.appspot.com/docs/api/tutorial-faq.html
-            sessionType: isChrome64PlusOnMacOrWindows() ? "persistent-license" : "temporary"
+            sessionType: isChrome64PlusOnMacOrWindows() ? "persistent-license" : "temporary",
+            "headers": {
+              "x-dt-auth-token": src.drm.token || ""
+            }
           },
           "com.microsoft.playready": {
             ...drmConfig2.advanced?.["com.microsoft.playready"],
-            sessionType: "temporary"
+            sessionType: "temporary",
             // PlayReady always uses temporary sessions
+            "headers": {
+              "x-dt-auth-token": src.drm.token || ""
+            }
           },
           "com.apple.fps": {
             ...drmConfig2.advanced?.["com.apple.fps"],
-            sessionType: "temporary"
+            sessionType: "temporary",
             // FairPlay always uses temporary sessions - Safari won't play with persistent-license
+            "headers": {
+              "x-dt-auth-token": src.drm.token || ""
+            }
           }
         };
         if (storedSessionsMetadata.length > 0) {
@@ -1401,11 +1417,6 @@ var useShakaPlayer = ({
         player.configure({ drm: drmConfig2 });
         const netEngine = player.getNetworkingEngine();
         if (netEngine) {
-          netEngine.registerRequestFilter((type, request) => {
-            if (type === shaka.net.NetworkingEngine.RequestType.LICENSE) {
-              request.headers["x-dt-auth-token"] = src.drm.token;
-            }
-          });
           netEngine.registerResponseFilter((type, response) => {
             if (type === shaka.net.NetworkingEngine.RequestType.LICENSE) {
               const ks = player.keySystem && player.keySystem();
@@ -1423,26 +1434,31 @@ var useShakaPlayer = ({
           return;
         }
         if (error?.code >= 6e3 && error?.code < 7e3 && !isRetrying && videoElementRef.current) {
-          console.warn(`DRM error detected (code: ${error.code}), clearing licenses and retrying...`);
-          setIsRetrying(true);
-          clearAllPersistentLicenses();
-          setTimeout(async () => {
-            try {
-              const video2 = videoElementRef.current;
-              const currentPlayer = playerRef.current;
-              if (video2 && currentPlayer) {
-                console.log("Reloading manifest after license cache clear...");
-                await currentPlayer.load(getManifestUrl());
-                console.log("Manifest reloaded successfully");
+          console.warn(`DRM error detected (code: ${error.code}), checking for cached licenses...`);
+          const clearedCount = clearAllPersistentLicenses();
+          if (clearedCount > 0) {
+            console.warn(`Cleared ${clearedCount} cached licenses, retrying...`);
+            setIsRetrying(true);
+            setTimeout(async () => {
+              try {
+                const video2 = videoElementRef.current;
+                const currentPlayer = playerRef.current;
+                if (video2 && currentPlayer) {
+                  console.log("Reloading manifest after license cache clear...");
+                  await currentPlayer.load(getManifestUrl());
+                  console.log("Manifest reloaded successfully");
+                }
+              } catch (retryError) {
+                console.error("Failed to retry after license clear:", retryError);
+                onError?.(retryError);
+              } finally {
+                setIsRetrying(false);
               }
-            } catch (retryError) {
-              console.error("Failed to retry after license clear:", retryError);
-              onError?.(retryError);
-            } finally {
-              setIsRetrying(false);
-            }
-          }, 500);
-          return;
+            }, 500);
+            return;
+          } else {
+            console.warn(`No cached licenses found to clear for error code ${error.code}, not retrying to avoid infinite loop`);
+          }
         }
         console.error("Shaka Player Error:", error);
         onError?.(new Error(`Shaka Player Error: ${error.message || "Unknown error"}`));