Try to optimize sha segments fetching

pull/3289/head
Chocobozzz 2020-11-10 14:21:26 +01:00
parent 210856a7be
commit 25b7c84724
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
4 changed files with 13 additions and 4 deletions

View File

@ -771,6 +771,8 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
: null,
embedUrl: video.embedUrl,
isLive: video.isLive,
language: this.localeId,
userWatching: user && user.videosHistoryEnabled === true ? {

View File

@ -6,11 +6,14 @@ type SegmentsJSON = { [filename: string]: string | { [byterange: string]: string
const maxRetries = 3
function segmentValidatorFactory (segmentsSha256Url: string) {
function segmentValidatorFactory (segmentsSha256Url: string, isLive: boolean) {
let segmentsJSON = fetchSha256Segments(segmentsSha256Url)
const regex = /bytes=(\d+)-(\d+)/
return async function segmentValidator (segment: Segment, retry = 1) {
// Wait for hash generation from the server
if (isLive) await wait(1000)
const filename = basename(segment.url)
const segmentValue = (await segmentsJSON)[filename]
@ -20,10 +23,10 @@ function segmentValidatorFactory (segmentsSha256Url: string) {
}
if (!segmentValue) {
await wait(1000)
console.log('Refetching sha segments for %s.', filename)
await wait(1000)
segmentsJSON = fetchSha256Segments(segmentsSha256Url)
await segmentValidator(segment, retry + 1)

View File

@ -98,6 +98,8 @@ export interface CommonOptions extends CustomizationOptions {
videoViewUrl: string
embedUrl: string
isLive: boolean
language?: string
videoCaptions: VideoJSCaption[]
@ -323,7 +325,7 @@ export class PeertubePlayerManager {
const p2pMediaLoaderConfig = {
loader: {
trackerAnnounce,
segmentValidator: segmentValidatorFactory(options.p2pMediaLoader.segmentsSha256Url),
segmentValidator: segmentValidatorFactory(options.p2pMediaLoader.segmentsSha256Url, options.common.isLive),
rtcConfig: getRtcConfig(),
requiredSegmentsPriority: 1,
segmentUrlBuilder: segmentUrlBuilderFactory(redundancyUrlManager),

View File

@ -532,6 +532,8 @@ export class PeerTubeEmbed {
inactivityTimeout: 2500,
videoViewUrl: this.getVideoUrl(videoInfo.uuid) + '/views',
isLive: videoInfo.isLive,
playerElement: this.playerElement,
onPlayerElementChange: (element: HTMLVideoElement) => this.playerElement = element,