-import * as express from 'express'
+import express from 'express'
import { move } from 'fs-extra'
+import { basename } from 'path'
import { getLowercaseExtension } from '@server/helpers/core-utils'
-import { deleteResumableUploadMetaFile, getResumableUploadPath } from '@server/helpers/upload'
+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 { addOptimizeOrMergeAudioJob, buildLocalVideoFromReq, buildVideoThumbnailsFromReq, setVideoTags } from '@server/lib/video'
-import { generateWebTorrentVideoFilename, getVideoFilePath } from '@server/lib/video-paths'
+import { generateWebTorrentVideoFilename } from '@server/lib/paths'
+import { Redis } from '@server/lib/redis'
+import {
+ addMoveToObjectStorageJob,
+ addOptimizeOrMergeAudioJob,
+ buildLocalVideoFromReq,
+ 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 { MVideo, MVideoFile, MVideoFullLight } from '@server/types/models'
-import { uploadx } from '@uploadx/core'
+import { Uploadx } from '@uploadx/core'
import { VideoCreate, VideoState } from '../../../../shared'
import { HttpStatusCode } from '../../../../shared/models'
import { auditLoggerFactory, getAuditIdFromRes, VideoAuditView } from '../../../helpers/audit-logger'
authenticate,
videosAddLegacyValidator,
videosAddResumableInitValidator,
+ videosResumableUploadIdValidator,
videosAddResumableValidator
} from '../../../middlewares'
import { ScheduleVideoUpdateModel } from '../../../models/video/schedule-video-update'
const lTags = loggerTagsFactory('api', 'video')
const auditLogger = auditLoggerFactory('videos')
const uploadRouter = express.Router()
-const uploadxMiddleware = uploadx.upload({ directory: getResumableUploadPath() })
+
+const uploadx = new Uploadx({ directory: getResumableUploadPath() })
+uploadx.getUserId = (_, res: express.Response) => res.locals.oauth?.token.user.id
const reqVideoFileAdd = createReqFiles(
[ 'videofile', 'thumbnailfile', 'previewfile' ],
authenticate,
reqVideoFileAddResumable,
asyncMiddleware(videosAddResumableInitValidator),
- uploadxMiddleware
+ uploadx.upload
)
uploadRouter.delete('/upload-resumable',
authenticate,
- uploadxMiddleware
+ videosResumableUploadIdValidator,
+ asyncMiddleware(deleteUploadResumableCache),
+ uploadx.upload
)
uploadRouter.put('/upload-resumable',
openapiOperationDoc({ operationId: 'uploadResumable' }),
authenticate,
- uploadxMiddleware, // uploadx doesn't use call next() before the file upload completes
+ videosResumableUploadIdValidator,
+ 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, () => {
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
-
+ 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)
// 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({
}, sequelizeOptions)
}
- // Channel has a new content, set as updated
- await videoCreated.VideoChannel.setAsUpdated(t)
-
await autoBlacklistVideoIfNeeded({
video,
user,
return { videoCreated }
})
+ // Channel has a new content, set as updated
+ await videoCreated.VideoChannel.setAsUpdated()
+
createTorrentFederate(video, videoFile)
.then(() => {
- if (video.state !== VideoState.TO_TRANSCODE) return
+ if (video.state === VideoState.TO_MOVE_TO_EXTERNAL_STORAGE) {
+ return addMoveToObjectStorageJob(video)
+ }
- return addOptimizeOrMergeAudioJob(videoCreated, videoFile, user)
+ if (video.state === VideoState.TO_TRANSCODE) {
+ return addOptimizeOrMergeAudioJob(videoCreated, videoFile, user)
+ }
})
.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 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: getLowercaseExtension(videoPhysicalFile.filename),
size: videoPhysicalFile.size,
})
.catch(err => logger.error('Cannot federate or notify video creation %s', video.url, { err, ...lTags(video.uuid) }))
}
+
+async function deleteUploadResumableCache (req: express.Request, res: express.Response, next: express.NextFunction) {
+ await Redis.Instance.deleteUploadSession(req.query.upload_id)
+
+ return next()
+}
projects / github / Chocobozzz / PeerTube.git / blobdiff