Skip to content

fix(FEC-14578): [DRM] playkit-js changes needed to support uDRM CPIX multikey solution for HLS FPS #819

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chanakabr wants to merge 5 commits into
base: master
Choose a base branch
from
Open

fix(FEC-14578): [DRM] playkit-js changes needed to support uDRM CPIX multikey solution for HLS FPS #819

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
71c513c
added kid passing to the fairplay
May 25, 2025
cd11eff
Merge branch 'kaltura:master' into cpix2.3_support
Jun 20, 2025
ea03edb
syntax fixes
Jun 20, 2025
ace4c95
Merge remote-tracking branch 'refs/remotes/origin/cpix2.3_support' in…
Jun 20, 2025
b39bfff
fix
Jun 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions src/engines/html5/media-source/adapters/fairplay-drm-handler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,13 +119,18 @@
private _onWebkitKeyMessage(event: any): void {
this._logger.debug('Webkit key message triggered');
const message = event.message;
// WebkitMediaKeySession has attribute contentId (which is the mykeyid from playlist's skd://mykeyid)
const session = event.target;
const kid = session?.contentId;
const kidBase64 = btoa(kid);

Copilot AI Jul 21, 2025

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The btoa() function expects a string input, but 'kid' could be undefined or null if session?.contentId is falsy. This will throw an error. Add validation: const kidBase64 = kid ? btoa(kid) : '';

Suggested change
const kidBase64 = btoa(kid);
const kidBase64 = kid ? btoa(kid) : '';

Copilot uses AI. Check for mistakes.

const request = new XMLHttpRequest();
request.responseType = 'arraybuffer';
this._eventManager.listenOnce(request, 'load', (e: Event) => this._licenseRequestLoaded(e));
const pkRequest: PKRequestObject = {
url: this._config.licenseUrl,
body: FairPlayDrmHandler._base64EncodeUint8Array(message),
headers: {}
headers: {'X-Kaltura-InitData': kidBase64} // pass the kid to uDRM
};
let requestFilterPromise;
const requestFilter = this._config.network.requestFilter;
Expand Down Expand Up @@ -265,9 +270,9 @@
}

public static _extractContentId(initData: Uint8Array): string {
const link = document.createElement('a');
link.href = FairPlayDrmHandler._arrayToString(initData);
return link.hostname;
const url = FairPlayDrmHandler._arrayToString(initData);
const hostname = url.slice(url.lastIndexOf("skd://")+6,url.length); // handle the skd://mykeyid format

Check warning on line 274 in src/engines/html5/media-source/adapters/fairplay-drm-handler.ts

View workflow job for this annotation

GitHub Actions / lint / running-tests (ubuntu-latest) 

Strings must use singlequote
return hostname;
Comment on lines +274 to +275

Copilot AI Jul 21, 2025

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If the URL doesn't contain 'skd://', lastIndexOf() returns -1, causing slice(-1+6, length) which would return the last 5 characters. Add validation: if (url.includes('skd://')) { return url.slice(url.lastIndexOf('skd://') + 6); } else { /* fallback logic */ }

Suggested change
const hostname = url.slice(url.lastIndexOf("skd://")+6,url.length); // handle the skd://mykeyid format
return hostname;
if (url.includes("skd://")) {
const hostname = url.slice(url.lastIndexOf("skd://") + 6); // handle the skd://mykeyid format
return hostname;
} else {
throw new Error("Invalid URL format: 'skd://' not found");
}

Copilot uses AI. Check for mistakes.
}

public static _arrayToString(array: Uint8Array): string {
Expand Down