import * as express from 'express'
import * as multer from 'multer'
import { extname, join } from 'path'
-
-import { database as db } from '../../../initializers/database'
+import { VideoCreate, VideoPrivacy, VideoUpdate } from '../../../../shared'
+import {
+ generateRandomString,
+ getFormattedObjects,
+ getVideoFileHeight,
+ logger,
+ renamePromise,
+ resetSequelizeInstance,
+ retryTransactionWrapper
+} from '../../../helpers'
+import { getServerActor } from '../../../helpers/utils'
import {
CONFIG,
- REQUEST_VIDEO_QADU_TYPES,
- REQUEST_VIDEO_EVENT_TYPES,
+ sequelizeTypescript,
VIDEO_CATEGORIES,
+ VIDEO_LANGUAGES,
VIDEO_LICENCES,
- VIDEO_LANGUAGES
+ VIDEO_MIMETYPE_EXT,
+ VIDEO_PRIVACIES
} from '../../../initializers'
import {
- addEventToRemoteVideo,
- quickAndDirtyUpdateVideoToFriends,
- addVideoToFriends,
- updateVideoToFriends,
- JobScheduler
-} from '../../../lib'
+ fetchRemoteVideoDescription,
+ getVideoActivityPubUrl,
+ shareVideoByServerAndChannel
+} from '../../../lib/activitypub'
+import { sendCreateVideo, sendCreateViewToOrigin, sendCreateViewToVideoFollowers, sendUpdateVideo } from '../../../lib/activitypub/send'
+import { transcodingJobScheduler } from '../../../lib/jobs/transcoding-job-scheduler'
import {
+ asyncMiddleware,
authenticate,
paginationValidator,
- videosSortValidator,
- setVideosSort,
setPagination,
- setVideosSearch,
- videosUpdateValidator,
- videosSearchValidator,
+ setVideosSort,
videosAddValidator,
videosGetValidator,
videosRemoveValidator,
- asyncMiddleware
+ videosSearchValidator,
+ videosSortValidator,
+ videosUpdateValidator
} from '../../../middlewares'
-import {
- logger,
- retryTransactionWrapper,
- generateRandomString,
- getFormattedObjects,
- renamePromise,
- getVideoFileHeight,
- resetSequelizeInstance
-} from '../../../helpers'
-import { VideoInstance } from '../../../models'
-import { VideoCreate, VideoUpdate } from '../../../../shared'
-
+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 { rateVideoRouter } from './rate'
import { videoChannelRouter } from './channel'
+import { rateVideoRouter } from './rate'
const videosRouter = express.Router()
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 => {
- cb(null, randomString + '.' + 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)
}
})
videosRouter.get('/categories', listVideoCategories)
videosRouter.get('/licences', listVideoLicences)
videosRouter.get('/languages', listVideoLanguages)
+videosRouter.get('/privacies', listVideoPrivacies)
videosRouter.get('/',
paginationValidator,
setPagination,
asyncMiddleware(listVideos)
)
+videosRouter.get('/search',
+ videosSearchValidator,
+ paginationValidator,
+ videosSortValidator,
+ setVideosSort,
+ setPagination,
+ asyncMiddleware(searchVideos)
+)
videosRouter.put('/:id',
authenticate,
- videosUpdateValidator,
+ asyncMiddleware(videosUpdateValidator),
asyncMiddleware(updateVideoRetryWrapper)
)
videosRouter.post('/upload',
authenticate,
reqFiles,
- videosAddValidator,
+ asyncMiddleware(videosAddValidator),
asyncMiddleware(addVideoRetryWrapper)
)
+
+videosRouter.get('/:id/description',
+ asyncMiddleware(videosGetValidator),
+ asyncMiddleware(getVideoDescription)
+)
videosRouter.get('/:id',
- videosGetValidator,
+ asyncMiddleware(videosGetValidator),
getVideo
)
+videosRouter.post('/:id/views',
+ asyncMiddleware(videosGetValidator),
+ asyncMiddleware(viewVideo)
+)
videosRouter.delete('/:id',
authenticate,
- videosRemoveValidator,
+ asyncMiddleware(videosRemoveValidator),
asyncMiddleware(removeVideoRetryWrapper)
)
-videosRouter.get('/search/:value',
- videosSearchValidator,
- paginationValidator,
- videosSortValidator,
- setVideosSort,
- setPagination,
- setVideosSearch,
- asyncMiddleware(searchVideos)
-)
-
// ---------------------------------------------------------------------------
export {
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
async function addVideoRetryWrapper (req: express.Request, res: express.Response, next: express.NextFunction) {
errorMessage: 'Cannot insert the video with many retries.'
}
- await retryTransactionWrapper(addVideo, options)
+ const video = await retryTransactionWrapper(addVideo, options)
- // TODO : include Location of the new video -> 201
- res.type('json').status(204).end()
+ res.json({
+ video: {
+ id: video.id,
+ uuid: video.uuid
+ }
+ }).end()
}
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 }
+ // Prepare data so we don't block the transaction
+ 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 = new VideoModel(videoData)
+ video.url = getVideoActivityPubUrl(video)
- 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,
- duration: videoPhysicalFile['duration'], // duration was added by a previous middleware
- channelId: res.locals.videoChannel.id
- }
- const video = db.Video.build(videoData)
+ const videoFilePath = join(CONFIG.STORAGE.VIDEOS_DIR, videoPhysicalFile.filename)
+ const videoFileHeight = await getVideoFileHeight(videoFilePath)
- 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 = new VideoFileModel(videoFileData)
+ const videoDir = CONFIG.STORAGE.VIDEOS_DIR
+ const source = join(videoDir, videoPhysicalFile.filename)
+ const destination = join(videoDir, video.getVideoFilename(videoFile))
- 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)
- 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 = []
- const tasks = []
+ tasks.push(
+ video.createTorrentAndSetInfoHash(videoFile),
+ video.createThumbnail(videoFile),
+ video.createPreview(videoFile)
+ )
+ await Promise.all(tasks)
- tasks.push(
- video.createTorrentAndSetInfoHash(videoFile),
- video.createThumbnail(videoFile),
- video.createPreview(videoFile)
- )
+ return sequelizeTypescript.transaction(async t => {
+ const sequelizeOptions = { transaction: t }
if (CONFIG.TRANSCODING.ENABLED === true) {
// Put uuid because we don't have id auto incremented for now
videoUUID: video.uuid
}
- tasks.push(
- JobScheduler.Instance.createJob(t, 'videoFileOptimizer', dataInput)
- )
+ await 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]
+
+ video.VideoFiles = [ videoFile ]
if (videoInfo.tags) {
- const tagInstances = await db.Tag.findOrCreateTags(videoInfo.tags, t)
+ const tagInstances = await TagModel.findOrCreateTags(videoInfo.tags, t)
- await video.setTags(tagInstances, sequelizeOptions)
+ await video.$set('Tags', 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
+ if (CONFIG.TRANSCODING.ENABLED === true) return videoCreated
+ // Don't send video to remote servers, it is private
+ if (video.privacy === VideoPrivacy.PRIVATE) return videoCreated
- const remoteVideo = await video.toAddRemoteJSON()
- // Now we'll add the video's meta data to our friends
- return addVideoToFriends(remoteVideo, t)
- })
+ await sendCreateVideo(video, t)
+ await shareVideoByServerAndChannel(video, t)
- logger.info('Video with name %s and uuid %s created.', videoInfo.name, videoUUID)
+ logger.info('Video with name %s and uuid %s created.', videoInfo.name, videoCreated.uuid)
+
+ return videoCreated
+ })
}
async function updateVideoRetryWrapper (req: express.Request, res: express.Response, next: express.NextFunction) {
}
async function updateVideo (req: express.Request, res: express.Response) {
- const videoInstance = res.locals.video
+ const videoInstance: VideoModel = res.locals.video
const videoFieldsSave = videoInstance.toJSON()
const videoInfoToUpdate: VideoUpdate = req.body
+ const wasPrivateVideo = videoInstance.privacy === VideoPrivacy.PRIVATE
try {
- await db.sequelize.transaction(async t => {
+ await sequelizeTypescript.transaction(async t => {
const sequelizeOptions = {
transaction: t
}
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', parseInt(videoInfoToUpdate.privacy.toString(), 10))
if (videoInfoToUpdate.description !== undefined) videoInstance.set('description', videoInfoToUpdate.description)
- await videoInstance.save(sequelizeOptions)
+ const videoInstanceUpdated = await videoInstance.save(sequelizeOptions)
if (videoInfoToUpdate.tags) {
- const tagInstances = await db.Tag.findOrCreateTags(videoInfoToUpdate.tags, t)
+ const tagInstances = await TagModel.findOrCreateTags(videoInfoToUpdate.tags, t)
- await videoInstance.setTags(tagInstances, sequelizeOptions)
+ await videoInstance.$set('Tags', tagInstances, sequelizeOptions)
videoInstance.Tags = tagInstances
}
- const json = videoInstance.toUpdateRemoteJSON()
-
// Now we'll update the video's meta data to our friends
- return updateVideoToFriends(json, t)
+ if (wasPrivateVideo === false) {
+ await sendUpdateVideo(videoInstanceUpdated, t)
+ }
+
+ // Video is not private anymore, send a create action to remote servers
+ if (wasPrivateVideo === true && videoInstanceUpdated.privacy !== VideoPrivacy.PRIVATE) {
+ await sendCreateVideo(videoInstanceUpdated, t)
+ await shareVideoByServerAndChannel(videoInstanceUpdated, t)
+ }
})
logger.info('Video with name %s and uuid %s updated.', videoInstance.name, videoInstance.uuid)
function getVideo (req: express.Request, res: express.Response) {
const videoInstance = res.locals.video
+ return res.json(videoInstance.toFormattedDetailsJSON())
+}
+
+async function viewVideo (req: express.Request, res: express.Response) {
+ const videoInstance = res.locals.video
+
+ await videoInstance.increment('views')
+ const serverAccount = await getServerActor()
+
if (videoInstance.isOwned()) {
- // The increment is done directly in the database, not using the instance value
- // FIXME: make a real view system
- // For example, only add a view when a user watch a video during 30s etc
- videoInstance.increment('views')
- .then(() => {
- const qaduParams = {
- videoId: videoInstance.id,
- type: REQUEST_VIDEO_QADU_TYPES.VIEWS
- }
- return quickAndDirtyUpdateVideoToFriends(qaduParams)
- })
- .catch(err => logger.error('Cannot add view to video %s.', videoInstance.uuid, err))
+ await sendCreateViewToVideoFollowers(serverAccount, videoInstance, undefined)
} else {
- // Just send the event to our friends
- const eventParams = {
- videoId: videoInstance.id,
- type: REQUEST_VIDEO_EVENT_TYPES.VIEWS
- }
- addEventToRemoteVideo(eventParams)
- .catch(err => logger.error('Cannot add event to remote video %s.', videoInstance.uuid, err))
+ await sendCreateViewToOrigin(serverAccount, videoInstance, undefined)
}
- // Do not wait the view system
- return res.json(videoInstance.toFormattedDetailsJSON())
+ return res.status(204).end()
+}
+
+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 })
}
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)
+ const resultList = await VideoModel.listForApi(req.query.start, req.query.count, req.query.sort)
return res.json(getFormattedObjects(resultList.data, resultList.total))
}
}
async function removeVideo (req: express.Request, res: express.Response) {
- const videoInstance: VideoInstance = res.locals.video
+ const videoInstance: VideoModel = res.locals.video
- await db.sequelize.transaction(async t => {
+ await sequelizeTypescript.transaction(async t => {
await videoInstance.destroy({ transaction: t })
})
}
async function searchVideos (req: express.Request, res: express.Response, next: express.NextFunction) {
- const resultList = await db.Video.searchAndPopulateAuthorAndPodAndTags(
- req.params.value,
- req.query.field,
+ const resultList = await VideoModel.searchAndPopulateAccountAndServerAndTags(
+ req.query.search,
req.query.start,
req.query.count,
req.query.sort
projects / github / Chocobozzz / PeerTube.git / blobdiff