import './embed.scss'
+import '../../assets/player/shared/dock/peertube-dock-component'
+import '../../assets/player/shared/dock/peertube-dock-plugin'
import videojs from 'video.js'
import { peertubeTranslate } from '../../../../shared/core-utils/i18n'
import {
HTMLServerConfig,
HttpStatusCode,
+ LiveVideo,
OAuth2ErrorCode,
ResultList,
UserRefreshToken,
+ Video,
VideoCaption,
VideoDetails,
VideoPlaylist,
VideoPlaylistElement,
VideoStreamingPlaylistType
} from '../../../../shared/models'
-import { P2PMediaLoaderOptions, PeertubePlayerManagerOptions, PlayerMode } from '../../assets/player/peertube-player-manager'
-import { VideoJSCaption } from '../../assets/player/peertube-videojs-typings'
+import { P2PMediaLoaderOptions, PeertubePlayerManagerOptions, PlayerMode, VideoJSCaption } from '../../assets/player'
import { TranslationsManager } from '../../assets/player/translations-manager'
+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 { isP2PEnabled } from '../../root-helpers/video'
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',
return window.location.origin + '/api/v1/videos/' + id
}
+ getLiveUrl (videoId: string) {
+ return window.location.origin + '/api/v1/videos/live/' + videoId
+ }
+
refreshFetch (url: string, options?: RequestInit) {
return fetch(url, options)
.then((res: Response) => {
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, {
return this.refreshFetch(this.getVideoUrl(videoId) + '/captions', { headers: this.headers })
}
+ loadWithLive (video: VideoDetails) {
+ return this.refreshFetch(this.getLiveUrl(video.uuid), { headers: this.headers })
+ .then(res => res.json())
+ .then((live: LiveVideo) => ({ video, live }))
+ }
+
loadPlaylistInfo (playlistId: string): Promise<Response> {
return this.refreshFetch(this.getPlaylistUrl(playlistId), { headers: this.headers })
}
}
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')
.then(res => res.json())
}
- const videoInfoPromise = videoResponse.json()
+ const videoInfoPromise: Promise<{ video: VideoDetails, live?: LiveVideo }> = videoResponse.json()
.then((videoInfo: VideoDetails) => {
this.loadParams(videoInfo)
- if (!alreadyHadPlayer && !this.autoplay) this.loadPlaceholder(videoInfo)
+ if (!alreadyHadPlayer && !this.autoplay) this.buildPlaceholder(videoInfo)
- return videoInfo
+ if (!videoInfo.isLive) return { video: videoInfo }
+
+ return this.loadWithLive(videoInfo)
})
const [ videoInfoTmp, serverTranslations, captionsResponse, PeertubePlayerManagerModule ] = await Promise.all([
await this.loadPlugins(serverTranslations)
- const videoInfo: VideoDetails = videoInfoTmp
+ const { video: videoInfo, live } = videoInfoTmp
const PeertubePlayerManager = PeertubePlayerManagerModule.PeertubePlayerManager
const videoCaptions = await this.buildCaptions(serverTranslations, captionsResponse)
+ const liveOptions = videoInfo.isLive
+ ? { latencyMode: live.latencyMode }
+ : undefined
+
const playlistPlugin = this.currentPlaylistElement
? {
elements: this.playlistElements,
muted: this.muted,
loop: this.loop,
+ p2pEnabled: this.p2pEnabled,
+
captions: videoCaptions.length !== 0,
subtitle: this.subtitle,
videoUUID: videoInfo.uuid,
isLive: videoInfo.isLive,
+ liveOptions,
playerElement: this.playerElement,
onPlayerElementChange: (element: HTMLVideoElement) => {
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.buildCSS()
- await this.buildDock(videoInfo)
+ this.buildDock(videoInfo)
this.initializeApi()
this.player.dispose()
this.playerElement = null
this.displayError('This video is not available because the remote instance is not responding.', translations)
-
}
}
- 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
})
}
}
return []
}
- private loadPlaceholder (video: VideoDetails) {
+ private buildPlaceholder (video: VideoDetails) {
const placeholder = this.getPlaceholderElement()
const url = window.location.origin + video.previewPath
return {
getBaseStaticRoute: unimplemented,
-
getBaseRouterRoute: unimplemented,
+ getBasePluginClientPath: unimplemented,
getSettings: unimplemented,
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