X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Fapi%2Fvideos%2Findex.ts;h=eb46ea01f5d0bbc78d14a633f5096296221fbf69;hb=2ad9dcda240ee843c5e4a5b98cc94f7b2aab2c89;hp=6641544066cd858c6133f2498234e8222bbbd121;hpb=7ad9b9846c44d198a736183fb186c2039f5236b5;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/controllers/api/videos/index.ts b/server/controllers/api/videos/index.ts index 664154406..eb46ea01f 100644 --- a/server/controllers/api/videos/index.ts +++ b/server/controllers/api/videos/index.ts @@ -1,42 +1,39 @@ import * as express from 'express' -import { extname, join } from 'path' +import { extname } from 'path' 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 { auditLoggerFactory, getAuditIdFromRes, VideoAuditView } from '../../../helpers/audit-logger' import { getFormattedObjects, getServerActor } from '../../../helpers/utils' +import { autoBlacklistVideoIfNeeded } from '../../../lib/video-blacklist' import { - CONFIG, - IMAGE_MIMETYPE_EXT, - PREVIEWS_SIZE, - sequelizeTypescript, - THUMBNAILS_SIZE, + DEFAULT_AUDIO_RESOLUTION, + MIMETYPES, VIDEO_CATEGORIES, VIDEO_LANGUAGES, VIDEO_LICENCES, - VIDEO_MIMETYPE_EXT, VIDEO_PRIVACIES -} from '../../../initializers' +} from '../../../initializers/constants' 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, + videosCustomGetValidator, videosGetValidator, videosRemoveValidator, videosSortValidator, @@ -51,32 +48,43 @@ 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 { buildNSFWFilter, createReqFiles, getCountVideos } 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 { move } from 'fs-extra' import { watchingRouter } from './watching' +import { Notifier } from '../../../lib/notifier' +import { sendView } from '../../../lib/activitypub/send/send-view' +import { CONFIG } from '../../../initializers/config' +import { sequelizeTypescript } from '../../../initializers/database' +import { createVideoMiniatureFromExisting, generateVideoMiniature } from '../../../lib/thumbnail' +import { ThumbnailType } from '../../../../shared/models/videos/thumbnail.type' +import { VideoTranscodingPayload } from '../../../lib/job-queue/handlers/video-transcoding' +import { Hooks } from '../../../lib/plugins/hooks' +import { MVideoDetails, MVideoFullLight } from '@server/typings/models' +import { createTorrentAndSetInfoHash } from '@server/helpers/webtorrent' +import { getVideoFilePath } from '@server/lib/video-paths' const auditLogger = auditLoggerFactory('videos') const videosRouter = express.Router() const reqVideoFileAdd = createReqFiles( [ 'videofile', 'thumbnailfile', 'previewfile' ], - Object.assign({}, VIDEO_MIMETYPE_EXT, IMAGE_MIMETYPE_EXT), + Object.assign({}, MIMETYPES.VIDEO.MIMETYPE_EXT, MIMETYPES.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, + MIMETYPES.IMAGE.MIMETYPE_EXT, { - thumbnailfile: CONFIG.STORAGE.THUMBNAILS_DIR, - previewfile: CONFIG.STORAGE.PREVIEWS_DIR + thumbnailfile: CONFIG.STORAGE.TMP_DIR, + previewfile: CONFIG.STORAGE.TMP_DIR } ) @@ -122,11 +130,12 @@ videosRouter.get('/:id/description', ) videosRouter.get('/:id', optionalAuthenticate, - asyncMiddleware(videosGetValidator), - getVideo + asyncMiddleware(videosCustomGetValidator('only-video-with-rights')), + asyncMiddleware(checkVideoFollowConstraints), + asyncMiddleware(getVideo) ) videosRouter.post('/:id/views', - asyncMiddleware(videosGetValidator), + asyncMiddleware(videosCustomGetValidator('only-immutable-attributes')), asyncMiddleware(viewVideo) ) @@ -178,64 +187,65 @@ async function addVideo (req: express.Request, res: express.Response) { category: videoInfo.category, licence: videoInfo.licence, language: videoInfo.language, - commentsEnabled: videoInfo.commentsEnabled || false, + commentsEnabled: videoInfo.commentsEnabled !== false, // If the value is not "false", the default is "true" + downloadEnabled: videoInfo.downloadEnabled !== 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, + privacy: videoInfo.privacy || VideoPrivacy.PRIVATE, duration: videoPhysicalFile['duration'], // duration was added by a previous middleware - channelId: res.locals.videoChannel.id + channelId: res.locals.videoChannel.id, + originallyPublishedAt: videoInfo.originallyPublishedAt } - const video = new VideoModel(videoData) - video.url = getVideoActivityPubUrl(video) // We use the UUID, so set the URL after building the object - // Build the file object - const { videoFileResolution } = await getVideoFileResolution(videoPhysicalFile.path) - const fps = await getVideoFileFPS(videoPhysicalFile.path) + const video = new VideoModel(videoData) as MVideoDetails + video.url = getVideoActivityPubUrl(video) // We use the UUID, so set the URL after building the object - const videoFileData = { + const videoFile = new VideoFileModel({ extname: extname(videoPhysicalFile.filename), - resolution: videoFileResolution, size: videoPhysicalFile.size, - fps + videoStreamingPlaylistId: null + }) + + if (videoFile.isAudio()) { + videoFile.resolution = DEFAULT_AUDIO_RESOLUTION + } else { + videoFile.fps = await getVideoFileFPS(videoPhysicalFile.path) + videoFile.resolution = (await getVideoFileResolution(videoPhysicalFile.path)).videoFileResolution } - const videoFile = new VideoFileModel(videoFileData) // Move physical file - const videoDir = CONFIG.STORAGE.VIDEOS_DIR - const destination = join(videoDir, video.getVideoFilename(videoFile)) - await rename(videoPhysicalFile.path, destination) + const destination = getVideoFilePath(video, videoFile) + await move(videoPhysicalFile.path, destination) // This is important in case if there is another attempt in the retry process - videoPhysicalFile.filename = video.getVideoFilename(videoFile) + videoPhysicalFile.filename = getVideoFilePath(video, videoFile) videoPhysicalFile.path = destination // 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) - } + const thumbnailModel = thumbnailField + ? await createVideoMiniatureFromExisting(thumbnailField[0].path, video, ThumbnailType.MINIATURE, false) + : await generateVideoMiniature(video, videoFile, ThumbnailType.MINIATURE) // 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) - } + const previewModel = previewField + ? await createVideoMiniatureFromExisting(previewField[0].path, video, ThumbnailType.PREVIEW, false) + : await generateVideoMiniature(video, videoFile, ThumbnailType.PREVIEW) // Create the torrent file - await video.createTorrentAndSetInfoHash(videoFile) + await createTorrentAndSetInfoHash(video, videoFile) - const videoCreated = await sequelizeTypescript.transaction(async t => { + const { videoCreated } = await sequelizeTypescript.transaction(async t => { const sequelizeOptions = { transaction: t } - const videoCreated = await video.save(sequelizeOptions) + const videoCreated = await video.save(sequelizeOptions) as MVideoFullLight + + await videoCreated.addAndSaveThumbnail(thumbnailModel, t) + await videoCreated.addAndSaveThumbnail(previewModel, t) + // Do not forget to add video channel information to the created video videoCreated.VideoChannel = res.locals.videoChannel @@ -261,24 +271,47 @@ async function addVideo (req: express.Request, res: express.Response) { }, { transaction: t }) } + await autoBlacklistVideoIfNeeded({ + video, + user: res.locals.oauth.token.User, + isRemote: false, + isNew: true, + transaction: 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 + return { videoCreated } }) + Notifier.Instance.notifyOnNewVideoIfNeeded(videoCreated) + 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 + let dataInput: VideoTranscodingPayload + + if (videoFile.isAudio()) { + dataInput = { + type: 'merge-audio' as 'merge-audio', + resolution: DEFAULT_AUDIO_RESOLUTION, + videoUUID: videoCreated.uuid, + isNewVideo: true + } + } else { + dataInput = { + type: 'optimize' as 'optimize', + videoUUID: videoCreated.uuid, + isNewVideo: true + } } - await JobQueue.Instance.createJob({ type: 'video-file', payload: dataInput }) + await JobQueue.Instance.createJobWithPromise({ type: 'video-transcoding', payload: dataInput }) } + Hooks.runAction('action:api.video.uploaded', { video: videoCreated }) + return res.json({ video: { id: videoCreated.id, @@ -288,50 +321,60 @@ async function addVideo (req: express.Request, res: express.Response) { } async function updateVideo (req: express.Request, res: express.Response) { - const videoInstance: VideoModel = res.locals.video + const videoInstance = res.locals.videoAll const videoFieldsSave = videoInstance.toJSON() const oldVideoAuditView = new VideoAuditView(videoInstance.toFormattedDetailsJSON()) const videoInfoToUpdate: VideoUpdate = req.body - const wasPrivateVideo = videoInstance.privacy === VideoPrivacy.PRIVATE + + const wasConfidentialVideo = videoInstance.isConfidential() + const hadPrivacyForFederation = videoInstance.hasPrivacyForFederation() // 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) - } + const thumbnailModel = req.files && req.files['thumbnailfile'] + ? await createVideoMiniatureFromExisting(req.files['thumbnailfile'][0].path, videoInstance, ThumbnailType.MINIATURE, false) + : undefined - // 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) - } + const previewModel = req.files && req.files['previewfile'] + ? await createVideoMiniatureFromExisting(req.files['previewfile'][0].path, videoInstance, ThumbnailType.PREVIEW, false) + : undefined try { - await sequelizeTypescript.transaction(async t => { - const sequelizeOptions = { - transaction: t - } + const videoInstanceUpdated = 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.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.name !== undefined) videoInstance.name = videoInfoToUpdate.name + if (videoInfoToUpdate.category !== undefined) videoInstance.category = videoInfoToUpdate.category + if (videoInfoToUpdate.licence !== undefined) videoInstance.licence = videoInfoToUpdate.licence + if (videoInfoToUpdate.language !== undefined) videoInstance.language = videoInfoToUpdate.language + if (videoInfoToUpdate.nsfw !== undefined) videoInstance.nsfw = videoInfoToUpdate.nsfw + if (videoInfoToUpdate.waitTranscoding !== undefined) videoInstance.waitTranscoding = videoInfoToUpdate.waitTranscoding + if (videoInfoToUpdate.support !== undefined) videoInstance.support = videoInfoToUpdate.support + if (videoInfoToUpdate.description !== undefined) videoInstance.description = videoInfoToUpdate.description + if (videoInfoToUpdate.commentsEnabled !== undefined) videoInstance.commentsEnabled = videoInfoToUpdate.commentsEnabled + if (videoInfoToUpdate.downloadEnabled !== undefined) videoInstance.downloadEnabled = videoInfoToUpdate.downloadEnabled + + if (videoInfoToUpdate.originallyPublishedAt !== undefined && videoInfoToUpdate.originallyPublishedAt !== null) { + videoInstance.originallyPublishedAt = new Date(videoInfoToUpdate.originallyPublishedAt) + } + + let isNewVideo = false if (videoInfoToUpdate.privacy !== undefined) { + isNewVideo = videoInstance.isNewVideo(videoInfoToUpdate.privacy) + const newPrivacy = parseInt(videoInfoToUpdate.privacy.toString(), 10) - videoInstance.set('privacy', newPrivacy) + videoInstance.setPrivacy(newPrivacy) - if (wasPrivateVideo === true && newPrivacy !== VideoPrivacy.PRIVATE) { - videoInstance.set('publishedAt', new Date()) + // Unfederate the video if the new privacy is not compatible with federation + if (hadPrivacyForFederation && !videoInstance.hasPrivacyForFederation()) { + await VideoModel.sendDelete(videoInstance, { transaction: t }) } } - const videoInstanceUpdated = await videoInstance.save(sequelizeOptions) + const videoInstanceUpdated = await videoInstance.save(sequelizeOptions) as MVideoFullLight + + if (thumbnailModel) await videoInstanceUpdated.addAndSaveThumbnail(thumbnailModel, t) + if (previewModel) await videoInstanceUpdated.addAndSaveThumbnail(previewModel, t) // Video tags update? if (videoInfoToUpdate.tags !== undefined) { @@ -346,7 +389,7 @@ async function updateVideo (req: express.Request, res: express.Response) { await videoInstanceUpdated.$set('VideoChannel', res.locals.videoChannel, { transaction: t }) videoInstanceUpdated.VideoChannel = res.locals.videoChannel - if (wasPrivateVideo === false) await changeVideoChannelShare(videoInstanceUpdated, oldVideoChannel, t) + if (hadPrivacyForFederation === true) await changeVideoChannelShare(videoInstanceUpdated, oldVideoChannel, t) } // Schedule an update in the future? @@ -360,7 +403,14 @@ async function updateVideo (req: express.Request, res: express.Response) { await ScheduleVideoUpdateModel.deleteByVideoId(videoInstanceUpdated.id, t) } - const isNewVideo = wasPrivateVideo && videoInstanceUpdated.privacy !== VideoPrivacy.PRIVATE + await autoBlacklistVideoIfNeeded({ + video: videoInstanceUpdated, + user: res.locals.oauth.token.User, + isRemote: false, + isNew: false, + transaction: t + }) + await federateVideoIfNeeded(videoInstanceUpdated, isNewVideo, t) auditLogger.update( @@ -369,7 +419,15 @@ async function updateVideo (req: express.Request, res: express.Response) { oldVideoAuditView ) logger.info('Video with name %s and uuid %s updated.', videoInstance.name, videoInstance.uuid) + + return videoInstanceUpdated }) + + if (wasConfidentialVideo) { + Notifier.Instance.notifyOnNewVideoIfNeeded(videoInstanceUpdated) + } + + Hooks.runAction('action:api.video.updated', { video: videoInstanceUpdated }) } catch (err) { // Force fields we want to update // If the transaction is retried, sequelize will think the object has not changed @@ -382,17 +440,28 @@ async function updateVideo (req: express.Request, res: express.Response) { return res.type('json').status(204).end() } -function getVideo (req: express.Request, res: express.Response) { - const videoInstance = res.locals.video +async function getVideo (req: express.Request, res: express.Response) { + // We need more attributes + const userId: number = res.locals.oauth ? res.locals.oauth.token.User.id : null + + const video = await Hooks.wrapPromiseFun( + VideoModel.loadForGetAPI, + { id: res.locals.onlyVideoWithRights.id, userId }, + 'filter:api.video.get.result' + ) + + if (video.isOutdated()) { + JobQueue.Instance.createJob({ type: 'activitypub-refresher', payload: { type: 'video', url: video.url } }) + } - return res.json(videoInstance.toFormattedDetailsJSON()) + return res.json(video.toFormattedDetailsJSON()) } async function viewVideo (req: express.Request, res: express.Response) { - const videoInstance = res.locals.video + const videoInstance = res.locals.onlyImmutableVideo const ip = req.ip - const exists = await Redis.Instance.isVideoIPViewExists(ip, videoInstance.uuid) + const exists = await Redis.Instance.doesVideoIPViewExist(ip, videoInstance.uuid) if (exists) { logger.debug('View for ip %s and video %s already exists.', ip, videoInstance.uuid) return res.status(204).end() @@ -404,14 +473,15 @@ async function viewVideo (req: express.Request, res: express.Response) { ]) const serverActor = await getServerActor() + await sendView(serverActor, videoInstance, undefined) - await sendCreateView(serverActor, videoInstance, undefined) + Hooks.runAction('action:api.video.viewed', { video: videoInstance, ip }) return res.status(204).end() } async function getVideoDescription (req: express.Request, res: express.Response) { - const videoInstance = res.locals.video + const videoInstance = res.locals.videoAll let description = '' if (videoInstance.isOwned()) { @@ -423,8 +493,10 @@ 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({ +async function listVideos (req: express.Request, res: express.Response) { + const countVideos = getCountVideos(req) + + const apiOptions = await Hooks.wrapObject({ start: req.query.start, count: req.query.count, sort: req.query.sort, @@ -437,14 +509,21 @@ async function listVideos (req: express.Request, res: express.Response, next: ex nsfw: buildNSFWFilter(res, req.query.nsfw), filter: req.query.filter as VideoFilter, withFiles: false, - user: res.locals.oauth ? res.locals.oauth.token.User : undefined - }) + user: res.locals.oauth ? res.locals.oauth.token.User : undefined, + countVideos + }, 'filter:api.videos.list.params') + + const resultList = await Hooks.wrapPromiseFun( + VideoModel.listForApi, + apiOptions, + 'filter:api.videos.list.result' + ) return res.json(getFormattedObjects(resultList.data, resultList.total)) } async function removeVideo (req: express.Request, res: express.Response) { - const videoInstance: VideoModel = res.locals.video + const videoInstance = res.locals.videoAll await sequelizeTypescript.transaction(async t => { await videoInstance.destroy({ transaction: t }) @@ -453,5 +532,7 @@ async function removeVideo (req: express.Request, res: express.Response) { auditLogger.delete(getAuditIdFromRes(res), new VideoAuditView(videoInstance.toFormattedDetailsJSON())) logger.info('Video with name %s and uuid %s deleted.', videoInstance.name, videoInstance.uuid) + Hooks.runAction('action:api.video.deleted', { video: videoInstance }) + return res.type('json').status(204).end() }