Skip to content
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

fix(FEC-10122): destroy cleanup process #326

Merged
merged 14 commits into from
Jul 2, 2020
Merged

fix(FEC-10122): destroy cleanup process #326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
e3ceec9
fix(FEC-10122): clear playlist manager on reset to avoid memory leak
Yuvalke May 24, 2020
2420bd2
clear the playlist manager on destroy
Yuvalke Jun 15, 2020
b406b8c
clear ref
Yuvalke Jun 15, 2020
02fd5a6
Merge branch 'master' into FEC-10122
Yuvalke Jun 15, 2020
14916ee
delete prop instead setting null
Yuvalke Jun 15, 2020
2bc1681
Merge branch 'FEC-10122' of https://github.com/kaltura/kaltura-player…
Yuvalke Jun 15, 2020
7e0c40e
Update playlist-manager.js
Yuvalke Jun 15, 2020
c71a4d2
Merge branch 'master' into FEC-10122
Yuvalke Jun 15, 2020
a08f949
fix: remove listeners which added by static class on destroy
Yuvalke Jun 28, 2020
abcf050
Merge branch 'master' into FEC-10122
Yuvalke Jul 2, 2020
379e95c
Merge remote-tracking branch 'origin/remove-listeners' into FEC-10122
Yuvalke Jul 2, 2020
1f4397b
Merge branch 'master' into FEC-10122
Yuvalke Jul 2, 2020
44b6855
Merge branch 'FEC-10122' of https://github.com/kaltura/kaltura-player…
Yuvalke Jul 2, 2020
d0f6cd0
Merge branch 'master' into FEC-10122
Yuvalke Jul 2, 2020
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
4 changes: 4 additions & 0 deletions src/common/playlist/playlist-manager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,10 @@ class PlaylistManager {
}
return Promise.reject();
}

destroy(): void {
this._eventManager.destroy();
}
}

export {PlaylistManager};
21 changes: 14 additions & 7 deletions src/common/storage/storage-manager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// @flow
import StorageWrapper from './storage-wrapper';
import getLogger from '../utils/logger';
import {Utils} from '@playkit-js/playkit-js';
import {EventManager, Utils} from '@playkit-js/playkit-js';

export default class StorageManager {
static StorageKeys: {[key: string]: string} = {
Expand Down Expand Up @@ -32,17 +32,19 @@ export default class StorageManager {
*/
static attach(player: Player): void {
StorageManager._logger.debug('Attach local storage');
player.addEventListener(player.Event.UI.USER_CLICKED_MUTE, () => {
let eventManager = new EventManager();
eventManager.listen(player, player.Event.UI.USER_CLICKED_MUTE, () => {
if (!player.isCasting()) {
StorageWrapper.setItem(StorageManager.StorageKeys.MUTED, player.muted);
}
});
player.addEventListener(player.Event.UI.USER_CLICKED_UNMUTE, () => {
eventManager.listen(player, player.Event.UI.USER_CLICKED_UNMUTE, () => {
if (!player.isCasting()) {
StorageWrapper.setItem(StorageManager.StorageKeys.MUTED, player.muted);
}
});
player.addEventListener(player.Event.UI.USER_CHANGED_VOLUME, () => {

eventManager.listen(player, player.Event.UI.USER_CHANGED_VOLUME, () => {
if (!player.isCasting()) {
if (player.volume > 0) {
StorageWrapper.setItem(StorageManager.StorageKeys.MUTED, false);
Expand All @@ -52,22 +54,27 @@ export default class StorageManager {
StorageWrapper.setItem(StorageManager.StorageKeys.VOLUME, player.volume);
}
});
player.addEventListener(player.Event.UI.USER_SELECTED_AUDIO_TRACK, event => {

eventManager.listen(player, player.Event.UI.USER_SELECTED_AUDIO_TRACK, event => {
const audioTrack = event.payload.audioTrack;
StorageWrapper.setItem(StorageManager.StorageKeys.AUDIO_LANG, audioTrack.language);
});
player.addEventListener(player.Event.UI.USER_SELECTED_CAPTION_TRACK, event => {

eventManager.listen(player, player.Event.UI.USER_SELECTED_CAPTION_TRACK, event => {
const textTrack = event.payload.captionTrack;
StorageWrapper.setItem(StorageManager.StorageKeys.TEXT_LANG, textTrack.language);
});
player.addEventListener(player.Event.UI.USER_SELECTED_CAPTIONS_STYLE, event => {

eventManager.listen(player, player.Event.UI.USER_SELECTED_CAPTIONS_STYLE, event => {
try {
const textStyle = JSON.stringify(event.payload.captionsStyle);
StorageWrapper.setItem(StorageManager.StorageKeys.TEXT_STYLE, textStyle);
} catch (e) {
this._logger.error(e.message);
}
});

eventManager.listen(player, player.Event.PLAYER_DESTROY, () => eventManager.destroy());
}

/**
Expand Down
1 change: 1 addition & 0 deletions src/kaltura-player.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,7 @@ class KalturaPlayer extends FakeEventTarget {
this._localPlayer.destroy();
this._uiWrapper.destroy();
this._eventManager.destroy();
this._playlistManager.destroy();
const targetContainer = document.getElementById(targetId);
if (targetContainer && targetContainer.parentNode) {
Utils.Dom.removeChild(targetContainer.parentNode, targetContainer);
Expand Down