X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Fapi%2Fvideos%2Fupload.ts;h=3afbedbb2ecd5811851eb33858d30d707fb97e9b;hb=1808a1f8e4b7b102823492a2007a46929aebf189;hp=3e9979330070894fec88892f967e6ae4b060ac01;hpb=020d3d3d79338148873cfd78ba59856f63260f2f;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/controllers/api/videos/upload.ts b/server/controllers/api/videos/upload.ts index 3e9979330..3afbedbb2 100644 --- a/server/controllers/api/videos/upload.ts +++ b/server/controllers/api/videos/upload.ts @@ -1,13 +1,12 @@ import express from 'express' import { move } from 'fs-extra' import { basename } from 'path' -import { getLowercaseExtension } from '@server/helpers/core-utils' import { getResumableUploadPath } from '@server/helpers/upload' -import { uuidToShort } from '@server/helpers/uuid' -import { createTorrentAndSetInfoHash } from '@server/helpers/webtorrent' import { getLocalVideoActivityPubUrl } from '@server/lib/activitypub/url' +import { JobQueue } from '@server/lib/job-queue' import { generateWebTorrentVideoFilename } from '@server/lib/paths' import { Redis } from '@server/lib/redis' +import { uploadx } from '@server/lib/uploadx' import { addMoveToObjectStorageJob, addOptimizeOrMergeAudioJob, @@ -18,17 +17,16 @@ import { import { VideoPathManager } from '@server/lib/video-path-manager' import { buildNextVideoState } from '@server/lib/video-state' import { openapiOperationDoc } from '@server/middlewares/doc' -import { MVideo, MVideoFile, MVideoFullLight } from '@server/types/models' -import { Uploadx } from '@uploadx/core' -import { VideoCreate, VideoState } from '../../../../shared' -import { HttpStatusCode } from '../../../../shared/models' +import { MVideoFile, MVideoFullLight } from '@server/types/models' +import { getLowercaseExtension } from '@shared/core-utils' +import { isAudioFile, uuidToShort } from '@shared/extra-utils' +import { HttpStatusCode, ManageVideoTorrentPayload, VideoCreate, VideoResolution, VideoState } from '@shared/models' import { auditLoggerFactory, getAuditIdFromRes, VideoAuditView } from '../../../helpers/audit-logger' import { retryTransactionWrapper } from '../../../helpers/database-utils' import { createReqFiles } from '../../../helpers/express-utils' -import { getMetadataFromFile, getVideoFileFPS, getVideoFileResolution } from '../../../helpers/ffprobe-utils' +import { buildFileMetadata, ffprobePromise, getVideoStreamDimensionsInfo, getVideoStreamFPS } from '../../../helpers/ffmpeg' import { logger, loggerTagsFactory } from '../../../helpers/logger' -import { CONFIG } from '../../../initializers/config' -import { DEFAULT_AUDIO_RESOLUTION, MIMETYPES } from '../../../initializers/constants' +import { MIMETYPES } from '../../../initializers/constants' import { sequelizeTypescript } from '../../../initializers/database' import { federateVideoIfNeeded } from '../../../lib/activitypub/videos' import { Notifier } from '../../../lib/notifier' @@ -41,7 +39,6 @@ import { authenticate, videosAddLegacyValidator, videosAddResumableInitValidator, - videosResumableUploadIdValidator, videosAddResumableValidator } from '../../../middlewares' import { ScheduleVideoUpdateModel } from '../../../models/video/schedule-video-update' @@ -52,26 +49,15 @@ const lTags = loggerTagsFactory('api', 'video') const auditLogger = auditLoggerFactory('videos') const uploadRouter = express.Router() -const uploadx = new Uploadx({ directory: getResumableUploadPath() }) -uploadx.getUserId = (_, res: express.Response) => res.locals.oauth?.token.user.id - const reqVideoFileAdd = createReqFiles( [ 'videofile', 'thumbnailfile', 'previewfile' ], - Object.assign({}, MIMETYPES.VIDEO.MIMETYPE_EXT, MIMETYPES.IMAGE.MIMETYPE_EXT), - { - videofile: CONFIG.STORAGE.TMP_DIR, - thumbnailfile: CONFIG.STORAGE.TMP_DIR, - previewfile: CONFIG.STORAGE.TMP_DIR - } + { ...MIMETYPES.VIDEO.MIMETYPE_EXT, ...MIMETYPES.IMAGE.MIMETYPE_EXT } ) const reqVideoFileAddResumable = createReqFiles( [ 'thumbnailfile', 'previewfile' ], MIMETYPES.IMAGE.MIMETYPE_EXT, - { - thumbnailfile: getResumableUploadPath(), - previewfile: getResumableUploadPath() - } + getResumableUploadPath() ) uploadRouter.post('/upload', @@ -92,7 +78,6 @@ uploadRouter.post('/upload-resumable', uploadRouter.delete('/upload-resumable', authenticate, - videosResumableUploadIdValidator, asyncMiddleware(deleteUploadResumableCache), uploadx.upload ) @@ -100,7 +85,6 @@ uploadRouter.delete('/upload-resumable', uploadRouter.put('/upload-resumable', openapiOperationDoc({ operationId: 'uploadResumable' }), authenticate, - videosResumableUploadIdValidator, uploadx.upload, // uploadx doesn't next() before the file upload completes asyncMiddleware(videosAddResumableValidator), asyncMiddleware(addVideoResumable) @@ -129,7 +113,7 @@ async function addVideoLegacy (req: express.Request, res: express.Response) { const videoInfo: VideoCreate = req.body const files = req.files - const response = await addVideo({ res, videoPhysicalFile, videoInfo, files }) + const response = await addVideo({ req, res, videoPhysicalFile, videoInfo, files }) return res.json(response) } @@ -139,23 +123,25 @@ async function addVideoResumable (req: express.Request, res: express.Response) { const videoInfo = videoPhysicalFile.metadata const files = { previewfile: videoInfo.previewfile } - const response = await addVideo({ res, videoPhysicalFile, videoInfo, files }) + const response = await addVideo({ req, res, videoPhysicalFile, videoInfo, files }) await Redis.Instance.setUploadSession(req.query.upload_id, response) return res.json(response) } async function addVideo (options: { + req: express.Request res: express.Response videoPhysicalFile: express.VideoUploadFile videoInfo: VideoCreate files: express.UploadFiles }) { - const { res, videoPhysicalFile, videoInfo, files } = options + const { req, res, videoPhysicalFile, videoInfo, files } = options const videoChannel = res.locals.videoChannel const user = res.locals.oauth.token.User - const videoData = buildLocalVideoFromReq(videoInfo, videoChannel.id) + let videoData = buildLocalVideoFromReq(videoInfo, videoChannel.id) + videoData = await Hooks.wrapObject(videoData, 'filter:api.video.upload.video-attribute.result') videoData.state = buildNextVideoState() videoData.duration = videoPhysicalFile.duration // duration was added by a previous middleware @@ -223,19 +209,24 @@ async function addVideo (options: { // Channel has a new content, set as updated await videoCreated.VideoChannel.setAsUpdated() - createTorrentFederate(video, videoFile) - .then(() => { - if (video.state === VideoState.TO_MOVE_TO_EXTERNAL_STORAGE) { - return addMoveToObjectStorageJob(video) + createTorrentFederate(videoCreated, videoFile) + .catch(err => { + logger.error('Cannot create torrent or federate video for %s.', videoCreated.uuid, { err, ...lTags(videoCreated.uuid) }) + + return videoCreated + }).then(refreshedVideo => { + if (!refreshedVideo) return + + if (refreshedVideo.state === VideoState.TO_MOVE_TO_EXTERNAL_STORAGE) { + return addMoveToObjectStorageJob({ video: refreshedVideo, previousVideoState: undefined }) } - if (video.state === VideoState.TO_TRANSCODE) { - return addOptimizeOrMergeAudioJob(videoCreated, videoFile, user) + if (refreshedVideo.state === VideoState.TO_TRANSCODE) { + return addOptimizeOrMergeAudioJob({ video: refreshedVideo, videoFile, user }) } - }) - .catch(err => logger.error('Cannot add optimize/merge audio job for %s.', videoCreated.uuid, { err, ...lTags(videoCreated.uuid) })) + }).catch(err => logger.error('Cannot add optimize/merge audio job for %s.', videoCreated.uuid, { err, ...lTags(videoCreated.uuid) })) - Hooks.runAction('action:api.video.uploaded', { video: videoCreated }) + Hooks.runAction('action:api.video.uploaded', { video: videoCreated, req, res }) return { video: { @@ -251,14 +242,16 @@ async function buildNewFile (videoPhysicalFile: express.VideoUploadFile) { extname: getLowercaseExtension(videoPhysicalFile.filename), size: videoPhysicalFile.size, videoStreamingPlaylistId: null, - metadata: await getMetadataFromFile(videoPhysicalFile.path) + metadata: await buildFileMetadata(videoPhysicalFile.path) }) - if (videoFile.isAudio()) { - videoFile.resolution = DEFAULT_AUDIO_RESOLUTION + const probe = await ffprobePromise(videoPhysicalFile.path) + + if (await isAudioFile(videoPhysicalFile.path, probe)) { + videoFile.resolution = VideoResolution.H_NOVIDEO } else { - videoFile.fps = await getVideoFileFPS(videoPhysicalFile.path) - videoFile.resolution = (await getVideoFileResolution(videoPhysicalFile.path)).resolution + videoFile.fps = await getVideoStreamFPS(videoPhysicalFile.path, probe) + videoFile.resolution = (await getVideoStreamDimensionsInfo(videoPhysicalFile.path, probe)).resolution } videoFile.filename = generateWebTorrentVideoFilename(videoFile.resolution, videoFile.extname) @@ -266,36 +259,23 @@ async function buildNewFile (videoPhysicalFile: express.VideoUploadFile) { return videoFile } -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() +async function createTorrentFederate (video: MVideoFullLight, videoFile: MVideoFile) { + const payload: ManageVideoTorrentPayload = { videoId: video.id, videoFileId: videoFile.id, action: 'create' } - refreshedFile.infoHash = fileArg.infoHash - refreshedFile.torrentFilename = fileArg.torrentFilename + const job = await JobQueue.Instance.createJobWithPromise({ type: 'manage-video-torrent', payload }) + await job.finished() - return refreshedFile.save() -} + const refreshedVideo = await VideoModel.loadAndPopulateAccountAndServerAndTags(video.id) + if (!refreshedVideo) return -function createTorrentFederate (video: MVideoFullLight, videoFile: MVideoFile) { - // Create the torrent file in async way because it could be long - return 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) - // Only federate and notify after the torrent creation - Notifier.Instance.notifyOnNewVideoIfNeeded(refreshedVideo) + await retryTransactionWrapper(() => { + return sequelizeTypescript.transaction(t => federateVideoIfNeeded(refreshedVideo, true, t)) + }) - 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) })) + return refreshedVideo } async function deleteUploadResumableCache (req: express.Request, res: express.Response, next: express.NextFunction) {