import './embed.scss'
import videojs from 'video.js'
import { peertubeTranslate } from '../../../../shared/core-utils/i18n'
+import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
import {
+ ClientHookName,
+ HTMLServerConfig,
+ PluginType,
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 { peertubeLocalStorage } from '../../root-helpers/peertube-web-storage'
import { Hooks, loadPlugin, runHook } from '../../root-helpers/plugins'
import { Tokens } from '../../root-helpers/users'
-import { peertubeLocalStorage } from '../../root-helpers/peertube-web-storage'
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
constructor (private videoWrapperId: string) {
this.wrapperElement = document.getElementById(this.videoWrapperId)
+
+ try {
+ this.config = JSON.parse(window['PeerTubeServerConfig'])
+ } catch (err) {
+ console.error('Cannot parse HTML config.', err)
+ }
}
getVideoUrl (id: string) {
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'}) => {
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)
}
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)
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.ensurePluginsAreLoaded(serverTranslations)
const videoInfo: VideoDetails = videoInfoTmp
videoCaptions,
inactivityTimeout: 2500,
videoViewUrl: this.getVideoUrl(videoInfo.uuid) + '/views',
+ videoUUID: videoInfo.uuid,
+
+ isLive: videoInfo.isLive,
playerElement: this.playerElement,
onPlayerElementChange: (element: HTMLVideoElement) => this.playerElement = element,
serverUrl: window.location.origin,
language: navigator.language,
- embedUrl: window.location.origin + videoInfo.embedPath
+ embedUrl: window.location.origin + videoInfo.embedPath,
+ embedTitle: videoInfo.name
},
webtorrent: {
this.buildCSS()
- await this.buildDock(videoInfo, config)
+ await this.buildDock(videoInfo)
this.initializeApi()
})
}
- this.runHook('action:embed.player.loaded', undefined, { player: this.player, videojs })
+ this.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 async buildDock (videoInfo: VideoDetails, config: ServerConfig) {
+ private async 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.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
- })
+ if (title || description) {
+ this.player.dock({
+ title,
+ description
+ })
+ }
}
private buildCSS () {
return window.location.pathname.split('/')[1] === 'video-playlists'
}
- private async ensurePluginsAreLoaded (config: ServerConfig, translations?: { [ id: string ]: string }) {
- if (config.plugin.registered.length === 0) return
+ private async ensurePluginsAreLoaded (translations?: { [ id: string ]: string }) {
+ if (this.config.plugin.registered.length === 0) return
- for (const plugin of config.plugin.registered) {
+ for (const plugin of this.config.plugin.registered) {
for (const key of Object.keys(plugin.clientScripts)) {
const clientScript = plugin.clientScripts[key]
await loadPlugin({
hooks: this.peertubeHooks,
pluginInfo,
+ onSettingsScripts: () => undefined,
peertubeHelpersFactory: _ => this.buildPeerTubeHelpers(translations)
})
}
getSettings: unimplemented,
isLoggedIn: unimplemented,
+ getAuthHeader: unimplemented,
notifier: {
info: unimplemented,
showModal: unimplemented,
+ getServerConfig: unimplemented,
+
markdownRenderer: {
textMarkdownToHTML: unimplemented,
enhancedMarkdownToHTML: unimplemented