Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 14 additions & 0 deletions api-extractor/report/hls.js.api.md
Original file line number Diff line number Diff line change
Expand Up @@ -1503,6 +1503,8 @@ export enum Events {
// (undocumented)
KEY_LOADING = "hlsKeyLoading",
// (undocumented)
KEY_STATUSES_CHANGED = "hlsKeyStatusesChanged",
// (undocumented)
LEVEL_LOADED = "hlsLevelLoaded",
// (undocumented)
LEVEL_LOADING = "hlsLevelLoading",
Expand Down Expand Up @@ -2401,6 +2403,8 @@ export interface HlsListeners {
// (undocumented)
[Events.KEY_LOADING]: (event: Events.KEY_LOADING, data: KeyLoadingData) => void;
// (undocumented)
[Events.KEY_STATUSES_CHANGED]: (event: Events.KEY_STATUSES_CHANGED, data: KeyStatusesChangedData) => void;
// (undocumented)
[Events.LEVEL_LOADED]: (event: Events.LEVEL_LOADED, data: LevelLoadedData) => void;
// (undocumented)
[Events.LEVEL_LOADING]: (event: Events.LEVEL_LOADING, data: LevelLoadingData) => void;
Expand Down Expand Up @@ -3036,6 +3040,16 @@ export interface KeyLoadingData {
frag: Fragment;
}

// Warning: (ae-missing-release-tag) "KeyStatusesChangedData" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
//
// @public (undocumented)
export interface KeyStatusesChangedData {
// (undocumented)
keyStatuses: MediaKeyStatusMap;
// (undocumented)
keySystem: string;
}

// Warning: (ae-missing-release-tag) "KeySystemFormats" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
//
// @public (undocumented)
Expand Down
18 changes: 8 additions & 10 deletions src/controller/eme-controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -680,6 +680,11 @@ class EMEController extends Logger implements ComponentAPI {
this.warn(`${context.keySystem} expired for key ${keyId}`);
this.renewKeySession(context);
}

this.hls.trigger(Events.KEY_STATUSES_CHANGED, {
keySystem: context.decryptdata.keyFormat,
keyStatuses: keySession.keyStatuses,
});
});

addEventListener(context.mediaKeysSession, 'message', onmessage);
Expand Down Expand Up @@ -708,16 +713,9 @@ class EMEController extends Logger implements ComponentAPI {
),
);
} else if (keyStatus === 'internal-error') {
reject(
new EMEKeyError(
{
type: ErrorTypes.KEY_SYSTEM_ERROR,
details: ErrorDetails.KEY_SYSTEM_STATUS_INTERNAL_ERROR,
fatal: true,
},
`key status changed to "${keyStatus}"`,
),
);
// resolve for Hardware DRM
this.warn('keyStatus: internal-error');
resolve();
} else if (keyStatus === 'expired') {
reject(new Error('key expired while generating request'));
} else {
Expand Down
7 changes: 7 additions & 0 deletions src/events.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ import type {
InterstitialsUpdatedData,
KeyLoadedData,
KeyLoadingData,
KeyStatusesChangedData,
LevelLoadedData,
LevelLoadingData,
LevelPTSUpdatedData,
Expand Down Expand Up @@ -220,6 +221,8 @@ export enum Events {
PLAYOUT_LIMIT_REACHED = 'hlsPlayoutLimitReached',
// Event DateRange cue "enter" event dispatched
EVENT_CUE_ENTER = 'hlsEventCueEnter',
// HD DRM
KEY_STATUSES_CHANGED = 'hlsKeyStatusesChanged',
}

/**
Expand Down Expand Up @@ -496,6 +499,10 @@ export interface HlsListeners {
data: {},
) => void;
[Events.EVENT_CUE_ENTER]: (event: Events.EVENT_CUE_ENTER, data: {}) => void;
[Events.KEY_STATUSES_CHANGED]: (
event: Events.KEY_STATUSES_CHANGED,
data: KeyStatusesChangedData,
) => void;
}
export interface HlsEventEmitter {
on<E extends keyof HlsListeners, Context = undefined>(
Expand Down
1 change: 1 addition & 0 deletions src/hls.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1417,6 +1417,7 @@ export type {
BufferFlushingData,
CuesParsedData,
ErrorData,
KeyStatusesChangedData,
FPSDropData,
FPSDropLevelCappingData,
FragBufferedData,
Expand Down
5 changes: 5 additions & 0 deletions src/types/events.ts
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,11 @@ export interface LevelPTSUpdatedData {
end: number;
}

export interface KeyStatusesChangedData {
keySystem: string;
keyStatuses: MediaKeyStatusMap;
}

export interface AudioTrackSwitchingData extends MediaPlaylist {}

export interface AudioTrackSwitchedData extends MediaPlaylist {}
Expand Down
Loading