-import * as express from 'express'
+import express from 'express'
import { move } from 'fs-extra'
-import { extname } from 'path'
-import { deleteResumableUploadMetaFile, getResumableUploadPath } from '@server/helpers/upload'
-import { createTorrentAndSetInfoHash } from '@server/helpers/webtorrent'
+import { basename } from 'path'
+import { getResumableUploadPath } from '@server/helpers/upload'
import { getLocalVideoActivityPubUrl } from '@server/lib/activitypub/url'
-import { addOptimizeOrMergeAudioJob, buildLocalVideoFromReq, buildVideoThumbnailsFromReq, setVideoTags } from '@server/lib/video'
-import { generateVideoFilename, getVideoFilePath } from '@server/lib/video-paths'
-import { MVideo, MVideoFile, MVideoFullLight } from '@server/types/models'
-import { uploadx } from '@uploadx/core'
-import { VideoCreate, VideoState } from '../../../../shared'
-import { HttpStatusCode } from '../../../../shared/core-utils/miscs'
+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 {
+ buildLocalVideoFromReq,
+ buildMoveToObjectStorageJob,
+ buildOptimizeOrMergeAudioJob,
+ buildVideoThumbnailsFromReq,
+ setVideoTags
+} from '@server/lib/video'
+import { VideoPathManager } from '@server/lib/video-path-manager'
+import { buildNextVideoState } from '@server/lib/video-state'
+import { openapiOperationDoc } from '@server/middlewares/doc'
+import { VideoSourceModel } from '@server/models/video/video-source'
+import { MUserId, MVideoFile, MVideoFullLight } from '@server/types/models'
+import { getLowercaseExtension } from '@shared/core-utils'
+import { isAudioFile, uuidToShort } from '@shared/extra-utils'
+import { HttpStatusCode, 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'
import { Hooks } from '../../../lib/plugins/hooks'
import { generateVideoMiniature } from '../../../lib/thumbnail'
import { autoBlacklistVideoIfNeeded } from '../../../lib/video-blacklist'
const lTags = loggerTagsFactory('api', 'video')
const auditLogger = auditLoggerFactory('videos')
const uploadRouter = express.Router()
-const uploadxMiddleware = uploadx.upload({ directory: getResumableUploadPath() })
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',
+ openapiOperationDoc({ operationId: 'uploadLegacy' }),
authenticate,
reqVideoFileAdd,
asyncMiddleware(videosAddLegacyValidator),
)
uploadRouter.post('/upload-resumable',
+ openapiOperationDoc({ operationId: 'uploadResumableInit' }),
authenticate,
reqVideoFileAddResumable,
asyncMiddleware(videosAddResumableInitValidator),
- uploadxMiddleware
+ uploadx.upload
)
uploadRouter.delete('/upload-resumable',
authenticate,
- uploadxMiddleware
+ asyncMiddleware(deleteUploadResumableCache),
+ uploadx.upload
)
uploadRouter.put('/upload-resumable',
+ openapiOperationDoc({ operationId: 'uploadResumable' }),
authenticate,
- uploadxMiddleware, // uploadx doesn't use call next() before the file upload completes
+ uploadx.upload, // uploadx doesn't next() before the file upload completes
asyncMiddleware(videosAddResumableValidator),
asyncMiddleware(addVideoResumable)
)
// ---------------------------------------------------------------------------
-export async function addVideoLegacy (req: express.Request, res: express.Response) {
+async function addVideoLegacy (req: express.Request, res: express.Response) {
// 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(HttpStatusCode.REQUEST_TIMEOUT_408)
+ logger.error('Video upload has timed out.')
+ return res.fail({
+ status: HttpStatusCode.REQUEST_TIMEOUT_408,
+ message: 'Video upload has timed out.'
+ })
})
const videoPhysicalFile = req.files['videofile'][0]
const videoInfo: VideoCreate = req.body
const files = req.files
- return addVideo({ res, videoPhysicalFile, videoInfo, files })
+ const response = await addVideo({ req, res, videoPhysicalFile, videoInfo, files })
+
+ return res.json(response)
}
-export async function addVideoResumable (_req: express.Request, res: express.Response) {
+async function addVideoResumable (req: express.Request, res: express.Response) {
const videoPhysicalFile = res.locals.videoFileResumable
const videoInfo = videoPhysicalFile.metadata
const files = { previewfile: videoInfo.previewfile }
- // Don't need the meta file anymore
- await deleteResumableUploadMetaFile(videoPhysicalFile.path)
+ const response = await addVideo({ req, res, videoPhysicalFile, videoInfo, files })
+ await Redis.Instance.setUploadSession(req.query.upload_id, response)
- return addVideo({ res, videoPhysicalFile, videoInfo, files })
+ 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)
-
- videoData.state = CONFIG.TRANSCODING.ENABLED
- ? VideoState.TO_TRANSCODE
- : VideoState.PUBLISHED
+ 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
const video = new VideoModel(videoData) as MVideoFullLight
video.VideoChannel = videoChannel
video.url = getLocalVideoActivityPubUrl(video) // We use the UUID, so set the URL after building the object
- const videoFile = await buildNewFile(video, videoPhysicalFile)
+ const videoFile = await buildNewFile(videoPhysicalFile)
+ const originalFilename = videoPhysicalFile.originalname
// Move physical file
- const destination = getVideoFilePath(video, videoFile)
+ const destination = VideoPathManager.Instance.getFSVideoFileOutputPath(video, videoFile)
await move(videoPhysicalFile.path, destination)
// This is important in case if there is another attempt in the retry process
- videoPhysicalFile.filename = getVideoFilePath(video, videoFile)
+ videoPhysicalFile.filename = basename(destination)
videoPhysicalFile.path = destination
const [ thumbnailModel, previewModel ] = await buildVideoThumbnailsFromReq({
video.VideoFiles = [ videoFile ]
+ await VideoSourceModel.create({
+ filename: originalFilename,
+ videoId: video.id
+ }, { transaction: t })
+
await setVideoTags({ video, tags: videoInfo.tags, transaction: t })
// Schedule an update in the future?
}, sequelizeOptions)
}
- // Channel has a new content, set as updated
- await videoCreated.VideoChannel.setAsUpdated(t)
-
await autoBlacklistVideoIfNeeded({
video,
user,
return { videoCreated }
})
- createTorrentFederate(video, videoFile)
+ // Channel has a new content, set as updated
+ await videoCreated.VideoChannel.setAsUpdated()
- if (video.state === VideoState.TO_TRANSCODE) {
- await addOptimizeOrMergeAudioJob(videoCreated, videoFile, user)
- }
+ addVideoJobsAfterUpload(videoCreated, videoFile, user)
+ .catch(err => logger.error('Cannot build new video jobs of %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 res.json({
+ return {
video: {
id: videoCreated.id,
+ shortUUID: uuidToShort(videoCreated.uuid),
uuid: videoCreated.uuid
}
- })
+ }
}
-async function buildNewFile (video: MVideo, videoPhysicalFile: express.VideoUploadFile) {
+async function buildNewFile (videoPhysicalFile: express.VideoUploadFile) {
const videoFile = new VideoFileModel({
- extname: extname(videoPhysicalFile.filename),
+ 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)).videoFileResolution
+ videoFile.fps = await getVideoStreamFPS(videoPhysicalFile.path, probe)
+ videoFile.resolution = (await getVideoStreamDimensionsInfo(videoPhysicalFile.path, probe)).resolution
}
- videoFile.filename = generateVideoFilename(video, false, videoFile.resolution, videoFile.extname)
+ videoFile.filename = generateWebTorrentVideoFilename(videoFile.resolution, videoFile.extname)
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()
-
- refreshedFile.infoHash = fileArg.infoHash
- refreshedFile.torrentFilename = fileArg.torrentFilename
-
- return refreshedFile.save()
+async function addVideoJobsAfterUpload (video: MVideoFullLight, videoFile: MVideoFile, user: MUserId) {
+ return JobQueue.Instance.createSequentialJobFlow(
+ {
+ type: 'manage-video-torrent' as 'manage-video-torrent',
+ payload: {
+ videoId: video.id,
+ videoFileId: videoFile.id,
+ action: 'create'
+ }
+ },
+ {
+ type: 'federate-video' as 'federate-video',
+ payload: {
+ videoUUID: video.uuid,
+ isNewVideo: true
+ }
+ },
+
+ video.state === VideoState.TO_MOVE_TO_EXTERNAL_STORAGE
+ ? await buildMoveToObjectStorageJob({ video, previousVideoState: undefined })
+ : undefined,
+
+ video.state === VideoState.TO_TRANSCODE
+ ? await buildOptimizeOrMergeAudioJob({ video, videoFile, user })
+ : undefined
+ )
}
-function createTorrentFederate (video: MVideoFullLight, videoFile: MVideoFile): void {
- // 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
+async function deleteUploadResumableCache (req: express.Request, res: express.Response, next: express.NextFunction) {
+ await Redis.Instance.deleteUploadSession(req.query.upload_id)
- // 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) }))
+ return next()
}
projects / github / Chocobozzz / PeerTube.git / blobdiff