GitHub/hls.js
1
0
Fork 0
mirror of https://github.com/video-dev/hls.js.git synced 2026-06-16 13:34:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix licenseXhrSetup return types and selectKeySystem nested Promise anti-pattern

Browse Source
This commit is contained in:
Rob Walch
2026-06-01 19:17:08 -07:00
committed by Rob Walch
parent 18307e5fe2
commit b667f1e79f
3 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api-extractor/report/hls.js.api.md
+1 -1
View File
@@ -1301,7 +1301,7 @@ export class EMEController extends Logger implements ComponentAPI {
export type EMEControllerConfig = {
licenseXhrSetup?: (this: Hls, xhr: XMLHttpRequest, url: string, keyContext: MediaKeySessionContext & {
decryptdata: LevelKey;
}, licenseChallenge: Uint8Array) => void | Uint8Array | Promise<Uint8Array | void>;
}, licenseChallenge: Uint8Array) => void | Uint8Array | string | Promise<Uint8Array | string | void>;
licenseResponseCallback?: (this: Hls, xhr: XMLHttpRequest, url: string, keyContext: MediaKeySessionContext & {
decryptdata: LevelKey;
}) => ArrayBuffer;
src/config.ts
+1 -1
View File
@@ -139,7 +139,7 @@ export type EMEControllerConfig = {
url: string,
keyContext: MediaKeySessionContext & { decryptdata: LevelKey },
licenseChallenge: Uint8Array,
) => void | Uint8Array | Promise<Uint8Array | void>;
) => void | Uint8Array | string | Promise<Uint8Array | string | void>;
licenseResponseCallback?: (
this: Hls,
xhr: XMLHttpRequest,
src/controller/eme-controller.ts
+11 -14
View File
@@ -428,20 +428,17 @@ class EMEController extends Logger implements ComponentAPI {
private selectKeySystem(
keySystemsToAttempt: KeySystems[],
): Promise<KeySystemFormats> {
return new Promise((resolve, reject) => {
this.getKeySystemSelectionPromise(keySystemsToAttempt)
.then(({ keySystem }) => {
const keySystemFormat = keySystemDomainToKeySystemFormat(keySystem);
if (keySystemFormat) {
resolve(keySystemFormat);
} else {
reject(
new Error(`Unable to find format for key-system "${keySystem}"`),
);
}
})
.catch(reject);
});
return this.getKeySystemSelectionPromise(keySystemsToAttempt).then(
({ keySystem }) => {
const keySystemFormat = keySystemDomainToKeySystemFormat(keySystem);
if (!keySystemFormat) {
throw new Error(
`Unable to find format for key-system "${keySystem}"`,
);
}
return keySystemFormat;
},
);
}
public selectKeySystemFormat(frag: Fragment): Promise<KeySystemFormats> {