Multi-key handling #7474

Author: robwalch

api-extractor/report/hls.js.api.md

@@ -1104,7 +1104,7 @@ export const enum DecrypterAesMode {
 export type DRMSystemConfiguration = {
     licenseUrl: string;
     serverCertificateUrl?: string;
-    generateRequest?: (this: Hls, initDataType: string, initData: ArrayBuffer | null, keyContext: MediaKeySessionContext) => {
+    generateRequest?: (this: Hls, initDataType: string, initData: ArrayBuffer | null, keyContext: MediaKeySessionContextAndLevelKey) => {
         initDataType: string;
         initData: ArrayBuffer | null;
     } | undefined | never;
@@ -1172,6 +1172,8 @@ export class EMEController extends Logger implements ComponentAPI {
     // (undocumented)
     destroy(): void;
     // (undocumented)
+    getKeyStatus(decryptdata: LevelKey): MediaKeyStatus | undefined;
+    // (undocumented)
     getKeySystemAccess(keySystemsToAttempt: KeySystems[]): Promise<void>;
     // (undocumented)
     getSelectedKeySystemFormats(): KeySystemFormats[];
@@ -1187,8 +1189,8 @@ export class EMEController extends Logger implements ComponentAPI {
 //
 // @public (undocumented)
 export type EMEControllerConfig = {
-    licenseXhrSetup?: (this: Hls, xhr: XMLHttpRequest, url: string, keyContext: MediaKeySessionContext, licenseChallenge: Uint8Array) => void | Uint8Array | Promise<Uint8Array | void>;
-    licenseResponseCallback?: (this: Hls, xhr: XMLHttpRequest, url: string, keyContext: MediaKeySessionContext) => ArrayBuffer;
+    licenseXhrSetup?: (this: Hls, xhr: XMLHttpRequest, url: string, keyContext: MediaKeySessionContextAndLevelKey, licenseChallenge: Uint8Array) => void | Uint8Array | Promise<Uint8Array | void>;
+    licenseResponseCallback?: (this: Hls, xhr: XMLHttpRequest, url: string, keyContext: MediaKeySessionContextAndLevelKey) => ArrayBuffer;
     emeEnabled: boolean;
     widevineLicenseUrl?: string;
     drmSystems: DRMSystemsConfiguration | undefined;
@@ -3381,6 +3383,8 @@ export class LevelKey implements DecryptData {
     // (undocumented)
     pssh: Uint8Array<ArrayBuffer> | null;
     // (undocumented)
+    static setKeyIdForUri(uri: string, keyId: Uint8Array<ArrayBuffer>): void;
+    // (undocumented)
     readonly uri: string;
 }
 
@@ -3992,12 +3996,14 @@ export type MediaKeyFunc = (keySystem: KeySystems, supportedConfigurations: Medi
 // @public (undocumented)
 export interface MediaKeySessionContext {
     // (undocumented)
-    decryptdata: LevelKey;
-    // (undocumented)
-    keyStatus: MediaKeyStatus;
+    keyStatuses: {
+        [keyId: string]: MediaKeyStatus;
+    };
     // (undocumented)
     keySystem: KeySystems;
     // (undocumented)
+    levelKeys: LevelKey[];
+    // (undocumented)
     licenseXhr?: XMLHttpRequest;
     // (undocumented)
     mediaKeys: MediaKeys;
@@ -5006,6 +5012,10 @@ export class XhrLoader implements Loader<LoaderContext> {
     stats: LoaderStats;
 }
 
+// Warnings were encountered during analysis:
+//
+// src/config.ts:91:3 - (ae-forgotten-export) The symbol "MediaKeySessionContextAndLevelKey" needs to be exported by the entry point hls.d.ts
+
 // (No @packageDocumentation comment for this package)
 
 ```

src/config.ts

@@ -17,7 +17,7 @@ import FetchLoader, { fetchSupported } from './utils/fetch-loader';
 import { requestMediaKeySystemAccess } from './utils/mediakeys-helper';
 import { stringify } from './utils/safe-json-stringify';
 import XhrLoader from './utils/xhr-loader';
-import type { MediaKeySessionContext } from './controller/eme-controller';
+import type { MediaKeySessionContextAndLevelKey } from './controller/eme-controller';
 import type Hls from './hls';
 import type {
   FragmentLoaderContext,
@@ -92,7 +92,7 @@ export type DRMSystemConfiguration = {
     this: Hls,
     initDataType: string,
     initData: ArrayBuffer | null,
-    keyContext: MediaKeySessionContext,
+    keyContext: MediaKeySessionContextAndLevelKey,
   ) =>
     | { initDataType: string; initData: ArrayBuffer | null }
     | undefined
@@ -108,14 +108,14 @@ export type EMEControllerConfig = {
     this: Hls,
     xhr: XMLHttpRequest,
     url: string,
-    keyContext: MediaKeySessionContext,
+    keyContext: MediaKeySessionContextAndLevelKey,
     licenseChallenge: Uint8Array,
   ) => void | Uint8Array | Promise<Uint8Array | void>;
   licenseResponseCallback?: (
     this: Hls,
     xhr: XMLHttpRequest,
     url: string,
-    keyContext: MediaKeySessionContext,
+    keyContext: MediaKeySessionContextAndLevelKey,
   ) => ArrayBuffer;
   emeEnabled: boolean;
   widevineLicenseUrl?: string;