X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Flive-manager.ts;h=4d2e9b1b390ee3e70e5d17947eb1d06f6cde09c0;hb=daf6e4801052d3ca6be2fafd20bae2323b1ce175;hp=4a1081a4f77cb257aca1d5cd553402911e1c607c;hpb=e4bf78561763cd84d22ebceb6f371cccf9a356d8;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/lib/live-manager.ts b/server/lib/live-manager.ts index 4a1081a4f..4d2e9b1b3 100644 --- a/server/lib/live-manager.ts +++ b/server/lib/live-manager.ts @@ -1,16 +1,11 @@ -import { AsyncQueue, queue } from 'async' import * as chokidar from 'chokidar' import { FfmpegCommand } from 'fluent-ffmpeg' import { ensureDir, stat } from 'fs-extra' import { basename } from 'path' -import { - computeResolutionsToTranscode, - getVideoFileFPS, - getVideoFileResolution, - runLiveMuxing, - runLiveTranscoding -} from '@server/helpers/ffmpeg-utils' +import { isTestInstance } from '@server/helpers/core-utils' +import { runLiveMuxing, runLiveTranscoding } 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' import { MEMOIZE_TTL, P2P_MEDIA_LOADER_PEER_VERSION, VIDEO_LIVE, VIEW_LIFETIME, WEBSERVER } from '@server/initializers/constants' @@ -49,12 +44,6 @@ const config = { } } -type SegmentSha256QueueParam = { - operation: 'update' | 'delete' - videoUUID: string - segmentPath: string -} - class LiveManager { private static instance: LiveManager @@ -70,7 +59,6 @@ class LiveManager { return isAbleToUploadVideo(userId, 1000) }, { maxAge: MEMOIZE_TTL.LIVE_ABLE_TO_UPLOAD }) - private segmentsSha256Queue: AsyncQueue private rtmpServer: any private constructor () { @@ -95,18 +83,6 @@ class LiveManager { logger.info('Live session ended.', { sessionId }) }) - this.segmentsSha256Queue = queue((options, cb) => { - const promise = options.operation === 'update' - ? this.addSegmentSha(options) - : Promise.resolve(this.removeSegmentSha(options)) - - promise.then(() => cb()) - .catch(err => { - logger.error('Cannot update/remove sha segment %s.', options.segmentPath, { err }) - cb() - }) - }) - registerConfigChangedHandler(() => { if (!this.rtmpServer && CONFIG.LIVE.ENABLED === true) { this.run() @@ -118,6 +94,10 @@ class LiveManager { } }) + // Cleanup broken lives, that were terminated by a server restart for example + this.handleBrokenLives() + .catch(err => logger.error('Cannot handle broken lives.', { err })) + setInterval(() => this.updateLiveViews(), VIEW_LIFETIME.LIVE) } @@ -218,13 +198,15 @@ class LiveManager { ? computeResolutionsToTranscode(resolutionResult.videoFileResolution, 'live') : [] - logger.info('Will mux/transcode live video of original resolution %d.', session.videoHeight, { resolutionsEnabled }) + const allResolutions = resolutionsEnabled.concat([ session.videoHeight ]) + + logger.info('Will mux/transcode live video of original resolution %d.', session.videoHeight, { allResolutions }) const [ videoStreamingPlaylist ] = await VideoStreamingPlaylistModel.upsert({ videoId: video.id, playlistUrl, segmentsSha256Url: WEBSERVER.URL + VideoStreamingPlaylistModel.getHlsSha256SegmentsStaticPath(video.uuid, video.isLive), - p2pMediaLoaderInfohashes: VideoStreamingPlaylistModel.buildP2PMediaLoaderInfoHashes(playlistUrl, resolutionsEnabled), + p2pMediaLoaderInfohashes: VideoStreamingPlaylistModel.buildP2PMediaLoaderInfoHashes(playlistUrl, allResolutions), p2pMediaLoaderPeerVersion: P2P_MEDIA_LOADER_PEER_VERSION, type: VideoStreamingPlaylistType.HLS @@ -234,10 +216,9 @@ class LiveManager { sessionId, videoLive, playlist: videoStreamingPlaylist, - originalResolution: session.videoHeight, rtmpUrl, fps, - resolutionsEnabled + allResolutions }) } @@ -247,12 +228,10 @@ class LiveManager { playlist: MStreamingPlaylist rtmpUrl: string fps: number - resolutionsEnabled: number[] - originalResolution: number + allResolutions: number[] }) { - const { sessionId, videoLive, playlist, resolutionsEnabled, originalResolution, fps, rtmpUrl } = options + const { sessionId, videoLive, playlist, allResolutions, fps, rtmpUrl } = options const startStreamDateTime = new Date().getTime() - const allResolutions = resolutionsEnabled.concat([ originalResolution ]) const user = await UserModel.loadByLiveId(videoLive.id) if (!this.livesPerUser.has(user.id)) { @@ -293,11 +272,28 @@ class LiveManager { const tsWatcher = chokidar.watch(outPath + '/*.ts') - const updateSegment = segmentPath => this.segmentsSha256Queue.push({ operation: 'update', segmentPath, videoUUID }) + 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 => { - updateSegment(segmentPath) + logger.debug('Live add handler of %s.', segmentPath) + const playlistId = basename(segmentPath).match(playlistIdMatcher)[0] + + const segmentsToProcess = segmentsToProcessPerPlaylist[playlistId] || [] + processHashSegments(segmentsToProcess) + + segmentsToProcessPerPlaylist[playlistId] = [ segmentPath ] + + // Duration constraint check if (this.isDurationConstraintValid(startStreamDateTime) !== true) { logger.info('Stopping session of %s: max duration exceeded.', videoUUID) @@ -322,10 +318,9 @@ class LiveManager { } } - const deleteHandler = segmentPath => this.segmentsSha256Queue.push({ operation: 'delete', segmentPath, videoUUID }) + const deleteHandler = segmentPath => this.removeSegmentSha(videoUUID, segmentPath) tsWatcher.on('add', p => addHandler(p)) - tsWatcher.on('change', p => updateSegment(p)) tsWatcher.on('unlink', p => deleteHandler(p)) const masterWatcher = chokidar.watch(outPath + '/master.m3u8') @@ -337,11 +332,15 @@ class LiveManager { await video.save() videoLive.Video = video - await federateVideoIfNeeded(video, false) + setTimeout(() => { + federateVideoIfNeeded(video, false) + .catch(err => logger.error('Cannot federate live video %s.', video.url, { err })) + + PeerTubeSocket.Instance.sendVideoLiveNewState(video) + }, VIDEO_LIVE.SEGMENT_TIME_SECONDS * 1000 * VIDEO_LIVE.EDGE_LIVE_DELAY_SEGMENTS_NOTIFICATION) - PeerTubeSocket.Instance.sendVideoLiveNewState(video) } catch (err) { - logger.error('Cannot federate video %d.', videoLive.videoId, { err }) + logger.error('Cannot save/federate live video %d.', videoLive.videoId, { err }) } finally { masterWatcher.close() .catch(err => logger.error('Cannot close master watcher of %s.', outPath, { err })) @@ -354,11 +353,21 @@ class LiveManager { this.transSessions.delete(sessionId) this.watchersPerVideo.delete(videoLive.videoId) - Promise.all([ tsWatcher.close(), masterWatcher.close() ]) - .catch(err => logger.error('Cannot close watchers of %s.', outPath, { err })) + 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 })) - this.onEndTransmuxing(videoLive.Video.id) - .catch(err => logger.error('Error in closed transmuxing.', { err })) + this.onEndTransmuxing(videoLive.Video.id) + .catch(err => logger.error('Error in closed transmuxing.', { err })) + }, 1000) } ffmpegExec.on('error', (err, stdout, stderr) => { @@ -398,33 +407,33 @@ class LiveManager { } } - private async addSegmentSha (options: SegmentSha256QueueParam) { - const segmentName = basename(options.segmentPath) - logger.debug('Updating live sha segment %s.', options.segmentPath) + private async addSegmentSha (videoUUID: string, segmentPath: string) { + const segmentName = basename(segmentPath) + logger.debug('Adding live sha segment %s.', segmentPath) - const shaResult = await buildSha256Segment(options.segmentPath) + const shaResult = await buildSha256Segment(segmentPath) - if (!this.segmentsSha256.has(options.videoUUID)) { - this.segmentsSha256.set(options.videoUUID, new Map()) + if (!this.segmentsSha256.has(videoUUID)) { + this.segmentsSha256.set(videoUUID, new Map()) } - const filesMap = this.segmentsSha256.get(options.videoUUID) + const filesMap = this.segmentsSha256.get(videoUUID) filesMap.set(segmentName, shaResult) } - private removeSegmentSha (options: SegmentSha256QueueParam) { - const segmentName = basename(options.segmentPath) + private removeSegmentSha (videoUUID: string, segmentPath: string) { + const segmentName = basename(segmentPath) - logger.debug('Removing live sha segment %s.', options.segmentPath) + logger.debug('Removing live sha segment %s.', segmentPath) - const filesMap = this.segmentsSha256.get(options.videoUUID) + const filesMap = this.segmentsSha256.get(videoUUID) if (!filesMap) { - logger.warn('Unknown files map to remove sha for %s.', options.videoUUID) + logger.warn('Unknown files map to remove sha for %s.', videoUUID) return } if (!filesMap.has(segmentName)) { - logger.warn('Unknown segment in files map for video %s and segment %s.', options.videoUUID, options.segmentPath) + logger.warn('Unknown segment in files map for video %s and segment %s.', videoUUID, segmentPath) return } @@ -451,7 +460,7 @@ class LiveManager { private async updateLiveViews () { if (!this.isRunning()) return - logger.info('Updating live video views.') + if (!isTestInstance()) logger.info('Updating live video views.') for (const videoId of this.watchersPerVideo.keys()) { const notBefore = new Date().getTime() - VIEW_LIFETIME.LIVE @@ -474,6 +483,14 @@ class LiveManager { } } + private async handleBrokenLives () { + const videoIds = await VideoModel.listPublishedLiveIds() + + for (const id of videoIds) { + await this.onEndTransmuxing(id, true) + } + } + static get Instance () { return this.instance || (this.instance = new this()) }