DO NOT MERGE: fix temporarily dev branch issues

canalplus · Dec 27, 2024 · 51c2b4a · 51c2b4a
1 parent 0b916a8
commit 51c2b4a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/compat/browser_detection.ts b/src/compat/browser_detection.ts
@@ -170,7 +170,7 @@ let isA1KStb40xx = false;
     isPanasonic = true;
   } else if (navigator.userAgent.indexOf("Xbox") !== -1) {
     isXbox = true;
-  } else if (navigator.userAgent.indexOf("Model/a1-kstb40xx")) {
+  } else if (navigator.userAgent.indexOf("Model/a1-kstb40xx") !== -1) {
     isA1KStb40xx = true;
   }
 })();

diff --git a/src/main_thread/decrypt/__tests__/find_key_system.test.ts b/src/main_thread/decrypt/__tests__/find_key_system.test.ts
@@ -166,6 +166,7 @@ describe("find_key_systems - ", () => {
   it("should create a media key the first time and then reuse the previous one if it's the same configuration", async () => {
     requestMediaKeySystemAccessMock.mockImplementation(() => {
       return {
+        keySystem: "com.widevine.alpha",
         createMediaKeys: () => ({
           createSession: () => ({
             // eslint-disable-next-line @typescript-eslint/no-empty-function
@@ -218,6 +219,7 @@ describe("find_key_systems - ", () => {
   it("should create a media key the first time and then create another one if the previous is not compatible.", async () => {
     requestMediaKeySystemAccessMock.mockImplementation(() => {
       return {
+        keySystem: "com.widevine.alpha",
         createMediaKeys: () => ({
           createSession: () => ({
             // eslint-disable-next-line @typescript-eslint/no-empty-function
@@ -278,6 +280,7 @@ describe("find_key_systems - ", () => {
   it("should create a media key the first time and then reuse the previous one if it's a different configuration but it's a compatible configuration.", async () => {
     requestMediaKeySystemAccessMock.mockImplementation(() => {
       return {
+        keySystem: "com.widevine.alpha",
         createMediaKeys: () => ({
           createSession: () => ({
             // eslint-disable-next-line @typescript-eslint/no-empty-function

diff --git a/src/main_thread/decrypt/find_key_system.ts b/src/main_thread/decrypt/find_key_system.ts
@@ -482,7 +482,7 @@ export default function getMediaKeySystemAccess(
         currentState !== null &&
         !shouldRenewMediaKeySystemAccess() &&
         // TODO: Do it with MediaKeySystemAccess.prototype.keySystem instead?
-        keyType === currentState.keySystemOptions.type &&
+        keyType === currentState.mediaKeySystemAccess.keySystem &&
         eme.implementation === currentState.emeImplementation.implementation &&
         isNewMediaKeySystemConfigurationCompatibleWithPreviousOne(
           keySystemConfiguration,
@@ -495,7 +495,7 @@ export default function getMediaKeySystemAccess(
           value: {
             mediaKeySystemAccess: currentState.mediaKeySystemAccess,
             askedConfiguration: currentState.askedConfiguration,
-            options: currentState.keySystemOptions,
+            options: keySystemOptions,
             codecSupport: extractCodecSupportListFromConfiguration(
               currentState.askedConfiguration,
               currentState.mediaKeySystemAccess.getConfiguration(),