X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=client%2Fsrc%2Fapp%2F%2Bvideos%2F%2Bvideo-watch%2Fvideo-watch.component.ts;h=19ad97d42a2a4e6dbd32b7e8fcfd6dd78ef3b3fe;hb=6de076222aca7005371e01768171efdc62ed8018;hp=1f45c4d2653198fc86983c4ea61c36162560c0af;hpb=c4207f978e23c77f09c4646b940dfd532281300f;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/app/+videos/+video-watch/video-watch.component.ts b/client/src/app/+videos/+video-watch/video-watch.component.ts index 1f45c4d26..19ad97d42 100644 --- a/client/src/app/+videos/+video-watch/video-watch.component.ts +++ b/client/src/app/+videos/+video-watch/video-watch.component.ts @@ -1,6 +1,6 @@ import { Hotkey, HotkeysService } from 'angular2-hotkeys' -import { forkJoin, Subscription } from 'rxjs' -import { isP2PEnabled } from 'src/assets/player/utils' +import { forkJoin, map, Observable, of, Subscription, switchMap } from 'rxjs' +import { VideoJsPlayer } from 'video.js' import { PlatformLocation } from '@angular/common' import { Component, ElementRef, Inject, LOCALE_ID, NgZone, OnDestroy, OnInit, ViewChild } from '@angular/core' import { ActivatedRoute, Router } from '@angular/router' @@ -20,13 +20,17 @@ import { } from '@app/core' import { HooksService } from '@app/core/plugins/hooks.service' import { isXPercentInViewport, scrollToTop } from '@app/helpers' -import { Video, VideoCaptionService, VideoDetails, VideoService } from '@app/shared/shared-main' +import { Video, VideoCaptionService, VideoDetails, VideoFileTokenService, VideoService } from '@app/shared/shared-main' import { SubscribeButtonComponent } from '@app/shared/shared-user-subscription' +import { LiveVideoService } from '@app/shared/shared-video-live' import { VideoPlaylist, VideoPlaylistService } from '@app/shared/shared-video-playlist' +import { logger } from '@root-helpers/logger' +import { isP2PEnabled, videoRequiresAuth } from '@root-helpers/video' import { timeToInt } from '@shared/core-utils' import { HTMLServerConfig, HttpStatusCode, + LiveVideo, PeerTubeProblemDocument, ServerErrorCode, VideoCaption, @@ -56,22 +60,26 @@ export class VideoWatchComponent implements OnInit, OnDestroy { @ViewChild('videoWatchPlaylist', { static: true }) videoWatchPlaylist: VideoWatchPlaylistComponent @ViewChild('subscribeButton') subscribeButton: SubscribeButtonComponent - player: any + player: VideoJsPlayer playerElement: HTMLVideoElement playerPlaceholderImgSrc: string theaterEnabled = false video: VideoDetails = null videoCaptions: VideoCaption[] = [] + liveVideo: LiveVideo playlistPosition: number playlist: VideoPlaylist = null remoteServerDown = false + noPlaylistVideoFound = false private nextVideoUUID = '' private nextVideoTitle = '' + private videoFileToken: string + private currentTime: number private paramsSub: Subscription @@ -83,12 +91,15 @@ export class VideoWatchComponent implements OnInit, OnDestroy { private hotkeys: Hotkey[] = [] + private static VIEW_VIDEO_INTERVAL_MS = 5000 + constructor ( private elementRef: ElementRef, private route: ActivatedRoute, private router: Router, private videoService: VideoService, private playlistService: VideoPlaylistService, + private liveVideoService: LiveVideoService, private confirmService: ConfirmService, private metaService: MetaService, private authService: AuthService, @@ -103,6 +114,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy { private pluginService: PluginService, private peertubeSocket: PeerTubeSocket, private screenService: ScreenService, + private videoFileTokenService: VideoFileTokenService, private location: PlatformLocation, @Inject(LOCALE_ID) private localeId: string ) { } @@ -123,8 +135,6 @@ export class VideoWatchComponent implements OnInit, OnDestroy { this.loadRouteParams() this.loadRouteQuery() - this.initHotkeys() - this.theaterEnabled = getStoredTheater() this.hooks.runAction('action:video-watch.init', 'video-watch') @@ -170,7 +180,11 @@ export class VideoWatchComponent implements OnInit, OnDestroy { } onPlaylistVideoFound (videoId: string) { - this.loadVideo(videoId) + this.loadVideo({ videoId, forceAutoplay: false }) + } + + onPlaylistNoVideoFound () { + this.noPlaylistVideoFound = true } isUserLoggedIn () { @@ -198,7 +212,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy { private loadRouteParams () { this.paramsSub = this.route.params.subscribe(routeParams => { const videoId = routeParams['videoId'] - if (videoId) return this.loadVideo(videoId) + if (videoId) return this.loadVideo({ videoId, forceAutoplay: false }) const playlistId = routeParams['playlistId'] if (playlistId) return this.loadPlaylist(playlistId) @@ -215,7 +229,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy { : parseInt(positionParam + '', 10) if (isNaN(this.playlistPosition)) { - console.error(`playlistPosition query param '${positionParam}' was parsed as NaN, defaulting to 1.`) + logger.error(`playlistPosition query param '${positionParam}' was parsed as NaN, defaulting to 1.`) this.playlistPosition = 1 } @@ -226,11 +240,18 @@ export class VideoWatchComponent implements OnInit, OnDestroy { }) } - private loadVideo (videoId: string) { + private loadVideo (options: { + videoId: string + forceAutoplay: boolean + }) { + const { videoId, forceAutoplay } = options + if (this.isSameElement(this.video, videoId)) return if (this.player) this.player.pause() + this.video = undefined + const videoObs = this.hooks.wrapObsFun( this.videoService.getVideo.bind(this.videoService), { videoId }, @@ -239,12 +260,28 @@ export class VideoWatchComponent implements OnInit, OnDestroy { 'filter:api.video-watch.video.get.result' ) + const videoAndLiveObs: Observable<{ video: VideoDetails, live?: LiveVideo, videoFileToken?: string }> = videoObs.pipe( + switchMap(video => { + if (!video.isLive) return of({ video, live: undefined }) + + return this.liveVideoService.getVideoLive(video.uuid) + .pipe(map(live => ({ live, video }))) + }), + + switchMap(({ video, live }) => { + if (!videoRequiresAuth(video)) return of({ video, live, videoFileToken: undefined }) + + return this.videoFileTokenService.getVideoFileToken(video.uuid) + .pipe(map(({ token }) => ({ video, live, videoFileToken: token }))) + }) + ) + forkJoin([ - videoObs, + videoAndLiveObs, this.videoCaptionService.listCaptions(videoId), this.userService.getAnonymousOrLoggedUser() ]).subscribe({ - next: ([ video, captionsResult, loggedInOrAnonymousUser ]) => { + next: ([ { video, live, videoFileToken }, captionsResult, loggedInOrAnonymousUser ]) => { const queryParams = this.route.snapshot.queryParams const urlOptions = { @@ -258,11 +295,19 @@ export class VideoWatchComponent implements OnInit, OnDestroy { subtitle: queryParams.subtitle, playerMode: queryParams.mode, + playbackRate: queryParams.playbackRate, peertubeLink: false } - this.onVideoFetched({ video, videoCaptions: captionsResult.data, loggedInOrAnonymousUser, urlOptions }) - .catch(err => this.handleGlobalError(err)) + this.onVideoFetched({ + video, + live, + videoCaptions: captionsResult.data, + videoFileToken, + loggedInOrAnonymousUser, + urlOptions, + forceAutoplay + }).catch(err => this.handleGlobalError(err)) }, error: err => this.handleRequestError(err) @@ -272,6 +317,8 @@ export class VideoWatchComponent implements OnInit, OnDestroy { private loadPlaylist (playlistId: string) { if (this.isSameElement(this.playlist, playlistId)) return + this.noPlaylistVideoFound = false + this.playlistService.getVideoPlaylist(playlistId) .subscribe({ next: playlist => { @@ -330,16 +377,22 @@ export class VideoWatchComponent implements OnInit, OnDestroy { private async onVideoFetched (options: { video: VideoDetails + live: LiveVideo videoCaptions: VideoCaption[] + videoFileToken: string + urlOptions: URLOptions loggedInOrAnonymousUser: User + forceAutoplay: boolean }) { - const { video, videoCaptions, urlOptions, loggedInOrAnonymousUser } = options + const { video, live, videoCaptions, urlOptions, videoFileToken, loggedInOrAnonymousUser, forceAutoplay } = options this.subscribeToLiveEventsIfNeeded(this.video, video) this.video = video this.videoCaptions = videoCaptions + this.liveVideo = live + this.videoFileToken = videoFileToken // Re init attributes this.playerPlaceholderImgSrc = undefined @@ -354,8 +407,10 @@ export class VideoWatchComponent implements OnInit, OnDestroy { if (res === false) return this.location.back() } - this.buildPlayer(urlOptions, loggedInOrAnonymousUser) - .catch(err => console.error('Cannot build the player', err)) + this.buildHotkeysHelp(video) + + this.buildPlayer({ urlOptions, loggedInOrAnonymousUser, forceAutoplay }) + .catch(err => logger.error('Cannot build the player', err)) this.setOpenGraphTags() @@ -367,7 +422,13 @@ export class VideoWatchComponent implements OnInit, OnDestroy { this.hooks.runAction('action:video-watch.video.loaded', 'video-watch', hookOptions) } - private async buildPlayer (urlOptions: URLOptions, loggedInOrAnonymousUser: User) { + private async buildPlayer (options: { + urlOptions: URLOptions + loggedInOrAnonymousUser: User + forceAutoplay: boolean + }) { + const { urlOptions, loggedInOrAnonymousUser, forceAutoplay } = options + // Flush old player if needed this.flushPlayer() @@ -387,8 +448,11 @@ export class VideoWatchComponent implements OnInit, OnDestroy { const params = { video: this.video, videoCaptions: this.videoCaptions, + liveVideo: this.liveVideo, + videoFileToken: this.videoFileToken, urlOptions, loggedInOrAnonymousUser, + forceAutoplay, user: this.user } const { playerMode, playerOptions } = await this.hooks.wrapFun( @@ -402,8 +466,8 @@ export class VideoWatchComponent implements OnInit, OnDestroy { this.zone.runOutsideAngular(async () => { this.player = await PeertubePlayerManager.initialize(playerMode, playerOptions, player => this.player = player) - this.player.on('customError', ({ err }: { err: any }) => { - this.zone.run(() => this.handleGlobalError(err)) + this.player.on('customError', (_e, data: any) => { + this.zone.run(() => this.handleGlobalError(data.err)) }) this.player.on('timeupdate', () => { @@ -442,7 +506,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy { suspended: () => { return ( - !isXPercentInViewport(this.player.el(), 80) || + !isXPercentInViewport(this.player.el() as HTMLElement, 80) || !document.getElementById('content').contains(document.activeElement) ) } @@ -526,18 +590,24 @@ export class VideoWatchComponent implements OnInit, OnDestroy { this.player.dispose() this.player = undefined } catch (err) { - console.error('Cannot dispose player.', err) + logger.error('Cannot dispose player.', err) } } private buildPlayerManagerOptions (params: { video: VideoDetails + liveVideo: LiveVideo videoCaptions: VideoCaption[] + + videoFileToken: string + urlOptions: CustomizationOptions & { playerMode: PlayerMode } + loggedInOrAnonymousUser: User - user?: AuthUser + forceAutoplay: boolean + user?: AuthUser // Keep for plugins }) { - const { video, videoCaptions, urlOptions, loggedInOrAnonymousUser, user } = params + const { video, liveVideo, videoCaptions, videoFileToken, urlOptions, loggedInOrAnonymousUser, forceAutoplay } = params const getStartTime = () => { const byUrl = urlOptions.startTime !== undefined @@ -545,16 +615,18 @@ export class VideoWatchComponent implements OnInit, OnDestroy { const byLocalStorage = getStoredVideoWatchHistory(video.uuid) if (byUrl) return timeToInt(urlOptions.startTime) - if (byHistory) return video.userHistory.currentTime - if (byLocalStorage) return byLocalStorage.duration - return 0 - } + let startTime = 0 + if (byHistory) startTime = video.userHistory.currentTime + if (byLocalStorage) startTime = byLocalStorage.duration - let startTime = getStartTime() + // If we are at the end of the video, reset the timer + if (video.duration - startTime <= 1) startTime = 0 - // If we are at the end of the video, reset the timer - if (video.duration - startTime <= 1) startTime = 0 + return startTime + } + + const startTime = getStartTime() const playerCaptions = videoCaptions.map(c => ({ label: c.language.label, @@ -562,9 +634,14 @@ export class VideoWatchComponent implements OnInit, OnDestroy { src: environment.apiUrl + c.captionPath })) + const liveOptions = video.isLive + ? { latencyMode: liveVideo.latencyMode } + : undefined + const options: PeertubePlayerManagerOptions = { common: { autoplay: this.isAutoplay(), + forceAutoplay, p2pEnabled: isP2PEnabled(video, this.serverConfig, loggedInOrAnonymousUser.p2pEnabled), hasNextVideo: () => this.hasNextVideo(), @@ -580,34 +657,39 @@ export class VideoWatchComponent implements OnInit, OnDestroy { startTime, stopTime: urlOptions.stopTime, + controlBar: urlOptions.controlBar, controls: urlOptions.controls, muted: urlOptions.muted, loop: urlOptions.loop, subtitle: urlOptions.subtitle, + playbackRate: urlOptions.playbackRate, peertubeLink: urlOptions.peertubeLink, theaterButton: true, captions: videoCaptions.length !== 0, - videoViewUrl: video.privacy.id !== VideoPrivacy.PRIVATE - ? this.videoService.getVideoViewUrl(video.uuid) - : null, embedUrl: video.embedUrl, embedTitle: video.name, + instanceName: this.serverConfig.instance.name, isLive: video.isLive, + liveOptions, language: this.localeId, - userWatching: user && user.videosHistoryEnabled === true - ? { - url: this.videoService.getUserWatchingVideoUrl(video.uuid), - authorizationHeader: this.authService.getRequestHeaderValue() - } - : undefined, + metricsUrl: environment.apiUrl + '/api/v1/metrics/playback', - serverUrl: environment.apiUrl, + videoViewUrl: video.privacy.id !== VideoPrivacy.PRIVATE + ? this.videoService.getVideoViewUrl(video.uuid) + : null, + videoViewIntervalMs: VideoWatchComponent.VIEW_VIDEO_INTERVAL_MS, + authorizationHeader: () => this.authService.getRequestHeaderValue(), + + serverUrl: environment.originServerUrl || window.location.origin, + + videoFileToken: () => videoFileToken, + requiresAuth: videoRequiresAuth(video), videoCaptions: playerCaptions, @@ -690,53 +772,63 @@ export class VideoWatchComponent implements OnInit, OnDestroy { private handleLiveStateChange (newState: VideoState) { if (newState !== VideoState.PUBLISHED) return - console.log('Loading video after live update.') + logger.info('Loading video after live update.') const videoUUID = this.video.uuid // Reset to force refresh the video this.video = undefined - this.loadVideo(videoUUID) + this.loadVideo({ videoId: videoUUID, forceAutoplay: true }) } private handleLiveViewsChange (newViewers: number) { if (!this.video) { - console.error('Cannot update video live views because video is no defined.') + logger.error('Cannot update video live views because video is no defined.') return } - console.log('Updating live views.') + logger.info('Updating live views.') this.video.viewers = newViewers } - private initHotkeys () { + private buildHotkeysHelp (video: Video) { + if (this.hotkeys.length !== 0) { + this.hotkeysService.remove(this.hotkeys) + } + this.hotkeys = [ // These hotkeys are managed by the player new Hotkey('f', e => e, undefined, $localize`Enter/exit fullscreen`), new Hotkey('space', e => e, undefined, $localize`Play/Pause the video`), new Hotkey('m', e => e, undefined, $localize`Mute/unmute the video`), - new Hotkey('0-9', e => e, undefined, $localize`Skip to a percentage of the video: 0 is 0% and 9 is 90%`), - new Hotkey('up', e => e, undefined, $localize`Increase the volume`), new Hotkey('down', e => e, undefined, $localize`Decrease the volume`), - new Hotkey('right', e => e, undefined, $localize`Seek the video forward`), - new Hotkey('left', e => e, undefined, $localize`Seek the video backward`), - - new Hotkey('>', e => e, undefined, $localize`Increase playback rate`), - new Hotkey('<', e => e, undefined, $localize`Decrease playback rate`), - - new Hotkey(',', e => e, undefined, $localize`Navigate in the video to the previous frame`), - new Hotkey('.', e => e, undefined, $localize`Navigate in the video to the next frame`), - new Hotkey('t', e => { this.theaterEnabled = !this.theaterEnabled return false }, undefined, $localize`Toggle theater mode`) ] + if (!video.isLive) { + this.hotkeys = this.hotkeys.concat([ + // These hotkeys are also managed by the player but only for VOD + + new Hotkey('0-9', e => e, undefined, $localize`Skip to a percentage of the video: 0 is 0% and 9 is 90%`), + + new Hotkey('right', e => e, undefined, $localize`Seek the video forward`), + new Hotkey('left', e => e, undefined, $localize`Seek the video backward`), + + new Hotkey('>', e => e, undefined, $localize`Increase playback rate`), + new Hotkey('<', e => e, undefined, $localize`Decrease playback rate`), + + new Hotkey(',', e => e, undefined, $localize`Navigate in the video to the previous frame`), + new Hotkey('.', e => e, undefined, $localize`Navigate in the video to the next frame`) + ]) + } + if (this.isUserLoggedIn()) { this.hotkeys = this.hotkeys.concat([ new Hotkey('shift+s', () => {