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'
} 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,
VideoPrivacy,
VideoState
} from '@shared/models'
-import { cleanupVideoWatch, getStoredTheater, getStoredVideoWatchHistory } from '../../../assets/player/peertube-player-local-storage'
import {
CustomizationOptions,
P2PMediaLoaderOptions,
PeertubePlayerManagerOptions,
PlayerMode,
videojs
-} from '../../../assets/player/peertube-player-manager'
+} 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 videoFileToken: string
+
private currentTime: number
private paramsSub: Subscription
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,
private pluginService: PluginService,
private peertubeSocket: PeerTubeSocket,
private screenService: ScreenService,
+ private videoFileTokenService: VideoFileTokenService,
private location: PlatformLocation,
@Inject(LOCALE_ID) private localeId: string
) { }
this.loadRouteParams()
this.loadRouteQuery()
- this.initHotkeys()
-
this.theaterEnabled = getStoredTheater()
this.hooks.runAction('action:video-watch.init', 'video-watch')
}
onPlaylistVideoFound (videoId: string) {
- this.loadVideo(videoId)
+ this.loadVideo({ videoId, forceAutoplay: false })
+ }
+
+ onPlaylistNoVideoFound () {
+ this.noPlaylistVideoFound = true
}
isUserLoggedIn () {
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)
: 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
}
})
}
- 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 },
'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 = {
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)
private loadPlaylist (playlistId: string) {
if (this.isSameElement(this.playlist, playlistId)) return
+ this.noPlaylistVideoFound = false
+
this.playlistService.getVideoPlaylist(playlistId)
.subscribe({
next: playlist => {
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
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()
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()
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(
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)
)
}
})
}
+ private hasNextVideo () {
+ if (this.playlist) {
+ return this.videoWatchPlaylist.hasNextVideo()
+ }
+
+ return true
+ }
+
private playNextVideoInAngularZone () {
if (this.playlist) {
this.zone.run(() => this.videoWatchPlaylist.navigateToNextPlaylistVideo())
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
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,
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(),
nextVideo: () => this.playNextVideoInAngularZone(),
playerElement: this.playerElement,
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',
+
+ videoViewUrl: video.privacy.id !== VideoPrivacy.PRIVATE
+ ? this.videoService.getVideoViewUrl(video.uuid)
+ : null,
+ videoViewIntervalMs: VideoWatchComponent.VIEW_VIDEO_INTERVAL_MS,
+ authorizationHeader: () => this.authService.getRequestHeaderValue(),
- serverUrl: environment.apiUrl,
+ serverUrl: environment.originServerUrl || window.location.origin,
+
+ videoFileToken: () => videoFileToken,
+ requiresAuth: videoRequiresAuth(video),
videoCaptions: playerCaptions,
videoShortUUID: video.shortUUID,
- videoUUID: video.uuid
+ 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())
}
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
// 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 (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% (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('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('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('0-9', e => e, undefined, $localize`Skip to a percentage of the video: 0 is 0% and 9 is 90%`),
- 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('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`Navigate in the video frame by frame (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`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([
projects / github / Chocobozzz / PeerTube.git / blobdiff