import './embed.scss'
-
+import videojs from 'video.js'
+import { objectToUrlEncoded, peertubeLocalStorage, PureAuthUser } from '@root-helpers/index'
import {
- getCompleteLocale,
- is18nLocale,
- isDefaultLocale,
peertubeTranslate,
ResultList,
ServerConfig,
- VideoDetails
-} from '../../../../shared'
+ UserRefreshToken,
+ VideoCaption,
+ VideoDetails,
+ VideoStreamingPlaylistType
+} from '../../../../shared/models'
+import { P2PMediaLoaderOptions, PeertubePlayerManagerOptions, PlayerMode } from '../../assets/player/peertube-player-manager'
import { VideoJSCaption } from '../../assets/player/peertube-videojs-typings'
-import { VideoCaption } from '../../../../shared/models/videos/caption/video-caption.model'
-import {
- P2PMediaLoaderOptions,
- PeertubePlayerManagerOptions,
- PlayerMode
-} from '../../assets/player/peertube-player-manager'
-import { VideoStreamingPlaylistType } from '../../../../shared/models/videos/video-streaming-playlist.type'
-import { PeerTubeEmbedApi } from './embed-api'
import { TranslationsManager } from '../../assets/player/translations-manager'
+import { PeerTubeEmbedApi } from './embed-api'
+
+type Translations = { [ id: string ]: string }
export class PeerTubeEmbed {
videoElement: HTMLVideoElement
- player: any
+ player: videojs.Player
api: PeerTubeEmbedApi = null
autoplay: boolean
controls: boolean
title: boolean
warningTitle: boolean
+ peertubeLink: boolean
bigPlayBackgroundColor: string
foregroundColor: string
mode: PlayerMode
scope = 'peertube'
+ user: PureAuthUser
+ headers = new Headers()
+ LOCAL_STORAGE_OAUTH_CLIENT_KEYS = {
+ CLIENT_ID: 'client_id',
+ CLIENT_SECRET: 'client_secret'
+ }
+
static async main () {
const videoContainerId = 'video-container'
const embed = new PeerTubeEmbed(videoContainerId)
return window.location.origin + '/api/v1/videos/' + id
}
+ refreshFetch (url: string, options?: Object) {
+ return fetch(url, options)
+ .then((res: Response) => {
+ if (res.status !== 401) return res
+
+ // 401 unauthorized is not catch-ed, but then-ed
+ const error = res
+
+ const refreshingTokenPromise = new Promise((resolve, reject) => {
+ const clientId: string = peertubeLocalStorage.getItem(this.LOCAL_STORAGE_OAUTH_CLIENT_KEYS.CLIENT_ID)
+ const clientSecret: string = peertubeLocalStorage.getItem(this.LOCAL_STORAGE_OAUTH_CLIENT_KEYS.CLIENT_SECRET)
+ const headers = new Headers()
+ headers.set('Content-Type', 'application/x-www-form-urlencoded')
+ const data = {
+ refresh_token: this.user.getRefreshToken(),
+ client_id: clientId,
+ client_secret: clientSecret,
+ response_type: 'code',
+ grant_type: 'refresh_token'
+ }
+
+ fetch('/api/v1/users/token', {
+ headers,
+ method: 'POST',
+ body: objectToUrlEncoded(data)
+ })
+ .then(res => res.json())
+ .then((obj: UserRefreshToken) => {
+ this.user.refreshTokens(obj.access_token, obj.refresh_token)
+ this.user.save()
+ this.headers.set('Authorization', `${this.user.getTokenType()} ${this.user.getAccessToken()}`)
+ resolve()
+ })
+ .catch((refreshTokenError: any) => {
+ reject(refreshTokenError)
+ })
+ })
+
+ return refreshingTokenPromise
+ .catch(() => {
+ // If refreshing fails, continue with original error
+ throw error
+ })
+ .then(() => fetch(url, {
+ ...options,
+ headers: this.headers
+ }))
+ })
+ }
+
loadVideoInfo (videoId: string): Promise<Response> {
- return fetch(this.getVideoUrl(videoId))
+ return this.refreshFetch(this.getVideoUrl(videoId), { headers: this.headers })
}
loadVideoCaptions (videoId: string): Promise<Response> {
element.parentElement.removeChild(element)
}
- displayError (text: string, translations?: { [ id: string ]: string }) {
+ displayError (text: string, translations?: Translations) {
// Remove video element
if (this.videoElement) this.removeElement(this.videoElement)
errorText.innerHTML = translatedText
}
- videoNotFound (translations?: { [ id: string ]: string }) {
+ videoNotFound (translations?: Translations) {
const text = 'This video does not exist.'
this.displayError(text, translations)
}
- videoFetchError (translations?: { [ id: string ]: string }) {
+ videoFetchError (translations?: Translations) {
const text = 'We cannot fetch the video. Please try again later.'
this.displayError(text, translations)
}
async init () {
try {
+ this.user = PureAuthUser.load()
await this.initCore()
} catch (e) {
console.error(e)
this.autoplay = this.getParamToggle(params, 'autoplay', false)
this.controls = this.getParamToggle(params, 'controls', true)
- this.muted = this.getParamToggle(params, 'muted', false)
+ this.muted = this.getParamToggle(params, 'muted', undefined)
this.loop = this.getParamToggle(params, 'loop', false)
this.title = this.getParamToggle(params, 'title', true)
this.enableApi = this.getParamToggle(params, 'api', this.enableApi)
this.warningTitle = this.getParamToggle(params, 'warningTitle', true)
+ this.peertubeLink = this.getParamToggle(params, 'peertubeLink', true)
this.scope = this.getParamString(params, 'scope', this.scope)
this.subtitle = this.getParamString(params, 'subtitle')
const urlParts = window.location.pathname.split('/')
const videoId = urlParts[ urlParts.length - 1 ]
+ if (this.user) {
+ this.headers.set('Authorization', `${this.user.getTokenType()} ${this.user.getAccessToken()}`)
+ }
+
const videoPromise = this.loadVideoInfo(videoId)
const captionsPromise = this.loadVideoCaptions(videoId)
const configPromise = this.loadConfig()
subtitle: this.subtitle,
videoCaptions,
- inactivityTimeout: 1500,
+ inactivityTimeout: 2500,
videoViewUrl: this.getVideoUrl(videoId) + '/views',
playerElement: this.videoElement,
videoDuration: videoInfo.duration,
enableHotkeys: true,
- peertubeLink: true,
+ peertubeLink: this.peertubeLink,
poster: window.location.origin + videoInfo.previewPath,
theaterButton: false,
})
}
- this.player = await PeertubePlayerManager.initialize(this.mode, options, (player: any) => this.player = player)
+ this.player = await PeertubePlayerManager.initialize(this.mode, options, (player: videojs.Player) => this.player = player)
this.player.on('customError', (event: any, data: any) => this.handleError(data.err, serverTranslations))
window[ 'videojsPlayer' ] = this.player
}
private async buildDock (videoInfo: VideoDetails, configResponse: Response) {
- if (this.controls) {
- const title = this.title ? videoInfo.name : undefined
+ if (!this.controls) return
- const config: ServerConfig = await configResponse.json()
- const description = config.tracker.enabled && this.warningTitle
- ? '<span class="text">' + this.player.localize('Watching this video may reveal your IP address to others.') + '</span>'
- : undefined
+ // On webtorrent fallback, player may have been disposed
+ if (!this.player.player_) return
- this.player.dock({
- title,
- description
- })
- }
+ const title = this.title ? videoInfo.name : undefined
+
+ const config: ServerConfig = await configResponse.json()
+ const description = config.tracker.enabled && this.warningTitle
+ ? '<span class="text">' + peertubeTranslate('Watching this video may reveal your IP address to others.') + '</span>'
+ : undefined
+
+ this.player.dock({
+ title,
+ description
+ })
}
private buildCSS () {
projects / github / Chocobozzz / PeerTube.git / blobdiff