ActivityPub-federated video streaming platform using P2P directly in your web browser
Fix crash on download stream error
Chocobozzza9069d0d0bca
diff --git a/packages/tests/src/api/videos/generate-download.ts b/packages/tests/src/api/videos/generate-download.tsindex 0745ed8433..f635ba29a8 100644--- a/packages/tests/src/api/videos/generate-download.ts+++ b/packages/tests/src/api/videos/generate-download.ts@@ -1,7 +1,7 @@/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */import { getHLS } from '@peertube/peertube-core-utils'-import { VideoDetails, VideoFile, VideoResolution } from '@peertube/peertube-models'+import { HttpStatusCode, VideoDetails, VideoFile, VideoResolution } from '@peertube/peertube-models'import { buildSUUID } from '@peertube/peertube-node-utils'import {ObjectStorageCommand,@@ -17,8 +17,11 @@ import { checkTmpIsEmpty } from '@tests/shared/directories.js'import { probeResBody } from '@tests/shared/videos.js'import { expect } from 'chai'import { FfprobeData } from 'fluent-ffmpeg'+import { remove } from 'fs-extra'+import { basename } from 'path'describe('Test generate download', function () {+ const resolutions = [ VideoResolution.H_NOVIDEO, VideoResolution.H_144P ]let servers: PeerTubeServer[]before(async function () {@@ -48,8 +51,6 @@ describe('Test generate download', function () {await server.run(objectStorage.getDefaultMockConfig())}- const resolutions = [ VideoResolution.H_NOVIDEO, VideoResolution.H_144P ]-{await server.config.enableTranscoding({ hls: true, webVideo: true, splitAudioAndVideo: false, resolutions })await server.videos.quickUpload({ name: 'common-' + seed })@@ -132,13 +133,37 @@ describe('Test generate download', function () {})}+ describe('Download crash', function () {+ it('Should not crash the server on non existing file', async function () {+ this.timeout(120000)++ await servers[0].config.enableTranscoding({ webVideo: false, hls: true, splitAudioAndVideo: true, resolutions })+ const { uuid } = await servers[0].videos.quickUpload({ name: 'crash' })+ await waitJobs(servers)++ for (const server of servers) {+ const video = await server.videos.get({ id: uuid })+ const file = getHLS(video).files.find(f => f.hasVideo)++ await remove(servers[0].getDirectoryPath('streaming-playlists/hls/' + uuid + '/' + basename(file.fileUrl)))++ await server.videos.generateDownload({+ videoId: uuid,+ videoFileIds: [ file.id ],+ expectedStatus: server === servers[0]+ ? HttpStatusCode.OK_200+ : HttpStatusCode.INTERNAL_SERVER_ERROR_500+ })+ }+ })+ })+for (const objectStorage of [ undefined, new ObjectStorageCommand() ]) {const testName = objectStorage? 'On Object Storage': 'On filesystem'describe(testName, function () {-describe('Videos on local server', function () {runSuite(() => servers[0], objectStorage)})diff --git a/server/core/lib/video-file.ts b/server/core/lib/video-file.tsindex 2a6dde2f05..bebe115332 100644--- a/server/core/lib/video-file.ts+++ b/server/core/lib/video-file.ts@@ -272,84 +272,112 @@ export async function muxToMergeVideoFiles (options: {const inputs: (string | Readable)[] = []const tmpDestinations: string[] = []+ let ffmpegContainer: FFmpegContainer- try {- let maxResolution = 0+ return new Promise<void>(async (res, rej) => {+ const cleanup = async () => {+ for (const destination of tmpDestinations) {+ await remove(destination)+ }- for (const videoFile of videoFiles) {- if (!videoFile) continue+ for (const input of inputs) {+ if (input instanceof Readable) {+ if (!input.destroyed) input.destroy()+ }+ }- maxResolution = Math.max(maxResolution, videoFile.resolution)+ if (ffmpegContainer) {+ ffmpegContainer.forceKill()+ ffmpegContainer = undefined+ }+ }- const { input, isTmpDestination } = await buildMuxInput(video, videoFile)+ try {+ let maxResolution = 0- inputs.push(input)+ for (const videoFile of videoFiles) {+ if (!videoFile) continue- if (isTmpDestination === true) tmpDestinations.push(input)- }+ maxResolution = Math.max(maxResolution, videoFile.resolution)- // Include cover to audio file?- const { coverPath, isTmpDestination } = maxResolution === 0- ? await buildCoverInput(video)- : { coverPath: undefined, isTmpDestination: false }+ const { input, isTmpDestination } = await buildMuxInput(+ video,+ videoFile,+ err => {+ logger.warn(`Cannot build mux input of video ${video.url}`, { err, inputs: inputsToLog, ...lTags(video.uuid) })- if (coverPath && isTmpDestination) tmpDestinations.push(coverPath)+ cleanup()+ .catch(cleanupErr => logger.error('Cannot cleanup after mux error', { err: cleanupErr, ...lTags(video.uuid) }))- const inputsToLog = inputs.map(i => {- if (typeof i === 'string') return i+ rej(buildRequestError(err as any))+ }+ )- return 'ReadableStream'- })+ inputs.push(input)++ if (isTmpDestination === true) tmpDestinations.push(input)+ }- logger.info(`Muxing files for video ${video.url}`, { inputs: inputsToLog, ...lTags(video.uuid) })+ // Include cover to audio file?+ const { coverPath, isTmpDestination } = maxResolution === 0+ ? await buildCoverInput(video)+ : { coverPath: undefined, isTmpDestination: false }- const ffmpegContainer = new FFmpegContainer(getFFmpegCommandWrapperOptions('vod'))+ if (coverPath && isTmpDestination) tmpDestinations.push(coverPath)- try {- await ffmpegContainer.mergeInputs({- inputs,- output,- logError: false,+ const inputsToLog = inputs.map(i => {+ if (typeof i === 'string') return i- // Include a cover if this is an audio file- coverPath+ return 'ReadableStream'})- logger.info(`Mux ended for video ${video.url}`, { inputs: inputsToLog, ...lTags(video.uuid) })- } catch (err) {- const message = err?.message || ''+ logger.info(`Muxing files for video ${video.url}`, { inputs: inputsToLog, ...lTags(video.uuid) })- if (message.includes('Output stream closed')) {- logger.info(`Client aborted mux for video ${video.url}`, lTags(video.uuid))- return- }+ ffmpegContainer = new FFmpegContainer(getFFmpegCommandWrapperOptions('vod'))- logger.warn(`Cannot mux files of video ${video.url}`, { err, inputs: inputsToLog, ...lTags(video.uuid) })+ try {+ await ffmpegContainer.mergeInputs({+ inputs,+ output,+ logError: false,- if (err.inputStreamError) {- err.inputStreamError = buildRequestError(err.inputStreamError)- }+ // Include a cover if this is an audio file+ coverPath+ })- throw err- } finally {- ffmpegContainer.forceKill()- }- } finally {- for (const destination of tmpDestinations) {- await remove(destination)- }+ logger.info(`Mux ended for video ${video.url}`, { inputs: inputsToLog, ...lTags(video.uuid) })++ res()+ } catch (err) {+ const message = err?.message || ''++ if (message.includes('Output stream closed')) {+ logger.info(`Client aborted mux for video ${video.url}`, lTags(video.uuid))+ return+ }++ logger.warn(`Cannot mux files of video ${video.url}`, { err, inputs: inputsToLog, ...lTags(video.uuid) })- for (const input of inputs) {- if (input instanceof Readable) {- if (!input.destroyed) input.destroy()+ if (err.inputStreamError) {+ err.inputStreamError = buildRequestError(err.inputStreamError)+ }++ throw err+ } finally {+ ffmpegContainer.forceKill()}+ } catch (err) {+ rej(err)+ } finally {+ await cleanup()}- }+ })}async function buildMuxInput (video: MVideo,- videoFile: MVideoFile+ videoFile: MVideoFile,+ onStreamError: (err: Error) => void): Promise<{ input: Readable, isTmpDestination: false } | { input: string, isTmpDestination: boolean }> {// ---------------------------------------------------------------------------// Remote@@ -375,7 +403,10 @@ async function buildMuxInput (return { input: destination, isTmpDestination: true }}- return { input: generateRequestStream(videoFile.fileUrl, { timeout, bodyKBLimit }), isTmpDestination: false }+ return {+ input: generateRequestStream(videoFile.fileUrl, { timeout, bodyKBLimit }).on('error', onStreamError),+ isTmpDestination: false+ }}// ---------------------------------------------------------------------------