ActivityPub-federated video streaming platform using P2P directly in your web browser
Fix infinite non-settle when client closes the stream
Chocobozzzc8ef2bf95ff3
diff --git a/server/core/lib/video-download.ts b/server/core/lib/video-download.tsindex 7259b6291c..d7411376ec 100644--- a/server/core/lib/video-download.ts+++ b/server/core/lib/video-download.ts@@ -30,6 +30,7 @@ export class VideoDownload {private readonly video: MVideoThumbnailsprivate readonly videoFiles: MVideoFile[]+ private cleanupPromise: Promise<void>private allowDirectSending = trueconstructor (options: {@@ -45,99 +46,114 @@ export class VideoDownload {bytesPerIpPerSecond: numberip: string}) {- return new Promise<void>(async (res, rej) => {- const totalBytesPerSecond = options?.totalBytesPerSecond- const bytesPerIpPerSecond = options?.bytesPerIpPerSecond- const ip = options?.ip+ const totalBytesPerSecond = options?.totalBytesPerSecond+ const bytesPerIpPerSecond = options?.bytesPerIpPerSecond+ const ip = options?.ip- try {- VideoDownload.totalDownloads+++ let rejectOnStreamError: (err: Error) => void+ const streamErrorPromise = new Promise<never>((_, rej) => {+ rejectOnStreamError = rej+ })- const maxResolution = await this.buildMuxInputs(rej)+ const run = async () => {+ VideoDownload.totalDownloads++- // Include cover to audio file?- const { coverPath, isTmpDestination } = maxResolution === 0- ? await this.buildCoverInput()- : { coverPath: undefined, isTmpDestination: false }+ const maxResolution = await this.buildMuxInputs(rejectOnStreamError)- if (coverPath && isTmpDestination) {- this.tmpDestinations.push(coverPath)- }+ // Include cover to audio file?+ const { coverPath, isTmpDestination } = maxResolution === 0+ ? await this.buildCoverInput()+ : { coverPath: undefined, isTmpDestination: false }- // Prefer sending the file directly if possible- if (this.allowDirectSending && !coverPath && this.inputs.length === 1) {- logger.info(`Piping single file for video ${this.video.url}`, { input: this.inputsToLog()[0], ...lTags(this.video.uuid) })+ if (coverPath && isTmpDestination) {+ this.tmpDestinations.push(coverPath)+ }- const input = typeof this.inputs[0] === 'string'- ? createReadStream(this.inputs[0])- : this.inputs[0]+ // Prefer sending the file directly if possible+ if (this.allowDirectSending && !coverPath && this.inputs.length === 1) {+ logger.info(`Piping single file for video ${this.video.url}`, { input: this.inputsToLog()[0], ...lTags(this.video.uuid) })- const throttleStream = totalBytesPerSecond || bytesPerIpPerSecond- ? new ThrottleStream({ totalBytesPerSecond, bytesPerIpPerSecond, ip })- : new PassThrough()+ const input = typeof this.inputs[0] === 'string'+ ? createReadStream(this.inputs[0])+ : this.inputs[0]- await pipeline(input, throttleStream, output)+ const throttleStream = totalBytesPerSecond || bytesPerIpPerSecond+ ? new ThrottleStream({ totalBytesPerSecond, bytesPerIpPerSecond, ip })+ : new PassThrough()- res()- } else {- logger.info(`Muxing files for video ${this.video.url}`, { inputs: this.inputsToLog(), ...lTags(this.video.uuid) })+ try {+ await pipeline(input, throttleStream, output)+ } catch (err) {+ if ((err?.message || '').includes('Output stream closed')) {+ logger.info(`Client aborted direct download for video ${this.video.url}`, lTags(this.video.uuid))+ return+ }- this.ffmpegContainer = new FFmpegContainer(getFFmpegCommandWrapperOptions('vod'))+ throw err+ }- const throttleStream = totalBytesPerSecond || bytesPerIpPerSecond- ? new ThrottleStream({ totalBytesPerSecond, bytesPerIpPerSecond, ip })- : undefined+ return+ }- const finalOutput = throttleStream ?? output+ logger.info(`Muxing files for video ${this.video.url}`, { inputs: this.inputsToLog(), ...lTags(this.video.uuid) })- const throttlePipeline = throttleStream- ? pipeline(throttleStream, output)- : Promise.resolve()+ this.ffmpegContainer = new FFmpegContainer(getFFmpegCommandWrapperOptions('vod'))- try {- // Run in parallel to prevent throttlePipeline unhandled rejection if an input stream errors- await Promise.all([- this.ffmpegContainer.mergeInputs({- inputs: this.inputs,- output: finalOutput,- logError: false,+ const throttleStream = totalBytesPerSecond || bytesPerIpPerSecond+ ? new ThrottleStream({ totalBytesPerSecond, bytesPerIpPerSecond, ip })+ : undefined- // Include a cover if this is an audio file- coverPath- }),+ const finalOutput = throttleStream ?? output- throttlePipeline- ])+ const throttlePipeline = throttleStream+ ? pipeline(throttleStream, output)+ : Promise.resolve()- logger.info(`Mux ended for video ${this.video.url}`, { inputs: this.inputsToLog(), ...lTags(this.video.uuid) })+ try {+ // Run in parallel to prevent throttlePipeline unhandled rejection if an input stream errors+ await Promise.all([+ this.ffmpegContainer.mergeInputs({+ inputs: this.inputs,+ output: finalOutput,+ logError: false,- res()- } catch (err) {- const message = err?.message || ''+ // Include a cover if this is an audio file+ coverPath+ }),- if (message.includes('Output stream closed')) {- logger.info(`Client aborted mux for video ${this.video.url}`, lTags(this.video.uuid))- return- }+ throttlePipeline+ ])- if (err.inputStreamError) {- err.inputStreamError = buildRequestError(err.inputStreamError)- }+ logger.info(`Mux ended for video ${this.video.url}`, { inputs: this.inputsToLog(), ...lTags(this.video.uuid) })+ } catch (err) {+ const message = err?.message || ''- logger.warn(`Cannot mux files of video ${this.video.url}`, { err, inputs: this.inputsToLog(), ...lTags(this.video.uuid) })+ if (message.includes('Output stream closed')) {+ logger.info(`Client aborted mux for video ${this.video.url}`, lTags(this.video.uuid))+ return+ }- throw err- } finally {- this.ffmpegContainer.forceKill()- }+ if (err.inputStreamError) {+ err.inputStreamError = buildRequestError(err.inputStreamError)}- } catch (err) {- rej(err)++ logger.warn(`Cannot mux files of video ${this.video.url}`, { err, inputs: this.inputsToLog(), ...lTags(this.video.uuid) })++ throw err} finally {- this.cleanup()- .catch(cleanupErr => logger.error('Cannot cleanup after mux error', { err: cleanupErr, ...lTags(this.video.uuid) }))+ // cleanup() may already have force killed and unset ffmpegContainer if a stream errored and won the race below+ this.ffmpegContainer?.forceKill()}- })+ }++ try {+ // If a stream errors, don't wait for run() to notice: reject immediately so the caller isn't stuck+ // run() keeps executing in the background but will abort once cleanup() destroys its streams/ffmpeg process+ await Promise.race([ run(), streamErrorPromise ])+ } finally {+ this.cleanup()+ .catch(cleanupErr => logger.error('Cannot cleanup after mux error', { err: cleanupErr, ...lTags(this.video.uuid) }))+ }}// ---------------------------------------------------------------------------@@ -167,9 +183,7 @@ export class VideoDownload {...lTags(this.video.uuid)})- this.cleanup()- .catch(cleanupErr => logger.error('Cannot cleanup after mux error', { err: cleanupErr, ...lTags(this.video.uuid) }))-+ // cleanup() is already run by muxToMergeVideoFiles's finally block once this rejection wins the racerej(err)})@@ -290,6 +304,14 @@ export class VideoDownload {}private async cleanup () {+ if (this.cleanupPromise === undefined) {+ this.cleanupPromise = this._doCleanup()+ }++ return this.cleanupPromise+ }++ private async _doCleanup () {VideoDownload.totalDownloads--for (const destination of this.tmpDestinations) {