yetangitu/Peertube
1
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-10-03 09:49:20 +02:00
Code Issues Releases Wiki Activity

Separate player in dedicated build

Browse source 
* Separate player in a dedicated build, that we can control using vite.
   We had too many issues with Angular build system and we can now
   have the same build between the embed and the client. We can also
   embed SVG directly in the CSS
 * Upgrade p2p-media-loader to v2
 * Update internal infohashes to reflect this p2p-media-loader protocol
   change (they are updated at PeerTube startup)
 * Minimum required iOS version is now v14
This commit is contained in:
Chocobozzz 2025-02-05 06:36:05 +01:00
parent 2fe6ce79f1
commit 50b067f9cd
No known key found for this signature in database
GPG key ID: 583A612D890159BE
151 changed files with 868 additions and 578 deletions
Download patch file Download diff file Expand all files Collapse all files

25
client/src/standalone/videos/embed.ts
View file

@ -1,8 +1,3 @@
import './embed.scss'
import '../../assets/player/shared/dock/peertube-dock-component'
import '../../assets/player/shared/dock/peertube-dock-plugin'
import { PeerTubeServerError } from 'src/types'
import videojs from 'video.js'
import {
HTMLServerConfig,
ResultList,
@ -12,10 +7,13 @@ import {
VideoPlaylistElement,
VideoState
} from '@peertube/peertube-models'
import { PeerTubePlayer } from '../../assets/player/peertube-player'
import { TranslationsManager } from '../../assets/player/translations-manager'
import type { PeerTubePlayer } from '@peertube/player'
import { TranslationsManager } from '@root-helpers/translations-manager'
import { PeerTubeServerError } from 'src/types'
import type videojs from 'video.js'
import { getParamString, logger, videoRequiresFileToken } from '../../root-helpers'
import { PeerTubeEmbedApi } from './embed-api'
import './embed.scss'
import {
AuthHTTP,
LiveManager,
@ -37,6 +35,7 @@ export class PeerTubeEmbed {
private translationsPromise: Promise<{ [id: string]: string }>
private PeerTubePlayerManagerModulePromise: Promise<any>
private videojs: typeof videojs
private readonly http: AuthHTTP
private readonly videoFetcher: VideoFetcher
@ -94,7 +93,7 @@ export class PeerTubeEmbed {
async init () {
this.translationsPromise = TranslationsManager.getServerTranslations(getBackendUrl(), navigator.language)
this.PeerTubePlayerManagerModulePromise = import('../../assets/player/peertube-player')
this.PeerTubePlayerManagerModulePromise = import('@peertube/player')
// Issue when we parsed config from HTML, fallback to API
if (!this.config) {
@ -334,7 +333,11 @@ export class PeerTubeEmbed {
}
}
this.peertubePlugin.getPluginsManager().runHook('action:embed.player.loaded', undefined, { player: this.player, videojs, video })
this.peertubePlugin.getPluginsManager().runHook(
'action:embed.player.loaded',
undefined,
{ player: this.player, videojs: this.videojs, video }
)
}
private buildCSS () {
@ -430,11 +433,13 @@ export class PeerTubeEmbed {
this.playerHTML.setInitVideoEl(playerElement)
this.playerHTML.addInitVideoElToDOM()
const [ { PeerTubePlayer } ] = await Promise.all([
const [ { PeerTubePlayer, videojs } ] = await Promise.all([
this.PeerTubePlayerManagerModulePromise,
this.peertubePlugin.loadPlugins(this.config, await this.translationsPromise)
])
this.videojs = videojs
const constructorOptions = this.playerOptionsBuilder.getPlayerConstructorOptions({
serverConfig: this.config,
authorizationHeader: () => this.http.getHeaderTokenValue()