X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fstandalone%2Fvideos%2Fembed.ts;h=28c10c75cd7b3bbb3c3c8bc9d699e26a8ed6d3d9;hb=f0a3988066f72a28bb44520af072f18d91d77dde;hp=c113c67da3095d9a5e5d4d341f45c76e62387f48;hpb=e0628695c3425bf69b5d7a46b24dcdf31892d9b6;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/standalone/videos/embed.ts b/client/src/standalone/videos/embed.ts index c113c67da..28c10c75c 100644 --- a/client/src/standalone/videos/embed.ts +++ b/client/src/standalone/videos/embed.ts @@ -17,17 +17,19 @@ import 'core-js/es6/set' // For google bot that uses Chrome 41 and does not understand fetch import 'whatwg-fetch' -// FIXME: something weird with our path definition in tsconfig and typings -// @ts-ignore -import * as vjs from 'video.js' - import * as Channel from 'jschannel' import { peertubeTranslate, ResultList, VideoDetails } from '../../../../shared' -import { addContextMenu, getServerTranslations, getVideojsOptions, loadLocaleInVideoJS } from '../../assets/player/peertube-player' import { PeerTubeResolution } from '../player/definitions' import { VideoJSCaption } from '../../assets/player/peertube-videojs-typings' import { VideoCaption } from '../../../../shared/models/videos/caption/video-caption.model' +import { + P2PMediaLoaderOptions, + PeertubePlayerManager, + PeertubePlayerManagerOptions, + PlayerMode +} from '../../assets/player/peertube-player-manager' +import { VideoStreamingPlaylistType } from '../../../../shared/models/videos/video-streaming-playlist.type' /** * Embed API exposes control of the embed player to the outside world via @@ -73,16 +75,16 @@ class PeerTubeEmbedApi { } private setResolution (resolutionId: number) { - if (resolutionId === -1 && this.embed.player.peertube().isAutoResolutionForbidden()) return + if (resolutionId === -1 && this.embed.player.webtorrent().isAutoResolutionForbidden()) return // Auto resolution if (resolutionId === -1) { - this.embed.player.peertube().enableAutoResolution() + this.embed.player.webtorrent().enableAutoResolution() return } - this.embed.player.peertube().disableAutoResolution() - this.embed.player.peertube().updateResolution(resolutionId) + this.embed.player.webtorrent().disableAutoResolution() + this.embed.player.webtorrent().updateResolution(resolutionId) } /** @@ -122,15 +124,17 @@ class PeerTubeEmbedApi { // PeerTube specific capabilities - this.embed.player.peertube().on('autoResolutionUpdate', () => this.loadResolutions()) - this.embed.player.peertube().on('videoFileUpdate', () => this.loadResolutions()) + if (this.embed.player.webtorrent) { + this.embed.player.webtorrent().on('autoResolutionUpdate', () => this.loadWebTorrentResolutions()) + this.embed.player.webtorrent().on('videoFileUpdate', () => this.loadWebTorrentResolutions()) + } } - private loadResolutions () { + private loadWebTorrentResolutions () { let resolutions = [] - let currentResolutionId = this.embed.player.peertube().getCurrentResolutionId() + let currentResolutionId = this.embed.player.webtorrent().getCurrentResolutionId() - for (const videoFile of this.embed.player.peertube().videoFiles) { + for (const videoFile of this.embed.player.webtorrent().videoFiles) { let label = videoFile.resolution.label if (videoFile.fps && videoFile.fps >= 50) { label += videoFile.fps @@ -157,12 +161,15 @@ class PeerTubeEmbed { player: any playerOptions: any api: PeerTubeEmbedApi = null - autoplay = false - controls = true - muted = false - loop = false + autoplay: boolean + controls: boolean + muted: boolean + loop: boolean + subtitle: string enableApi = false startTime: number | string = 0 + stopTime: number | string + mode: PlayerMode scope = 'peertube' static async main () { @@ -191,34 +198,40 @@ class PeerTubeEmbed { element.parentElement.removeChild(element) } - displayError (text: string) { + displayError (text: string, translations?: { [ id: string ]: string }) { // Remove video element if (this.videoElement) this.removeElement(this.videoElement) - document.title = 'Sorry - ' + text + const translatedText = peertubeTranslate(text, translations) + const translatedSorry = peertubeTranslate('Sorry', translations) + + document.title = translatedSorry + ' - ' + translatedText const errorBlock = document.getElementById('error-block') errorBlock.style.display = 'flex' + const errorTitle = document.getElementById('error-title') + errorTitle.innerHTML = peertubeTranslate('Sorry', translations) + const errorText = document.getElementById('error-content') - errorText.innerHTML = text + errorText.innerHTML = translatedText } - videoNotFound () { + videoNotFound (translations?: { [ id: string ]: string }) { const text = 'This video does not exist.' - this.displayError(text) + this.displayError(text, translations) } - videoFetchError () { + videoFetchError (translations?: { [ id: string ]: string }) { const text = 'We cannot fetch the video. Please try again later.' - this.displayError(text) + this.displayError(text, translations) } - getParamToggle (params: URLSearchParams, name: string, defaultValue: boolean) { + getParamToggle (params: URLSearchParams, name: string, defaultValue?: boolean) { return params.has(name) ? (params.get(name) === '1' || params.get(name) === 'true') : defaultValue } - getParamString (params: URLSearchParams, name: string, defaultValue: string) { + getParamString (params: URLSearchParams, name: string, defaultValue?: string) { return params.has(name) ? params.get(name) : defaultValue } @@ -241,36 +254,37 @@ class PeerTubeEmbed { try { let params = new URL(window.location.toString()).searchParams - this.autoplay = this.getParamToggle(params, 'autoplay', this.autoplay) - this.controls = this.getParamToggle(params, 'controls', this.controls) - this.muted = this.getParamToggle(params, 'muted', this.muted) - this.loop = this.getParamToggle(params, 'loop', this.loop) + this.autoplay = this.getParamToggle(params, 'autoplay') + this.controls = this.getParamToggle(params, 'controls') + this.muted = this.getParamToggle(params, 'muted') + this.loop = this.getParamToggle(params, 'loop') this.enableApi = this.getParamToggle(params, 'api', this.enableApi) + this.scope = this.getParamString(params, 'scope', this.scope) + this.subtitle = this.getParamString(params, 'subtitle') + this.startTime = this.getParamString(params, 'start') + this.stopTime = this.getParamString(params, 'stop') - const startTimeParamString = params.get('start') - if (startTimeParamString) this.startTime = startTimeParamString + this.mode = this.getParamString(params, 'mode') === 'p2p-media-loader' ? 'p2p-media-loader' : 'webtorrent' } catch (err) { console.error('Cannot get params from URL.', err) } } private async initCore () { - const urlParts = window.location.href.split('/') - const lastPart = urlParts[ urlParts.length - 1 ] - const videoId = lastPart.indexOf('?') === -1 ? lastPart : lastPart.split('?')[ 0 ] + const urlParts = window.location.pathname.split('/') + const videoId = urlParts[ urlParts.length - 1 ] - const [ , serverTranslations, videoResponse, captionsResponse ] = await Promise.all([ - loadLocaleInVideoJS(window.location.origin, vjs, navigator.language), - getServerTranslations(window.location.origin, navigator.language), + const [ serverTranslations, videoResponse, captionsResponse ] = await Promise.all([ + PeertubePlayerManager.getServerTranslations(window.location.origin, navigator.language), this.loadVideoInfo(videoId), this.loadVideoCaptions(videoId) ]) if (!videoResponse.ok) { - if (videoResponse.status === 404) return this.videoNotFound() + if (videoResponse.status === 404) return this.videoNotFound(serverTranslations) - return this.videoFetchError() + return this.videoFetchError(serverTranslations) } const videoInfo: VideoDetails = await videoResponse.json() @@ -286,49 +300,75 @@ class PeerTubeEmbed { this.loadParams() - const videojsOptions = getVideojsOptions({ - autoplay: this.autoplay, - controls: this.controls, - muted: this.muted, - loop: this.loop, - startTime: this.startTime, - - videoCaptions, - inactivityTimeout: 1500, - videoViewUrl: this.getVideoUrl(videoId) + '/views', - playerElement: this.videoElement, - videoFiles: videoInfo.files, - videoDuration: videoInfo.duration, - enableHotkeys: true, - peertubeLink: true, - poster: window.location.origin + videoInfo.previewPath, - theaterMode: false - }) + const options: PeertubePlayerManagerOptions = { + common: { + autoplay: this.autoplay, + controls: this.controls, + muted: this.muted, + loop: this.loop, + captions: videoCaptions.length !== 0, + startTime: this.startTime, + stopTime: this.stopTime, + subtitle: this.subtitle, + + videoCaptions, + inactivityTimeout: 1500, + videoViewUrl: this.getVideoUrl(videoId) + '/views', + + playerElement: this.videoElement, + onPlayerElementChange: (element: HTMLVideoElement) => this.videoElement = element, + + videoDuration: videoInfo.duration, + enableHotkeys: true, + peertubeLink: true, + poster: window.location.origin + videoInfo.previewPath, + theaterMode: false, + + serverUrl: window.location.origin, + language: navigator.language, + embedUrl: window.location.origin + videoInfo.embedPath + }, + + webtorrent: { + videoFiles: videoInfo.files + } + } - this.playerOptions = videojsOptions - this.player = vjs(this.videoContainerId, videojsOptions, () => { - this.player.on('customError', (event: any, data: any) => this.handleError(data.err)) + if (this.mode === 'p2p-media-loader') { + const hlsPlaylist = videoInfo.streamingPlaylists.find(p => p.type === VideoStreamingPlaylistType.HLS) + + Object.assign(options, { + p2pMediaLoader: { + playlistUrl: hlsPlaylist.playlistUrl, + segmentsSha256Url: hlsPlaylist.segmentsSha256Url, + redundancyBaseUrls: hlsPlaylist.redundancies.map(r => r.baseUrl), + trackerAnnounce: videoInfo.trackerUrls, + videoFiles: videoInfo.files + } as P2PMediaLoaderOptions + }) + } - window[ 'videojsPlayer' ] = this.player + this.player = await PeertubePlayerManager.initialize(this.mode, options) - if (this.controls) { - this.player.dock({ - title: videoInfo.name, - description: this.player.localize('Uses P2P, others may know your IP is downloading this video.') - }) - } + this.player.on('customError', (event: any, data: any) => this.handleError(data.err, serverTranslations)) - addContextMenu(this.player, window.location.origin + videoInfo.embedPath) + window[ 'videojsPlayer' ] = this.player - this.initializeApi() - }) + if (this.controls) { + this.player.dock({ + title: videoInfo.name, + description: this.player.localize('Uses P2P, others may know your IP is downloading this video.') + }) + } + + this.initializeApi() } - private handleError (err: Error) { + private handleError (err: Error, translations?: { [ id: string ]: string }) { if (err.message.indexOf('from xs param') !== -1) { this.player.dispose() this.videoElement = null - this.displayError('This video is not available because the remote instance is not responding.') + this.displayError('This video is not available because the remote instance is not responding.', translations) return } }