import videojs from 'video.js'
import { peertubeTranslate } from '../../../../shared/core-utils/i18n'
import {
+ HTMLServerConfig,
+ HttpStatusCode,
+ OAuth2ErrorCode,
ResultList,
- ServerConfig,
UserRefreshToken,
VideoCaption,
VideoDetails,
VideoPlaylist,
VideoPlaylistElement,
- VideoStreamingPlaylistType,
- PluginType,
- ClientHookName
+ VideoStreamingPlaylistType
} from '../../../../shared/models'
import { P2PMediaLoaderOptions, PeertubePlayerManagerOptions, PlayerMode } from '../../assets/player/peertube-player-manager'
import { VideoJSCaption } from '../../assets/player/peertube-videojs-typings'
import { TranslationsManager } from '../../assets/player/translations-manager'
-import { Hooks, loadPlugin, runHook } from '../../root-helpers/plugins'
-import { Tokens } from '../../root-helpers/users'
import { peertubeLocalStorage } from '../../root-helpers/peertube-web-storage'
+import { PluginsManager } from '../../root-helpers/plugins-manager'
+import { Tokens } from '../../root-helpers/users'
import { objectToUrlEncoded } from '../../root-helpers/utils'
-import { PeerTubeEmbedApi } from './embed-api'
import { RegisterClientHelpers } from '../../types/register-client-option.model'
+import { PeerTubeEmbedApi } from './embed-api'
type Translations = { [ id: string ]: string }
CLIENT_SECRET: 'client_secret'
}
+ config: HTMLServerConfig
+
private translationsPromise: Promise<{ [id: string]: string }>
- private configPromise: Promise<ServerConfig>
private PeertubePlayerManagerModulePromise: Promise<any>
private playlist: VideoPlaylist
private playlistElements: VideoPlaylistElement[]
private currentPlaylistElement: VideoPlaylistElement
- private wrapperElement: HTMLElement
+ private readonly wrapperElement: HTMLElement
+
+ private pluginsManager: PluginsManager
- private peertubeHooks: Hooks = {}
- private loadedScripts = new Set<string>()
+ constructor (private readonly videoWrapperId: string) {
+ this.wrapperElement = document.getElementById(this.videoWrapperId)
+
+ try {
+ this.config = JSON.parse(window['PeerTubeServerConfig'])
+ } catch (err) {
+ console.error('Cannot parse HTML config.', err)
+ }
+ }
static async main () {
const videoContainerId = 'video-wrapper'
await embed.init()
}
- constructor (private videoWrapperId: string) {
- this.wrapperElement = document.getElementById(this.videoWrapperId)
- }
-
getVideoUrl (id: string) {
return window.location.origin + '/api/v1/videos/' + id
}
refreshFetch (url: string, options?: RequestInit) {
return fetch(url, options)
.then((res: Response) => {
- if (res.status !== 401) return res
+ if (res.status !== HttpStatusCode.UNAUTHORIZED_401) return res
- const refreshingTokenPromise = new Promise((resolve, reject) => {
+ const refreshingTokenPromise = new Promise<void>((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)
method: 'POST',
body: objectToUrlEncoded(data)
}).then(res => {
- if (res.status === 401) return undefined
+ if (res.status === HttpStatusCode.UNAUTHORIZED_401) return undefined
return res.json()
- }).then((obj: UserRefreshToken & { code: 'invalid_grant'}) => {
- if (!obj || obj.code === 'invalid_grant') {
+ }).then((obj: UserRefreshToken & { code?: OAuth2ErrorCode }) => {
+ if (!obj || obj.code === OAuth2ErrorCode.INVALID_GRANT) {
Tokens.flush()
this.removeTokensFromHeaders()
this.setHeadersFromTokens()
resolve()
+ }).catch((refreshTokenError: any) => {
+ reject(refreshTokenError)
})
- .catch((refreshTokenError: any) => {
- reject(refreshTokenError)
- })
})
return refreshingTokenPromise
return this.refreshFetch(url.toString(), { headers: this.headers })
}
- loadConfig (): Promise<ServerConfig> {
- return this.refreshFetch('/api/v1/config')
- .then(res => res.json())
- }
-
removeElement (element: HTMLElement) {
element.parentElement.removeChild(element)
}
}
async init () {
- try {
- this.userTokens = Tokens.load()
- await this.initCore()
- } catch (e) {
- console.error(e)
- }
+ this.userTokens = Tokens.load()
+ await this.initCore()
}
private initializeApi () {
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)
try {
playlistResponse = await playlistPromise
- isResponseOk = true
+ isResponseOk = playlistResponse.status === HttpStatusCode.OK_200
} catch (err) {
console.error(err)
isResponseOk = false
if (!isResponseOk) {
const serverTranslations = await this.translationsPromise
- if (playlistResponse?.status === 404) {
+ if (playlistResponse?.status === HttpStatusCode.NOT_FOUND_404) {
this.playlistNotFound(serverTranslations)
return undefined
}
try {
videoResponse = await videoPromise
- isResponseOk = true
+ isResponseOk = videoResponse.status === HttpStatusCode.OK_200
} catch (err) {
console.error(err)
if (!isResponseOk) {
const serverTranslations = await this.translationsPromise
- if (videoResponse?.status === 404) {
+ if (videoResponse?.status === HttpStatusCode.NOT_FOUND_404) {
this.videoNotFound(serverTranslations)
return undefined
}
this.playerElement.setAttribute('playsinline', 'true')
this.wrapperElement.appendChild(this.playerElement)
+ // 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())
+ }
+
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 [ videoInfoTmp, serverTranslations, captionsResponse, config, PeertubePlayerManagerModule ] = await Promise.all([
+ const [ videoInfoTmp, serverTranslations, captionsResponse, PeertubePlayerManagerModule ] = await Promise.all([
videoInfoPromise,
this.translationsPromise,
captionsPromise,
- this.configPromise,
this.PeertubePlayerManagerModulePromise
])
- await this.ensurePluginsAreLoaded(config, serverTranslations)
+ await this.loadPlugins(serverTranslations)
const videoInfo: VideoDetails = videoInfoTmp
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
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
+ embedUrl: window.location.origin + videoInfo.embedPath,
+ embedTitle: videoInfo.name
},
webtorrent: {
videoFiles: videoInfo.files
- }
+ },
+
+ pluginsManager: this.pluginsManager
}
if (this.mode === 'p2p-media-loader') {
Object.assign(options, {
p2pMediaLoader: {
- playlistUrl: 'http://localhost:9000/live/toto/master.m3u8',
+ playlistUrl: hlsPlaylist.playlistUrl,
segmentsSha256Url: hlsPlaylist.segmentsSha256Url,
- redundancyBaseUrls: [],
+ redundancyBaseUrls: hlsPlaylist.redundancies.map(r => r.baseUrl),
trackerAnnounce: videoInfo.trackerUrls,
videoFiles: hlsPlaylist.files
} as P2PMediaLoaderOptions
})
}
- 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, config)
+ this.buildDock(videoInfo)
this.initializeApi()
})
}
- this.runHook('action:embed.player.loaded', undefined, { player: this.player, videojs, video: videoInfo })
+ this.pluginsManager.runHook('action:embed.player.loaded', undefined, { player: this.player, videojs, video: videoInfo })
}
private async initCore () {
if (this.userTokens) this.setHeadersFromTokens()
- this.configPromise = this.loadConfig()
this.translationsPromise = TranslationsManager.getServerTranslations(window.location.origin, navigator.language)
this.PeertubePlayerManagerModulePromise = import('../../assets/player/peertube-player-manager')
}
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, config: ServerConfig) {
+ private buildDock (videoInfo: VideoDetails) {
if (!this.controls) return
// On webtorrent fallback, player may have been disposed
const title = this.title ? videoInfo.name : undefined
- const description = config.tracker.enabled && this.warningTitle
+ const description = this.warningTitle && (!videoInfo.isLocal || this.config.tracker.enabled)
? '<span class="text">' + peertubeTranslate('Watching this video may reveal your IP address to others.') + '</span>'
: undefined
- this.player.dock({
- title,
- description
- })
+ if (title || description) {
+ this.player.dock({
+ title,
+ description
+ })
+ }
}
private buildCSS () {
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 () {
return window.location.pathname.split('/')[1] === 'video-playlists'
}
- private async ensurePluginsAreLoaded (config: ServerConfig, translations?: { [ id: string ]: string }) {
- if (config.plugin.registered.length === 0) return
-
- for (const plugin of config.plugin.registered) {
- for (const key of Object.keys(plugin.clientScripts)) {
- const clientScript = plugin.clientScripts[key]
-
- if (clientScript.scopes.includes('embed') === false) continue
-
- const script = `/plugins/${plugin.name}/${plugin.version}/client-scripts/${clientScript.script}`
-
- if (this.loadedScripts.has(script)) continue
+ private loadPlugins (translations?: { [ id: string ]: string }) {
+ this.pluginsManager = new PluginsManager({
+ peertubeHelpersFactory: _ => this.buildPeerTubeHelpers(translations)
+ })
- const pluginInfo = {
- plugin,
- clientScript: {
- script,
- scopes: clientScript.scopes
- },
- pluginType: PluginType.PLUGIN,
- isTheme: false
- }
+ this.pluginsManager.loadPluginsList(this.config)
- await loadPlugin({
- hooks: this.peertubeHooks,
- pluginInfo,
- peertubeHelpersFactory: _ => this.buildPeerTubeHelpers(translations)
- })
- }
- }
+ return this.pluginsManager.ensurePluginsAreLoaded('embed')
}
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,
+
getSettings: unimplemented,
isLoggedIn: unimplemented,
+ getAuthHeader: unimplemented,
notifier: {
info: unimplemented,
showModal: unimplemented,
+ getServerConfig: unimplemented,
+
markdownRenderer: {
textMarkdownToHTML: unimplemented,
enhancedMarkdownToHTML: unimplemented
},
- translate: (value: string) => {
- return Promise.resolve(peertubeTranslate(value, translations))
- }
+ translate: (value: string) => Promise.resolve(peertubeTranslate(value, translations))
}
}
-
- private runHook <T> (hookName: ClientHookName, result?: T, params?: any): Promise<T> {
- return runHook(this.peertubeHooks, hookName, result, params)
- }
}
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