X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=server%2Fcontrollers%2Fapi%2Fvideos%2Findex.ts;h=4e4697ef4cfc1b24c0edbe8abb3c81592a110a38;hb=6040f87d143a5fa01db79867ece8197c3ce7be47;hp=10b6c000f74168a807246878d989ecd835dd42bb;hpb=e3a682a877a10833cb54ac3595e55110bda95647;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/controllers/api/videos/index.ts b/server/controllers/api/videos/index.ts index 10b6c000f..4e4697ef4 100644 --- a/server/controllers/api/videos/index.ts +++ b/server/controllers/api/videos/index.ts @@ -1,12 +1,11 @@ import * as express from 'express' import { extname, join } from 'path' -import { VideoCreate, VideoPrivacy, VideoUpdate } from '../../../../shared' -import { renamePromise } from '../../../helpers/core-utils' -import { retryTransactionWrapper } from '../../../helpers/database-utils' -import { getVideoFileHeight } from '../../../helpers/ffmpeg-utils' +import { VideoCreate, VideoPrivacy, VideoState, VideoUpdate } from '../../../../shared' +import { getVideoFileFPS, getVideoFileResolution } from '../../../helpers/ffmpeg-utils' import { processImage } from '../../../helpers/image-utils' import { logger } from '../../../helpers/logger' -import { createReqFiles, getFormattedObjects, getServerActor, resetSequelizeInstance } from '../../../helpers/utils' +import { auditLoggerFactory, getAuditIdFromRes, VideoAuditView } from '../../../helpers/audit-logger' +import { getFormattedObjects, getServerActor } from '../../../helpers/utils' import { CONFIG, IMAGE_MIMETYPE_EXT, @@ -19,19 +18,28 @@ import { VIDEO_MIMETYPE_EXT, VIDEO_PRIVACIES } from '../../../initializers' -import { fetchRemoteVideoDescription, getVideoActivityPubUrl, shareVideoByServerAndChannel } from '../../../lib/activitypub' -import { sendCreateVideo, sendCreateViewToOrigin, sendCreateViewToVideoFollowers, sendUpdateVideo } from '../../../lib/activitypub/send' +import { + changeVideoChannelShare, + federateVideoIfNeeded, + fetchRemoteVideoDescription, + getVideoActivityPubUrl +} from '../../../lib/activitypub' +import { sendCreateView } from '../../../lib/activitypub/send' import { JobQueue } from '../../../lib/job-queue' +import { Redis } from '../../../lib/redis' import { asyncMiddleware, + asyncRetryTransactionMiddleware, authenticate, + checkVideoFollowConstraints, + commonVideosFiltersValidator, + optionalAuthenticate, paginationValidator, setDefaultPagination, setDefaultSort, videosAddValidator, videosGetValidator, videosRemoveValidator, - videosSearchValidator, videosSortValidator, videosUpdateValidator } from '../../../middlewares' @@ -40,35 +48,47 @@ import { VideoModel } from '../../../models/video/video' import { VideoFileModel } from '../../../models/video/video-file' import { abuseVideoRouter } from './abuse' import { blacklistRouter } from './blacklist' -import { videoChannelRouter } from './channel' import { videoCommentRouter } from './comment' import { rateVideoRouter } from './rate' - +import { ownershipVideoRouter } from './ownership' +import { VideoFilter } from '../../../../shared/models/videos/video-query.type' +import { buildNSFWFilter, createReqFiles } from '../../../helpers/express-utils' +import { ScheduleVideoUpdateModel } from '../../../models/video/schedule-video-update' +import { videoCaptionsRouter } from './captions' +import { videoImportsRouter } from './import' +import { resetSequelizeInstance } from '../../../helpers/database-utils' +import { rename } from 'fs-extra' +import { watchingRouter } from './watching' + +const auditLogger = auditLoggerFactory('videos') const videosRouter = express.Router() const reqVideoFileAdd = createReqFiles( [ 'videofile', 'thumbnailfile', 'previewfile' ], Object.assign({}, VIDEO_MIMETYPE_EXT, IMAGE_MIMETYPE_EXT), { - videofile: CONFIG.STORAGE.VIDEOS_DIR, - thumbnailfile: CONFIG.STORAGE.THUMBNAILS_DIR, - previewfile: CONFIG.STORAGE.PREVIEWS_DIR + videofile: CONFIG.STORAGE.TMP_DIR, + thumbnailfile: CONFIG.STORAGE.TMP_DIR, + previewfile: CONFIG.STORAGE.TMP_DIR } ) const reqVideoFileUpdate = createReqFiles( [ 'thumbnailfile', 'previewfile' ], IMAGE_MIMETYPE_EXT, { - thumbnailfile: CONFIG.STORAGE.THUMBNAILS_DIR, - previewfile: CONFIG.STORAGE.PREVIEWS_DIR + thumbnailfile: CONFIG.STORAGE.TMP_DIR, + previewfile: CONFIG.STORAGE.TMP_DIR } ) videosRouter.use('/', abuseVideoRouter) videosRouter.use('/', blacklistRouter) videosRouter.use('/', rateVideoRouter) -videosRouter.use('/', videoChannelRouter) videosRouter.use('/', videoCommentRouter) +videosRouter.use('/', videoCaptionsRouter) +videosRouter.use('/', videoImportsRouter) +videosRouter.use('/', ownershipVideoRouter) +videosRouter.use('/', watchingRouter) videosRouter.get('/categories', listVideoCategories) videosRouter.get('/licences', listVideoLicences) @@ -80,27 +100,21 @@ videosRouter.get('/', videosSortValidator, setDefaultSort, setDefaultPagination, + optionalAuthenticate, + commonVideosFiltersValidator, asyncMiddleware(listVideos) ) -videosRouter.get('/search', - videosSearchValidator, - paginationValidator, - videosSortValidator, - setDefaultSort, - setDefaultPagination, - asyncMiddleware(searchVideos) -) videosRouter.put('/:id', authenticate, reqVideoFileUpdate, asyncMiddleware(videosUpdateValidator), - asyncMiddleware(updateVideoRetryWrapper) + asyncRetryTransactionMiddleware(updateVideo) ) videosRouter.post('/upload', authenticate, reqVideoFileAdd, asyncMiddleware(videosAddValidator), - asyncMiddleware(addVideoRetryWrapper) + asyncRetryTransactionMiddleware(addVideo) ) videosRouter.get('/:id/description', @@ -108,7 +122,9 @@ videosRouter.get('/:id/description', asyncMiddleware(getVideoDescription) ) videosRouter.get('/:id', + optionalAuthenticate, asyncMiddleware(videosGetValidator), + asyncMiddleware(checkVideoFollowConstraints), getVideo ) videosRouter.post('/:id/views', @@ -119,7 +135,7 @@ videosRouter.post('/:id/views', videosRouter.delete('/:id', authenticate, asyncMiddleware(videosRemoveValidator), - asyncMiddleware(removeVideoRetryWrapper) + asyncRetryTransactionMiddleware(removeVideo) ) // --------------------------------------------------------------------------- @@ -146,59 +162,56 @@ function listVideoPrivacies (req: express.Request, res: express.Response) { res.json(VIDEO_PRIVACIES) } -// Wrapper to video add that retry the function if there is a database error -// We need this because we run the transaction in SERIALIZABLE isolation that can fail -async function addVideoRetryWrapper (req: express.Request, res: express.Response, next: express.NextFunction) { - const options = { - arguments: [ req, res, req.files['videofile'][0] ], - errorMessage: 'Cannot insert the video with many retries.' - } - - const video = await retryTransactionWrapper(addVideo, options) - - res.json({ - video: { - id: video.id, - uuid: video.uuid - } - }).end() -} +async function addVideo (req: express.Request, res: express.Response) { + // Processing the video could be long + // Set timeout to 10 minutes + req.setTimeout(1000 * 60 * 10, () => { + logger.error('Upload video has timed out.') + return res.sendStatus(408) + }) -async function addVideo (req: express.Request, res: express.Response, videoPhysicalFile: Express.Multer.File) { + const videoPhysicalFile = req.files['videofile'][0] const videoInfo: VideoCreate = req.body // Prepare data so we don't block the transaction const videoData = { name: videoInfo.name, remote: false, - extname: extname(videoPhysicalFile.filename), category: videoInfo.category, licence: videoInfo.licence, language: videoInfo.language, - commentsEnabled: videoInfo.commentsEnabled, - nsfw: videoInfo.nsfw, + commentsEnabled: videoInfo.commentsEnabled || false, + waitTranscoding: videoInfo.waitTranscoding || false, + state: CONFIG.TRANSCODING.ENABLED ? VideoState.TO_TRANSCODE : VideoState.PUBLISHED, + nsfw: videoInfo.nsfw || false, description: videoInfo.description, + support: videoInfo.support, privacy: videoInfo.privacy, duration: videoPhysicalFile['duration'], // duration was added by a previous middleware channelId: res.locals.videoChannel.id } const video = new VideoModel(videoData) - video.url = getVideoActivityPubUrl(video) + video.url = getVideoActivityPubUrl(video) // We use the UUID, so set the URL after building the object - const videoFileHeight = await getVideoFileHeight(videoPhysicalFile.path) + // Build the file object + const { videoFileResolution } = await getVideoFileResolution(videoPhysicalFile.path) + const fps = await getVideoFileFPS(videoPhysicalFile.path) const videoFileData = { extname: extname(videoPhysicalFile.filename), - resolution: videoFileHeight, - size: videoPhysicalFile.size + resolution: videoFileResolution, + size: videoPhysicalFile.size, + fps } const videoFile = new VideoFileModel(videoFileData) + + // Move physical file const videoDir = CONFIG.STORAGE.VIDEOS_DIR const destination = join(videoDir, video.getVideoFilename(videoFile)) - - await renamePromise(videoPhysicalFile.path, destination) + await rename(videoPhysicalFile.path, destination) // This is important in case if there is another attempt in the retry process videoPhysicalFile.filename = video.getVideoFilename(videoFile) + videoPhysicalFile.path = destination // Process thumbnail or create it from the video const thumbnailField = req.files['thumbnailfile'] @@ -218,6 +231,7 @@ async function addVideo (req: express.Request, res: express.Response, videoPhysi await video.createPreview(videoFile) } + // Create the torrent file await video.createTorrentAndSetInfoHash(videoFile) const videoCreated = await sequelizeTypescript.transaction(async t => { @@ -232,52 +246,53 @@ async function addVideo (req: express.Request, res: express.Response, videoPhysi video.VideoFiles = [ videoFile ] - if (videoInfo.tags) { + // Create tags + if (videoInfo.tags !== undefined) { const tagInstances = await TagModel.findOrCreateTags(videoInfo.tags, t) await video.$set('Tags', tagInstances, sequelizeOptions) video.Tags = tagInstances } - // Let transcoding job send the video to friends because the video file extension might change - if (CONFIG.TRANSCODING.ENABLED === true) return videoCreated - // Don't send video to remote servers, it is private - if (video.privacy === VideoPrivacy.PRIVATE) return videoCreated + // Schedule an update in the future? + if (videoInfo.scheduleUpdate) { + await ScheduleVideoUpdateModel.create({ + videoId: video.id, + updateAt: videoInfo.scheduleUpdate.updateAt, + privacy: videoInfo.scheduleUpdate.privacy || null + }, { transaction: t }) + } - await sendCreateVideo(video, t) - await shareVideoByServerAndChannel(video, t) + await federateVideoIfNeeded(video, true, t) + auditLogger.create(getAuditIdFromRes(res), new VideoAuditView(videoCreated.toFormattedDetailsJSON())) logger.info('Video with name %s and uuid %s created.', videoInfo.name, videoCreated.uuid) return videoCreated }) - if (CONFIG.TRANSCODING.ENABLED === true) { + if (video.state === VideoState.TO_TRANSCODE) { // Put uuid because we don't have id auto incremented for now const dataInput = { - videoUUID: videoCreated.uuid + videoUUID: videoCreated.uuid, + isNewVideo: true } await JobQueue.Instance.createJob({ type: 'video-file', payload: dataInput }) } - return videoCreated -} - -async function updateVideoRetryWrapper (req: express.Request, res: express.Response, next: express.NextFunction) { - const options = { - arguments: [ req, res ], - errorMessage: 'Cannot update the video with many retries.' - } - - await retryTransactionWrapper(updateVideo, options) - - return res.type('json').status(204).end() + return res.json({ + video: { + id: videoCreated.id, + uuid: videoCreated.uuid + } + }).end() } async function updateVideo (req: express.Request, res: express.Response) { const videoInstance: VideoModel = res.locals.video const videoFieldsSave = videoInstance.toJSON() + const oldVideoAuditView = new VideoAuditView(videoInstance.toFormattedDetailsJSON()) const videoInfoToUpdate: VideoUpdate = req.body const wasPrivateVideo = videoInstance.privacy === VideoPrivacy.PRIVATE @@ -298,38 +313,65 @@ async function updateVideo (req: express.Request, res: express.Response) { const sequelizeOptions = { transaction: t } + const oldVideoChannel = videoInstance.VideoChannel if (videoInfoToUpdate.name !== undefined) videoInstance.set('name', videoInfoToUpdate.name) if (videoInfoToUpdate.category !== undefined) videoInstance.set('category', videoInfoToUpdate.category) if (videoInfoToUpdate.licence !== undefined) videoInstance.set('licence', videoInfoToUpdate.licence) if (videoInfoToUpdate.language !== undefined) videoInstance.set('language', videoInfoToUpdate.language) if (videoInfoToUpdate.nsfw !== undefined) videoInstance.set('nsfw', videoInfoToUpdate.nsfw) - if (videoInfoToUpdate.privacy !== undefined) videoInstance.set('privacy', parseInt(videoInfoToUpdate.privacy.toString(), 10)) + if (videoInfoToUpdate.waitTranscoding !== undefined) videoInstance.set('waitTranscoding', videoInfoToUpdate.waitTranscoding) + if (videoInfoToUpdate.support !== undefined) videoInstance.set('support', videoInfoToUpdate.support) if (videoInfoToUpdate.description !== undefined) videoInstance.set('description', videoInfoToUpdate.description) if (videoInfoToUpdate.commentsEnabled !== undefined) videoInstance.set('commentsEnabled', videoInfoToUpdate.commentsEnabled) + if (videoInfoToUpdate.privacy !== undefined) { + const newPrivacy = parseInt(videoInfoToUpdate.privacy.toString(), 10) + videoInstance.set('privacy', newPrivacy) + + if (wasPrivateVideo === true && newPrivacy !== VideoPrivacy.PRIVATE) { + videoInstance.set('publishedAt', new Date()) + } + } const videoInstanceUpdated = await videoInstance.save(sequelizeOptions) - if (videoInfoToUpdate.tags) { + // Video tags update? + if (videoInfoToUpdate.tags !== undefined) { const tagInstances = await TagModel.findOrCreateTags(videoInfoToUpdate.tags, t) - await videoInstance.$set('Tags', tagInstances, sequelizeOptions) - videoInstance.Tags = tagInstances + await videoInstanceUpdated.$set('Tags', tagInstances, sequelizeOptions) + videoInstanceUpdated.Tags = tagInstances } - // Now we'll update the video's meta data to our friends - if (wasPrivateVideo === false) { - await sendUpdateVideo(videoInstanceUpdated, t) + // Video channel update? + if (res.locals.videoChannel && videoInstanceUpdated.channelId !== res.locals.videoChannel.id) { + await videoInstanceUpdated.$set('VideoChannel', res.locals.videoChannel, { transaction: t }) + videoInstanceUpdated.VideoChannel = res.locals.videoChannel + + if (wasPrivateVideo === false) await changeVideoChannelShare(videoInstanceUpdated, oldVideoChannel, t) } - // Video is not private anymore, send a create action to remote servers - if (wasPrivateVideo === true && videoInstanceUpdated.privacy !== VideoPrivacy.PRIVATE) { - await sendCreateVideo(videoInstanceUpdated, t) - await shareVideoByServerAndChannel(videoInstanceUpdated, t) + // Schedule an update in the future? + if (videoInfoToUpdate.scheduleUpdate) { + await ScheduleVideoUpdateModel.upsert({ + videoId: videoInstanceUpdated.id, + updateAt: videoInfoToUpdate.scheduleUpdate.updateAt, + privacy: videoInfoToUpdate.scheduleUpdate.privacy || null + }, { transaction: t }) + } else if (videoInfoToUpdate.scheduleUpdate === null) { + await ScheduleVideoUpdateModel.deleteByVideoId(videoInstanceUpdated.id, t) } - }) - logger.info('Video with name %s and uuid %s updated.', videoInstance.name, videoInstance.uuid) + const isNewVideo = wasPrivateVideo && videoInstanceUpdated.privacy !== VideoPrivacy.PRIVATE + await federateVideoIfNeeded(videoInstanceUpdated, isNewVideo, t) + + auditLogger.update( + getAuditIdFromRes(res), + new VideoAuditView(videoInstanceUpdated.toFormattedDetailsJSON()), + oldVideoAuditView + ) + logger.info('Video with name %s and uuid %s updated.', videoInstance.name, videoInstance.uuid) + }) } catch (err) { // Force fields we want to update // If the transaction is retried, sequelize will think the object has not changed @@ -338,26 +380,39 @@ async function updateVideo (req: express.Request, res: express.Response) { throw err } + + return res.type('json').status(204).end() } function getVideo (req: express.Request, res: express.Response) { const videoInstance = res.locals.video + if (videoInstance.isOutdated()) { + JobQueue.Instance.createJob({ type: 'activitypub-refresher', payload: { type: 'video', videoUrl: videoInstance.url } }) + .catch(err => logger.error('Cannot create AP refresher job for video %s.', videoInstance.url, { err })) + } + return res.json(videoInstance.toFormattedDetailsJSON()) } async function viewVideo (req: express.Request, res: express.Response) { const videoInstance = res.locals.video - await videoInstance.increment('views') - const serverAccount = await getServerActor() - - if (videoInstance.isOwned()) { - await sendCreateViewToVideoFollowers(serverAccount, videoInstance, undefined) - } else { - await sendCreateViewToOrigin(serverAccount, videoInstance, undefined) + const ip = req.ip + const exists = await Redis.Instance.isVideoIPViewExists(ip, videoInstance.uuid) + if (exists) { + logger.debug('View for ip %s and video %s already exists.', ip, videoInstance.uuid) + return res.status(204).end() } + await Promise.all([ + Redis.Instance.addVideoView(videoInstance.id), + Redis.Instance.setIPVideoView(ip, videoInstance.uuid) + ]) + + const serverActor = await getServerActor() + await sendCreateView(serverActor, videoInstance, undefined) + return res.status(204).end() } @@ -374,23 +429,26 @@ async function getVideoDescription (req: express.Request, res: express.Response) return res.json({ description }) } -async function listVideos (req: express.Request, res: express.Response, next: express.NextFunction) { - const resultList = await VideoModel.listForApi(req.query.start, req.query.count, req.query.sort) +async function listVideos (req: express.Request, res: express.Response) { + const resultList = await VideoModel.listForApi({ + start: req.query.start, + count: req.query.count, + sort: req.query.sort, + includeLocalVideos: true, + categoryOneOf: req.query.categoryOneOf, + licenceOneOf: req.query.licenceOneOf, + languageOneOf: req.query.languageOneOf, + tagsOneOf: req.query.tagsOneOf, + tagsAllOf: req.query.tagsAllOf, + nsfw: buildNSFWFilter(res, req.query.nsfw), + filter: req.query.filter as VideoFilter, + withFiles: false, + user: res.locals.oauth ? res.locals.oauth.token.User : undefined + }) return res.json(getFormattedObjects(resultList.data, resultList.total)) } -async function removeVideoRetryWrapper (req: express.Request, res: express.Response, next: express.NextFunction) { - const options = { - arguments: [ req, res ], - errorMessage: 'Cannot remove the video with many retries.' - } - - await retryTransactionWrapper(removeVideo, options) - - return res.type('json').status(204).end() -} - async function removeVideo (req: express.Request, res: express.Response) { const videoInstance: VideoModel = res.locals.video @@ -398,16 +456,8 @@ async function removeVideo (req: express.Request, res: express.Response) { await videoInstance.destroy({ transaction: t }) }) + auditLogger.delete(getAuditIdFromRes(res), new VideoAuditView(videoInstance.toFormattedDetailsJSON())) logger.info('Video with name %s and uuid %s deleted.', videoInstance.name, videoInstance.uuid) -} -async function searchVideos (req: express.Request, res: express.Response, next: express.NextFunction) { - const resultList = await VideoModel.searchAndPopulateAccountAndServerAndTags( - req.query.search, - req.query.start, - req.query.count, - req.query.sort - ) - - return res.json(getFormattedObjects(resultList.data, resultList.total)) + return res.type('json').status(204).end() }