X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=shared%2Fserver-commands%2Fvideos%2Fstreaming-playlists-command.ts;h=950808b6009912b6e0516ef07c9abe493b174105;hb=5170f492b95dc81b75230312411c5fdb0019eed2;hp=7b92dcc0a385834f22842262ffccb115673b8921;hpb=9d1e41e8bbd9afd961f2dd48c791a3be114e878d;p=github%2FChocobozzz%2FPeerTube.git diff --git a/shared/server-commands/videos/streaming-playlists-command.ts b/shared/server-commands/videos/streaming-playlists-command.ts index 7b92dcc0a..950808b60 100644 --- a/shared/server-commands/videos/streaming-playlists-command.ts +++ b/shared/server-commands/videos/streaming-playlists-command.ts @@ -44,31 +44,71 @@ export class StreamingPlaylistsCommand extends AbstractCommand { } } - getFragmentedSegment (options: OverrideCommandOptions & { + async getFragmentedSegment (options: OverrideCommandOptions & { url: string range?: string + + withRetry?: boolean // default false + currentRetry?: number }) { - return unwrapBody(this.getRawRequest({ - ...options, - - url: options.url, - range: options.range, - implicitToken: false, - responseType: 'application/octet-stream', - defaultExpectedStatus: HttpStatusCode.OK_200 - })) + const { withRetry, currentRetry = 1 } = options + + try { + const result = await unwrapBody(this.getRawRequest({ + ...options, + + url: options.url, + range: options.range, + implicitToken: false, + responseType: 'application/octet-stream', + defaultExpectedStatus: HttpStatusCode.OK_200 + })) + + return result + } catch (err) { + if (!withRetry || currentRetry > 5) throw err + + await wait(100) + + return this.getFragmentedSegment({ + ...options, + + withRetry, + currentRetry: currentRetry + 1 + }) + } } - getSegmentSha256 (options: OverrideCommandOptions & { + async getSegmentSha256 (options: OverrideCommandOptions & { url: string + + withRetry?: boolean // default false + currentRetry?: number }) { - return unwrapBodyOrDecodeToJSON<{ [ id: string ]: string }>(this.getRawRequest({ - ...options, - - url: options.url, - contentType: 'application/json', - implicitToken: false, - defaultExpectedStatus: HttpStatusCode.OK_200 - })) + const { withRetry, currentRetry = 1 } = options + + try { + const result = await unwrapBodyOrDecodeToJSON<{ [ id: string ]: string }>(this.getRawRequest({ + ...options, + + url: options.url, + contentType: 'application/json', + implicitToken: false, + defaultExpectedStatus: HttpStatusCode.OK_200 + })) + + return result + } catch (err) { + if (!withRetry || currentRetry > 5) throw err + + await wait(100) + + return this.getSegmentSha256({ + ...options, + + withRetry, + currentRetry: currentRetry + 1 + }) + } } }