Skip to content

Commit

Permalink
fix(youtube-player): handle API interactions before API has loaded (#…
Browse files Browse the repository at this point in the history
…18368)

Currently if the user tries to interact with the API before the YouTube API has loaded (e.g. by calling `playVideo`) their method call will be ignored. These changes add some logic that will store the state and replay it once the player has been initialized.

Fixes #18279.
  • Loading branch information
crisbeto authored and mmalerba committed Feb 5, 2020
1 parent 06b7378 commit 98fac6c
Show file tree
Hide file tree
Showing 2 changed files with 194 additions and 6 deletions.
74 changes: 74 additions & 0 deletions src/youtube-player/youtube-player.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,80 @@ describe('YoutubePlayer', () => {
testComponent.youtubePlayer.getVideoEmbedCode();
expect(playerSpy.getVideoEmbedCode).toHaveBeenCalled();
});

it('should play on init if playVideo was called before the API has loaded', () => {
testComponent.youtubePlayer.playVideo();
expect(testComponent.youtubePlayer.getPlayerState()).toBe(YT.PlayerState.PLAYING);

events.onReady({target: playerSpy});

expect(playerSpy.playVideo).toHaveBeenCalled();
});

it('should pause on init if pauseVideo was called before the API has loaded', () => {
testComponent.youtubePlayer.pauseVideo();
expect(testComponent.youtubePlayer.getPlayerState()).toBe(YT.PlayerState.PAUSED);

events.onReady({target: playerSpy});

expect(playerSpy.pauseVideo).toHaveBeenCalled();
});

it('should stop on init if stopVideo was called before the API has loaded', () => {
testComponent.youtubePlayer.stopVideo();
expect(testComponent.youtubePlayer.getPlayerState()).toBe(YT.PlayerState.CUED);

events.onReady({target: playerSpy});

expect(playerSpy.stopVideo).toHaveBeenCalled();
});

it('should set the playback rate on init if setPlaybackRate was called before ' +
'the API has loaded', () => {
testComponent.youtubePlayer.setPlaybackRate(1337);
expect(testComponent.youtubePlayer.getPlaybackRate()).toBe(1337);

events.onReady({target: playerSpy});

expect(playerSpy.setPlaybackRate).toHaveBeenCalledWith(1337);
});

it('should set the volume on init if setVolume was called before the API has loaded', () => {
testComponent.youtubePlayer.setVolume(37);
expect(testComponent.youtubePlayer.getVolume()).toBe(37);

events.onReady({target: playerSpy});

expect(playerSpy.setVolume).toHaveBeenCalledWith(37);
});

it('should mute on init if mute was called before the API has loaded', () => {
testComponent.youtubePlayer.mute();
expect(testComponent.youtubePlayer.isMuted()).toBe(true);

events.onReady({target: playerSpy});

expect(playerSpy.mute).toHaveBeenCalled();
});

it('should unmute on init if umMute was called before the API has loaded', () => {
testComponent.youtubePlayer.unMute();
expect(testComponent.youtubePlayer.isMuted()).toBe(false);

events.onReady({target: playerSpy});

expect(playerSpy.unMute).toHaveBeenCalled();
});

it('should seek on init if seekTo was called before the API has loaded', () => {
testComponent.youtubePlayer.seekTo(1337, true);
expect(testComponent.youtubePlayer.getCurrentTime()).toBe(1337);

events.onReady({target: playerSpy});

expect(playerSpy.seekTo).toHaveBeenCalledWith(1337, true);
});

});

describe('API loaded asynchronously', () => {
Expand Down
126 changes: 120 additions & 6 deletions src/youtube-player/youtube-player.ts
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,18 @@ interface Player extends YT.Player {
// The only field available is destroy and addEventListener.
type UninitializedPlayer = Pick<Player, 'videoId' | 'destroy' | 'addEventListener'>;

/**
* Object used to store the state of the player if the
* user tries to interact with the API before it has been loaded.
*/
interface PendingPlayerState {
playbackState?: YT.PlayerState.PLAYING | YT.PlayerState.PAUSED | YT.PlayerState.CUED;
playbackRate?: number;
volume?: number;
muted?: boolean;
seek?: {seconds: number, allowSeekAhead: boolean};
}

/**
* Angular component that renders a YouTube player via the YouTube player
* iframe API.
Expand Down Expand Up @@ -160,6 +172,7 @@ export class YouTubePlayer implements AfterViewInit, OnDestroy, OnInit {
private _destroyed = new Subject<void>();
private _player: Player | undefined;
private _existingApiReadyCallback: (() => void) | undefined;
private _pendingPlayerState: PendingPlayerState | undefined;

constructor(
private _ngZone: NgZone,
Expand Down Expand Up @@ -218,7 +231,15 @@ export class YouTubePlayer implements AfterViewInit, OnDestroy, OnInit {
}), takeUntil(this._destroyed), publish());

// Set up side effects to bind inputs to the player.
playerObs.subscribe(player => this._player = player);
playerObs.subscribe(player => {
this._player = player;

if (player && this._pendingPlayerState) {
this._initializePlayer(player, this._pendingPlayerState);
}

this._pendingPlayerState = undefined;
});

bindSizeToPlayer(playerObs, this._width, this._height);

Expand Down Expand Up @@ -289,71 +310,112 @@ export class YouTubePlayer implements AfterViewInit, OnDestroy, OnInit {
playVideo() {
if (this._player) {
this._player.playVideo();
} else {
this._getPendingState().playbackState = YT.PlayerState.PLAYING;
}
}

/** See https://developers.google.com/youtube/iframe_api_reference#pauseVideo */
pauseVideo() {
if (this._player) {
this._player.pauseVideo();
} else {
this._getPendingState().playbackState = YT.PlayerState.PAUSED;
}
}

/** See https://developers.google.com/youtube/iframe_api_reference#stopVideo */
stopVideo() {
if (this._player) {
this._player.stopVideo();
} else {
// It seems like YouTube sets the player to CUED when it's stopped.
this._getPendingState().playbackState = YT.PlayerState.CUED;
}
}

/** See https://developers.google.com/youtube/iframe_api_reference#seekTo */
seekTo(seconds: number, allowSeekAhead: boolean) {
if (this._player) {
this._player.seekTo(seconds, allowSeekAhead);
} else {
this._getPendingState().seek = {seconds, allowSeekAhead};
}
}

/** See https://developers.google.com/youtube/iframe_api_reference#mute */
mute() {
if (this._player) {
this._player.mute();
} else {
this._getPendingState().muted = true;
}
}

/** See https://developers.google.com/youtube/iframe_api_reference#unMute */
unMute() {
if (this._player) {
this._player.unMute();
} else {
this._getPendingState().muted = false;
}
}

/** See https://developers.google.com/youtube/iframe_api_reference#isMuted */
isMuted(): boolean {
return !this._player || this._player.isMuted();
if (this._player) {
return this._player.isMuted();
}

if (this._pendingPlayerState) {
return !!this._pendingPlayerState.muted;
}

return false;
}

/** See https://developers.google.com/youtube/iframe_api_reference#setVolume */
setVolume(volume: number) {
if (this._player) {
this._player.setVolume(volume);
} else {
this._getPendingState().volume = volume;
}
}

/** See https://developers.google.com/youtube/iframe_api_reference#getVolume */
getVolume(): number {
return this._player ? this._player.getVolume() : 0;
if (this._player) {
return this._player.getVolume();
}

if (this._pendingPlayerState && this._pendingPlayerState.volume != null) {
return this._pendingPlayerState.volume;
}

return 0;
}

/** See https://developers.google.com/youtube/iframe_api_reference#setPlaybackRate */
setPlaybackRate(playbackRate: number) {
if (this._player) {
return this._player.setPlaybackRate(playbackRate);
} else {
this._getPendingState().playbackRate = playbackRate;
}
}

/** See https://developers.google.com/youtube/iframe_api_reference#getPlaybackRate */
getPlaybackRate(): number {
return this._player ? this._player.getPlaybackRate() : 0;
if (this._player) {
return this._player.getPlaybackRate();
}

if (this._pendingPlayerState && this._pendingPlayerState.playbackRate != null) {
return this._pendingPlayerState.playbackRate;
}

return 0;
}

/** See https://developers.google.com/youtube/iframe_api_reference#getAvailablePlaybackRates */
Expand All @@ -372,12 +434,28 @@ export class YouTubePlayer implements AfterViewInit, OnDestroy, OnInit {
return undefined;
}

return this._player ? this._player.getPlayerState() : YT.PlayerState.UNSTARTED;
if (this._player) {
return this._player.getPlayerState();
}

if (this._pendingPlayerState && this._pendingPlayerState.playbackState != null) {
return this._pendingPlayerState.playbackState;
}

return YT.PlayerState.UNSTARTED;
}

/** See https://developers.google.com/youtube/iframe_api_reference#getCurrentTime */
getCurrentTime(): number {
return this._player ? this._player.getCurrentTime() : 0;
if (this._player) {
return this._player.getCurrentTime();
}

if (this._pendingPlayerState && this._pendingPlayerState.seek) {
return this._pendingPlayerState.seek.seconds;
}

return 0;
}

/** See https://developers.google.com/youtube/iframe_api_reference#getPlaybackQuality */
Expand All @@ -404,6 +482,42 @@ export class YouTubePlayer implements AfterViewInit, OnDestroy, OnInit {
getVideoEmbedCode(): string {
return this._player ? this._player.getVideoEmbedCode() : '';
}

/** Gets an object that should be used to store the temporary API state. */
private _getPendingState(): PendingPlayerState {
if (!this._pendingPlayerState) {
this._pendingPlayerState = {};
}

return this._pendingPlayerState;
}

/** Initializes a player from a temporary state. */
private _initializePlayer(player: YT.Player, state: PendingPlayerState): void {
const {playbackState, playbackRate, volume, muted, seek} = state;

switch (playbackState) {
case YT.PlayerState.PLAYING: player.playVideo(); break;
case YT.PlayerState.PAUSED: player.pauseVideo(); break;
case YT.PlayerState.CUED: player.stopVideo(); break;
}

if (playbackRate != null) {
player.setPlaybackRate(playbackRate);
}

if (volume != null) {
player.setVolume(volume);
}

if (muted != null) {
muted ? player.mute() : player.unMute();
}

if (seek != null) {
player.seekTo(seek.seconds, seek.allowSeekAhead);
}
}
}

/** Listens to changes to the given width and height and sets it on the player. */
Expand Down

0 comments on commit 98fac6c

Please sign in to comment.