X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fstandalone%2Fvideos%2Fembed.ts;h=c04f94d202119cfeda13e0e55d5e3b60c7aac592;hb=b65de1be4dcf626c552be613d531d3f6e23c6085;hp=103014bb08dd3c7c23bd58c6a88e79da405fc2c0;hpb=3e0e8d4afded28559b7c473061bbdc31ab542e1c;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/standalone/videos/embed.ts b/client/src/standalone/videos/embed.ts index 103014bb0..c04f94d20 100644 --- a/client/src/standalone/videos/embed.ts +++ b/client/src/standalone/videos/embed.ts @@ -2,27 +2,29 @@ import './embed.scss' import videojs from 'video.js' import { peertubeTranslate } from '../../../../shared/core-utils/i18n' import { + HTMLServerConfig, + HttpStatusCode, + OAuth2ErrorCode, ResultList, - ServerConfig, UserRefreshToken, + Video, VideoCaption, VideoDetails, VideoPlaylist, VideoPlaylistElement, - VideoStreamingPlaylistType, - PluginType, - ClientHookName + VideoStreamingPlaylistType } 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 { isP2PEnabled } from '../../assets/player/utils' +import { getBoolOrDefault } from '../../root-helpers/local-storage-utils' import { peertubeLocalStorage } from '../../root-helpers/peertube-web-storage' +import { PluginsManager } from '../../root-helpers/plugins-manager' +import { UserLocalStorageKeys, UserTokens } 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 } @@ -49,25 +51,35 @@ export class PeerTubeEmbed { mode: PlayerMode scope = 'peertube' - userTokens: Tokens + userTokens: UserTokens headers = new Headers() LOCAL_STORAGE_OAUTH_CLIENT_KEYS = { CLIENT_ID: 'client_id', CLIENT_SECRET: 'client_secret' } + config: HTMLServerConfig + private translationsPromise: Promise<{ [id: string]: string }> - private configPromise: Promise private PeertubePlayerManagerModulePromise: Promise private playlist: VideoPlaylist private playlistElements: VideoPlaylistElement[] private currentPlaylistElement: VideoPlaylistElement - private wrapperElement: HTMLElement + private readonly wrapperElement: HTMLElement - private peertubeHooks: Hooks = {} - private loadedScripts = new Set() + private pluginsManager: PluginsManager + + 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' @@ -75,10 +87,6 @@ export class PeerTubeEmbed { await embed.init() } - constructor (private videoWrapperId: string) { - this.wrapperElement = document.getElementById(this.videoWrapperId) - } - getVideoUrl (id: string) { return window.location.origin + '/api/v1/videos/' + id } @@ -111,9 +119,9 @@ export class PeerTubeEmbed { 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() + }).then((obj: UserRefreshToken & { code?: OAuth2ErrorCode }) => { + if (!obj || obj.code === OAuth2ErrorCode.INVALID_GRANT) { + UserTokens.flushLocalStorage(peertubeLocalStorage) this.removeTokensFromHeaders() return resolve() @@ -121,7 +129,7 @@ export class PeerTubeEmbed { this.userTokens.accessToken = obj.access_token this.userTokens.refreshToken = obj.refresh_token - this.userTokens.save() + UserTokens.saveToLocalStorage(peertubeLocalStorage, this.userTokens) this.setHeadersFromTokens() @@ -133,7 +141,7 @@ export class PeerTubeEmbed { return refreshingTokenPromise .catch(() => { - Tokens.flush() + UserTokens.flushLocalStorage(peertubeLocalStorage) this.removeTokensFromHeaders() }).then(() => fetch(url, { @@ -166,11 +174,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) } @@ -258,12 +261,8 @@ export class PeerTubeEmbed { } async init () { - try { - this.userTokens = Tokens.load() - await this.initCore() - } catch (e) { - console.error(e) - } + this.userTokens = UserTokens.getUserTokens(peertubeLocalStorage) + await this.initCore() } private initializeApi () { @@ -316,7 +315,7 @@ export class PeerTubeEmbed { while (total > elements.length && i < 10) { const result = await this.loadPlaylistElements(playlistId, elements.length) - const json = await result.json() as ResultList + const json = await result.json() total = json.total elements = elements.concat(json.data) @@ -466,30 +465,35 @@ 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) + 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, @@ -501,7 +505,7 @@ export class PeerTubeEmbed { this.currentPlaylistElement = videoPlaylistElement this.loadVideoAndBuildPlayer(this.currentPlaylistElement.video.uuid) - .catch(err => console.error(err)) + .catch(err => console.error(err)) } } : undefined @@ -514,6 +518,8 @@ export class PeerTubeEmbed { muted: this.muted, loop: this.loop, + p2pEnabled: this.isP2PEnabled(videoInfo), + captions: videoCaptions.length !== 0, subtitle: this.subtitle, @@ -531,12 +537,15 @@ 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, + onPlayerElementChange: (element: HTMLVideoElement) => { + this.playerElement = element + }, videoDuration: videoInfo.duration, enableHotkeys: true, @@ -552,7 +561,9 @@ export class PeerTubeEmbed { webtorrent: { videoFiles: videoInfo.files - } + }, + + pluginsManager: this.pluginsManager } if (this.mode === 'p2p-media-loader') { @@ -569,14 +580,17 @@ export class PeerTubeEmbed { }) } - 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() @@ -592,13 +606,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') @@ -645,15 +658,15 @@ export class PeerTubeEmbed { } 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 @@ -661,7 +674,7 @@ export class PeerTubeEmbed { const title = this.title ? videoInfo.name : undefined - const description = config.tracker.enabled && this.warningTitle + const description = this.warningTitle && this.isP2PEnabled(videoInfo) ? '' + peertubeTranslate('Watching this video may reveal your IP address to others.') + '' : undefined @@ -687,9 +700,9 @@ export class PeerTubeEmbed { private async buildCaptions (serverTranslations: any, captionsResponse: Response): Promise { if (captionsResponse.ok) { - const { data } = (await captionsResponse.json()) as ResultList + 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 @@ -726,57 +739,37 @@ export class PeerTubeEmbed { 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}` + private loadPlugins (translations?: { [ id: string ]: string }) { + this.pluginsManager = new PluginsManager({ + peertubeHelpersFactory: _ => this.buildPeerTubeHelpers(translations) + }) - if (this.loadedScripts.has(script)) continue + this.pluginsManager.loadPluginsList(this.config) - const pluginInfo = { - plugin, - clientScript: { - script, - scopes: clientScript.scopes - }, - pluginType: PluginType.PLUGIN, - isTheme: false - } - - await loadPlugin({ - hooks: this.peertubeHooks, - pluginInfo, - onSettingsScripts: () => undefined, - 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, + getBasePluginClientPath: unimplemented, getSettings: unimplemented, isLoggedIn: unimplemented, + getAuthHeader: unimplemented, notifier: { info: unimplemented, @@ -793,16 +786,23 @@ export class PeerTubeEmbed { enhancedMarkdownToHTML: unimplemented }, - translate: (value: string) => { - return Promise.resolve(peertubeTranslate(value, translations)) - } + translate: (value: string) => Promise.resolve(peertubeTranslate(value, translations)) } } - private runHook (hookName: ClientHookName, result?: T, params?: any): Promise { - return runHook(this.peertubeHooks, hookName, result, params) + private isP2PEnabled (video: Video) { + const userP2PEnabled = getBoolOrDefault( + peertubeLocalStorage.getItem(UserLocalStorageKeys.P2P_ENABLED), + this.config.defaults.p2p.embed.enabled + ) + + return isP2PEnabled(video, this.config, userP2PEnabled) } } PeerTubeEmbed.main() - .catch(err => console.error('Cannot init embed.', err)) + .catch(err => { + (window as any).displayIncompatibleBrowser() + + console.error('Cannot init embed.', err) + })