X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Fapi%2Fvideos%2Findex.ts;h=101183eabd9ac65e2a85f944beb4639ac85d4f0d;hb=d525fc399a14a8b16eaad6d4c0bc0a9c4093c3c9;hp=63de662a7a528a4de2f74ccf4a474b3c00a132b2;hpb=f595d3947708114deeed4312cc5ffd285745b090;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/controllers/api/videos/index.ts b/server/controllers/api/videos/index.ts index 63de662a7..101183eab 100644 --- a/server/controllers/api/videos/index.ts +++ b/server/controllers/api/videos/index.ts @@ -1,75 +1,84 @@ import * as express from 'express' -import * as multer from 'multer' import { extname, join } from 'path' -import { VideoCreate, VideoPrivacy, VideoUpdate } from '../../../../shared' +import { VideoCreate, VideoPrivacy, VideoState, VideoUpdate } from '../../../../shared' +import { renamePromise } from '../../../helpers/core-utils' +import { getVideoFileFPS, getVideoFileResolution } from '../../../helpers/ffmpeg-utils' +import { processImage } from '../../../helpers/image-utils' +import { logger } from '../../../helpers/logger' +import { getFormattedObjects, getServerActor, resetSequelizeInstance } from '../../../helpers/utils' import { - generateRandomString, - getFormattedObjects, - getVideoFileHeight, - logger, - renamePromise, - resetSequelizeInstance, - retryTransactionWrapper -} from '../../../helpers' -import { getServerAccount } from '../../../helpers/utils' -import { CONFIG, VIDEO_CATEGORIES, VIDEO_LANGUAGES, VIDEO_LICENCES, VIDEO_MIMETYPE_EXT, VIDEO_PRIVACIES } from '../../../initializers' -import { database as db } from '../../../initializers/database' -import { sendAddVideo } from '../../../lib/activitypub/send/send-add' -import { sendCreateViewToOrigin } from '../../../lib/activitypub/send/send-create' -import { sendUpdateVideo } from '../../../lib/activitypub/send/send-update' -import { shareVideoByServer } from '../../../lib/activitypub/share' -import { getVideoActivityPubUrl } from '../../../lib/activitypub/url' -import { fetchRemoteVideoDescription } from '../../../lib/activitypub/videos' -import { sendCreateViewToVideoFollowers } from '../../../lib/index' -import { transcodingJobScheduler } from '../../../lib/jobs/transcoding-job-scheduler/transcoding-job-scheduler' + CONFIG, + IMAGE_MIMETYPE_EXT, + PREVIEWS_SIZE, + sequelizeTypescript, + THUMBNAILS_SIZE, + VIDEO_CATEGORIES, + VIDEO_LANGUAGES, + VIDEO_LICENCES, + VIDEO_MIMETYPE_EXT, + VIDEO_PRIVACIES +} from '../../../initializers' +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, + commonVideosFiltersValidator, + optionalAuthenticate, paginationValidator, - setPagination, - setVideosSort, + setDefaultPagination, + setDefaultSort, videosAddValidator, videosGetValidator, videosRemoveValidator, - videosSearchValidator, videosSortValidator, videosUpdateValidator } from '../../../middlewares' -import { VideoInstance } from '../../../models' +import { TagModel } from '../../../models/video/tag' +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 { VideoFilter } from '../../../../shared/models/videos/video-query.type' +import { createReqFiles, buildNSFWFilter } from '../../../helpers/express-utils' +import { ScheduleVideoUpdateModel } from '../../../models/video/schedule-video-update' +import { videoCaptionsRouter } from './captions' const videosRouter = express.Router() -// multer configuration -const storage = multer.diskStorage({ - destination: (req, file, cb) => { - cb(null, CONFIG.STORAGE.VIDEOS_DIR) - }, - - filename: async (req, file, cb) => { - const extension = VIDEO_MIMETYPE_EXT[file.mimetype] - let randomString = '' - - try { - randomString = await generateRandomString(16) - } catch (err) { - logger.error('Cannot generate random string for file name.', err) - randomString = 'fake-random-string' - } - - cb(null, randomString + extension) +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 } -}) - -const reqFiles = multer({ storage: storage }).fields([{ name: 'videofile', maxCount: 1 }]) +) +const reqVideoFileUpdate = createReqFiles( + [ 'thumbnailfile', 'previewfile' ], + IMAGE_MIMETYPE_EXT, + { + thumbnailfile: CONFIG.STORAGE.THUMBNAILS_DIR, + previewfile: CONFIG.STORAGE.PREVIEWS_DIR + } +) videosRouter.use('/', abuseVideoRouter) videosRouter.use('/', blacklistRouter) videosRouter.use('/', rateVideoRouter) -videosRouter.use('/', videoChannelRouter) +videosRouter.use('/', videoCommentRouter) +videosRouter.use('/', videoCaptionsRouter) videosRouter.get('/categories', listVideoCategories) videosRouter.get('/licences', listVideoLicences) @@ -79,28 +88,23 @@ videosRouter.get('/privacies', listVideoPrivacies) videosRouter.get('/', paginationValidator, videosSortValidator, - setVideosSort, - setPagination, + setDefaultSort, + setDefaultPagination, + optionalAuthenticate, + commonVideosFiltersValidator, asyncMiddleware(listVideos) ) -videosRouter.get('/search', - videosSearchValidator, - paginationValidator, - videosSortValidator, - setVideosSort, - setPagination, - asyncMiddleware(searchVideos) -) videosRouter.put('/:id', authenticate, + reqVideoFileUpdate, asyncMiddleware(videosUpdateValidator), - asyncMiddleware(updateVideoRetryWrapper) + asyncRetryTransactionMiddleware(updateVideo) ) videosRouter.post('/upload', authenticate, - reqFiles, - videosAddValidator, - asyncMiddleware(addVideoRetryWrapper) + reqVideoFileAdd, + asyncMiddleware(videosAddValidator), + asyncRetryTransactionMiddleware(addVideo) ) videosRouter.get('/:id/description', @@ -119,7 +123,7 @@ videosRouter.post('/:id/views', videosRouter.delete('/:id', authenticate, asyncMiddleware(videosRemoveValidator), - asyncMiddleware(removeVideoRetryWrapper) + asyncRetryTransactionMiddleware(removeVideo) ) // --------------------------------------------------------------------------- @@ -146,25 +150,8 @@ 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, videoPhysicalFile: Express.Multer.File) { +async function addVideo (req: express.Request, res: express.Response) { + const videoPhysicalFile = req.files['videofile'][0] const videoInfo: VideoCreate = req.body // Prepare data so we don't block the transaction @@ -175,52 +162,62 @@ async function addVideo (req: express.Request, res: express.Response, videoPhysi category: videoInfo.category, licence: videoInfo.licence, language: videoInfo.language, - 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 = db.Video.build(videoData) - video.url = getVideoActivityPubUrl(video) + const video = new VideoModel(videoData) + video.url = getVideoActivityPubUrl(video) // We use the UUID, so set the URL after building the object - const videoFilePath = join(CONFIG.STORAGE.VIDEOS_DIR, videoPhysicalFile.filename) - const videoFileHeight = await getVideoFileHeight(videoFilePath) + // 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 = db.VideoFile.build(videoFileData) + const videoFile = new VideoFileModel(videoFileData) + + // Move physical file const videoDir = CONFIG.STORAGE.VIDEOS_DIR - const source = join(videoDir, videoPhysicalFile.filename) const destination = join(videoDir, video.getVideoFilename(videoFile)) - - await renamePromise(source, destination) + await renamePromise(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 - const tasks = [] - - tasks.push( - video.createTorrentAndSetInfoHash(videoFile), - video.createThumbnail(videoFile), - video.createPreview(videoFile) - ) - await Promise.all(tasks) + // Process thumbnail or create it from the video + const thumbnailField = req.files['thumbnailfile'] + if (thumbnailField) { + const thumbnailPhysicalFile = thumbnailField[0] + await processImage(thumbnailPhysicalFile, join(CONFIG.STORAGE.THUMBNAILS_DIR, video.getThumbnailName()), THUMBNAILS_SIZE) + } else { + await video.createThumbnail(videoFile) + } - return db.sequelize.transaction(async t => { - const sequelizeOptions = { transaction: t } + // Process preview or create it from the video + const previewField = req.files['previewfile'] + if (previewField) { + const previewPhysicalFile = previewField[0] + await processImage(previewPhysicalFile, join(CONFIG.STORAGE.PREVIEWS_DIR, video.getPreviewName()), PREVIEWS_SIZE) + } else { + await video.createPreview(videoFile) + } - if (CONFIG.TRANSCODING.ENABLED === true) { - // Put uuid because we don't have id auto incremented for now - const dataInput = { - videoUUID: video.uuid - } + // Create the torrent file + await video.createTorrentAndSetInfoHash(videoFile) - await transcodingJobScheduler.createJob(t, 'videoFileOptimizer', dataInput) - } + const videoCreated = await sequelizeTypescript.transaction(async t => { + const sequelizeOptions = { transaction: t } const videoCreated = await video.save(sequelizeOptions) // Do not forget to add video channel information to the created video @@ -231,77 +228,122 @@ async function addVideo (req: express.Request, res: express.Response, videoPhysi video.VideoFiles = [ videoFile ] - if (videoInfo.tags) { - const tagInstances = await db.Tag.findOrCreateTags(videoInfo.tags, t) + // Create tags + if (videoInfo.tags !== undefined) { + const tagInstances = await TagModel.findOrCreateTags(videoInfo.tags, t) - await video.setTags(tagInstances, sequelizeOptions) + 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 sendAddVideo(video, t) - await shareVideoByServer(video, t) + await federateVideoIfNeeded(video, true, t) logger.info('Video with name %s and uuid %s created.', videoInfo.name, videoCreated.uuid) 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.' - } + if (video.state === VideoState.TO_TRANSCODE) { + // Put uuid because we don't have id auto incremented for now + const dataInput = { + videoUUID: videoCreated.uuid, + isNewVideo: true + } - await retryTransactionWrapper(updateVideo, options) + await JobQueue.Instance.createJob({ type: 'video-file', payload: dataInput }) + } - 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: VideoInstance = res.locals.video + const videoInstance: VideoModel = res.locals.video const videoFieldsSave = videoInstance.toJSON() const videoInfoToUpdate: VideoUpdate = req.body const wasPrivateVideo = videoInstance.privacy === VideoPrivacy.PRIVATE + // Process thumbnail or create it from the video + if (req.files && req.files['thumbnailfile']) { + const thumbnailPhysicalFile = req.files['thumbnailfile'][0] + await processImage(thumbnailPhysicalFile, join(CONFIG.STORAGE.THUMBNAILS_DIR, videoInstance.getThumbnailName()), THUMBNAILS_SIZE) + } + + // Process preview or create it from the video + if (req.files && req.files['previewfile']) { + const previewPhysicalFile = req.files['previewfile'][0] + await processImage(previewPhysicalFile, join(CONFIG.STORAGE.PREVIEWS_DIR, videoInstance.getPreviewName()), PREVIEWS_SIZE) + } + try { - await db.sequelize.transaction(async t => { + await sequelizeTypescript.transaction(async t => { 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) { - const tagInstances = await db.Tag.findOrCreateTags(videoInfoToUpdate.tags, t) + // Video tags update? + if (videoInfoToUpdate.tags !== undefined) { + const tagInstances = await TagModel.findOrCreateTags(videoInfoToUpdate.tags, t) - await videoInstance.setTags(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 sendAddVideo(videoInstanceUpdated, t) - await shareVideoByServer(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) } + + const isNewVideo = wasPrivateVideo && videoInstanceUpdated.privacy !== VideoPrivacy.PRIVATE + await federateVideoIfNeeded(videoInstanceUpdated, isNewVideo, t) }) logger.info('Video with name %s and uuid %s updated.', videoInstance.name, videoInstance.uuid) @@ -313,6 +355,8 @@ 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) { @@ -324,14 +368,19 @@ function getVideo (req: express.Request, res: express.Response) { async function viewVideo (req: express.Request, res: express.Response) { const videoInstance = res.locals.video + const ip = req.ip + const exists = await Redis.Instance.isViewExists(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 videoInstance.increment('views') - const serverAccount = await getServerAccount() + await Redis.Instance.setView(ip, videoInstance.uuid) - if (videoInstance.isOwned()) { - await sendCreateViewToVideoFollowers(serverAccount, videoInstance, undefined) - } else { - await sendCreateViewToOrigin(serverAccount, videoInstance, undefined) - } + const serverAccount = await getServerActor() + + await sendCreateView(serverAccount, videoInstance, undefined) return res.status(204).end() } @@ -350,39 +399,31 @@ async function getVideoDescription (req: express.Request, res: express.Response) } async function listVideos (req: express.Request, res: express.Response, next: express.NextFunction) { - const resultList = await db.Video.listForApi(req.query.start, req.query.count, req.query.sort) + const resultList = await VideoModel.listForApi({ + start: req.query.start, + count: req.query.count, + sort: req.query.sort, + 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 + }) 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: VideoInstance = res.locals.video + const videoInstance: VideoModel = res.locals.video - await db.sequelize.transaction(async t => { + await sequelizeTypescript.transaction(async t => { await videoInstance.destroy({ transaction: t }) }) 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 db.Video.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() }