X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Fapi%2Fvideos%2Flive.ts;h=de047d4ec3c803658aacc2a326cb6d557433b832;hb=05a60d85997c108d39bcfb14f1ffd4c74f8b1e93;hp=ed4da8f479ad3154bd545e57b90d88872256b7fe;hpb=ac27887774e63d99f4e227fbe18846f143cc4b3c;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/controllers/api/videos/live.ts b/server/controllers/api/videos/live.ts index ed4da8f47..de047d4ec 100644 --- a/server/controllers/api/videos/live.ts +++ b/server/controllers/api/videos/live.ts @@ -1,33 +1,34 @@ -import * as express from 'express' +import express from 'express' +import { exists } from '@server/helpers/custom-validators/misc' import { createReqFiles } from '@server/helpers/express-utils' -import { buildUUID, uuidToShort } from '@server/helpers/uuid' -import { CONFIG } from '@server/initializers/config' +import { getFormattedObjects } from '@server/helpers/utils' import { ASSETS_PATH, MIMETYPES } from '@server/initializers/constants' import { getLocalVideoActivityPubUrl } from '@server/lib/activitypub/url' import { federateVideoIfNeeded } from '@server/lib/activitypub/videos' import { Hooks } from '@server/lib/plugins/hooks' import { buildLocalVideoFromReq, buildVideoThumbnailsFromReq, setVideoTags } from '@server/lib/video' -import { videoLiveAddValidator, videoLiveGetValidator, videoLiveUpdateValidator } from '@server/middlewares/validators/videos/video-live' +import { + videoLiveAddValidator, + videoLiveFindReplaySessionValidator, + videoLiveGetValidator, + videoLiveListSessionsValidator, + videoLiveUpdateValidator +} from '@server/middlewares/validators/videos/video-live' import { VideoLiveModel } from '@server/models/video/video-live' -import { MVideoDetails, MVideoFullLight } from '@server/types/models' -import { LiveVideoCreate, LiveVideoUpdate, VideoState } from '../../../../shared' -import { HttpStatusCode } from '../../../../shared/models/http/http-error-codes' +import { VideoLiveSessionModel } from '@server/models/video/video-live-session' +import { MVideoDetails, MVideoFullLight, MVideoLive } from '@server/types/models' +import { buildUUID, uuidToShort } from '@shared/extra-utils' +import { HttpStatusCode, LiveVideoCreate, LiveVideoLatencyMode, LiveVideoUpdate, UserRight, VideoState } from '@shared/models' import { logger } from '../../../helpers/logger' import { sequelizeTypescript } from '../../../initializers/database' import { updateVideoMiniatureFromExisting } from '../../../lib/thumbnail' -import { asyncMiddleware, asyncRetryTransactionMiddleware, authenticate } from '../../../middlewares' +import { asyncMiddleware, asyncRetryTransactionMiddleware, authenticate, optionalAuthenticate } from '../../../middlewares' import { VideoModel } from '../../../models/video/video' +import { VideoLiveReplaySettingModel } from '@server/models/video/video-live-replay-setting' const liveRouter = express.Router() -const reqVideoFileLive = createReqFiles( - [ 'thumbnailfile', 'previewfile' ], - MIMETYPES.IMAGE.MIMETYPE_EXT, - { - thumbnailfile: CONFIG.STORAGE.TMP_DIR, - previewfile: CONFIG.STORAGE.TMP_DIR - } -) +const reqVideoFileLive = createReqFiles([ 'thumbnailfile', 'previewfile' ], MIMETYPES.IMAGE.MIMETYPE_EXT) liveRouter.post('/live', authenticate, @@ -36,10 +37,17 @@ liveRouter.post('/live', asyncRetryTransactionMiddleware(addLiveVideo) ) -liveRouter.get('/live/:videoId', +liveRouter.get('/live/:videoId/sessions', authenticate, asyncMiddleware(videoLiveGetValidator), - asyncRetryTransactionMiddleware(getLiveVideo) + videoLiveListSessionsValidator, + asyncMiddleware(getLiveVideoSessions) +) + +liveRouter.get('/live/:videoId', + optionalAuthenticate, + asyncMiddleware(videoLiveGetValidator), + getLiveVideo ) liveRouter.put('/live/:videoId', @@ -49,6 +57,11 @@ liveRouter.put('/live/:videoId', asyncRetryTransactionMiddleware(updateLiveVideo) ) +liveRouter.get('/:videoId/live-session', + asyncMiddleware(videoLiveFindReplaySessionValidator), + getLiveReplaySession +) + // --------------------------------------------------------------------------- export { @@ -57,10 +70,34 @@ export { // --------------------------------------------------------------------------- -async function getLiveVideo (req: express.Request, res: express.Response) { +function getLiveVideo (req: express.Request, res: express.Response) { const videoLive = res.locals.videoLive - return res.json(videoLive.toFormattedJSON()) + return res.json(videoLive.toFormattedJSON(canSeePrivateLiveInformation(res))) +} + +function getLiveReplaySession (req: express.Request, res: express.Response) { + const session = res.locals.videoLiveSession + + return res.json(session.toFormattedJSON()) +} + +async function getLiveVideoSessions (req: express.Request, res: express.Response) { + const videoLive = res.locals.videoLive + + const data = await VideoLiveSessionModel.listSessionsOfLiveForAPI({ videoId: videoLive.videoId }) + + return res.json(getFormattedObjects(data, data.length)) +} + +function canSeePrivateLiveInformation (res: express.Response) { + const user = res.locals.oauth?.token.User + if (!user) return false + + if (user.hasRight(UserRight.GET_ANY_LIVE)) return true + + const video = res.locals.videoAll + return video.VideoChannel.Account.userId === user.id } async function updateLiveVideo (req: express.Request, res: express.Response) { @@ -69,8 +106,12 @@ async function updateLiveVideo (req: express.Request, res: express.Response) { const video = res.locals.videoAll const videoLive = res.locals.videoLive - videoLive.saveReplay = body.saveReplay || false - videoLive.permanentLive = body.permanentLive || false + const newReplaySettingModel = await updateReplaySettings(videoLive, body) + if (newReplaySettingModel) videoLive.replaySettingId = newReplaySettingModel.id + else videoLive.replaySettingId = null + + if (exists(body.permanentLive)) videoLive.permanentLive = body.permanentLive + if (exists(body.latencyMode)) videoLive.latencyMode = body.latencyMode video.VideoLive = await videoLive.save() @@ -79,11 +120,34 @@ async function updateLiveVideo (req: express.Request, res: express.Response) { return res.status(HttpStatusCode.NO_CONTENT_204).end() } +async function updateReplaySettings (videoLive: MVideoLive, body: LiveVideoUpdate) { + if (exists(body.saveReplay)) videoLive.saveReplay = body.saveReplay + + // The live replay is not saved anymore, destroy the old model if it existed + if (!videoLive.saveReplay) { + if (videoLive.replaySettingId) { + await VideoLiveReplaySettingModel.removeSettings(videoLive.replaySettingId) + } + + return undefined + } + + const settingModel = videoLive.replaySettingId + ? await VideoLiveReplaySettingModel.load(videoLive.replaySettingId) + : new VideoLiveReplaySettingModel() + + if (exists(body.replaySettings.privacy)) settingModel.privacy = body.replaySettings.privacy + + return settingModel.save() +} + async function addLiveVideo (req: express.Request, res: express.Response) { const videoInfo: LiveVideoCreate = req.body // Prepare data so we don't block the transaction - const videoData = buildLocalVideoFromReq(videoInfo, res.locals.videoChannel.id) + let videoData = buildLocalVideoFromReq(videoInfo, res.locals.videoChannel.id) + videoData = await Hooks.wrapObject(videoData, 'filter:api.video.live.video-attribute.result') + videoData.isLive = true videoData.state = VideoState.WAITING_FOR_LIVE videoData.duration = 0 @@ -94,6 +158,7 @@ async function addLiveVideo (req: express.Request, res: express.Response) { const videoLive = new VideoLiveModel() videoLive.saveReplay = videoInfo.saveReplay || false videoLive.permanentLive = videoInfo.permanentLive || false + videoLive.latencyMode = videoInfo.latencyMode || LiveVideoLatencyMode.DEFAULT videoLive.streamKey = buildUUID() const [ thumbnailModel, previewModel ] = await buildVideoThumbnailsFromReq({ @@ -121,6 +186,15 @@ async function addLiveVideo (req: express.Request, res: express.Response) { // Do not forget to add video channel information to the created video videoCreated.VideoChannel = res.locals.videoChannel + if (videoLive.saveReplay) { + const replaySettings = new VideoLiveReplaySettingModel({ + privacy: videoInfo.replaySettings.privacy + }) + await replaySettings.save(sequelizeOptions) + + videoLive.replaySettingId = replaySettings.id + } + videoLive.videoId = videoCreated.id videoCreated.VideoLive = await videoLive.save(sequelizeOptions) @@ -133,7 +207,7 @@ async function addLiveVideo (req: express.Request, res: express.Response) { return { videoCreated } }) - Hooks.runAction('action:api.live-video.created', { video: videoCreated }) + Hooks.runAction('action:api.live-video.created', { video: videoCreated, req, res }) return res.json({ video: {