X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Flive-manager.ts;h=c2dd116a99847f34188a066af824268a196a6a03;hb=3851e732c4b1da0bc0c40a46ed5a89d93cdc5389;hp=4d2e9b1b390ee3e70e5d17947eb1d06f6cde09c0;hpb=daf6e4801052d3ca6be2fafd20bae2323b1ce175;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/lib/live-manager.ts b/server/lib/live-manager.ts index 4d2e9b1b3..c2dd116a9 100644 --- a/server/lib/live-manager.ts +++ b/server/lib/live-manager.ts @@ -1,10 +1,10 @@ import * as chokidar from 'chokidar' import { FfmpegCommand } from 'fluent-ffmpeg' -import { ensureDir, stat } from 'fs-extra' -import { basename } from 'path' +import { appendFile, copy, ensureDir, readFile, stat } from 'fs-extra' +import { basename, join } from 'path' import { isTestInstance } from '@server/helpers/core-utils' -import { runLiveMuxing, runLiveTranscoding } from '@server/helpers/ffmpeg-utils' +import { getLiveMuxingCommand, getLiveTranscodingCommand } from '@server/helpers/ffmpeg-utils' import { computeResolutionsToTranscode, getVideoFileFPS, getVideoFileResolution } from '@server/helpers/ffprobe-utils' import { logger } from '@server/helpers/logger' import { CONFIG, registerConfigChangedHandler } from '@server/initializers/config' @@ -19,11 +19,15 @@ import { VideoState, VideoStreamingPlaylistType } from '@shared/models' import { federateVideoIfNeeded } from './activitypub/videos' import { buildSha256Segment } from './hls' import { JobQueue } from './job-queue' +import { cleanupLive } from './job-queue/handlers/video-live-ending' import { PeerTubeSocket } from './peertube-socket' import { isAbleToUploadVideo } from './user' import { getHLSDirectory } from './video-paths' +import { availableEncoders } from './video-transcoding-profiles' +import * as Bluebird from 'bluebird' import memoizee = require('memoizee') + const NodeRtmpServer = require('node-media-server/node_rtmp_server') const context = require('node-media-server/node_core_ctx') const nodeMediaServerLogger = require('node-media-server/node_core_logger') @@ -151,6 +155,36 @@ class LiveManager { watchers.push(new Date().getTime()) } + cleanupShaSegments (videoUUID: string) { + this.segmentsSha256.delete(videoUUID) + } + + addSegmentToReplay (hlsVideoPath: string, segmentPath: string) { + const segmentName = basename(segmentPath) + const dest = join(hlsVideoPath, VIDEO_LIVE.REPLAY_DIRECTORY, this.buildConcatenatedName(segmentName)) + + return readFile(segmentPath) + .then(data => appendFile(dest, data)) + .catch(err => logger.error('Cannot copy segment %s to repay directory.', segmentPath, { err })) + } + + buildConcatenatedName (segmentOrPlaylistPath: string) { + const num = basename(segmentOrPlaylistPath).match(/^(\d+)(-|\.)/) + + return 'concat-' + num[1] + '.ts' + } + + private processSegments (hlsVideoPath: string, videoUUID: string, videoLive: MVideoLive, segmentPaths: string[]) { + Bluebird.mapSeries(segmentPaths, async previousSegment => { + // Add sha hash of previous segments, because ffmpeg should have finished generating them + await this.addSegmentSha(videoUUID, previousSegment) + + if (videoLive.saveReplay) { + await this.addSegmentToReplay(hlsVideoPath, previousSegment) + } + }).catch(err => logger.error('Cannot process segments in %s', hlsVideoPath, { err })) + } + private getContext () { return context } @@ -182,6 +216,14 @@ class LiveManager { return this.abortSession(sessionId) } + // Cleanup old potential live files (could happen with a permanent live) + this.cleanupShaSegments(video.uuid) + + const oldStreamingPlaylist = await VideoStreamingPlaylistModel.loadHLSPlaylistByVideo(video.id) + if (oldStreamingPlaylist) { + await cleanupLive(video, oldStreamingPlaylist) + } + this.videoSessions.set(video.id, sessionId) const playlistUrl = WEBSERVER.URL + VideoStreamingPlaylistModel.getHlsMasterPlaylistStaticPath(video.uuid) @@ -260,12 +302,24 @@ class LiveManager { const outPath = getHLSDirectory(videoLive.Video) await ensureDir(outPath) + const replayDirectory = join(outPath, VIDEO_LIVE.REPLAY_DIRECTORY) + + if (videoLive.saveReplay === true) { + await ensureDir(replayDirectory) + } + const videoUUID = videoLive.Video.uuid - const deleteSegments = videoLive.saveReplay === false const ffmpegExec = CONFIG.LIVE.TRANSCODING.ENABLED - ? runLiveTranscoding(rtmpUrl, outPath, allResolutions, fps, deleteSegments) - : runLiveMuxing(rtmpUrl, outPath, deleteSegments) + ? await getLiveTranscodingCommand({ + rtmpUrl, + outPath, + resolutions: allResolutions, + fps, + availableEncoders, + profile: 'default' + }) + : getLiveMuxingCommand(rtmpUrl, outPath) logger.info('Running live muxing/transcoding for %s.', videoUUID) this.transSessions.set(sessionId, ffmpegExec) @@ -275,21 +329,13 @@ class LiveManager { const segmentsToProcessPerPlaylist: { [playlistId: string]: string[] } = {} const playlistIdMatcher = /^([\d+])-/ - const processHashSegments = (segmentsToProcess: string[]) => { - // Add sha hash of previous segments, because ffmpeg should have finished generating them - for (const previousSegment of segmentsToProcess) { - this.addSegmentSha(videoUUID, previousSegment) - .catch(err => logger.error('Cannot add sha segment of video %s -> %s.', videoUUID, previousSegment, { err })) - } - } - const addHandler = segmentPath => { logger.debug('Live add handler of %s.', segmentPath) const playlistId = basename(segmentPath).match(playlistIdMatcher)[0] const segmentsToProcess = segmentsToProcessPerPlaylist[playlistId] || [] - processHashSegments(segmentsToProcess) + this.processSegments(outPath, videoUUID, videoLive, segmentsToProcess) segmentsToProcessPerPlaylist[playlistId] = [ segmentPath ] @@ -351,19 +397,25 @@ class LiveManager { logger.info('RTMP transmuxing for video %s ended. Scheduling cleanup', rtmpUrl) this.transSessions.delete(sessionId) + this.watchersPerVideo.delete(videoLive.videoId) + this.videoSessions.delete(videoLive.videoId) + + const newLivesPerUser = this.livesPerUser.get(user.id) + .filter(o => o.liveId !== videoLive.id) + this.livesPerUser.set(user.id, newLivesPerUser) setTimeout(() => { // Wait latest segments generation, and close watchers Promise.all([ tsWatcher.close(), masterWatcher.close() ]) - .then(() => { - // Process remaining segments hash - for (const key of Object.keys(segmentsToProcessPerPlaylist)) { - processHashSegments(segmentsToProcessPerPlaylist[key]) - } - }) - .catch(err => logger.error('Cannot close watchers of %s or process remaining hash segments.', outPath, { err })) + .then(() => { + // Process remaining segments hash + for (const key of Object.keys(segmentsToProcessPerPlaylist)) { + this.processSegments(outPath, videoUUID, videoLive, segmentsToProcessPerPlaylist[key]) + } + }) + .catch(err => logger.error('Cannot close watchers of %s or process remaining hash segments.', outPath, { err })) this.onEndTransmuxing(videoLive.Video.id) .catch(err => logger.error('Error in closed transmuxing.', { err })) @@ -382,6 +434,8 @@ class LiveManager { }) ffmpegExec.on('end', () => onFFmpegEnded()) + + ffmpegExec.run() } private async onEndTransmuxing (videoId: number, cleanupNow = false) { @@ -389,14 +443,21 @@ class LiveManager { const fullVideo = await VideoModel.loadAndPopulateAccountAndServerAndTags(videoId) if (!fullVideo) return - JobQueue.Instance.createJob({ - type: 'video-live-ending', - payload: { - videoId: fullVideo.id - } - }, { delay: cleanupNow ? 0 : VIDEO_LIVE.CLEANUP_DELAY }) + const live = await VideoLiveModel.loadByVideoId(videoId) + + if (!live.permanentLive) { + JobQueue.Instance.createJob({ + type: 'video-live-ending', + payload: { + videoId: fullVideo.id + } + }, { delay: cleanupNow ? 0 : VIDEO_LIVE.CLEANUP_DELAY }) + + fullVideo.state = VideoState.LIVE_ENDED + } else { + fullVideo.state = VideoState.WAITING_FOR_LIVE + } - fullVideo.state = VideoState.LIVE_ENDED await fullVideo.save() PeerTubeSocket.Instance.sendVideoLiveNewState(fullVideo)