import './embed.scss'
+import '../../assets/player/dock/peertube-dock-component'
+import '../../assets/player/dock/peertube-dock-plugin'
import videojs from 'video.js'
import { peertubeTranslate } from '../../../../shared/core-utils/i18n'
import {
OAuth2ErrorCode,
ResultList,
UserRefreshToken,
+ Video,
VideoCaption,
VideoDetails,
VideoPlaylist,
VideoPlaylistElement,
VideoStreamingPlaylistType
} from '../../../../shared/models'
-import { P2PMediaLoaderOptions, PeertubePlayerManagerOptions, PlayerMode } from '../../assets/player/peertube-player-manager'
+import { P2PMediaLoaderOptions, PeertubePlayerManagerOptions, PlayerMode } from '../../assets/player'
import { VideoJSCaption } from '../../assets/player/peertube-videojs-typings'
import { TranslationsManager } from '../../assets/player/translations-manager'
+import { isP2PEnabled } from '../../assets/player/utils'
+import { getBoolOrDefault } from '../../root-helpers/local-storage-utils'
import { peertubeLocalStorage } from '../../root-helpers/peertube-web-storage'
import { PluginsManager } from '../../root-helpers/plugins-manager'
-import { Tokens } from '../../root-helpers/users'
+import { UserLocalStorageKeys, UserTokens } from '../../root-helpers/users'
import { objectToUrlEncoded } from '../../root-helpers/utils'
import { RegisterClientHelpers } from '../../types/register-client-option.model'
import { PeerTubeEmbedApi } from './embed-api'
title: boolean
warningTitle: boolean
peertubeLink: boolean
+ p2pEnabled: boolean
bigPlayBackgroundColor: string
foregroundColor: string
mode: PlayerMode
scope = 'peertube'
- userTokens: Tokens
+ userTokens: UserTokens
headers = new Headers()
LOCAL_STORAGE_OAUTH_CLIENT_KEYS = {
CLIENT_ID: 'client_id',
private playlistElements: VideoPlaylistElement[]
private currentPlaylistElement: VideoPlaylistElement
- private wrapperElement: HTMLElement
+ private readonly wrapperElement: HTMLElement
private pluginsManager: PluginsManager
- static async main () {
- const videoContainerId = 'video-wrapper'
- const embed = new PeerTubeEmbed(videoContainerId)
- await embed.init()
- }
-
- constructor (private videoWrapperId: string) {
+ constructor (private readonly videoWrapperId: string) {
this.wrapperElement = document.getElementById(this.videoWrapperId)
try {
}
}
+ static async main () {
+ const videoContainerId = 'video-wrapper'
+ const embed = new PeerTubeEmbed(videoContainerId)
+ await embed.init()
+ }
+
getVideoUrl (id: string) {
return window.location.origin + '/api/v1/videos/' + id
}
return res.json()
}).then((obj: UserRefreshToken & { code?: OAuth2ErrorCode }) => {
if (!obj || obj.code === OAuth2ErrorCode.INVALID_GRANT) {
- Tokens.flush()
+ UserTokens.flushLocalStorage(peertubeLocalStorage)
this.removeTokensFromHeaders()
return resolve()
this.userTokens.accessToken = obj.access_token
this.userTokens.refreshToken = obj.refresh_token
- this.userTokens.save()
+ UserTokens.saveToLocalStorage(peertubeLocalStorage, this.userTokens)
this.setHeadersFromTokens()
return refreshingTokenPromise
.catch(() => {
- Tokens.flush()
+ UserTokens.flushLocalStorage(peertubeLocalStorage)
this.removeTokensFromHeaders()
}).then(() => fetch(url, {
}
async init () {
- try {
- this.userTokens = Tokens.load()
- await this.initCore()
- } catch (e) {
- console.error(e)
- }
+ this.userTokens = UserTokens.getUserTokens(peertubeLocalStorage)
+ await this.initCore()
}
private initializeApi () {
this.enableApi = this.getParamToggle(params, 'api', this.enableApi)
this.warningTitle = this.getParamToggle(params, 'warningTitle', true)
this.peertubeLink = this.getParamToggle(params, 'peertubeLink', true)
+ this.p2pEnabled = this.getParamToggle(params, 'p2p', this.isP2PEnabled(video))
this.scope = this.getParamString(params, 'scope', this.scope)
this.subtitle = this.getParamString(params, 'subtitle')
while (total > elements.length && i < 10) {
const result = await this.loadPlaylistElements(playlistId, elements.length)
- const json = await result.json() as ResultList<VideoPlaylistElement>
+ const json = await result.json()
total = json.total
elements = elements.concat(json.data)
// Issue when we parsed config from HTML, fallback to API
if (!this.config) {
this.config = await this.refreshFetch('/api/v1/config')
- .then(res => res.json())
+ .then(res => res.json())
}
const videoInfoPromise = videoResponse.json()
.then((videoInfo: VideoDetails) => {
- if (!alreadyHadPlayer) this.loadPlaceholder(videoInfo)
+ this.loadParams(videoInfo)
+
+ if (!alreadyHadPlayer && !this.autoplay) this.loadPlaceholder(videoInfo)
return videoInfo
})
const PeertubePlayerManager = PeertubePlayerManagerModule.PeertubePlayerManager
const videoCaptions = await this.buildCaptions(serverTranslations, captionsResponse)
- this.loadParams(videoInfo)
-
const playlistPlugin = this.currentPlaylistElement
? {
elements: this.playlistElements,
this.currentPlaylistElement = videoPlaylistElement
this.loadVideoAndBuildPlayer(this.currentPlaylistElement.video.uuid)
- .catch(err => console.error(err))
+ .catch(err => console.error(err))
}
}
: undefined
muted: this.muted,
loop: this.loop,
+ p2pEnabled: this.p2pEnabled,
+
captions: videoCaptions.length !== 0,
subtitle: this.subtitle,
videoCaptions,
inactivityTimeout: 2500,
videoViewUrl: this.getVideoUrl(videoInfo.uuid) + '/views',
+ videoShortUUID: videoInfo.shortUUID,
videoUUID: videoInfo.uuid,
isLive: videoInfo.isLive,
playerElement: this.playerElement,
- onPlayerElementChange: (element: HTMLVideoElement) => this.playerElement = element,
+ onPlayerElementChange: (element: HTMLVideoElement) => {
+ this.playerElement = element
+ },
videoDuration: videoInfo.duration,
enableHotkeys: true,
serverUrl: window.location.origin,
language: navigator.language,
embedUrl: window.location.origin + videoInfo.embedPath,
- embedTitle: videoInfo.name
+ embedTitle: videoInfo.name,
+
+ errorNotifier: () => {
+ // Empty, we don't have a notifier in the embed
+ }
},
webtorrent: {
})
}
- this.player = await PeertubePlayerManager.initialize(this.mode, options, (player: videojs.Player) => 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
+ window['videojsPlayer'] = this.player
this.buildCSS()
- await this.buildDock(videoInfo)
+ this.buildDock(videoInfo)
this.initializeApi()
}
private handleError (err: Error, translations?: { [ id: string ]: string }) {
- if (err.message.indexOf('from xs param') !== -1) {
+ if (err.message.includes('from xs param')) {
this.player.dispose()
this.playerElement = null
this.displayError('This video is not available because the remote instance is not responding.', translations)
- return
}
}
- private async buildDock (videoInfo: VideoDetails) {
+ private buildDock (videoInfo: VideoDetails) {
if (!this.controls) return
// On webtorrent fallback, player may have been disposed
if (!this.player.player_) return
const title = this.title ? videoInfo.name : undefined
-
- const description = this.config.tracker.enabled && this.warningTitle
+ const description = this.warningTitle && this.p2pEnabled
? '<span class="text">' + peertubeTranslate('Watching this video may reveal your IP address to others.') + '</span>'
: undefined
+ const availableAvatars = videoInfo.channel.avatars.filter(a => a.width < 50)
+ const avatar = availableAvatars.length !== 0
+ ? availableAvatars[0]
+ : undefined
+
if (title || description) {
- this.player.dock({
+ this.player.peertubeDock({
title,
- description
+ description,
+ avatarUrl: title && avatar
+ ? avatar.path
+ : undefined
})
}
}
private async buildCaptions (serverTranslations: any, captionsResponse: Response): Promise<VideoJSCaption[]> {
if (captionsResponse.ok) {
- const { data } = (await captionsResponse.json()) as ResultList<VideoCaption>
+ const { data } = await captionsResponse.json()
- return data.map(c => ({
+ return data.map((c: VideoCaption) => ({
label: peertubeTranslate(c.language.label, serverTranslations),
language: c.language.id,
src: window.location.origin + c.captionPath
private getResourceId () {
const urlParts = window.location.pathname.split('/')
- return urlParts[ urlParts.length - 1 ]
+ return urlParts[urlParts.length - 1]
}
private isPlaylistEmbed () {
}
private buildPeerTubeHelpers (translations?: { [ id: string ]: string }): RegisterClientHelpers {
- function unimplemented (): any {
+ const unimplemented = () => {
throw new Error('This helper is not implemented in embed.')
}
return {
getBaseStaticRoute: unimplemented,
-
getBaseRouterRoute: unimplemented,
+ getBasePluginClientPath: unimplemented,
getSettings: unimplemented,
enhancedMarkdownToHTML: unimplemented
},
- translate: (value: string) => {
- return Promise.resolve(peertubeTranslate(value, translations))
- }
+ translate: (value: string) => Promise.resolve(peertubeTranslate(value, translations))
}
}
+
+ private isP2PEnabled (video: Video) {
+ const userP2PEnabled = getBoolOrDefault(
+ peertubeLocalStorage.getItem(UserLocalStorageKeys.P2P_ENABLED),
+ this.config.defaults.p2p.embed.enabled
+ )
+
+ return isP2PEnabled(video, this.config, userP2PEnabled)
+ }
}
PeerTubeEmbed.main()
- .catch(err => console.error('Cannot init embed.', err))
+ .catch(err => {
+ (window as any).displayIncompatibleBrowser()
+
+ console.error('Cannot init embed.', err)
+ })
projects / github / Chocobozzz / PeerTube.git / blobdiff