aboutsummaryrefslogtreecommitdiffhomepage
path: root/server
diff options
context:
space:
mode:
Diffstat (limited to 'server')
-rw-r--r--server/controllers/api/videos/live.ts37
-rw-r--r--server/helpers/ffmpeg-utils.ts15
-rw-r--r--server/helpers/image-utils.ts2
-rw-r--r--server/lib/hls.ts32
-rw-r--r--server/lib/job-queue/handlers/video-live-ending.ts84
-rw-r--r--server/lib/job-queue/handlers/video-transcoding.ts30
-rw-r--r--server/lib/live-manager.ts2
-rw-r--r--server/lib/video-transcoding.ts24
-rw-r--r--server/middlewares/validators/videos/video-live.ts42
-rw-r--r--server/models/video/video-live.ts3
10 files changed, 214 insertions, 57 deletions
diff --git a/server/controllers/api/videos/live.ts b/server/controllers/api/videos/live.ts
index 97b135f96..be46fb1c6 100644
--- a/server/controllers/api/videos/live.ts
+++ b/server/controllers/api/videos/live.ts
@@ -5,10 +5,10 @@ import { CONFIG } from '@server/initializers/config'
5import { ASSETS_PATH, MIMETYPES } from '@server/initializers/constants' 5import { ASSETS_PATH, MIMETYPES } from '@server/initializers/constants'
6import { getVideoActivityPubUrl } from '@server/lib/activitypub/url' 6import { getVideoActivityPubUrl } from '@server/lib/activitypub/url'
7import { buildLocalVideoFromReq, buildVideoThumbnailsFromReq, setVideoTags } from '@server/lib/video' 7import { buildLocalVideoFromReq, buildVideoThumbnailsFromReq, setVideoTags } from '@server/lib/video'
8import { videoLiveAddValidator, videoLiveGetValidator } from '@server/middlewares/validators/videos/video-live' 8import { videoLiveAddValidator, videoLiveGetValidator, videoLiveUpdateValidator } from '@server/middlewares/validators/videos/video-live'
9import { VideoLiveModel } from '@server/models/video/video-live' 9import { VideoLiveModel } from '@server/models/video/video-live'
10import { MVideoDetails, MVideoFullLight } from '@server/types/models' 10import { MVideoDetails, MVideoFullLight } from '@server/types/models'
11import { VideoCreate, VideoState } from '../../../../shared' 11import { LiveVideoCreate, LiveVideoUpdate, VideoState } from '../../../../shared'
12import { logger } from '../../../helpers/logger' 12import { logger } from '../../../helpers/logger'
13import { sequelizeTypescript } from '../../../initializers/database' 13import { sequelizeTypescript } from '../../../initializers/database'
14import { createVideoMiniatureFromExisting } from '../../../lib/thumbnail' 14import { createVideoMiniatureFromExisting } from '../../../lib/thumbnail'
@@ -36,7 +36,14 @@ liveRouter.post('/live',
36liveRouter.get('/live/:videoId', 36liveRouter.get('/live/:videoId',
37 authenticate, 37 authenticate,
38 asyncMiddleware(videoLiveGetValidator), 38 asyncMiddleware(videoLiveGetValidator),
39 asyncRetryTransactionMiddleware(getVideoLive) 39 asyncRetryTransactionMiddleware(getLiveVideo)
40)
41
42liveRouter.put('/live/:videoId',
43 authenticate,
44 asyncMiddleware(videoLiveGetValidator),
45 videoLiveUpdateValidator,
46 asyncRetryTransactionMiddleware(updateLiveVideo)
40) 47)
41 48
42// --------------------------------------------------------------------------- 49// ---------------------------------------------------------------------------
@@ -47,14 +54,25 @@ export {
47 54
48// --------------------------------------------------------------------------- 55// ---------------------------------------------------------------------------
49 56
50async function getVideoLive (req: express.Request, res: express.Response) { 57async function getLiveVideo (req: express.Request, res: express.Response) {
51 const videoLive = res.locals.videoLive 58 const videoLive = res.locals.videoLive
52 59
53 return res.json(videoLive.toFormattedJSON()) 60 return res.json(videoLive.toFormattedJSON())
54} 61}
55 62
63async function updateLiveVideo (req: express.Request, res: express.Response) {
64 const body: LiveVideoUpdate = req.body
65
66 const videoLive = res.locals.videoLive
67 videoLive.saveReplay = body.saveReplay || false
68
69 await videoLive.save()
70
71 return res.sendStatus(204)
72}
73
56async function addLiveVideo (req: express.Request, res: express.Response) { 74async function addLiveVideo (req: express.Request, res: express.Response) {
57 const videoInfo: VideoCreate = req.body 75 const videoInfo: LiveVideoCreate = req.body
58 76
59 // Prepare data so we don't block the transaction 77 // Prepare data so we don't block the transaction
60 const videoData = buildLocalVideoFromReq(videoInfo, res.locals.videoChannel.id) 78 const videoData = buildLocalVideoFromReq(videoInfo, res.locals.videoChannel.id)
@@ -66,13 +84,20 @@ async function addLiveVideo (req: express.Request, res: express.Response) {
66 video.url = getVideoActivityPubUrl(video) // We use the UUID, so set the URL after building the object 84 video.url = getVideoActivityPubUrl(video) // We use the UUID, so set the URL after building the object
67 85
68 const videoLive = new VideoLiveModel() 86 const videoLive = new VideoLiveModel()
87 videoLive.saveReplay = videoInfo.saveReplay || false
69 videoLive.streamKey = uuidv4() 88 videoLive.streamKey = uuidv4()
70 89
71 const [ thumbnailModel, previewModel ] = await buildVideoThumbnailsFromReq({ 90 const [ thumbnailModel, previewModel ] = await buildVideoThumbnailsFromReq({
72 video, 91 video,
73 files: req.files, 92 files: req.files,
74 fallback: type => { 93 fallback: type => {
75 return createVideoMiniatureFromExisting({ inputPath: ASSETS_PATH.DEFAULT_LIVE_BACKGROUND, video, type, automaticallyGenerated: true }) 94 return createVideoMiniatureFromExisting({
95 inputPath: ASSETS_PATH.DEFAULT_LIVE_BACKGROUND,
96 video,
97 type,
98 automaticallyGenerated: true,
99 keepOriginal: true
100 })
76 } 101 }
77 }) 102 })
78 103
diff --git a/server/helpers/ffmpeg-utils.ts b/server/helpers/ffmpeg-utils.ts
index b25dcaa90..2f167a580 100644
--- a/server/helpers/ffmpeg-utils.ts
+++ b/server/helpers/ffmpeg-utils.ts
@@ -424,6 +424,20 @@ function runLiveMuxing (rtmpUrl: string, outPath: string, deleteSegments: boolea
424 return command 424 return command
425} 425}
426 426
427function hlsPlaylistToFragmentedMP4 (playlistPath: string, outputPath: string) {
428 const command = getFFmpeg(playlistPath)
429
430 command.outputOption('-c copy')
431 command.output(outputPath)
432
433 command.run()
434
435 return new Promise<string>((res, rej) => {
436 command.on('error', err => rej(err))
437 command.on('end', () => res())
438 })
439}
440
427// --------------------------------------------------------------------------- 441// ---------------------------------------------------------------------------
428 442
429export { 443export {
@@ -443,6 +457,7 @@ export {
443 getVideoFileFPS, 457 getVideoFileFPS,
444 computeResolutionsToTranscode, 458 computeResolutionsToTranscode,
445 audio, 459 audio,
460 hlsPlaylistToFragmentedMP4,
446 getVideoFileBitrate, 461 getVideoFileBitrate,
447 canDoQuickTranscode 462 canDoQuickTranscode
448} 463}
diff --git a/server/helpers/image-utils.ts b/server/helpers/image-utils.ts
index f2f6a004f..5f254a7aa 100644
--- a/server/helpers/image-utils.ts
+++ b/server/helpers/image-utils.ts
@@ -21,7 +21,7 @@ async function processImage (
21 try { 21 try {
22 jimpInstance = await Jimp.read(path) 22 jimpInstance = await Jimp.read(path)
23 } catch (err) { 23 } catch (err) {
24 logger.debug('Cannot read %s with jimp. Try to convert the image using ffmpeg first.', { err }) 24 logger.debug('Cannot read %s with jimp. Try to convert the image using ffmpeg first.', path, { err })
25 25
26 const newName = path + '.jpg' 26 const newName = path + '.jpg'
27 await convertWebPToJPG(path, newName) 27 await convertWebPToJPG(path, newName)
diff --git a/server/lib/hls.ts b/server/lib/hls.ts
index e38a8788c..7aa152638 100644
--- a/server/lib/hls.ts
+++ b/server/lib/hls.ts
@@ -106,22 +106,6 @@ async function buildSha256Segment (segmentPath: string) {
106 return sha256(buf) 106 return sha256(buf)
107} 107}
108 108
109function getRangesFromPlaylist (playlistContent: string) {
110 const ranges: { offset: number, length: number }[] = []
111 const lines = playlistContent.split('\n')
112 const regex = /^#EXT-X-BYTERANGE:(\d+)@(\d+)$/
113
114 for (const line of lines) {
115 const captured = regex.exec(line)
116
117 if (captured) {
118 ranges.push({ length: parseInt(captured[1], 10), offset: parseInt(captured[2], 10) })
119 }
120 }
121
122 return ranges
123}
124
125function downloadPlaylistSegments (playlistUrl: string, destinationDir: string, timeout: number) { 109function downloadPlaylistSegments (playlistUrl: string, destinationDir: string, timeout: number) {
126 let timer 110 let timer
127 111
@@ -199,3 +183,19 @@ export {
199} 183}
200 184
201// --------------------------------------------------------------------------- 185// ---------------------------------------------------------------------------
186
187function getRangesFromPlaylist (playlistContent: string) {
188 const ranges: { offset: number, length: number }[] = []
189 const lines = playlistContent.split('\n')
190 const regex = /^#EXT-X-BYTERANGE:(\d+)@(\d+)$/
191
192 for (const line of lines) {
193 const captured = regex.exec(line)
194
195 if (captured) {
196 ranges.push({ length: parseInt(captured[1], 10), offset: parseInt(captured[2], 10) })
197 }
198 }
199
200 return ranges
201}
diff --git a/server/lib/job-queue/handlers/video-live-ending.ts b/server/lib/job-queue/handlers/video-live-ending.ts
index 1a58a9f7e..1a9a36129 100644
--- a/server/lib/job-queue/handlers/video-live-ending.ts
+++ b/server/lib/job-queue/handlers/video-live-ending.ts
@@ -1,24 +1,89 @@
1import * as Bull from 'bull' 1import * as Bull from 'bull'
2import { readdir, remove } from 'fs-extra' 2import { readdir, remove } from 'fs-extra'
3import { join } from 'path' 3import { join } from 'path'
4import { getVideoFileResolution, hlsPlaylistToFragmentedMP4 } from '@server/helpers/ffmpeg-utils'
4import { getHLSDirectory } from '@server/lib/video-paths' 5import { getHLSDirectory } from '@server/lib/video-paths'
6import { generateHlsPlaylist } from '@server/lib/video-transcoding'
5import { VideoModel } from '@server/models/video/video' 7import { VideoModel } from '@server/models/video/video'
8import { VideoLiveModel } from '@server/models/video/video-live'
6import { VideoStreamingPlaylistModel } from '@server/models/video/video-streaming-playlist' 9import { VideoStreamingPlaylistModel } from '@server/models/video/video-streaming-playlist'
7import { VideoLiveEndingPayload } from '@shared/models' 10import { MStreamingPlaylist, MVideo } from '@server/types/models'
11import { VideoLiveEndingPayload, VideoState } from '@shared/models'
8import { logger } from '../../../helpers/logger' 12import { logger } from '../../../helpers/logger'
9 13
10async function processVideoLiveEnding (job: Bull.Job) { 14async function processVideoLiveEnding (job: Bull.Job) {
11 const payload = job.data as VideoLiveEndingPayload 15 const payload = job.data as VideoLiveEndingPayload
12 16
13 const video = await VideoModel.loadAndPopulateAccountAndServerAndTags(payload.videoId) 17 const video = await VideoModel.load(payload.videoId)
14 if (!video) { 18 const live = await VideoLiveModel.loadByVideoId(payload.videoId)
15 logger.warn('Video live %d does not exist anymore. Cannot cleanup.', payload.videoId) 19
20 const streamingPlaylist = await VideoStreamingPlaylistModel.loadHLSPlaylistByVideo(video.id)
21 if (!video || !streamingPlaylist || !live) {
22 logger.warn('Video live %d does not exist anymore. Cannot process live ending.', payload.videoId)
16 return 23 return
17 } 24 }
18 25
19 const streamingPlaylist = await VideoStreamingPlaylistModel.loadHLSPlaylistByVideo(video.id) 26 if (live.saveReplay !== true) {
27 return cleanupLive(video, streamingPlaylist)
28 }
29
30 return saveLive(video, streamingPlaylist)
31}
32
33// ---------------------------------------------------------------------------
34
35export {
36 processVideoLiveEnding
37}
38
39// ---------------------------------------------------------------------------
40
41async function saveLive (video: MVideo, streamingPlaylist: MStreamingPlaylist) {
42 const videoFiles = await streamingPlaylist.get('VideoFiles')
43 const hlsDirectory = getHLSDirectory(video, false)
44
45 for (const videoFile of videoFiles) {
46 const playlistPath = join(hlsDirectory, VideoStreamingPlaylistModel.getHlsPlaylistFilename(videoFile.resolution))
47
48 const mp4TmpName = buildMP4TmpName(videoFile.resolution)
49 await hlsPlaylistToFragmentedMP4(playlistPath, mp4TmpName)
50 }
51
52 await cleanupLiveFiles(hlsDirectory)
53
54 video.isLive = false
55 video.state = VideoState.TO_TRANSCODE
56 await video.save()
57
58 const videoWithFiles = await VideoModel.loadWithFiles(video.id)
59
60 for (const videoFile of videoFiles) {
61 const videoInputPath = buildMP4TmpName(videoFile.resolution)
62 const { isPortraitMode } = await getVideoFileResolution(videoInputPath)
63
64 await generateHlsPlaylist({
65 video: videoWithFiles,
66 videoInputPath,
67 resolution: videoFile.resolution,
68 copyCodecs: true,
69 isPortraitMode
70 })
71 }
72
73 video.state = VideoState.PUBLISHED
74 await video.save()
75}
76
77async function cleanupLive (video: MVideo, streamingPlaylist: MStreamingPlaylist) {
20 const hlsDirectory = getHLSDirectory(video, false) 78 const hlsDirectory = getHLSDirectory(video, false)
21 79
80 await cleanupLiveFiles(hlsDirectory)
81
82 streamingPlaylist.destroy()
83 .catch(err => logger.error('Cannot remove live streaming playlist.', { err }))
84}
85
86async function cleanupLiveFiles (hlsDirectory: string) {
22 const files = await readdir(hlsDirectory) 87 const files = await readdir(hlsDirectory)
23 88
24 for (const filename of files) { 89 for (const filename of files) {
@@ -35,13 +100,8 @@ async function processVideoLiveEnding (job: Bull.Job) {
35 .catch(err => logger.error('Cannot remove %s.', p, { err })) 100 .catch(err => logger.error('Cannot remove %s.', p, { err }))
36 } 101 }
37 } 102 }
38
39 streamingPlaylist.destroy()
40 .catch(err => logger.error('Cannot remove live streaming playlist.', { err }))
41} 103}
42 104
43// --------------------------------------------------------------------------- 105function buildMP4TmpName (resolution: number) {
44 106 return resolution + 'tmp.mp4'
45export {
46 processVideoLiveEnding
47} 107}
diff --git a/server/lib/job-queue/handlers/video-transcoding.ts b/server/lib/job-queue/handlers/video-transcoding.ts
index 6659ab716..2aebc29f7 100644
--- a/server/lib/job-queue/handlers/video-transcoding.ts
+++ b/server/lib/job-queue/handlers/video-transcoding.ts
@@ -1,21 +1,22 @@
1import * as Bull from 'bull' 1import * as Bull from 'bull'
2import { getVideoFilePath } from '@server/lib/video-paths'
3import { MVideoFullLight, MVideoUUID, MVideoWithFile } from '@server/types/models'
2import { 4import {
3 MergeAudioTranscodingPayload, 5 MergeAudioTranscodingPayload,
4 NewResolutionTranscodingPayload, 6 NewResolutionTranscodingPayload,
5 OptimizeTranscodingPayload, 7 OptimizeTranscodingPayload,
6 VideoTranscodingPayload 8 VideoTranscodingPayload
7} from '../../../../shared' 9} from '../../../../shared'
10import { retryTransactionWrapper } from '../../../helpers/database-utils'
11import { computeResolutionsToTranscode } from '../../../helpers/ffmpeg-utils'
8import { logger } from '../../../helpers/logger' 12import { logger } from '../../../helpers/logger'
13import { CONFIG } from '../../../initializers/config'
14import { sequelizeTypescript } from '../../../initializers/database'
9import { VideoModel } from '../../../models/video/video' 15import { VideoModel } from '../../../models/video/video'
10import { JobQueue } from '../job-queue'
11import { federateVideoIfNeeded } from '../../activitypub/videos' 16import { federateVideoIfNeeded } from '../../activitypub/videos'
12import { retryTransactionWrapper } from '../../../helpers/database-utils'
13import { sequelizeTypescript } from '../../../initializers/database'
14import { computeResolutionsToTranscode } from '../../../helpers/ffmpeg-utils'
15import { generateHlsPlaylist, mergeAudioVideofile, optimizeOriginalVideofile, transcodeNewResolution } from '../../video-transcoding'
16import { Notifier } from '../../notifier' 17import { Notifier } from '../../notifier'
17import { CONFIG } from '../../../initializers/config' 18import { generateHlsPlaylist, mergeAudioVideofile, optimizeOriginalVideofile, transcodeNewResolution } from '../../video-transcoding'
18import { MVideoFullLight, MVideoUUID, MVideoWithFile } from '@server/types/models' 19import { JobQueue } from '../job-queue'
19 20
20async function processVideoTranscoding (job: Bull.Job) { 21async function processVideoTranscoding (job: Bull.Job) {
21 const payload = job.data as VideoTranscodingPayload 22 const payload = job.data as VideoTranscodingPayload
@@ -29,7 +30,20 @@ async function processVideoTranscoding (job: Bull.Job) {
29 } 30 }
30 31
31 if (payload.type === 'hls') { 32 if (payload.type === 'hls') {
32 await generateHlsPlaylist(video, payload.resolution, payload.copyCodecs, payload.isPortraitMode || false) 33 const videoFileInput = payload.copyCodecs
34 ? video.getWebTorrentFile(payload.resolution)
35 : video.getMaxQualityFile()
36
37 const videoOrStreamingPlaylist = videoFileInput.getVideoOrStreamingPlaylist()
38 const videoInputPath = getVideoFilePath(videoOrStreamingPlaylist, videoFileInput)
39
40 await generateHlsPlaylist({
41 video,
42 videoInputPath,
43 resolution: payload.resolution,
44 copyCodecs: payload.copyCodecs,
45 isPortraitMode: payload.isPortraitMode || false
46 })
33 47
34 await retryTransactionWrapper(onHlsPlaylistGenerationSuccess, video) 48 await retryTransactionWrapper(onHlsPlaylistGenerationSuccess, video)
35 } else if (payload.type === 'new-resolution') { 49 } else if (payload.type === 'new-resolution') {
diff --git a/server/lib/live-manager.ts b/server/lib/live-manager.ts
index 3ff2434ff..692c49008 100644
--- a/server/lib/live-manager.ts
+++ b/server/lib/live-manager.ts
@@ -13,7 +13,7 @@ import { VideoModel } from '@server/models/video/video'
13import { VideoFileModel } from '@server/models/video/video-file' 13import { VideoFileModel } from '@server/models/video/video-file'
14import { VideoLiveModel } from '@server/models/video/video-live' 14import { VideoLiveModel } from '@server/models/video/video-live'
15import { VideoStreamingPlaylistModel } from '@server/models/video/video-streaming-playlist' 15import { VideoStreamingPlaylistModel } from '@server/models/video/video-streaming-playlist'
16import { MStreamingPlaylist, MUser, MUserId, MVideoLive, MVideoLiveVideo } from '@server/types/models' 16import { MStreamingPlaylist, MUserId, MVideoLive, MVideoLiveVideo } from '@server/types/models'
17import { VideoState, VideoStreamingPlaylistType } from '@shared/models' 17import { VideoState, VideoStreamingPlaylistType } from '@shared/models'
18import { federateVideoIfNeeded } from './activitypub/videos' 18import { federateVideoIfNeeded } from './activitypub/videos'
19import { buildSha256Segment } from './hls' 19import { buildSha256Segment } from './hls'
diff --git a/server/lib/video-transcoding.ts b/server/lib/video-transcoding.ts
index a7b73a30d..c62b3c1ce 100644
--- a/server/lib/video-transcoding.ts
+++ b/server/lib/video-transcoding.ts
@@ -147,17 +147,18 @@ async function mergeAudioVideofile (video: MVideoWithAllFiles, resolution: Video
147 return onVideoFileTranscoding(video, inputVideoFile, videoTranscodedPath, videoOutputPath) 147 return onVideoFileTranscoding(video, inputVideoFile, videoTranscodedPath, videoOutputPath)
148} 148}
149 149
150async function generateHlsPlaylist (video: MVideoWithFile, resolution: VideoResolution, copyCodecs: boolean, isPortraitMode: boolean) { 150async function generateHlsPlaylist (options: {
151 video: MVideoWithFile
152 videoInputPath: string
153 resolution: VideoResolution
154 copyCodecs: boolean
155 isPortraitMode: boolean
156}) {
157 const { video, videoInputPath, resolution, copyCodecs, isPortraitMode } = options
158
151 const baseHlsDirectory = join(HLS_STREAMING_PLAYLIST_DIRECTORY, video.uuid) 159 const baseHlsDirectory = join(HLS_STREAMING_PLAYLIST_DIRECTORY, video.uuid)
152 await ensureDir(join(HLS_STREAMING_PLAYLIST_DIRECTORY, video.uuid)) 160 await ensureDir(join(HLS_STREAMING_PLAYLIST_DIRECTORY, video.uuid))
153 161
154 const videoFileInput = copyCodecs
155 ? video.getWebTorrentFile(resolution)
156 : video.getMaxQualityFile()
157
158 const videoOrStreamingPlaylist = videoFileInput.getVideoOrStreamingPlaylist()
159 const videoInputPath = getVideoFilePath(videoOrStreamingPlaylist, videoFileInput)
160
161 const outputPath = join(baseHlsDirectory, VideoStreamingPlaylistModel.getHlsPlaylistFilename(resolution)) 162 const outputPath = join(baseHlsDirectory, VideoStreamingPlaylistModel.getHlsPlaylistFilename(resolution))
162 const videoFilename = generateVideoStreamingPlaylistName(video.uuid, resolution) 163 const videoFilename = generateVideoStreamingPlaylistName(video.uuid, resolution)
163 164
@@ -184,7 +185,7 @@ async function generateHlsPlaylist (video: MVideoWithFile, resolution: VideoReso
184 videoId: video.id, 185 videoId: video.id,
185 playlistUrl, 186 playlistUrl,
186 segmentsSha256Url: WEBSERVER.URL + VideoStreamingPlaylistModel.getHlsSha256SegmentsStaticPath(video.uuid, video.isLive), 187 segmentsSha256Url: WEBSERVER.URL + VideoStreamingPlaylistModel.getHlsSha256SegmentsStaticPath(video.uuid, video.isLive),
187 p2pMediaLoaderInfohashes: VideoStreamingPlaylistModel.buildP2PMediaLoaderInfoHashes(playlistUrl, video.VideoFiles), 188 p2pMediaLoaderInfohashes: [],
188 p2pMediaLoaderPeerVersion: P2P_MEDIA_LOADER_PEER_VERSION, 189 p2pMediaLoaderPeerVersion: P2P_MEDIA_LOADER_PEER_VERSION,
189 190
190 type: VideoStreamingPlaylistType.HLS 191 type: VideoStreamingPlaylistType.HLS
@@ -211,6 +212,11 @@ async function generateHlsPlaylist (video: MVideoWithFile, resolution: VideoReso
211 await VideoFileModel.customUpsert(newVideoFile, 'streaming-playlist', undefined) 212 await VideoFileModel.customUpsert(newVideoFile, 'streaming-playlist', undefined)
212 videoStreamingPlaylist.VideoFiles = await videoStreamingPlaylist.$get('VideoFiles') 213 videoStreamingPlaylist.VideoFiles = await videoStreamingPlaylist.$get('VideoFiles')
213 214
215 videoStreamingPlaylist.p2pMediaLoaderInfohashes = VideoStreamingPlaylistModel.buildP2PMediaLoaderInfoHashes(
216 playlistUrl, videoStreamingPlaylist.VideoFiles
217 )
218 await videoStreamingPlaylist.save()
219
214 video.setHLSPlaylist(videoStreamingPlaylist) 220 video.setHLSPlaylist(videoStreamingPlaylist)
215 221
216 await updateMasterHLSPlaylist(video) 222 await updateMasterHLSPlaylist(video)
diff --git a/server/middlewares/validators/videos/video-live.ts b/server/middlewares/validators/videos/video-live.ts
index a4c364976..ab57e67bf 100644
--- a/server/middlewares/validators/videos/video-live.ts
+++ b/server/middlewares/validators/videos/video-live.ts
@@ -1,15 +1,15 @@
1import * as express from 'express' 1import * as express from 'express'
2import { body, param } from 'express-validator' 2import { body, param } from 'express-validator'
3import { checkUserCanManageVideo, doesVideoChannelOfAccountExist, doesVideoExist } from '@server/helpers/middlewares/videos' 3import { checkUserCanManageVideo, doesVideoChannelOfAccountExist, doesVideoExist } from '@server/helpers/middlewares/videos'
4import { UserRight } from '@shared/models' 4import { VideoLiveModel } from '@server/models/video/video-live'
5import { isIdOrUUIDValid, isIdValid, toIntOrNull } from '../../../helpers/custom-validators/misc' 5import { UserRight, VideoState } from '@shared/models'
6import { isBooleanValid, isIdOrUUIDValid, isIdValid, toBooleanOrNull, toIntOrNull } from '../../../helpers/custom-validators/misc'
6import { isVideoNameValid } from '../../../helpers/custom-validators/videos' 7import { isVideoNameValid } from '../../../helpers/custom-validators/videos'
7import { cleanUpReqFiles } from '../../../helpers/express-utils' 8import { cleanUpReqFiles } from '../../../helpers/express-utils'
8import { logger } from '../../../helpers/logger' 9import { logger } from '../../../helpers/logger'
9import { CONFIG } from '../../../initializers/config' 10import { CONFIG } from '../../../initializers/config'
10import { areValidationErrors } from '../utils' 11import { areValidationErrors } from '../utils'
11import { getCommonVideoEditAttributes } from './videos' 12import { getCommonVideoEditAttributes } from './videos'
12import { VideoLiveModel } from '@server/models/video/video-live'
13 13
14const videoLiveGetValidator = [ 14const videoLiveGetValidator = [
15 param('videoId').custom(isIdOrUUIDValid).not().isEmpty().withMessage('Should have a valid videoId'), 15 param('videoId').custom(isIdOrUUIDValid).not().isEmpty().withMessage('Should have a valid videoId'),
@@ -41,6 +41,11 @@ const videoLiveAddValidator = getCommonVideoEditAttributes().concat([
41 body('name') 41 body('name')
42 .custom(isVideoNameValid).withMessage('Should have a valid name'), 42 .custom(isVideoNameValid).withMessage('Should have a valid name'),
43 43
44 body('saveReplay')
45 .optional()
46 .customSanitizer(toBooleanOrNull)
47 .custom(isBooleanValid).withMessage('Should have a valid saveReplay attribute'),
48
44 async (req: express.Request, res: express.Response, next: express.NextFunction) => { 49 async (req: express.Request, res: express.Response, next: express.NextFunction) => {
45 logger.debug('Checking videoLiveAddValidator parameters', { parameters: req.body }) 50 logger.debug('Checking videoLiveAddValidator parameters', { parameters: req.body })
46 51
@@ -49,6 +54,11 @@ const videoLiveAddValidator = getCommonVideoEditAttributes().concat([
49 .json({ error: 'Live is not enabled on this instance' }) 54 .json({ error: 'Live is not enabled on this instance' })
50 } 55 }
51 56
57 if (CONFIG.LIVE.ALLOW_REPLAY !== true && req.body.saveReplay === true) {
58 return res.status(403)
59 .json({ error: 'Saving live replay is not allowed instance' })
60 }
61
52 if (areValidationErrors(req, res)) return cleanUpReqFiles(req) 62 if (areValidationErrors(req, res)) return cleanUpReqFiles(req)
53 63
54 const user = res.locals.oauth.token.User 64 const user = res.locals.oauth.token.User
@@ -58,9 +68,35 @@ const videoLiveAddValidator = getCommonVideoEditAttributes().concat([
58 } 68 }
59]) 69])
60 70
71const videoLiveUpdateValidator = [
72 body('saveReplay')
73 .optional()
74 .customSanitizer(toBooleanOrNull)
75 .custom(isBooleanValid).withMessage('Should have a valid saveReplay attribute'),
76
77 (req: express.Request, res: express.Response, next: express.NextFunction) => {
78 logger.debug('Checking videoLiveUpdateValidator parameters', { parameters: req.body })
79
80 if (areValidationErrors(req, res)) return
81
82 if (CONFIG.LIVE.ALLOW_REPLAY !== true && req.body.saveReplay === true) {
83 return res.status(403)
84 .json({ error: 'Saving live replay is not allowed instance' })
85 }
86
87 if (res.locals.videoAll.state !== VideoState.WAITING_FOR_LIVE) {
88 return res.status(400)
89 .json({ error: 'Cannot update a live that has already started' })
90 }
91
92 return next()
93 }
94]
95
61// --------------------------------------------------------------------------- 96// ---------------------------------------------------------------------------
62 97
63export { 98export {
64 videoLiveAddValidator, 99 videoLiveAddValidator,
100 videoLiveUpdateValidator,
65 videoLiveGetValidator 101 videoLiveGetValidator
66} 102}
diff --git a/server/models/video/video-live.ts b/server/models/video/video-live.ts
index 0e229de6a..345918cb9 100644
--- a/server/models/video/video-live.ts
+++ b/server/models/video/video-live.ts
@@ -94,7 +94,8 @@ export class VideoLiveModel extends Model<VideoLiveModel> {
94 toFormattedJSON (): LiveVideo { 94 toFormattedJSON (): LiveVideo {
95 return { 95 return {
96 rtmpUrl: WEBSERVER.RTMP_URL, 96 rtmpUrl: WEBSERVER.RTMP_URL,
97 streamKey: this.streamKey 97 streamKey: this.streamKey,
98 saveReplay: this.saveReplay
98 } 99 }
99 } 100 }
100} 101}