} 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,
playlist: VideoPlaylist = null
remoteServerDown = false
+ noPlaylistVideoFound = false
private nextVideoUUID = ''
private nextVideoTitle = ''
+ private videoFileToken: string
+
private currentTime: number
private paramsSub: Subscription
private pluginService: PluginService,
private peertubeSocket: PeerTubeSocket,
private screenService: ScreenService,
+ private videoFileTokenService: VideoFileTokenService,
private location: PlatformLocation,
@Inject(LOCALE_ID) private localeId: string
) { }
this.loadVideo(videoId)
}
+ onPlaylistNoVideoFound () {
+ this.noPlaylistVideoFound = true
+ }
+
isUserLoggedIn () {
return this.authService.isLoggedIn()
}
: 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
}
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 = {
peertubeLink: false
}
- this.onVideoFetched({ video, live, videoCaptions: captionsResult.data, loggedInOrAnonymousUser, urlOptions })
+ this.onVideoFetched({ video, live, videoCaptions: captionsResult.data, videoFileToken, loggedInOrAnonymousUser, urlOptions })
.catch(err => this.handleGlobalError(err))
},
private loadPlaylist (playlistId: string) {
if (this.isSameElement(this.playlist, playlistId)) return
+ this.noPlaylistVideoFound = false
+
this.playlistService.getVideoPlaylist(playlistId)
.subscribe({
next: playlist => {
video: VideoDetails
live: LiveVideo
videoCaptions: VideoCaption[]
+ videoFileToken: string
+
urlOptions: URLOptions
loggedInOrAnonymousUser: User
}) {
- const { video, live, videoCaptions, urlOptions, loggedInOrAnonymousUser } = options
+ const { video, live, videoCaptions, urlOptions, videoFileToken, loggedInOrAnonymousUser } = options
this.subscribeToLiveEventsIfNeeded(this.video, video)
this.video = video
this.videoCaptions = videoCaptions
this.liveVideo = live
+ this.videoFileToken = videoFileToken
// Re init attributes
this.playerPlaceholderImgSrc = undefined
}
this.buildPlayer(urlOptions, loggedInOrAnonymousUser)
- .catch(err => console.error('Cannot build the player', err))
+ .catch(err => logger.error('Cannot build the player', err))
this.setOpenGraphTags()
video: this.video,
videoCaptions: this.videoCaptions,
liveVideo: this.liveVideo,
+ videoFileToken: this.videoFileToken,
urlOptions,
loggedInOrAnonymousUser,
user: this.user
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
user?: AuthUser // Keep for plugins
}) {
- const { video, liveVideo, videoCaptions, urlOptions, loggedInOrAnonymousUser } = params
+ const { video, liveVideo, videoCaptions, videoFileToken, urlOptions, loggedInOrAnonymousUser } = params
const getStartTime = () => {
const byUrl = urlOptions.startTime !== undefined
startTime,
stopTime: urlOptions.stopTime,
+ controlBar: urlOptions.controlBar,
controls: urlOptions.controls,
muted: urlOptions.muted,
loop: urlOptions.loop,
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,
+ 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
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
}