} 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 { isP2PEnabled } from '@root-helpers/video'
+import { logger } from '@root-helpers/logger'
+import { isP2PEnabled, videoRequiresAuth } from '@root-helpers/video'
import { timeToInt } from '@shared/core-utils'
import {
HTMLServerConfig,
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 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 () {
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 }> = videoObs.pipe(
+ const videoAndLiveObs: Observable<{ video: VideoDetails, live?: LiveVideo, videoFileToken?: string }> = videoObs.pipe(
switchMap(video => {
- if (!video.isLive) return of({ 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 })))
})
)
this.videoCaptionService.listCaptions(videoId),
this.userService.getAnonymousOrLoggedUser()
]).subscribe({
- next: ([ { video, live }, 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, live, 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)
video: VideoDetails
live: LiveVideo
videoCaptions: VideoCaption[]
+ videoFileToken: string
+
urlOptions: URLOptions
loggedInOrAnonymousUser: User
+ forceAutoplay: boolean
}) {
- const { video, live, 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()
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.player.dispose()
this.player = undefined
} catch (err) {
- console.error('Cannot dispose player.', err)
+ logger.error('Cannot dispose player.', err)
}
}
video: VideoDetails
liveVideo: LiveVideo
videoCaptions: VideoCaption[]
+
+ videoFileToken: string
+
urlOptions: CustomizationOptions & { playerMode: PlayerMode }
+
loggedInOrAnonymousUser: User
+ forceAutoplay: boolean
user?: AuthUser // Keep for plugins
}) {
- const { video, liveVideo, videoCaptions, urlOptions, loggedInOrAnonymousUser } = 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
+
+ // If we are at the end of the video, reset the timer
+ if (video.duration - startTime <= 1) startTime = 0
- let startTime = getStartTime()
+ return startTime
+ }
- // If we are at the end of the video, reset the timer
- if (video.duration - startTime <= 1) startTime = 0
+ const startTime = getStartTime()
const playerCaptions = videoCaptions.map(c => ({
label: c.language.label,
const options: PeertubePlayerManagerOptions = {
common: {
autoplay: this.isAutoplay(),
+ forceAutoplay,
p2pEnabled: isP2PEnabled(video, this.serverConfig, loggedInOrAnonymousUser.p2pEnabled),
hasNextVideo: () => this.hasNextVideo(),
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,
- authorizationHeader: this.authService.getRequestHeaderValue(),
-
embedUrl: video.embedUrl,
embedTitle: video.name,
+ instanceName: this.serverConfig.instance.name,
isLive: video.isLive,
liveOptions,
language: this.localeId,
- serverUrl: environment.apiUrl,
+ 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.originServerUrl || window.location.origin,
+
+ videoFileToken: () => videoFileToken,
+ requiresAuth: videoRequiresAuth(video),
videoCaptions: playerCaptions,
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', () => {
projects / github / Chocobozzz / PeerTube.git / blobdiff