X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2F%2Bvideos%2F%2Bvideo-watch%2Fvideo-watch.component.ts;h=1f45c4d2653198fc86983c4ea61c36162560c0af;hb=ab4b8974997777373a6032073f9c1aaf33ba9931;hp=7460ae3fc8d7b5df7ae692a7c5ac1966947c4be8;hpb=c0e8b12e7fd554ba4d2ceb0c4900804c6a4c63ea;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 7460ae3fc..1f45c4d26 100644 --- a/client/src/app/+videos/+video-watch/video-watch.component.ts +++ b/client/src/app/+videos/+video-watch/video-watch.component.ts @@ -1,5 +1,6 @@ import { Hotkey, HotkeysService } from 'angular2-hotkeys' import { forkJoin, Subscription } from 'rxjs' +import { isP2PEnabled } from 'src/assets/player/utils' import { PlatformLocation } from '@angular/common' import { Component, ElementRef, Inject, LOCALE_ID, NgZone, OnDestroy, OnInit, ViewChild } from '@angular/core' import { ActivatedRoute, Router } from '@angular/router' @@ -14,6 +15,7 @@ import { RestExtractor, ScreenService, ServerService, + User, UserService } from '@app/core' import { HooksService } from '@app/core/plugins/hooks.service' @@ -21,6 +23,7 @@ import { isXPercentInViewport, scrollToTop } from '@app/helpers' import { Video, VideoCaptionService, VideoDetails, VideoService } from '@app/shared/shared-main' import { SubscribeButtonComponent } from '@app/shared/shared-user-subscription' import { VideoPlaylist, VideoPlaylistService } from '@app/shared/shared-video-playlist' +import { timeToInt } from '@shared/core-utils' import { HTMLServerConfig, HttpStatusCode, @@ -30,7 +33,6 @@ import { VideoPrivacy, VideoState } from '@shared/models' -import { cleanupVideoWatch, getStoredTheater, getStoredVideoWatchHistory } from '../../../assets/player/peertube-player-local-storage' import { CustomizationOptions, P2PMediaLoaderOptions, @@ -38,8 +40,8 @@ import { PeertubePlayerManagerOptions, PlayerMode, videojs -} from '../../../assets/player/peertube-player-manager' -import { timeToInt } from '../../../assets/player/utils' +} from '../../../assets/player' +import { cleanupVideoWatch, getStoredTheater, getStoredVideoWatchHistory } from '../../../assets/player/peertube-player-local-storage' import { environment } from '../../../environments/environment' import { VideoWatchPlaylistComponent } from './shared' @@ -113,7 +115,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy { return this.userService.getAnonymousUser() } - async ngOnInit () { + ngOnInit () { this.serverConfig = this.serverService.getHTMLConfig() PeertubePlayerManager.initState() @@ -195,10 +197,10 @@ export class VideoWatchComponent implements OnInit, OnDestroy { private loadRouteParams () { this.paramsSub = this.route.params.subscribe(routeParams => { - const videoId = routeParams[ 'videoId' ] + const videoId = routeParams['videoId'] if (videoId) return this.loadVideo(videoId) - const playlistId = routeParams[ 'playlistId' ] + const playlistId = routeParams['playlistId'] if (playlistId) return this.loadPlaylist(playlistId) }) } @@ -206,7 +208,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy { private loadRouteQuery () { this.queryParamsSub = this.route.queryParams.subscribe(queryParams => { // Handle the ?playlistPosition - const positionParam = queryParams[ 'playlistPosition' ] ?? 1 + const positionParam = queryParams['playlistPosition'] ?? 1 this.playlistPosition = positionParam === 'last' ? -1 // Handle the "last" index @@ -219,7 +221,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy { this.videoWatchPlaylist.updatePlaylistIndex(this.playlistPosition) - const start = queryParams[ 'start' ] + const start = queryParams['start'] if (this.player && start) this.player.currentTime(parseInt(start, 10)) }) } @@ -237,46 +239,49 @@ export class VideoWatchComponent implements OnInit, OnDestroy { 'filter:api.video-watch.video.get.result' ) - forkJoin([ videoObs, this.videoCaptionService.listCaptions(videoId)]) - .subscribe( - ([ video, captionsResult ]) => { - const queryParams = this.route.snapshot.queryParams + forkJoin([ + videoObs, + this.videoCaptionService.listCaptions(videoId), + this.userService.getAnonymousOrLoggedUser() + ]).subscribe({ + next: ([ video, captionsResult, loggedInOrAnonymousUser ]) => { + const queryParams = this.route.snapshot.queryParams - const urlOptions = { - resume: queryParams.resume, + const urlOptions = { + resume: queryParams.resume, - startTime: queryParams.start, - stopTime: queryParams.stop, + startTime: queryParams.start, + stopTime: queryParams.stop, - muted: queryParams.muted, - loop: queryParams.loop, - subtitle: queryParams.subtitle, + muted: queryParams.muted, + loop: queryParams.loop, + subtitle: queryParams.subtitle, - playerMode: queryParams.mode, - peertubeLink: false - } + playerMode: queryParams.mode, + peertubeLink: false + } - this.onVideoFetched(video, captionsResult.data, urlOptions) - .catch(err => this.handleGlobalError(err)) - }, + this.onVideoFetched({ video, videoCaptions: captionsResult.data, loggedInOrAnonymousUser, urlOptions }) + .catch(err => this.handleGlobalError(err)) + }, - err => this.handleRequestError(err) - ) + error: err => this.handleRequestError(err) + }) } private loadPlaylist (playlistId: string) { if (this.isSameElement(this.playlist, playlistId)) return this.playlistService.getVideoPlaylist(playlistId) - .subscribe( - playlist => { + .subscribe({ + next: playlist => { this.playlist = playlist this.videoWatchPlaylist.loadPlaylistElements(playlist, !this.playlistPosition, this.playlistPosition) }, - err => this.handleRequestError(err) - ) + error: err => this.handleRequestError(err) + }) } private isSameElement (element: VideoDetails | VideoPlaylist, newId: string) { @@ -288,10 +293,11 @@ export class VideoWatchComponent implements OnInit, OnDestroy { private async handleRequestError (err: any) { const errorBody = err.body as PeerTubeProblemDocument - if (errorBody.code === ServerErrorCode.DOES_NOT_RESPECT_FOLLOW_CONSTRAINTS && errorBody.originUrl) { + if (errorBody?.code === ServerErrorCode.DOES_NOT_RESPECT_FOLLOW_CONSTRAINTS && errorBody.originUrl) { const originUrl = errorBody.originUrl + (window.location.search ?? '') const res = await this.confirmService.confirm( + // eslint-disable-next-line max-len $localize`This video is not available on this instance. Do you want to be redirected on the origin instance: ${originUrl}?`, $localize`Redirection` ) @@ -312,7 +318,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy { if (!errorMessage) return // Display a message in the video player instead of a notification - if (errorMessage.indexOf('from xs param') !== -1) { + if (errorMessage.includes('from xs param')) { this.flushPlayer() this.remoteServerDown = true @@ -322,11 +328,14 @@ export class VideoWatchComponent implements OnInit, OnDestroy { this.notifier.error(errorMessage) } - private async onVideoFetched ( - video: VideoDetails, - videoCaptions: VideoCaption[], + private async onVideoFetched (options: { + video: VideoDetails + videoCaptions: VideoCaption[] urlOptions: URLOptions - ) { + loggedInOrAnonymousUser: User + }) { + const { video, videoCaptions, urlOptions, loggedInOrAnonymousUser } = options + this.subscribeToLiveEventsIfNeeded(this.video, video) this.video = video @@ -345,7 +354,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy { if (res === false) return this.location.back() } - this.buildPlayer(urlOptions) + this.buildPlayer(urlOptions, loggedInOrAnonymousUser) .catch(err => console.error('Cannot build the player', err)) this.setOpenGraphTags() @@ -358,7 +367,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy { this.hooks.runAction('action:video-watch.video.loaded', 'video-watch', hookOptions) } - private async buildPlayer (urlOptions: URLOptions) { + private async buildPlayer (urlOptions: URLOptions, loggedInOrAnonymousUser: User) { // Flush old player if needed this.flushPlayer() @@ -379,6 +388,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy { video: this.video, videoCaptions: this.videoCaptions, urlOptions, + loggedInOrAnonymousUser, user: this.user } const { playerMode, playerOptions } = await this.hooks.wrapFun( @@ -454,10 +464,24 @@ export class VideoWatchComponent implements OnInit, OnDestroy { this.zone.run(() => this.theaterEnabled = enabled) }) - this.hooks.runAction('action:video-watch.player.loaded', 'video-watch', { player: this.player, videojs, video: this.video }) + this.hooks.runAction('action:video-watch.player.loaded', 'video-watch', { + player: this.player, + playlist: this.playlist, + playlistPosition: this.playlistPosition, + videojs, + video: this.video + }) }) } + private hasNextVideo () { + if (this.playlist) { + return this.videoWatchPlaylist.hasNextVideo() + } + + return true + } + private playNextVideoInAngularZone () { if (this.playlist) { this.zone.run(() => this.videoWatchPlaylist.navigateToNextPlaylistVideo()) @@ -466,7 +490,6 @@ export class VideoWatchComponent implements OnInit, OnDestroy { if (this.nextVideoUUID) { this.router.navigate([ '/w', this.nextVideoUUID ]) - return } } @@ -483,14 +506,14 @@ export class VideoWatchComponent implements OnInit, OnDestroy { private isAutoPlayNext () { return ( - (this.user && this.user.autoPlayNextVideo) || + (this.user?.autoPlayNextVideo) || this.anonymousUser.autoPlayNextVideo ) } private isPlaylistAutoPlayNext () { return ( - (this.user && this.user.autoPlayNextVideoPlaylist) || + (this.user?.autoPlayNextVideoPlaylist) || this.anonymousUser.autoPlayNextVideoPlaylist ) } @@ -508,12 +531,13 @@ export class VideoWatchComponent implements OnInit, OnDestroy { } private buildPlayerManagerOptions (params: { - video: VideoDetails, - videoCaptions: VideoCaption[], - urlOptions: CustomizationOptions & { playerMode: PlayerMode }, + video: VideoDetails + videoCaptions: VideoCaption[] + urlOptions: CustomizationOptions & { playerMode: PlayerMode } + loggedInOrAnonymousUser: User user?: AuthUser }) { - const { video, videoCaptions, urlOptions, user } = params + const { video, videoCaptions, urlOptions, loggedInOrAnonymousUser, user } = params const getStartTime = () => { const byUrl = urlOptions.startTime !== undefined @@ -541,6 +565,9 @@ export class VideoWatchComponent implements OnInit, OnDestroy { const options: PeertubePlayerManagerOptions = { common: { autoplay: this.isAutoplay(), + p2pEnabled: isP2PEnabled(video, this.serverConfig, loggedInOrAnonymousUser.p2pEnabled), + + hasNextVideo: () => this.hasNextVideo(), nextVideo: () => this.playNextVideoInAngularZone(), playerElement: this.playerElement, @@ -573,16 +600,21 @@ export class VideoWatchComponent implements OnInit, OnDestroy { language: this.localeId, - userWatching: user && user.videosHistoryEnabled === true ? { - url: this.videoService.getUserWatchingVideoUrl(video.uuid), - authorizationHeader: this.authService.getRequestHeaderValue() - } : undefined, + userWatching: user && user.videosHistoryEnabled === true + ? { + url: this.videoService.getUserWatchingVideoUrl(video.uuid), + authorizationHeader: this.authService.getRequestHeaderValue() + } + : undefined, serverUrl: environment.apiUrl, videoCaptions: playerCaptions, - videoUUID: video.uuid + videoShortUUID: video.shortUUID, + videoUUID: video.uuid, + + errorNotifier: (message: string) => this.notifier.error(message) }, webtorrent: { @@ -594,6 +626,8 @@ export class VideoWatchComponent implements OnInit, OnDestroy { // Only set this if we're in a playlist if (this.playlist) { + options.common.hasPreviousVideo = () => this.videoWatchPlaylist.hasPreviousVideo() + options.common.previousVideo = () => { this.zone.run(() => this.videoWatchPlaylist.navigateToPreviousPlaylistVideo()) } @@ -637,7 +671,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy { } if (oldVideo && oldVideo.id !== newVideo.id) { - await this.peertubeSocket.unsubscribeLiveVideos(oldVideo.id) + this.peertubeSocket.unsubscribeLiveVideos(oldVideo.id) } if (!newVideo.isLive) return @@ -649,16 +683,13 @@ export class VideoWatchComponent implements OnInit, OnDestroy { return this.peertubeSocket.getLiveVideosObservable() .subscribe(({ type, payload }) => { if (type === 'state-change') return this.handleLiveStateChange(payload.state) - if (type === 'views-change') return this.handleLiveViewsChange(payload.views) + if (type === 'views-change') return this.handleLiveViewsChange(payload.viewers) }) } private handleLiveStateChange (newState: VideoState) { if (newState !== VideoState.PUBLISHED) return - const videoState = this.video.state.id - if (videoState !== VideoState.WAITING_FOR_LIVE && videoState !== VideoState.LIVE_ENDED) return - console.log('Loading video after live update.') const videoUUID = this.video.uuid @@ -668,7 +699,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy { this.loadVideo(videoUUID) } - private handleLiveViewsChange (newViews: number) { + private handleLiveViewsChange (newViewers: number) { if (!this.video) { console.error('Cannot update video live views because video is no defined.') return @@ -676,36 +707,41 @@ export class VideoWatchComponent implements OnInit, OnDestroy { console.log('Updating live views.') - this.video.views = newViews + this.video.viewers = newViewers } private initHotkeys () { this.hotkeys = [ // These hotkeys are managed by the player - new Hotkey('f', e => e, undefined, $localize`Enter/exit fullscreen (requires player focus)`), - new Hotkey('space', e => e, undefined, $localize`Play/Pause the video (requires player focus)`), - new Hotkey('m', e => e, undefined, $localize`Mute/unmute the video (requires player focus)`), + 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('0-9', e => e, undefined, $localize`Skip to a percentage of the video: 0 is 0% and 9 is 90% (requires player focus)`), + new Hotkey('up', e => e, undefined, $localize`Increase the volume`), + new Hotkey('down', e => e, undefined, $localize`Decrease the volume`), - new Hotkey('up', e => e, undefined, $localize`Increase the volume (requires player focus)`), - new Hotkey('down', e => e, undefined, $localize`Decrease the volume (requires player focus)`), + new Hotkey('right', e => e, undefined, $localize`Seek the video forward`), + new Hotkey('left', e => e, undefined, $localize`Seek the video backward`), - new Hotkey('right', e => e, undefined, $localize`Seek the video forward (requires player focus)`), - new Hotkey('left', e => e, undefined, $localize`Seek the video backward (requires player focus)`), + new Hotkey('>', e => e, undefined, $localize`Increase playback rate`), + new Hotkey('<', e => e, undefined, $localize`Decrease playback rate`), - new Hotkey('>', e => e, undefined, $localize`Increase playback rate (requires player focus)`), - new Hotkey('<', e => e, undefined, $localize`Decrease playback rate (requires player focus)`), + 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('.', e => e, undefined, $localize`Navigate in the video frame by frame (requires player focus)`) + new Hotkey('t', e => { + this.theaterEnabled = !this.theaterEnabled + return false + }, undefined, $localize`Toggle theater mode`) ] if (this.isUserLoggedIn()) { this.hotkeys = this.hotkeys.concat([ new Hotkey('shift+s', () => { - this.subscribeButton.isSubscribedToAll() - ? this.subscribeButton.unsubscribe() - : this.subscribeButton.subscribe() + if (this.subscribeButton.isSubscribedToAll()) this.subscribeButton.unsubscribe() + else this.subscribeButton.subscribe() return false }, undefined, $localize`Subscribe to the account`)