X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Fapi%2Fvideos%2Findex.ts;h=2b5afd632d1f3e92ecfd70972d8db1844bb5affa;hb=40ff57078e15d5b86ee6b71e198b95d3feb78eaf;hp=d71a132ed05d40742d244ebdd3a1b249fd119914;hpb=93e1258c7cbc0d1235ca6d2a1f7c1875985328b8;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/controllers/api/videos/index.ts b/server/controllers/api/videos/index.ts index d71a132ed..2b5afd632 100644 --- a/server/controllers/api/videos/index.ts +++ b/server/controllers/api/videos/index.ts @@ -1,50 +1,46 @@ import * as express from 'express' -import * as Promise from 'bluebird' import * as multer from 'multer' import { extname, join } from 'path' - -import { database as db } from '../../../initializers/database' -import { - CONFIG, - REQUEST_VIDEO_QADU_TYPES, - REQUEST_VIDEO_EVENT_TYPES, - VIDEO_CATEGORIES, - VIDEO_LICENCES, - VIDEO_LANGUAGES -} from '../../../initializers' +import { VideoCreate, VideoPrivacy, VideoUpdate } from '../../../../shared' import { - addEventToRemoteVideo, - quickAndDirtyUpdateVideoToFriends, - addVideoToFriends, - updateVideoToFriends, - JobScheduler -} from '../../../lib' + generateRandomString, + getFormattedObjects, + getVideoFileHeight, + logger, + renamePromise, + resetSequelizeInstance, + retryTransactionWrapper +} from '../../../helpers' +import { getServerAccount } from '../../../helpers/utils' +import { CONFIG, VIDEO_CATEGORIES, VIDEO_LANGUAGES, VIDEO_LICENCES, VIDEO_MIMETYPE_EXT, VIDEO_PRIVACIES } from '../../../initializers' +import { database as db } from '../../../initializers/database' +import { sendAddVideo } from '../../../lib/activitypub/send/send-add' +import { sendUpdateVideo } from '../../../lib/activitypub/send/send-update' +import { shareVideoByServer } from '../../../lib/activitypub/share' +import { getVideoActivityPubUrl } from '../../../lib/activitypub/url' +import { fetchRemoteVideoDescription } from '../../../lib/activitypub/videos' +import { sendCreateViewToVideoFollowers } from '../../../lib/index' +import { transcodingJobScheduler } from '../../../lib/jobs/transcoding-job-scheduler/transcoding-job-scheduler' import { + asyncMiddleware, authenticate, paginationValidator, - videosSortValidator, - setVideosSort, setPagination, setVideosSearch, - videosUpdateValidator, - videosSearchValidator, + setVideosSort, videosAddValidator, videosGetValidator, - videosRemoveValidator + videosRemoveValidator, + videosSearchValidator, + videosSortValidator, + videosUpdateValidator } from '../../../middlewares' -import { - logger, - retryTransactionWrapper, - generateRandomString, - getFormatedObjects, - renamePromise -} from '../../../helpers' -import { TagInstance } from '../../../models' -import { VideoCreate, VideoUpdate } from '../../../../shared' - +import { VideoInstance } from '../../../models' import { abuseVideoRouter } from './abuse' import { blacklistRouter } from './blacklist' +import { videoChannelRouter } from './channel' import { rateVideoRouter } from './rate' +import { sendCreateViewToOrigin } from '../../../lib/activitypub/send/send-create' const videosRouter = express.Router() @@ -54,20 +50,18 @@ const storage = multer.diskStorage({ cb(null, CONFIG.STORAGE.VIDEOS_DIR) }, - filename: (req, file, cb) => { - let extension = '' - if (file.mimetype === 'video/webm') extension = 'webm' - else if (file.mimetype === 'video/mp4') extension = 'mp4' - else if (file.mimetype === 'video/ogg') extension = 'ogv' - generateRandomString(16) - .then(randomString => { - const filename = randomString - cb(null, filename + '.' + extension) - }) - .catch(err => { - logger.error('Cannot generate random string for file name.', err) - throw err - }) + filename: async (req, file, cb) => { + const extension = VIDEO_MIMETYPE_EXT[file.mimetype] + let randomString = '' + + try { + randomString = await generateRandomString(16) + } catch (err) { + logger.error('Cannot generate random string for file name.', err) + randomString = 'fake-random-string' + } + + cb(null, randomString + extension) } }) @@ -76,28 +70,35 @@ const reqFiles = multer({ storage: storage }).fields([{ name: 'videofile', maxCo videosRouter.use('/', abuseVideoRouter) videosRouter.use('/', blacklistRouter) videosRouter.use('/', rateVideoRouter) +videosRouter.use('/', videoChannelRouter) videosRouter.get('/categories', listVideoCategories) videosRouter.get('/licences', listVideoLicences) videosRouter.get('/languages', listVideoLanguages) +videosRouter.get('/privacies', listVideoPrivacies) videosRouter.get('/', paginationValidator, videosSortValidator, setVideosSort, setPagination, - listVideos + asyncMiddleware(listVideos) ) videosRouter.put('/:id', authenticate, videosUpdateValidator, - updateVideoRetryWrapper + asyncMiddleware(updateVideoRetryWrapper) ) -videosRouter.post('/', +videosRouter.post('/upload', authenticate, reqFiles, videosAddValidator, - addVideoRetryWrapper + asyncMiddleware(addVideoRetryWrapper) +) + +videosRouter.get('/:id/description', + videosGetValidator, + asyncMiddleware(getVideoDescription) ) videosRouter.get('/:id', videosGetValidator, @@ -107,7 +108,7 @@ videosRouter.get('/:id', videosRouter.delete('/:id', authenticate, videosRemoveValidator, - removeVideo + asyncMiddleware(removeVideoRetryWrapper) ) videosRouter.get('/search/:value', @@ -117,7 +118,7 @@ videosRouter.get('/search/:value', setVideosSort, setPagination, setVideosSearch, - searchVideos + asyncMiddleware(searchVideos) ) // --------------------------------------------------------------------------- @@ -128,286 +129,257 @@ export { // --------------------------------------------------------------------------- -function listVideoCategories (req: express.Request, res: express.Response, next: express.NextFunction) { +function listVideoCategories (req: express.Request, res: express.Response) { res.json(VIDEO_CATEGORIES) } -function listVideoLicences (req: express.Request, res: express.Response, next: express.NextFunction) { +function listVideoLicences (req: express.Request, res: express.Response) { res.json(VIDEO_LICENCES) } -function listVideoLanguages (req: express.Request, res: express.Response, next: express.NextFunction) { +function listVideoLanguages (req: express.Request, res: express.Response) { res.json(VIDEO_LANGUAGES) } +function listVideoPrivacies (req: express.Request, res: express.Response) { + res.json(VIDEO_PRIVACIES) +} + // Wrapper to video add that retry the function if there is a database error // We need this because we run the transaction in SERIALIZABLE isolation that can fail -function addVideoRetryWrapper (req: express.Request, res: express.Response, next: express.NextFunction) { +async function addVideoRetryWrapper (req: express.Request, res: express.Response, next: express.NextFunction) { const options = { - arguments: [ req, res, req.files.videofile[0] ], + arguments: [ req, res, req.files['videofile'][0] ], errorMessage: 'Cannot insert the video with many retries.' } - retryTransactionWrapper(addVideo, options) - .then(() => { - // TODO : include Location of the new video -> 201 - res.type('json').status(204).end() - }) - .catch(err => next(err)) + await retryTransactionWrapper(addVideo, options) + + // TODO : include Location of the new video -> 201 + res.type('json').status(204).end() } -function addVideo (req: express.Request, res: express.Response, videoPhysicalFile: Express.Multer.File) { - const videoInfos: VideoCreate = req.body - - return db.sequelize.transaction(t => { - const user = res.locals.oauth.token.User - - const name = user.username - // null because it is OUR pod - const podId = null - const userId = user.id - - return db.Author.findOrCreateAuthor(name, podId, userId, t) - .then(author => { - const tags = videoInfos.tags - if (!tags) return { author, tagInstances: undefined } - - return db.Tag.findOrCreateTags(tags, t).then(tagInstances => ({ author, tagInstances })) - }) - .then(({ author, tagInstances }) => { - const videoData = { - name: videoInfos.name, - remote: false, - extname: extname(videoPhysicalFile.filename), - category: videoInfos.category, - licence: videoInfos.licence, - language: videoInfos.language, - nsfw: videoInfos.nsfw, - description: videoInfos.description, - duration: videoPhysicalFile['duration'], // duration was added by a previous middleware - authorId: author.id - } - - const video = db.Video.build(videoData) - return { author, tagInstances, video } - }) - .then(({ author, tagInstances, video }) => { - const videoFileData = { - extname: extname(videoPhysicalFile.filename), - resolution: 0, // TODO: improve readability, - size: videoPhysicalFile.size - } - - const videoFile = db.VideoFile.build(videoFileData) - return { author, tagInstances, video, videoFile } - }) - .then(({ author, tagInstances, video, videoFile }) => { - const videoDir = CONFIG.STORAGE.VIDEOS_DIR - const source = join(videoDir, videoPhysicalFile.filename) - const destination = join(videoDir, video.getVideoFilename(videoFile)) - - return renamePromise(source, destination) - .then(() => { - // This is important in case if there is another attempt in the retry process - videoPhysicalFile.filename = video.getVideoFilename(videoFile) - return { author, tagInstances, video, videoFile } - }) - }) - .then(({ author, tagInstances, video, videoFile }) => { - const tasks = [] - - tasks.push( - video.createTorrentAndSetInfoHash(videoFile), - video.createThumbnail(videoFile), - video.createPreview(videoFile) - ) - - if (CONFIG.TRANSCODING.ENABLED === true) { - // Put uuid because we don't have id auto incremented for now - const dataInput = { - videoUUID: video.uuid - } - - tasks.push( - JobScheduler.Instance.createJob(t, 'videoTranscoder', dataInput) - ) - } - - return Promise.all(tasks).then(() => ({ author, tagInstances, video, videoFile })) - }) - .then(({ author, tagInstances, video, videoFile }) => { - const options = { transaction: t } - - return video.save(options) - .then(videoCreated => { - // Do not forget to add Author informations to the created video - videoCreated.Author = author - - return { tagInstances, video: videoCreated, videoFile } - }) - }) - .then(({ tagInstances, video, videoFile }) => { - const options = { transaction: t } - videoFile.videoId = video.id - - return videoFile.save(options) - .then(() => video.VideoFiles = [ videoFile ]) - .then(() => ({ tagInstances, video })) - }) - .then(({ tagInstances, video }) => { - if (!tagInstances) return video - - const options = { transaction: t } - return video.setTags(tagInstances, options) - .then(() => { - video.Tags = tagInstances - return video - }) - }) - .then(video => { - // Let transcoding job send the video to friends because the videofile extension might change - if (CONFIG.TRANSCODING.ENABLED === true) return undefined - - return video.toAddRemoteJSON() - .then(remoteVideo => { - // Now we'll add the video's meta data to our friends - return addVideoToFriends(remoteVideo, t) - }) - }) - }) - .then(() => logger.info('Video with name %s created.', videoInfos.name)) - .catch((err: Error) => { - logger.debug('Cannot insert the video.', err) - throw err +async function addVideo (req: express.Request, res: express.Response, videoPhysicalFile: Express.Multer.File) { + const videoInfo: VideoCreate = req.body + let videoUUID = '' + + await db.sequelize.transaction(async t => { + const sequelizeOptions = { transaction: t } + + const videoData = { + name: videoInfo.name, + remote: false, + extname: extname(videoPhysicalFile.filename), + category: videoInfo.category, + licence: videoInfo.licence, + language: videoInfo.language, + nsfw: videoInfo.nsfw, + description: videoInfo.description, + privacy: videoInfo.privacy, + duration: videoPhysicalFile['duration'], // duration was added by a previous middleware + channelId: res.locals.videoChannel.id + } + const video = db.Video.build(videoData) + video.url = getVideoActivityPubUrl(video) + + const videoFilePath = join(CONFIG.STORAGE.VIDEOS_DIR, videoPhysicalFile.filename) + const videoFileHeight = await getVideoFileHeight(videoFilePath) + + const videoFileData = { + extname: extname(videoPhysicalFile.filename), + resolution: videoFileHeight, + size: videoPhysicalFile.size + } + const videoFile = db.VideoFile.build(videoFileData) + const videoDir = CONFIG.STORAGE.VIDEOS_DIR + const source = join(videoDir, videoPhysicalFile.filename) + const destination = join(videoDir, video.getVideoFilename(videoFile)) + + await renamePromise(source, destination) + // This is important in case if there is another attempt in the retry process + videoPhysicalFile.filename = video.getVideoFilename(videoFile) + + const tasks = [] + + tasks.push( + video.createTorrentAndSetInfoHash(videoFile), + video.createThumbnail(videoFile), + video.createPreview(videoFile) + ) + + if (CONFIG.TRANSCODING.ENABLED === true) { + // Put uuid because we don't have id auto incremented for now + const dataInput = { + videoUUID: video.uuid + } + + tasks.push( + transcodingJobScheduler.createJob(t, 'videoFileOptimizer', dataInput) + ) + } + await Promise.all(tasks) + + const videoCreated = await video.save(sequelizeOptions) + // Do not forget to add video channel information to the created video + videoCreated.VideoChannel = res.locals.videoChannel + videoUUID = videoCreated.uuid + + videoFile.videoId = video.id + + await videoFile.save(sequelizeOptions) + video.VideoFiles = [videoFile] + + if (videoInfo.tags) { + const tagInstances = await db.Tag.findOrCreateTags(videoInfo.tags, t) + + await video.setTags(tagInstances, sequelizeOptions) + video.Tags = tagInstances + } + + // Let transcoding job send the video to friends because the video file extension might change + if (CONFIG.TRANSCODING.ENABLED === true) return undefined + // Don't send video to remote servers, it is private + if (video.privacy === VideoPrivacy.PRIVATE) return undefined + + await sendAddVideo(video, t) + await shareVideoByServer(video, t) }) + + logger.info('Video with name %s and uuid %s created.', videoInfo.name, videoUUID) } -function updateVideoRetryWrapper (req: express.Request, res: express.Response, next: express.NextFunction) { +async function updateVideoRetryWrapper (req: express.Request, res: express.Response, next: express.NextFunction) { const options = { arguments: [ req, res ], errorMessage: 'Cannot update the video with many retries.' } - retryTransactionWrapper(updateVideo, options) - .then(() => { - // TODO : include Location of the new video -> 201 - return res.type('json').status(204).end() - }) - .catch(err => next(err)) + await retryTransactionWrapper(updateVideo, options) + + return res.type('json').status(204).end() } -function updateVideo (req: express.Request, res: express.Response) { - const videoInstance = res.locals.video +async function updateVideo (req: express.Request, res: express.Response) { + const videoInstance: VideoInstance = res.locals.video const videoFieldsSave = videoInstance.toJSON() - const videoInfosToUpdate: VideoUpdate = req.body - - return db.sequelize.transaction(t => { - let tagsPromise: Promise - if (!videoInfosToUpdate.tags) { - tagsPromise = Promise.resolve(null) - } else { - tagsPromise = db.Tag.findOrCreateTags(videoInfosToUpdate.tags, t) - } - - return tagsPromise - .then(tagInstances => { - const options = { - transaction: t - } - - if (videoInfosToUpdate.name !== undefined) videoInstance.set('name', videoInfosToUpdate.name) - if (videoInfosToUpdate.category !== undefined) videoInstance.set('category', videoInfosToUpdate.category) - if (videoInfosToUpdate.licence !== undefined) videoInstance.set('licence', videoInfosToUpdate.licence) - if (videoInfosToUpdate.language !== undefined) videoInstance.set('language', videoInfosToUpdate.language) - if (videoInfosToUpdate.nsfw !== undefined) videoInstance.set('nsfw', videoInfosToUpdate.nsfw) - if (videoInfosToUpdate.description !== undefined) videoInstance.set('description', videoInfosToUpdate.description) - - return videoInstance.save(options).then(() => tagInstances) - }) - .then(tagInstances => { - if (!tagInstances) return - - const options = { transaction: t } - return videoInstance.setTags(tagInstances, options) - .then(() => { - videoInstance.Tags = tagInstances - - return - }) - }) - .then(() => { - const json = videoInstance.toUpdateRemoteJSON() - - // Now we'll update the video's meta data to our friends - return updateVideoToFriends(json, t) - }) - }) - .then(() => { - logger.info('Video with name %s updated.', videoInstance.name) - }) - .catch(err => { - logger.debug('Cannot update the video.', err) + const videoInfoToUpdate: VideoUpdate = req.body + const wasPrivateVideo = videoInstance.privacy === VideoPrivacy.PRIVATE + + try { + await db.sequelize.transaction(async t => { + const sequelizeOptions = { + transaction: t + } + + 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.privacy !== undefined) videoInstance.set('privacy', videoInfoToUpdate.privacy) + if (videoInfoToUpdate.description !== undefined) videoInstance.set('description', videoInfoToUpdate.description) + + const videoInstanceUpdated = await videoInstance.save(sequelizeOptions) + + if (videoInfoToUpdate.tags) { + const tagInstances = await db.Tag.findOrCreateTags(videoInfoToUpdate.tags, t) + + await videoInstance.setTags(tagInstances, sequelizeOptions) + videoInstance.Tags = tagInstances + } + + // Now we'll update the video's meta data to our friends + if (wasPrivateVideo === false) { + await sendUpdateVideo(videoInstanceUpdated, t) + } + + // Video is not private anymore, send a create action to remote servers + if (wasPrivateVideo === true && videoInstance.privacy !== VideoPrivacy.PRIVATE) { + await sendAddVideo(videoInstance, t) + await shareVideoByServer(videoInstance, t) + } + }) + logger.info('Video with name %s and uuid %s updated.', videoInstance.name, videoInstance.uuid) + } catch (err) { // Force fields we want to update // If the transaction is retried, sequelize will think the object has not changed // So it will skip the SQL request, even if the last one was ROLLBACKed! - Object.keys(videoFieldsSave).forEach(key => { - const value = videoFieldsSave[key] - videoInstance.set(key, value) - }) + resetSequelizeInstance(videoInstance, videoFieldsSave) throw err - }) + } } -function getVideo (req: express.Request, res: express.Response, next: express.NextFunction) { +async function getVideo (req: express.Request, res: express.Response) { const videoInstance = res.locals.video + const baseIncrementPromise = videoInstance.increment('views') + .then(() => getServerAccount()) + if (videoInstance.isOwned()) { // The increment is done directly in the database, not using the instance value - videoInstance.increment('views') - .then(() => { - // FIXME: make a real view system - // For example, only add a view when a user watch a video during 30s etc - const qaduParams = { - videoId: videoInstance.id, - type: REQUEST_VIDEO_QADU_TYPES.VIEWS - } - return quickAndDirtyUpdateVideoToFriends(qaduParams) - }) - .catch(err => logger.error('Cannot add view to video %d.', videoInstance.id, err)) + baseIncrementPromise + .then(serverAccount => sendCreateViewToVideoFollowers(serverAccount, videoInstance, undefined)) + .catch(err => logger.error('Cannot add view to video/send view to followers for %s.', videoInstance.uuid, err)) } else { - // Just send the event to our friends - const eventParams = { - videoId: videoInstance.id, - type: REQUEST_VIDEO_EVENT_TYPES.VIEWS - } - addEventToRemoteVideo(eventParams) + baseIncrementPromise + .then(serverAccount => sendCreateViewToOrigin(serverAccount, videoInstance, undefined)) + .catch(err => logger.error('Cannot send view to origin server for %s.', videoInstance.uuid, err)) } // Do not wait the view system - res.json(videoInstance.toFormatedJSON()) + return res.json(videoInstance.toFormattedDetailsJSON()) +} + +async function getVideoDescription (req: express.Request, res: express.Response) { + const videoInstance = res.locals.video + let description = '' + + if (videoInstance.isOwned()) { + description = videoInstance.description + } else { + description = await fetchRemoteVideoDescription(videoInstance) + } + + return res.json({ description }) } -function listVideos (req: express.Request, res: express.Response, next: express.NextFunction) { - db.Video.listForApi(req.query.start, req.query.count, req.query.sort) - .then(result => res.json(getFormatedObjects(result.data, result.total))) - .catch(err => next(err)) +async function listVideos (req: express.Request, res: express.Response, next: express.NextFunction) { + const resultList = await db.Video.listForApi(req.query.start, req.query.count, req.query.sort) + + return res.json(getFormattedObjects(resultList.data, resultList.total)) } -function removeVideo (req: express.Request, res: express.Response, next: express.NextFunction) { - const videoInstance = res.locals.video +async function removeVideoRetryWrapper (req: express.Request, res: express.Response, next: express.NextFunction) { + const options = { + arguments: [ req, res ], + errorMessage: 'Cannot remove the video with many retries.' + } - videoInstance.destroy() - .then(() => res.type('json').status(204).end()) - .catch(err => { - logger.error('Errors when removed the video.', err) - return next(err) - }) + await retryTransactionWrapper(removeVideo, options) + + return res.type('json').status(204).end() +} + +async function removeVideo (req: express.Request, res: express.Response) { + const videoInstance: VideoInstance = res.locals.video + + await db.sequelize.transaction(async t => { + await videoInstance.destroy({ transaction: t }) + }) + + logger.info('Video with name %s and uuid %s deleted.', videoInstance.name, videoInstance.uuid) } -function searchVideos (req: express.Request, res: express.Response, next: express.NextFunction) { - db.Video.searchAndPopulateAuthorAndPodAndTags(req.params.value, req.query.field, req.query.start, req.query.count, req.query.sort) - .then(result => res.json(getFormatedObjects(result.data, result.total))) - .catch(err => next(err)) +async function searchVideos (req: express.Request, res: express.Response, next: express.NextFunction) { + const resultList = await db.Video.searchAndPopulateAccountAndServerAndTags( + req.params.value, + req.query.field, + req.query.start, + req.query.count, + req.query.sort + ) + + return res.json(getFormattedObjects(resultList.data, resultList.total)) }