X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fstandalone%2Fvideos%2Fembed.ts;h=334f386b6b53fd6078eca27c7e7635c591c81ada;hb=171efc48e67498406feb6d7873b3482b41505515;hp=8d1720f7565f5775663d91924dfa248f99ea3f24;hpb=6fad8e51c47b9d07bea99b777c1f55c10f6d576d;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/standalone/videos/embed.ts b/client/src/standalone/videos/embed.ts index 8d1720f75..334f386b6 100644 --- a/client/src/standalone/videos/embed.ts +++ b/client/src/standalone/videos/embed.ts @@ -1,11 +1,11 @@ import './embed.scss' import videojs from 'video.js' -import { objectToUrlEncoded, peertubeLocalStorage } from '@root-helpers/index' -import { Tokens } from '@root-helpers/users' import { peertubeTranslate } from '../../../../shared/core-utils/i18n' import { + HTMLServerConfig, + HttpStatusCode, + OAuth2ErrorCode, ResultList, - ServerConfig, UserRefreshToken, VideoCaption, VideoDetails, @@ -16,6 +16,11 @@ import { 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 { PluginsManager } from '../../root-helpers/plugins-manager' +import { Tokens } from '../../root-helpers/users' +import { objectToUrlEncoded } from '../../root-helpers/utils' +import { RegisterClientHelpers } from '../../types/register-client-option.model' import { PeerTubeEmbedApi } from './embed-api' type Translations = { [ id: string ]: string } @@ -50,8 +55,9 @@ export class PeerTubeEmbed { CLIENT_SECRET: 'client_secret' } + config: HTMLServerConfig + private translationsPromise: Promise<{ [id: string]: string }> - private configPromise: Promise private PeertubePlayerManagerModulePromise: Promise private playlist: VideoPlaylist @@ -60,6 +66,8 @@ export class PeerTubeEmbed { private wrapperElement: HTMLElement + private pluginsManager: PluginsManager + static async main () { const videoContainerId = 'video-wrapper' const embed = new PeerTubeEmbed(videoContainerId) @@ -68,25 +76,30 @@ export class PeerTubeEmbed { 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) { return window.location.origin + '/api/v1/videos/' + id } - refreshFetch (url: string, options?: Object) { + 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 - // 401 unauthorized is not catch-ed, but then-ed - const error = res - - const refreshingTokenPromise = new Promise((resolve, reject) => { + 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.userTokens.refreshToken, client_id: clientId, @@ -99,28 +112,36 @@ export class PeerTubeEmbed { headers, method: 'POST', body: objectToUrlEncoded(data) + }).then(res => { + if (res.status === HttpStatusCode.UNAUTHORIZED_401) return undefined + + return res.json() + }).then((obj: UserRefreshToken & { code?: OAuth2ErrorCode }) => { + if (!obj || obj.code === OAuth2ErrorCode.INVALID_GRANT) { + Tokens.flush() + this.removeTokensFromHeaders() + + return resolve() + } + + this.userTokens.accessToken = obj.access_token + this.userTokens.refreshToken = obj.refresh_token + this.userTokens.save() + + this.setHeadersFromTokens() + + resolve() + }).catch((refreshTokenError: any) => { + reject(refreshTokenError) }) - .then(res => res.json()) - .then((obj: UserRefreshToken) => { - this.userTokens.accessToken = obj.access_token - this.userTokens.refreshToken = obj.refresh_token - this.userTokens.save() - - this.setHeadersFromTokens() - - resolve() - }) - .catch((refreshTokenError: any) => { - reject(refreshTokenError) - }) }) return refreshingTokenPromise .catch(() => { - // If refreshing fails, continue with original error - throw error - }) - .then(() => fetch(url, { + Tokens.flush() + + this.removeTokensFromHeaders() + }).then(() => fetch(url, { ...options, headers: this.headers })) @@ -136,23 +157,18 @@ export class PeerTubeEmbed { } loadVideoCaptions (videoId: string): Promise { - return fetch(this.getVideoUrl(videoId) + '/captions') + return this.refreshFetch(this.getVideoUrl(videoId) + '/captions', { headers: this.headers }) } loadPlaylistInfo (playlistId: string): Promise { - return fetch(this.getPlaylistUrl(playlistId)) + return this.refreshFetch(this.getPlaylistUrl(playlistId), { headers: this.headers }) } loadPlaylistElements (playlistId: string, start = 0): Promise { const url = new URL(this.getPlaylistUrl(playlistId) + '/videos') url.search = new URLSearchParams({ start: '' + start, count: '100' }).toString() - return fetch(url.toString()) - } - - loadConfig (): Promise { - return fetch('/api/v1/config') - .then(res => res.json()) + return this.refreshFetch(url.toString(), { headers: this.headers }) } removeElement (element: HTMLElement) { @@ -318,12 +334,21 @@ export class PeerTubeEmbed { const playlistPromise = this.loadPlaylistInfo(playlistId) const playlistElementsPromise = this.loadPlaylistElements(playlistId) - const playlistResponse = await playlistPromise + let playlistResponse: Response + let isResponseOk: boolean + + try { + playlistResponse = await playlistPromise + isResponseOk = playlistResponse.status === HttpStatusCode.OK_200 + } catch (err) { + console.error(err) + isResponseOk = false + } - if (!playlistResponse.ok) { + if (!isResponseOk) { const serverTranslations = await this.translationsPromise - if (playlistResponse.status === 404) { + if (playlistResponse?.status === HttpStatusCode.NOT_FOUND_404) { this.playlistNotFound(serverTranslations) return undefined } @@ -338,12 +363,22 @@ export class PeerTubeEmbed { private async loadVideo (videoId: string) { const videoPromise = this.loadVideoInfo(videoId) - const videoResponse = await videoPromise + let videoResponse: Response + let isResponseOk: boolean - if (!videoResponse.ok) { + try { + videoResponse = await videoPromise + isResponseOk = videoResponse.status === HttpStatusCode.OK_200 + } catch (err) { + console.error(err) + + isResponseOk = false + } + + if (!isResponseOk) { const serverTranslations = await this.translationsPromise - if (videoResponse.status === 404) { + if (videoResponse?.status === HttpStatusCode.NOT_FOUND_404) { this.videoNotFound(serverTranslations) return undefined } @@ -431,6 +466,12 @@ export class PeerTubeEmbed { 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) @@ -438,14 +479,15 @@ export class PeerTubeEmbed { 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.loadPlugins(serverTranslations) + const videoInfo: VideoDetails = videoInfoTmp const PeertubePlayerManager = PeertubePlayerManagerModule.PeertubePlayerManager @@ -494,6 +536,10 @@ export class PeerTubeEmbed { 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, @@ -506,12 +552,15 @@ export class PeerTubeEmbed { 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') { @@ -535,7 +584,7 @@ export class PeerTubeEmbed { this.buildCSS() - await this.buildDock(videoInfo, config) + await this.buildDock(videoInfo) this.initializeApi() @@ -550,12 +599,13 @@ export class PeerTubeEmbed { this.playNextVideo() }) } + + 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') @@ -610,7 +660,7 @@ export class PeerTubeEmbed { } } - private async buildDock (videoInfo: VideoDetails, config: ServerConfig) { + private async buildDock (videoInfo: VideoDetails) { if (!this.controls) return // On webtorrent fallback, player may have been disposed @@ -618,14 +668,16 @@ export class PeerTubeEmbed { const title = this.title ? videoInfo.name : undefined - const description = config.tracker.enabled && this.warningTitle + const description = this.config.tracker.enabled && this.warningTitle ? '' + peertubeTranslate('Watching this video may reveal your IP address to others.') + '' : undefined - this.player.dock({ - title, - description - }) + if (title || description) { + this.player.dock({ + title, + description + }) + } } private buildCSS () { @@ -675,6 +727,10 @@ export class PeerTubeEmbed { this.headers.set('Authorization', `${this.userTokens.tokenType} ${this.userTokens.accessToken}`) } + private removeTokensFromHeaders () { + this.headers.delete('Authorization') + } + private getResourceId () { const urlParts = window.location.pathname.split('/') return urlParts[ urlParts.length - 1 ] @@ -683,6 +739,52 @@ export class PeerTubeEmbed { private isPlaylistEmbed () { return window.location.pathname.split('/')[1] === 'video-playlists' } + + private loadPlugins (translations?: { [ id: string ]: string }) { + this.pluginsManager = new PluginsManager({ + peertubeHelpersFactory: _ => this.buildPeerTubeHelpers(translations) + }) + + this.pluginsManager.loadPluginsList(this.config) + + return this.pluginsManager.ensurePluginsAreLoaded('embed') + } + + private buildPeerTubeHelpers (translations?: { [ id: string ]: string }): RegisterClientHelpers { + function unimplemented (): any { + throw new Error('This helper is not implemented in embed.') + } + + return { + getBaseStaticRoute: unimplemented, + + getBaseRouterRoute: unimplemented, + + getSettings: unimplemented, + + isLoggedIn: unimplemented, + getAuthHeader: unimplemented, + + notifier: { + info: unimplemented, + error: unimplemented, + success: unimplemented + }, + + showModal: unimplemented, + + getServerConfig: unimplemented, + + markdownRenderer: { + textMarkdownToHTML: unimplemented, + enhancedMarkdownToHTML: unimplemented + }, + + translate: (value: string) => { + return Promise.resolve(peertubeTranslate(value, translations)) + } + } + } } PeerTubeEmbed.main()