X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fstandalone%2Fvideos%2Fembed.ts;h=334f386b6b53fd6078eca27c7e7635c591c81ada;hb=171efc48e67498406feb6d7873b3482b41505515;hp=995e8c27781b4df05080751555d72ed6967dae18;hpb=781ba981263ee6524fea1a95836108d252a124f4;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/standalone/videos/embed.ts b/client/src/standalone/videos/embed.ts index 995e8c277..334f386b6 100644 --- a/client/src/standalone/videos/embed.ts +++ b/client/src/standalone/videos/embed.ts @@ -2,26 +2,26 @@ import './embed.scss' 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 } @@ -55,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 @@ -65,8 +66,7 @@ export class PeerTubeEmbed { private wrapperElement: HTMLElement - private peertubeHooks: Hooks = {} - private loadedScripts = new Set() + private pluginsManager: PluginsManager static async main () { const videoContainerId = 'video-wrapper' @@ -76,6 +76,12 @@ 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) { @@ -85,9 +91,9 @@ export class PeerTubeEmbed { 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((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) @@ -107,11 +113,11 @@ export class PeerTubeEmbed { 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() @@ -125,10 +131,9 @@ export class PeerTubeEmbed { this.setHeadersFromTokens() resolve() + }).catch((refreshTokenError: any) => { + reject(refreshTokenError) }) - .catch((refreshTokenError: any) => { - reject(refreshTokenError) - }) }) return refreshingTokenPromise @@ -166,11 +171,6 @@ export class PeerTubeEmbed { return this.refreshFetch(url.toString(), { headers: this.headers }) } - loadConfig (): Promise { - return this.refreshFetch('/api/v1/config') - .then(res => res.json()) - } - removeElement (element: HTMLElement) { element.parentElement.removeChild(element) } @@ -339,7 +339,7 @@ export class PeerTubeEmbed { try { playlistResponse = await playlistPromise - isResponseOk = true + isResponseOk = playlistResponse.status === HttpStatusCode.OK_200 } catch (err) { console.error(err) isResponseOk = false @@ -348,7 +348,7 @@ export class PeerTubeEmbed { if (!isResponseOk) { const serverTranslations = await this.translationsPromise - if (playlistResponse?.status === 404) { + if (playlistResponse?.status === HttpStatusCode.NOT_FOUND_404) { this.playlistNotFound(serverTranslations) return undefined } @@ -368,7 +368,7 @@ export class PeerTubeEmbed { try { videoResponse = await videoPromise - isResponseOk = true + isResponseOk = videoResponse.status === HttpStatusCode.OK_200 } catch (err) { console.error(err) @@ -378,7 +378,7 @@ export class PeerTubeEmbed { if (!isResponseOk) { const serverTranslations = await this.translationsPromise - if (videoResponse?.status === 404) { + if (videoResponse?.status === HttpStatusCode.NOT_FOUND_404) { this.videoNotFound(serverTranslations) return undefined } @@ -466,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) @@ -473,15 +479,14 @@ 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.ensurePluginsAreLoaded(config, serverTranslations) + await this.loadPlugins(serverTranslations) const videoInfo: VideoDetails = videoInfoTmp @@ -531,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, @@ -543,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') { @@ -572,7 +584,7 @@ export class PeerTubeEmbed { this.buildCSS() - await this.buildDock(videoInfo, config) + await this.buildDock(videoInfo) this.initializeApi() @@ -588,13 +600,12 @@ export class PeerTubeEmbed { }) } - 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') @@ -649,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 @@ -657,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 () { @@ -727,36 +740,14 @@ export class PeerTubeEmbed { 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 { @@ -767,9 +758,12 @@ export class PeerTubeEmbed { return { getBaseStaticRoute: unimplemented, + getBaseRouterRoute: unimplemented, + getSettings: unimplemented, isLoggedIn: unimplemented, + getAuthHeader: unimplemented, notifier: { info: unimplemented, @@ -779,6 +773,8 @@ export class PeerTubeEmbed { showModal: unimplemented, + getServerConfig: unimplemented, + markdownRenderer: { textMarkdownToHTML: unimplemented, enhancedMarkdownToHTML: unimplemented @@ -789,10 +785,6 @@ export class PeerTubeEmbed { } } } - - private runHook (hookName: ClientHookName, result?: T, params?: any): Promise { - return runHook(this.peertubeHooks, hookName, result, params) - } } PeerTubeEmbed.main()