Merge branch 'release/4.0.0' into develop

[github/Chocobozzz/PeerTube.git] / server / lib / job-queue / handlers / video-transcoding.ts

diff --git a/server/lib/job-queue/handlers/video-transcoding.ts b/server/lib/job-queue/handlers/video-transcoding.ts
index 20880cdc1a39209f395f163cd9cc91982c2adb15..ef3abcbcd7f5308b5473930b63e602a1a5cb3599 100644 (file)
--- a/server/lib/job-queue/handlers/video-transcoding.ts
+++ b/server/lib/job-queue/handlers/video-transcoding.ts
@@ -2,7 +2,7 @@ import { Job } from 'bull'
 import { TranscodeOptionsType } from '@server/helpers/ffmpeg-utils'
 import { addTranscodingJob, getTranscodingJobPriority } from '@server/lib/video'
 import { VideoPathManager } from '@server/lib/video-path-manager'
-import { moveToNextState } from '@server/lib/video-state'
+import { moveToFailedTranscodingState, moveToNextState } from '@server/lib/video-state'
 import { UserModel } from '@server/models/user/user'
 import { VideoJobInfoModel } from '@server/models/video/video-job-info'
 import { MUser, MUserId, MVideo, MVideoFullLight, MVideoWithFile } from '@server/types/models'
@@ -12,9 +12,9 @@ import {
   NewResolutionTranscodingPayload,
   OptimizeTranscodingPayload,
   VideoTranscodingPayload
-} from '../../../../shared'
+} from '@shared/models'
 import { retryTransactionWrapper } from '../../../helpers/database-utils'
-import { computeResolutionsToTranscode } from '../../../helpers/ffprobe-utils'
+import { computeLowerResolutionsToTranscode } from '../../../helpers/ffprobe-utils'
 import { logger, loggerTagsFactory } from '../../../helpers/logger'
 import { CONFIG } from '../../../initializers/config'
 import { VideoModel } from '../../../models/video/video'
@@ -52,14 +52,31 @@ async function processVideoTranscoding (job: Job) {
   const handler = handlers[payload.type]
 
   if (!handler) {
+    await moveToFailedTranscodingState(video)
+    await VideoJobInfoModel.decrease(video.uuid, 'pendingTranscode')
+
     throw new Error('Cannot find transcoding handler for ' + payload.type)
   }
 
-  await handler(job, payload, video, user)
+  try {
+    await handler(job, payload, video, user)
+  } catch (error) {
+    await moveToFailedTranscodingState(video)
+
+    await VideoJobInfoModel.decrease(video.uuid, 'pendingTranscode')
+
+    throw error
+  }
 
   return video
 }
 
+// ---------------------------------------------------------------------------
+
+export {
+  processVideoTranscoding
+}
+
 // ---------------------------------------------------------------------------
 // Job handlers
 // ---------------------------------------------------------------------------
@@ -73,7 +90,7 @@ async function handleHLSJob (job: Job, payload: HLSTranscodingPayload, video: MV
 
   const videoOrStreamingPlaylist = videoFileInput.getVideoOrStreamingPlaylist()
 
-  await VideoPathManager.Instance.makeAvailableVideoFile(videoOrStreamingPlaylist, videoFileInput, videoInputPath => {
+  await VideoPathManager.Instance.makeAvailableVideoFile(videoFileInput.withVideoOrPlaylist(videoOrStreamingPlaylist), videoInputPath => {
     return generateHlsPlaylistResolution({
       video,
       videoInputPath,
@@ -86,7 +103,7 @@ async function handleHLSJob (job: Job, payload: HLSTranscodingPayload, video: MV
 
   logger.info('HLS transcoding job for %s ended.', video.uuid, lTags(video.uuid))
 
-  await retryTransactionWrapper(onHlsPlaylistGeneration, video, user, payload)
+  await onHlsPlaylistGeneration(video, user, payload)
 }
 
 async function handleNewWebTorrentResolutionJob (
@@ -101,7 +118,7 @@ async function handleNewWebTorrentResolutionJob (
 
   logger.info('WebTorrent transcoding job for %s ended.', video.uuid, lTags(video.uuid))
 
-  await retryTransactionWrapper(onNewWebTorrentFileResolution, video, user, payload)
+  await onNewWebTorrentFileResolution(video, user, payload)
 }
 
 async function handleWebTorrentMergeAudioJob (job: Job, payload: MergeAudioTranscodingPayload, video: MVideoFullLight, user: MUserId) {
@@ -111,7 +128,7 @@ async function handleWebTorrentMergeAudioJob (job: Job, payload: MergeAudioTrans
 
   logger.info('Merge audio transcoding job for %s ended.', video.uuid, lTags(video.uuid))
 
-  await retryTransactionWrapper(onVideoFileOptimizer, video, payload, 'video', user)
+  await onVideoFirstWebTorrentTranscoding(video, payload, 'video', user)
 }
 
 async function handleWebTorrentOptimizeJob (job: Job, payload: OptimizeTranscodingPayload, video: MVideoFullLight, user: MUserId) {
@@ -121,16 +138,16 @@ async function handleWebTorrentOptimizeJob (job: Job, payload: OptimizeTranscodi
 
   logger.info('Optimize transcoding job for %s ended.', video.uuid, lTags(video.uuid))
 
-  await retryTransactionWrapper(onVideoFileOptimizer, video, payload, transcodeType, user)
+  await onVideoFirstWebTorrentTranscoding(video, payload, transcodeType, user)
 }
 
 // ---------------------------------------------------------------------------
 
 async function onHlsPlaylistGeneration (video: MVideoFullLight, user: MUser, payload: HLSTranscodingPayload) {
-  if (payload.isMaxQuality && CONFIG.TRANSCODING.WEBTORRENT.ENABLED === false) {
+  if (payload.isMaxQuality && payload.autoDeleteWebTorrentIfNeeded && CONFIG.TRANSCODING.WEBTORRENT.ENABLED === false) {
     // Remove webtorrent files if not enabled
     for (const file of video.VideoFiles) {
-      await video.removeFileAndTorrent(file)
+      await video.removeWebTorrentFileAndTorrent(file)
       await file.destroy()
     }
 
@@ -148,10 +165,10 @@ async function onHlsPlaylistGeneration (video: MVideoFullLight, user: MUser, pay
   }
 
   await VideoJobInfoModel.decrease(video.uuid, 'pendingTranscode')
-  await moveToNextState(video, payload.isNewVideo)
+  await retryTransactionWrapper(moveToNextState, video, payload.isNewVideo)
 }
 
-async function onVideoFileOptimizer (
+async function onVideoFirstWebTorrentTranscoding (
   videoArg: MVideoWithFile,
   payload: OptimizeTranscodingPayload | MergeAudioTranscodingPayload,
   transcodeType: TranscodeOptionsType,
@@ -188,7 +205,7 @@ async function onVideoFileOptimizer (
 
   // Move to next state if there are no other resolutions to generate
   if (!hasHls && !hasNewResolutions) {
-    await moveToNextState(videoDatabase, payload.isNewVideo)
+    await retryTransactionWrapper(moveToNextState, videoDatabase, payload.isNewVideo)
   }
 }
 
@@ -200,9 +217,11 @@ async function onNewWebTorrentFileResolution (
   await createHlsJobIfEnabled(user, { ...payload, copyCodecs: true, isMaxQuality: false })
   await VideoJobInfoModel.decrease(video.uuid, 'pendingTranscode')
 
-  await moveToNextState(video, payload.isNewVideo)
+  await retryTransactionWrapper(moveToNextState, video, payload.isNewVideo)
 }
 
+// ---------------------------------------------------------------------------
+
 async function createHlsJobIfEnabled (user: MUserId, payload: {
   videoUUID: string
   resolution: number
@@ -224,6 +243,7 @@ async function createHlsJobIfEnabled (user: MUserId, payload: {
     isPortraitMode: payload.isPortraitMode,
     copyCodecs: payload.copyCodecs,
     isMaxQuality: payload.isMaxQuality,
+    autoDeleteWebTorrentIfNeeded: true,
     isNewVideo: payload.isNewVideo
   }
 
@@ -232,16 +252,6 @@ async function createHlsJobIfEnabled (user: MUserId, payload: {
   return true
 }
 
-// ---------------------------------------------------------------------------
-
-export {
-  processVideoTranscoding,
-  createHlsJobIfEnabled,
-  onNewWebTorrentFileResolution
-}
-
-// ---------------------------------------------------------------------------
-
 async function createLowerResolutionsJobs (options: {
   video: MVideoFullLight
   user: MUserId
@@ -253,7 +263,7 @@ async function createLowerResolutionsJobs (options: {
   const { video, user, videoFileResolution, isPortraitMode, isNewVideo, type } = options
 
   // Create transcoding jobs if there are enabled resolutions
-  const resolutionsEnabled = computeResolutionsToTranscode(videoFileResolution, 'vod')
+  const resolutionsEnabled = computeLowerResolutionsToTranscode(videoFileResolution, 'vod')
   const resolutionCreated: string[] = []
 
   for (const resolution of resolutionsEnabled) {
@@ -280,6 +290,7 @@ async function createLowerResolutionsJobs (options: {
         isPortraitMode,
         copyCodecs: false,
         isMaxQuality: false,
+        autoDeleteWebTorrentIfNeeded: true,
         isNewVideo
       }