X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=server%2Fcontrollers%2Fapi%2Fvideos%2Findex.ts;h=fbdb0f77687cdcf19b43cf6d577279ce2cb072a1;hb=e024fd6a7494b37251da1d59470324305cdb4129;hp=1539afc352da1b4d7af91509fea1ebcbe108e9bb;hpb=1ef65f4c034cc53ab5d55417e52d60e1f7fc1ddb;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/controllers/api/videos/index.ts b/server/controllers/api/videos/index.ts index 1539afc35..fbdb0f776 100644 --- a/server/controllers/api/videos/index.ts +++ b/server/controllers/api/videos/index.ts @@ -2,21 +2,21 @@ import * as express from 'express' import { move } from 'fs-extra' import { extname } from 'path' import toInt from 'validator/lib/toInt' -import { addOptimizeOrMergeAudioJob } from '@server/helpers/video' import { createTorrentAndSetInfoHash } from '@server/helpers/webtorrent' import { changeVideoChannelShare } from '@server/lib/activitypub/share' -import { getVideoActivityPubUrl } from '@server/lib/activitypub/url' -import { buildLocalVideoFromReq, buildVideoThumbnailsFromReq, setVideoTags } from '@server/lib/video' -import { getVideoFilePath } from '@server/lib/video-paths' +import { getLocalVideoActivityPubUrl } from '@server/lib/activitypub/url' +import { LiveManager } from '@server/lib/live-manager' +import { addOptimizeOrMergeAudioJob, buildLocalVideoFromReq, buildVideoThumbnailsFromReq, setVideoTags } from '@server/lib/video' +import { generateVideoFilename, getVideoFilePath } from '@server/lib/video-paths' import { getServerActor } from '@server/models/application/application' -import { MVideoDetails, MVideoFullLight } from '@server/types/models' -import { VideoCreate, VideoState, VideoUpdate } from '../../../../shared' -import { VideoFilter } from '../../../../shared/models/videos/video-query.type' +import { MVideo, MVideoFile, MVideoFullLight } from '@server/types/models' +import { VideoCreate, VideosCommonQuery, VideoState, VideoUpdate } from '../../../../shared' +import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes' import { auditLoggerFactory, getAuditIdFromRes, VideoAuditView } from '../../../helpers/audit-logger' -import { resetSequelizeInstance } from '../../../helpers/database-utils' +import { resetSequelizeInstance, retryTransactionWrapper } from '../../../helpers/database-utils' import { buildNSFWFilter, createReqFiles, getCountVideos } from '../../../helpers/express-utils' -import { getMetadataFromFile, getVideoFileFPS, getVideoFileResolution } from '../../../helpers/ffmpeg-utils' -import { logger } from '../../../helpers/logger' +import { getMetadataFromFile, getVideoFileFPS, getVideoFileResolution } from '../../../helpers/ffprobe-utils' +import { logger, loggerTagsFactory } from '../../../helpers/logger' import { getFormattedObjects } from '../../../helpers/utils' import { CONFIG } from '../../../initializers/config' import { @@ -55,10 +55,8 @@ import { videosUpdateValidator } from '../../../middlewares' import { ScheduleVideoUpdateModel } from '../../../models/video/schedule-video-update' -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 { videoCaptionsRouter } from './captions' import { videoCommentRouter } from './comment' @@ -68,6 +66,7 @@ import { ownershipVideoRouter } from './ownership' import { rateVideoRouter } from './rate' import { watchingRouter } from './watching' +const lTags = loggerTagsFactory('api', 'video') const auditLogger = auditLoggerFactory('videos') const videosRouter = express.Router() @@ -89,7 +88,6 @@ const reqVideoFileUpdate = createReqFiles( } ) -videosRouter.use('/', abuseVideoRouter) videosRouter.use('/', blacklistRouter) videosRouter.use('/', rateVideoRouter) videosRouter.use('/', videoCommentRouter) @@ -176,11 +174,11 @@ function listVideoPrivacies (req: express.Request, res: express.Response) { } async function addVideo (req: express.Request, res: express.Response) { - // Processing the video could be long - // Set timeout to 10 minutes + // Uploading the video could be long + // Set timeout to 10 minutes, as Express's default is 2 minutes req.setTimeout(1000 * 60 * 10, () => { logger.error('Upload video has timed out.') - return res.sendStatus(408) + return res.sendStatus(HttpStatusCode.REQUEST_TIMEOUT_408) }) const videoPhysicalFile = req.files['videofile'][0] @@ -190,14 +188,15 @@ async function addVideo (req: express.Request, res: express.Response) { videoData.state = CONFIG.TRANSCODING.ENABLED ? VideoState.TO_TRANSCODE : VideoState.PUBLISHED videoData.duration = videoPhysicalFile['duration'] // duration was added by a previous middleware - const video = new VideoModel(videoData) as MVideoDetails - video.url = getVideoActivityPubUrl(video) // We use the UUID, so set the URL after building the object + const video = new VideoModel(videoData) as MVideoFullLight + video.VideoChannel = res.locals.videoChannel + video.url = getLocalVideoActivityPubUrl(video) // We use the UUID, so set the URL after building the object const videoFile = new VideoFileModel({ extname: extname(videoPhysicalFile.filename), size: videoPhysicalFile.size, videoStreamingPlaylistId: null, - metadata: await getMetadataFromFile(videoPhysicalFile.path) + metadata: await getMetadataFromFile(videoPhysicalFile.path) }) if (videoFile.isAudio()) { @@ -207,6 +206,8 @@ async function addVideo (req: express.Request, res: express.Response) { videoFile.resolution = (await getVideoFileResolution(videoPhysicalFile.path)).videoFileResolution } + videoFile.filename = generateVideoFilename(video, false, videoFile.resolution, videoFile.extname) + // Move physical file const destination = getVideoFilePath(video, videoFile) await move(videoPhysicalFile.path, destination) @@ -217,12 +218,9 @@ async function addVideo (req: express.Request, res: express.Response) { const [ thumbnailModel, previewModel ] = await buildVideoThumbnailsFromReq({ video, files: req.files, - fallback: type => generateVideoMiniature(video, videoFile, type) + fallback: type => generateVideoMiniature({ video, videoFile, type }) }) - // Create the torrent file - await createTorrentAndSetInfoHash(video, videoFile) - const { videoCreated } = await sequelizeTypescript.transaction(async t => { const sequelizeOptions = { transaction: t } @@ -250,6 +248,9 @@ async function addVideo (req: express.Request, res: express.Response) { }, { transaction: t }) } + // Channel has a new content, set as updated + await videoCreated.VideoChannel.setAsUpdated(t) + await autoBlacklistVideoIfNeeded({ video, user: res.locals.oauth.token.User, @@ -257,18 +258,31 @@ async function addVideo (req: express.Request, res: express.Response) { 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) + logger.info('Video with name %s and uuid %s created.', videoInfo.name, videoCreated.uuid, lTags(videoCreated.uuid)) return { videoCreated } }) - Notifier.Instance.notifyOnNewVideoIfNeeded(videoCreated) + // Create the torrent file in async way because it could be long + createTorrentAndSetInfoHashAsync(video, videoFile) + .catch(err => logger.error('Cannot create torrent file for video %s', video.url, { err, ...lTags(video.uuid) })) + .then(() => VideoModel.loadAndPopulateAccountAndServerAndTags(video.id)) + .then(refreshedVideo => { + if (!refreshedVideo) return + + // Only federate and notify after the torrent creation + Notifier.Instance.notifyOnNewVideoIfNeeded(refreshedVideo) + + return retryTransactionWrapper(() => { + return sequelizeTypescript.transaction(t => federateVideoIfNeeded(refreshedVideo, true, t)) + }) + }) + .catch(err => logger.error('Cannot federate or notify video creation %s', video.url, { err, ...lTags(video.uuid) })) if (video.state === VideoState.TO_TRANSCODE) { - await addOptimizeOrMergeAudioJob(videoCreated, videoFile) + await addOptimizeOrMergeAudioJob(videoCreated, videoFile, res.locals.oauth.token.User) } Hooks.runAction('action:api.video.uploaded', { video: videoCreated }) @@ -336,12 +350,13 @@ async function updateVideo (req: express.Request, res: express.Response) { if (previewModel) await videoInstanceUpdated.addAndSaveThumbnail(previewModel, t) // Video tags update? - await setVideoTags({ - video: videoInstanceUpdated, - tags: videoInfoToUpdate.tags, - transaction: t, - defaultValue: videoInstanceUpdated.Tags - }) + if (videoInfoToUpdate.tags !== undefined) { + await setVideoTags({ + video: videoInstanceUpdated, + tags: videoInfoToUpdate.tags, + transaction: t + }) + } // Video channel update? if (res.locals.videoChannel && videoInstanceUpdated.channelId !== res.locals.videoChannel.id) { @@ -377,7 +392,7 @@ async function updateVideo (req: express.Request, res: express.Response) { new VideoAuditView(videoInstanceUpdated.toFormattedDetailsJSON()), oldVideoAuditView ) - logger.info('Video with name %s and uuid %s updated.', videoInstance.name, videoInstance.uuid) + logger.info('Video with name %s and uuid %s updated.', videoInstance.name, videoInstance.uuid, lTags(videoInstance.uuid)) return videoInstanceUpdated }) @@ -396,7 +411,9 @@ async function updateVideo (req: express.Request, res: express.Response) { throw err } - return res.type('json').status(204).end() + return res.type('json') + .status(HttpStatusCode.NO_CONTENT_204) + .end() } async function getVideo (req: express.Request, res: express.Response) { @@ -417,26 +434,46 @@ async function getVideo (req: express.Request, res: express.Response) { } async function viewVideo (req: express.Request, res: express.Response) { - const videoInstance = res.locals.onlyImmutableVideo + const immutableVideoAttrs = res.locals.onlyImmutableVideo const ip = req.ip - const exists = await Redis.Instance.doesVideoIPViewExist(ip, videoInstance.uuid) + const exists = await Redis.Instance.doesVideoIPViewExist(ip, immutableVideoAttrs.uuid) if (exists) { - logger.debug('View for ip %s and video %s already exists.', ip, videoInstance.uuid) - return res.status(204).end() + logger.debug('View for ip %s and video %s already exists.', ip, immutableVideoAttrs.uuid) + return res.sendStatus(HttpStatusCode.NO_CONTENT_204) + } + + const video = await VideoModel.load(immutableVideoAttrs.id) + + const promises: Promise[] = [ + Redis.Instance.setIPVideoView(ip, video.uuid, video.isLive) + ] + + let federateView = true + + // Increment our live manager + if (video.isLive && video.isOwned()) { + LiveManager.Instance.addViewTo(video.id) + + // Views of our local live will be sent by our live manager + federateView = false + } + + // Increment our video views cache counter + if (!video.isLive) { + promises.push(Redis.Instance.addVideoView(video.id)) } - await Promise.all([ - Redis.Instance.addVideoView(videoInstance.id), - Redis.Instance.setIPVideoView(ip, videoInstance.uuid) - ]) + if (federateView) { + const serverActor = await getServerActor() + promises.push(sendView(serverActor, video, undefined)) + } - const serverActor = await getServerActor() - await sendView(serverActor, videoInstance, undefined) + await Promise.all(promises) - Hooks.runAction('action:api.video.viewed', { video: videoInstance, ip }) + Hooks.runAction('action:api.video.viewed', { video, ip }) - return res.status(204).end() + return res.sendStatus(HttpStatusCode.NO_CONTENT_204) } async function getVideoDescription (req: express.Request, res: express.Response) { @@ -459,20 +496,22 @@ async function getVideoFileMetadata (req: express.Request, res: express.Response } async function listVideos (req: express.Request, res: express.Response) { + const query = req.query as VideosCommonQuery const countVideos = getCountVideos(req) const apiOptions = await Hooks.wrapObject({ - start: req.query.start, - count: req.query.count, - sort: req.query.sort, + start: query.start, + count: query.count, + sort: 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, + categoryOneOf: query.categoryOneOf, + licenceOneOf: query.licenceOneOf, + languageOneOf: query.languageOneOf, + tagsOneOf: query.tagsOneOf, + tagsAllOf: query.tagsAllOf, + nsfw: buildNSFWFilter(res, query.nsfw), + isLive: query.isLive, + filter: query.filter, withFiles: false, user: res.locals.oauth ? res.locals.oauth.token.User : undefined, countVideos @@ -499,5 +538,21 @@ async function removeVideo (req: express.Request, res: express.Response) { Hooks.runAction('action:api.video.deleted', { video: videoInstance }) - return res.type('json').status(204).end() + return res.type('json') + .status(HttpStatusCode.NO_CONTENT_204) + .end() +} + +async function createTorrentAndSetInfoHashAsync (video: MVideo, fileArg: MVideoFile) { + await createTorrentAndSetInfoHash(video, fileArg) + + // Refresh videoFile because the createTorrentAndSetInfoHash could be long + const refreshedFile = await VideoFileModel.loadWithVideo(fileArg.id) + // File does not exist anymore, remove the generated torrent + if (!refreshedFile) return fileArg.removeTorrent() + + refreshedFile.infoHash = fileArg.infoHash + refreshedFile.torrentFilename = fileArg.torrentFilename + + return refreshedFile.save() }