import { Hotkey, HotkeysService } from 'angular2-hotkeys'
-import { forkJoin, Subscription } from 'rxjs'
+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'
RestExtractor,
ScreenService,
ServerService,
+ User,
UserService
} 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 { 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 { HttpStatusCode } from '@shared/core-utils/miscs/http-error-codes'
-import { HTMLServerConfig, PeerTubeProblemDocument, ServerErrorCode, VideoCaption, VideoPrivacy, VideoState } from '@shared/models'
-import { cleanupVideoWatch, getStoredTheater, getStoredVideoWatchHistory } from '../../../assets/player/peertube-player-local-storage'
+import { logger } from '@root-helpers/logger'
+import { isP2PEnabled } from '@root-helpers/video'
+import { timeToInt } from '@shared/core-utils'
+import {
+ HTMLServerConfig,
+ HttpStatusCode,
+ LiveVideo,
+ PeerTubeProblemDocument,
+ ServerErrorCode,
+ VideoCaption,
+ VideoPrivacy,
+ VideoState
+} from '@shared/models'
import {
CustomizationOptions,
P2PMediaLoaderOptions,
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'
@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 router: Router,
private videoService: VideoService,
private playlistService: VideoPlaylistService,
+ private liveVideoService: LiveVideoService,
private confirmService: ConfirmService,
private metaService: MetaService,
private authService: AuthService,
return this.userService.getAnonymousUser()
}
- async ngOnInit () {
+ ngOnInit () {
this.serverConfig = this.serverService.getHTMLConfig()
PeertubePlayerManager.initState()
this.loadVideo(videoId)
}
+ onPlaylistNoVideoFound () {
+ this.noPlaylistVideoFound = true
+ }
+
isUserLoggedIn () {
return this.authService.isLoggedIn()
}
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)
})
}
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
: 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
}
this.videoWatchPlaylist.updatePlaylistIndex(this.playlistPosition)
- const start = queryParams[ 'start' ]
+ const start = queryParams['start']
if (this.player && start) this.player.currentTime(parseInt(start, 10))
})
}
if (this.player) this.player.pause()
+ this.video = undefined
+
const videoObs = this.hooks.wrapObsFun(
this.videoService.getVideo.bind(this.videoService),
{ videoId },
'filter:api.video-watch.video.get.result'
)
- forkJoin([ videoObs, this.videoCaptionService.listCaptions(videoId)])
- .subscribe(
- ([ video, captionsResult ]) => {
- const queryParams = this.route.snapshot.queryParams
+ const videoAndLiveObs: Observable<{ video: VideoDetails, live?: LiveVideo }> = videoObs.pipe(
+ switchMap(video => {
+ if (!video.isLive) return of({ video })
- const urlOptions = {
- resume: queryParams.resume,
+ return this.liveVideoService.getVideoLive(video.uuid)
+ .pipe(map(live => ({ live, video })))
+ })
+ )
- startTime: queryParams.start,
- stopTime: queryParams.stop,
+ forkJoin([
+ videoAndLiveObs,
+ this.videoCaptionService.listCaptions(videoId),
+ this.userService.getAnonymousOrLoggedUser()
+ ]).subscribe({
+ next: ([ { video, live }, captionsResult, loggedInOrAnonymousUser ]) => {
+ const queryParams = this.route.snapshot.queryParams
- muted: queryParams.muted,
- loop: queryParams.loop,
- subtitle: queryParams.subtitle,
+ const urlOptions = {
+ resume: queryParams.resume,
- playerMode: queryParams.mode,
- peertubeLink: false
- }
+ startTime: queryParams.start,
+ stopTime: queryParams.stop,
- this.onVideoFetched(video, captionsResult.data, urlOptions)
- .catch(err => this.handleGlobalError(err))
- },
+ muted: queryParams.muted,
+ loop: queryParams.loop,
+ subtitle: queryParams.subtitle,
- err => this.handleRequestError(err)
- )
+ playerMode: queryParams.mode,
+ peertubeLink: false
+ }
+
+ this.onVideoFetched({ video, live, videoCaptions: captionsResult.data, loggedInOrAnonymousUser, urlOptions })
+ .catch(err => this.handleGlobalError(err))
+ },
+
+ error: err => this.handleRequestError(err)
+ })
}
private loadPlaylist (playlistId: string) {
if (this.isSameElement(this.playlist, playlistId)) return
+ this.noPlaylistVideoFound = false
+
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) {
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: <a href="${originUrl}">${originUrl}</a>?`,
$localize`Redirection`
)
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
this.notifier.error(errorMessage)
}
- private async onVideoFetched (
- video: VideoDetails,
- videoCaptions: VideoCaption[],
+ private async onVideoFetched (options: {
+ video: VideoDetails
+ live: LiveVideo
+ videoCaptions: VideoCaption[]
urlOptions: URLOptions
- ) {
+ loggedInOrAnonymousUser: User
+ }) {
+ const { video, live, videoCaptions, urlOptions, loggedInOrAnonymousUser } = options
+
this.subscribeToLiveEventsIfNeeded(this.video, video)
this.video = video
this.videoCaptions = videoCaptions
+ this.liveVideo = live
// Re init attributes
this.playerPlaceholderImgSrc = undefined
if (res === false) return this.location.back()
}
- this.buildPlayer(urlOptions)
- .catch(err => console.error('Cannot build the player', err))
+ this.buildPlayer(urlOptions, loggedInOrAnonymousUser)
+ .catch(err => logger.error('Cannot build the player', err))
this.setOpenGraphTags()
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()
const params = {
video: this.video,
videoCaptions: this.videoCaptions,
+ liveVideo: this.liveVideo,
urlOptions,
+ loggedInOrAnonymousUser,
user: this.user
}
const { playerMode, playerOptions } = await this.hooks.wrapFun(
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', () => {
suspended: () => {
return (
- !isXPercentInViewport(this.player.el(), 80) ||
+ !isXPercentInViewport(this.player.el() as HTMLElement, 80) ||
!document.getElementById('content').contains(document.activeElement)
)
}
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())
if (this.nextVideoUUID) {
this.router.navigate([ '/w', this.nextVideoUUID ])
- return
}
}
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
)
}
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,
- videoCaptions: VideoCaption[],
- urlOptions: CustomizationOptions & { playerMode: PlayerMode },
- user?: AuthUser
+ video: VideoDetails
+ liveVideo: LiveVideo
+ videoCaptions: VideoCaption[]
+ urlOptions: CustomizationOptions & { playerMode: PlayerMode }
+ loggedInOrAnonymousUser: User
+ user?: AuthUser // Keep for plugins
}) {
- const { video, videoCaptions, urlOptions, user } = params
+ const { video, liveVideo, videoCaptions, urlOptions, loggedInOrAnonymousUser } = params
const getStartTime = () => {
const byUrl = urlOptions.startTime !== undefined
src: environment.apiUrl + c.captionPath
}))
+ const liveOptions = video.isLive
+ ? { latencyMode: liveVideo.latencyMode }
+ : undefined
+
const options: PeertubePlayerManagerOptions = {
common: {
autoplay: this.isAutoplay(),
+ p2pEnabled: isP2PEnabled(video, this.serverConfig, loggedInOrAnonymousUser.p2pEnabled),
+
+ hasNextVideo: () => this.hasNextVideo(),
nextVideo: () => this.playNextVideoInAngularZone(),
playerElement: this.playerElement,
startTime,
stopTime: urlOptions.stopTime,
+ controlBar: urlOptions.controlBar,
controls: urlOptions.controls,
muted: urlOptions.muted,
loop: urlOptions.loop,
videoViewUrl: video.privacy.id !== VideoPrivacy.PRIVATE
? this.videoService.getVideoViewUrl(video.uuid)
: null,
+ authorizationHeader: this.authService.getRequestHeaderValue(),
+
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,
-
serverUrl: environment.apiUrl,
videoCaptions: playerCaptions,
- videoUUID: video.uuid
+ videoShortUUID: video.shortUUID,
+ videoUUID: video.uuid,
+
+ errorNotifier: (message: string) => this.notifier.error(message)
},
webtorrent: {
// 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())
}
}
if (oldVideo && oldVideo.id !== newVideo.id) {
- await this.peertubeSocket.unsubscribeLiveVideos(oldVideo.id)
+ this.peertubeSocket.unsubscribeLiveVideos(oldVideo.id)
}
if (!newVideo.isLive) return
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.')
+ logger.info('Loading video after live update.')
const videoUUID = this.video.uuid
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.')
+ 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.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`)
projects / github / Chocobozzz / PeerTube.git / blobdiff