X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fstandalone%2Fvideos%2Fembed.ts;h=ae8f176b73aa00837c4ca5177ed2b0752c115224;hb=c713017f3cd2d617da22c24c579342ec4121cfcd;hp=a7fb087b19995a51fad3ff57983302cfa638d93f;hpb=9054a8b6e522dd8d46260dca85e9de94a2d806cf;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/standalone/videos/embed.ts b/client/src/standalone/videos/embed.ts index a7fb087b1..ae8f176b7 100644 --- a/client/src/standalone/videos/embed.ts +++ b/client/src/standalone/videos/embed.ts @@ -1,7 +1,5 @@ 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 { ResultList, @@ -11,12 +9,20 @@ import { VideoDetails, VideoPlaylist, VideoPlaylistElement, - VideoStreamingPlaylistType + VideoStreamingPlaylistType, + PluginType, + ClientHookName } from '../../../../shared/models' +import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes' 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 { objectToUrlEncoded } from '../../root-helpers/utils' import { PeerTubeEmbedApi } from './embed-api' +import { RegisterClientHelpers } from '../../types/register-client-option.model' type Translations = { [ id: string ]: string } @@ -60,6 +66,9 @@ export class PeerTubeEmbed { private wrapperElement: HTMLElement + private peertubeHooks: Hooks = {} + private loadedScripts = new Set() + static async main () { const videoContainerId = 'video-wrapper' const embed = new PeerTubeEmbed(videoContainerId) @@ -74,19 +83,18 @@ export class PeerTubeEmbed { 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 - - // 401 unauthorized is not catch-ed, but then-ed - const error = res + if (res.status !== HttpStatusCode.UNAUTHORIZED_401) return 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 +107,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: 'invalid_grant'}) => { + if (!obj || obj.code === '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,22 +152,22 @@ 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()) + return this.refreshFetch(url.toString(), { headers: this.headers }) } loadConfig (): Promise { - return fetch('/api/v1/config') + return this.refreshFetch('/api/v1/config') .then(res => res.json()) } @@ -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 } @@ -438,7 +473,7 @@ export class PeerTubeEmbed { return videoInfo }) - const [ videoInfo, serverTranslations, captionsResponse, config, PeertubePlayerManagerModule ] = await Promise.all([ + const [ videoInfoTmp, serverTranslations, captionsResponse, config, PeertubePlayerManagerModule ] = await Promise.all([ videoInfoPromise, this.translationsPromise, captionsPromise, @@ -446,6 +481,10 @@ export class PeerTubeEmbed { this.PeertubePlayerManagerModulePromise ]) + await this.ensurePluginsAreLoaded(config, serverTranslations) + + const videoInfo: VideoDetails = videoInfoTmp + const PeertubePlayerManager = PeertubePlayerManagerModule.PeertubePlayerManager const videoCaptions = await this.buildCaptions(serverTranslations, captionsResponse) @@ -492,6 +531,9 @@ export class PeerTubeEmbed { videoCaptions, inactivityTimeout: 2500, videoViewUrl: this.getVideoUrl(videoInfo.uuid) + '/views', + videoUUID: videoInfo.uuid, + + isLive: videoInfo.isLive, playerElement: this.playerElement, onPlayerElementChange: (element: HTMLVideoElement) => this.playerElement = element, @@ -504,7 +546,8 @@ 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: { @@ -548,6 +591,8 @@ export class PeerTubeEmbed { this.playNextVideo() }) } + + this.runHook('action:embed.player.loaded', undefined, { player: this.player, videojs, video: videoInfo }) } private async initCore () { @@ -620,10 +665,12 @@ export class PeerTubeEmbed { ? '' + 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 () { @@ -673,6 +720,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 ] @@ -681,6 +732,75 @@ export class PeerTubeEmbed { 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 + + const pluginInfo = { + plugin, + clientScript: { + script, + scopes: clientScript.scopes + }, + pluginType: PluginType.PLUGIN, + isTheme: false + } + + await loadPlugin({ + hooks: this.peertubeHooks, + pluginInfo, + peertubeHelpersFactory: _ => this.buildPeerTubeHelpers(translations) + }) + } + } + } + + private buildPeerTubeHelpers (translations?: { [ id: string ]: string }): RegisterClientHelpers { + function unimplemented (): any { + throw new Error('This helper is not implemented in embed.') + } + + return { + getBaseStaticRoute: unimplemented, + + getSettings: unimplemented, + + isLoggedIn: 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)) + } + } + } + + private runHook (hookName: ClientHookName, result?: T, params?: any): Promise { + return runHook(this.peertubeHooks, hookName, result, params) + } } PeerTubeEmbed.main()