X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Factivitypub%2Fvideos.ts;h=506204674dbafad0f6bced6113d74b83a2e4ec85;hb=1e0741d16545ea720d04b566a808853b3975ea7f;hp=30de4714c2b5c8b93bf8ebd61191d75136128a83;hpb=8319d6ae72d4da6de51bd3d4b5c68040fc8dc3b4;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/lib/activitypub/videos.ts b/server/lib/activitypub/videos.ts index 30de4714c..506204674 100644 --- a/server/lib/activitypub/videos.ts +++ b/server/lib/activitypub/videos.ts @@ -1,93 +1,104 @@ import * as Bluebird from 'bluebird' -import * as sequelize from 'sequelize' +import { maxBy, minBy } from 'lodash' import * as magnetUtil from 'magnet-uri' -import * as request from 'request' +import { basename } from 'path' +import { Transaction } from 'sequelize/types' +import { TrackerModel } from '@server/models/server/tracker' +import { VideoLiveModel } from '@server/models/video/video-live' +import { HttpStatusCode } from '../../../shared/core-utils/miscs/http-error-codes' import { ActivityHashTagObject, ActivityMagnetUrlObject, ActivityPlaylistSegmentHashesObject, ActivityPlaylistUrlObject, + ActivitypubHttpFetcherPayload, ActivityTagObject, ActivityUrlObject, - ActivityVideoUrlObject, - VideoState, - ActivityVideoFileMetadataObject + ActivityVideoUrlObject } from '../../../shared/index' -import { VideoTorrentObject } from '../../../shared/models/activitypub/objects' +import { ActivityTrackerUrlObject, VideoObject } from '../../../shared/models/activitypub/objects' import { VideoPrivacy } from '../../../shared/models/videos' -import { sanitizeAndCheckVideoTorrentObject } from '../../helpers/custom-validators/activitypub/videos' +import { ThumbnailType } from '../../../shared/models/videos/thumbnail.type' +import { VideoStreamingPlaylistType } from '../../../shared/models/videos/video-streaming-playlist.type' +import { buildRemoteVideoBaseUrl, checkUrlsSameHost, getAPId } from '../../helpers/activitypub' +import { + isAPVideoFileUrlMetadataObject, + isAPVideoTrackerUrlObject, + sanitizeAndCheckVideoTorrentObject +} from '../../helpers/custom-validators/activitypub/videos' +import { isArray } from '../../helpers/custom-validators/misc' import { isVideoFileInfoHashValid } from '../../helpers/custom-validators/videos' import { deleteNonExistingModels, resetSequelizeInstance, retryTransactionWrapper } from '../../helpers/database-utils' import { logger } from '../../helpers/logger' -import { doRequest } from '../../helpers/requests' +import { doJSONRequest, PeerTubeRequestError } from '../../helpers/requests' +import { fetchVideoByUrl, getExtFromMimetype, VideoFetchByUrlType } from '../../helpers/video' import { ACTIVITY_PUB, MIMETYPES, P2P_MEDIA_LOADER_PEER_VERSION, PREVIEWS_SIZE, REMOTE_SCHEME, - STATIC_PATHS, THUMBNAILS_SIZE + THUMBNAILS_SIZE } from '../../initializers/constants' -import { TagModel } from '../../models/video/tag' +import { sequelizeTypescript } from '../../initializers/database' +import { AccountVideoRateModel } from '../../models/account/account-video-rate' import { VideoModel } from '../../models/video/video' -import { VideoFileModel } from '../../models/video/video-file' -import { getOrCreateActorAndServerAndModel } from './actor' -import { addVideoComments } from './video-comments' -import { crawlCollectionPage } from './crawl' -import { sendCreateVideo, sendUpdateVideo } from './send' -import { isArray } from '../../helpers/custom-validators/misc' import { VideoCaptionModel } from '../../models/video/video-caption' -import { JobQueue } from '../job-queue' -import { ActivitypubHttpFetcherPayload } from '../job-queue/handlers/activitypub-http-fetcher' -import { createRates } from './video-rates' -import { addVideoShares, shareVideoByServerAndChannel } from './share' -import { fetchVideoByUrl, VideoFetchByUrlType } from '../../helpers/video' -import { buildRemoteVideoBaseUrl, checkUrlsSameHost, getAPId } from '../../helpers/activitypub' -import { Notifier } from '../notifier' -import { VideoStreamingPlaylistModel } from '../../models/video/video-streaming-playlist' -import { VideoStreamingPlaylistType } from '../../../shared/models/videos/video-streaming-playlist.type' -import { AccountVideoRateModel } from '../../models/account/account-video-rate' -import { VideoShareModel } from '../../models/video/video-share' import { VideoCommentModel } from '../../models/video/video-comment' -import { sequelizeTypescript } from '../../initializers/database' -import { createPlaceholderThumbnail, createVideoMiniatureFromUrl } from '../thumbnail' -import { ThumbnailType } from '../../../shared/models/videos/thumbnail.type' -import { join } from 'path' -import { FilteredModelAttributes } from '../../typings/sequelize' -import { autoBlacklistVideoIfNeeded } from '../video-blacklist' -import { ActorFollowScoreCache } from '../files-cache' +import { VideoFileModel } from '../../models/video/video-file' +import { VideoShareModel } from '../../models/video/video-share' +import { VideoStreamingPlaylistModel } from '../../models/video/video-streaming-playlist' import { MAccountIdActor, MChannelAccountLight, MChannelDefault, MChannelId, MStreamingPlaylist, + MStreamingPlaylistFilesVideo, + MStreamingPlaylistVideo, MVideo, MVideoAccountLight, MVideoAccountLightBlacklistAllFiles, MVideoAP, MVideoAPWithoutCaption, + MVideoCaption, MVideoFile, MVideoFullLight, - MVideoId, MVideoImmutable, - MVideoThumbnail -} from '../../typings/models' -import { MThumbnail } from '../../typings/models/video/thumbnail' -import { maxBy, minBy } from 'lodash' + MVideoId, + MVideoImmutable, + MVideoThumbnail, + MVideoWithHost +} from '../../types/models' +import { MThumbnail } from '../../types/models/video/thumbnail' +import { FilteredModelAttributes } from '../../types/sequelize' +import { ActorFollowScoreCache } from '../files-cache' +import { JobQueue } from '../job-queue' +import { Notifier } from '../notifier' +import { PeerTubeSocket } from '../peertube-socket' +import { createPlaceholderThumbnail, createVideoMiniatureFromUrl } from '../thumbnail' +import { setVideoTags } from '../video' +import { autoBlacklistVideoIfNeeded } from '../video-blacklist' +import { generateTorrentFileName } from '../video-paths' +import { getOrCreateActorAndServerAndModel } from './actor' +import { crawlCollectionPage } from './crawl' +import { sendCreateVideo, sendUpdateVideo } from './send' +import { addVideoShares, shareVideoByServerAndChannel } from './share' +import { addVideoComments } from './video-comments' +import { createRates } from './video-rates' -async function federateVideoIfNeeded (videoArg: MVideoAPWithoutCaption, isNewVideo: boolean, transaction?: sequelize.Transaction) { +async function federateVideoIfNeeded (videoArg: MVideoAPWithoutCaption, isNewVideo: boolean, transaction?: Transaction) { const video = videoArg as MVideoAP if ( // Check this is not a blacklisted video, or unfederated blacklisted video (video.isBlacklisted() === false || (isNewVideo === false && video.VideoBlacklist.unfederated === false)) && // Check the video is public/unlisted and published - video.hasPrivacyForFederation() && video.state === VideoState.PUBLISHED + video.hasPrivacyForFederation() && video.hasStateForFederation() ) { // Fetch more attributes that we will need to serialize in AP object if (isArray(video.VideoCaptions) === false) { video.VideoCaptions = await video.$get('VideoCaptions', { - attributes: [ 'language' ], + attributes: [ 'filename', 'language' ], transaction }) } @@ -102,39 +113,29 @@ async function federateVideoIfNeeded (videoArg: MVideoAPWithoutCaption, isNewVid } } -async function fetchRemoteVideo (videoUrl: string): Promise<{ response: request.RequestResponse, videoObject: VideoTorrentObject }> { - const options = { - uri: videoUrl, - method: 'GET', - json: true, - activityPub: true - } - +async function fetchRemoteVideo (videoUrl: string): Promise<{ statusCode: number, videoObject: VideoObject }> { logger.info('Fetching remote video %s.', videoUrl) - const { response, body } = await doRequest(options) + const { statusCode, body } = await doJSONRequest(videoUrl, { activityPub: true }) if (sanitizeAndCheckVideoTorrentObject(body) === false || checkUrlsSameHost(body.id, videoUrl) !== true) { logger.debug('Remote video JSON is not valid.', { body }) - return { response, videoObject: undefined } + return { statusCode, videoObject: undefined } } - return { response, videoObject: body } + return { statusCode, videoObject: body } } async function fetchRemoteVideoDescription (video: MVideoAccountLight) { const host = video.VideoChannel.Account.Actor.Server.host const path = video.getDescriptionAPIPath() - const options = { - uri: REMOTE_SCHEME.HTTP + '://' + host + path, - json: true - } + const url = REMOTE_SCHEME.HTTP + '://' + host + path - const { body } = await doRequest(options) - return body.description ? body.description : '' + const { body } = await doJSONRequest(url) + return body.description || '' } -function getOrCreateVideoChannelFromVideoObject (videoObject: VideoTorrentObject) { +function getOrCreateVideoChannelFromVideoObject (videoObject: VideoObject) { const channel = videoObject.attributedTo.find(a => a.type === 'Group') if (!channel) throw new Error('Cannot find associated video channel to video ' + videoObject.url) @@ -153,7 +154,7 @@ type SyncParam = { thumbnail: boolean refreshVideo?: boolean } -async function syncVideoExternalAttributes (video: MVideo, fetchedVideo: VideoTorrentObject, syncParam: SyncParam) { +async function syncVideoExternalAttributes (video: MVideo, fetchedVideo: VideoObject, syncParam: SyncParam) { logger.info('Adding likes/dislikes/shares/comments of video %s.', video.uuid) const jobPayloads: ActivitypubHttpFetcherPayload[] = [] @@ -272,23 +273,34 @@ async function getOrCreateVideoAndAccountAndChannel ( const actor = await getOrCreateVideoChannelFromVideoObject(fetchedVideo) const videoChannel = actor.VideoChannel - const { autoBlacklisted, videoCreated } = await retryTransactionWrapper(createVideo, fetchedVideo, videoChannel, syncParam.thumbnail) - await syncVideoExternalAttributes(videoCreated, fetchedVideo, syncParam) + try { + const { autoBlacklisted, videoCreated } = await retryTransactionWrapper(createVideo, fetchedVideo, videoChannel, syncParam.thumbnail) + + await syncVideoExternalAttributes(videoCreated, fetchedVideo, syncParam) - return { video: videoCreated, created: true, autoBlacklisted } + return { video: videoCreated, created: true, autoBlacklisted } + } catch (err) { + // Maybe a concurrent getOrCreateVideoAndAccountAndChannel call created this video + if (err.name === 'SequelizeUniqueConstraintError') { + const fallbackVideo = await fetchVideoByUrl(videoUrl, fetchType) + if (fallbackVideo) return { video: fallbackVideo, created: false } + } + + throw err + } } async function updateVideoFromAP (options: { video: MVideoAccountLightBlacklistAllFiles - videoObject: VideoTorrentObject + videoObject: VideoObject account: MAccountIdActor channel: MChannelDefault overrideTo?: string[] }) { const { video, videoObject, account, channel, overrideTo } = options - logger.debug('Updating remote video "%s".', options.videoObject.uuid, { account, channel }) + logger.debug('Updating remote video "%s".', options.videoObject.uuid, { videoObject: options.videoObject, account, channel }) let videoFieldsSave: any const wasPrivateVideo = video.privacy === VideoPrivacy.PRIVATE @@ -298,7 +310,11 @@ async function updateVideoFromAP (options: { let thumbnailModel: MThumbnail try { - thumbnailModel = await createVideoMiniatureFromUrl(getThumbnailFromIcons(videoObject).url, video, ThumbnailType.MINIATURE) + thumbnailModel = await createVideoMiniatureFromUrl({ + downloadUrl: getThumbnailFromIcons(videoObject).url, + video, + type: ThumbnailType.MINIATURE + }) } catch (err) { logger.warn('Cannot generate thumbnail of %s.', videoObject.id, { err }) } @@ -308,10 +324,15 @@ async function updateVideoFromAP (options: { videoFieldsSave = video.toJSON() - // Check actor has the right to update the video - const videoChannel = video.VideoChannel - if (videoChannel.Account.id !== account.id) { - throw new Error('Account ' + account.Actor.url + ' does not own video channel ' + videoChannel.Actor.url) + // Check we can update the channel: we trust the remote server + const oldVideoChannel = video.VideoChannel + + if (!oldVideoChannel.Actor.serverId || !channel.Actor.serverId) { + throw new Error('Cannot check old channel/new channel validity because `serverId` is null') + } + + if (oldVideoChannel.Actor.serverId !== channel.Actor.serverId) { + throw new Error('New channel ' + channel.Actor.url + ' is not on the same server than new channel ' + oldVideoChannel.Actor.url) } const to = overrideTo || videoObject.to @@ -336,14 +357,23 @@ async function updateVideoFromAP (options: { video.privacy = videoData.privacy video.channelId = videoData.channelId video.views = videoData.views + video.isLive = videoData.isLive + + // Ensures we update the updated video attribute + video.changed('updatedAt', true) const videoUpdated = await video.save(sequelizeOptions) as MVideoFullLight if (thumbnailModel) await videoUpdated.addAndSaveThumbnail(thumbnailModel, t) - if (videoUpdated.getPreview()) { - const previewUrl = videoUpdated.getPreview().getFileUrl(videoUpdated) - const previewModel = createPlaceholderThumbnail(previewUrl, video, ThumbnailType.PREVIEW, PREVIEWS_SIZE) + const previewIcon = getPreviewFromIcons(videoObject) + if (videoUpdated.getPreview() && previewIcon) { + const previewModel = createPlaceholderThumbnail({ + fileUrl: previewIcon.url, + video, + type: ThumbnailType.PREVIEW, + size: previewIcon + }) await videoUpdated.addAndSaveThumbnail(previewModel, t) } @@ -377,7 +407,8 @@ async function updateVideoFromAP (options: { for (const playlistAttributes of streamingPlaylistAttributes) { const streamingPlaylistModel = await VideoStreamingPlaylistModel.upsert(playlistAttributes, { returning: true, transaction: t }) - .then(([ streamingPlaylist ]) => streamingPlaylist) + .then(([ streamingPlaylist ]) => streamingPlaylist as MStreamingPlaylistFilesVideo) + streamingPlaylistModel.Video = videoUpdated const newVideoFiles: MVideoFile[] = videoFileActivityUrlToDBAttributes(streamingPlaylistModel, playlistAttributes.tagAPObject) .map(a => new VideoFileModel(a)) @@ -397,8 +428,13 @@ async function updateVideoFromAP (options: { const tags = videoObject.tag .filter(isAPHashTagObject) .map(tag => tag.name) - const tagInstances = await TagModel.findOrCreateTags(tags, t) - await videoUpdated.$set('Tags', tagInstances, sequelizeOptions) + await setVideoTags({ video: videoUpdated, tags, transaction: t }) + } + + // Update trackers + { + const trackers = getTrackerUrls(videoObject, videoUpdated) + await setVideoTrackers({ video: videoUpdated, trackers, transaction: t }) } { @@ -406,11 +442,40 @@ async function updateVideoFromAP (options: { await VideoCaptionModel.deleteAllCaptionsOfRemoteVideo(videoUpdated.id, t) const videoCaptionsPromises = videoObject.subtitleLanguage.map(c => { - return VideoCaptionModel.insertOrReplaceLanguage(videoUpdated.id, c.identifier, c.url, t) + const caption = new VideoCaptionModel({ + videoId: videoUpdated.id, + filename: VideoCaptionModel.generateCaptionName(c.identifier), + language: c.identifier, + fileUrl: c.url + }) as MVideoCaption + + return VideoCaptionModel.insertOrReplaceLanguage(caption, t) }) await Promise.all(videoCaptionsPromises) } + { + // Create or update existing live + if (video.isLive) { + const [ videoLive ] = await VideoLiveModel.upsert({ + saveReplay: videoObject.liveSaveReplay, + permanentLive: videoObject.permanentLive, + videoId: video.id + }, { transaction: t, returning: true }) + + videoUpdated.VideoLive = videoLive + } else { // Delete existing live if it exists + await VideoLiveModel.destroy({ + where: { + videoId: video.id + }, + transaction: t + }) + + videoUpdated.VideoLive = null + } + } + return videoUpdated }) @@ -422,7 +487,13 @@ async function updateVideoFromAP (options: { transaction: undefined }) - if (wasPrivateVideo || wasUnlistedVideo) Notifier.Instance.notifyOnNewVideoIfNeeded(videoUpdated) // Notify our users? + // Notify our users? + if (wasPrivateVideo || wasUnlistedVideo) Notifier.Instance.notifyOnNewVideoIfNeeded(videoUpdated) + + if (videoUpdated.isLive) { + PeerTubeSocket.Instance.sendVideoLiveNewState(videoUpdated) + PeerTubeSocket.Instance.sendVideoViewsUpdate(videoUpdated) + } logger.info('Remote video with uuid %s updated', videoObject.uuid) @@ -451,14 +522,7 @@ async function refreshVideoIfNeeded (options: { : await VideoModel.loadByUrlAndPopulateAccount(options.video.url) try { - const { response, videoObject } = await fetchRemoteVideo(video.url) - if (response.statusCode === 404) { - logger.info('Cannot refresh remote video %s: video does not exist anymore. Deleting it.', video.url) - - // Video does not exist anymore - await video.destroy() - return undefined - } + const { videoObject } = await fetchRemoteVideo(video.url) if (videoObject === undefined) { logger.warn('Cannot refresh remote video %s: invalid body.', video.url) @@ -475,13 +539,21 @@ async function refreshVideoIfNeeded (options: { account: channelActor.VideoChannel.Account, channel: channelActor.VideoChannel } - await retryTransactionWrapper(updateVideoFromAP, updateOptions) + await updateVideoFromAP(updateOptions) await syncVideoExternalAttributes(video, videoObject, options.syncParam) ActorFollowScoreCache.Instance.addGoodServerId(video.VideoChannel.Actor.serverId) return video } catch (err) { + if ((err as PeerTubeRequestError).statusCode === HttpStatusCode.NOT_FOUND_404) { + logger.info('Cannot refresh remote video %s: video does not exist anymore. Deleting it.', video.url) + + // Video does not exist anymore + await video.destroy() + return undefined + } + logger.warn('Cannot refresh video %s.', options.video.url, { err }) ActorFollowScoreCache.Instance.addBadServerId(video.VideoChannel.Actor.serverId) @@ -505,13 +577,12 @@ export { // --------------------------------------------------------------------------- function isAPVideoUrlObject (url: any): url is ActivityVideoUrlObject { - const mimeTypes = Object.keys(MIMETYPES.VIDEO.MIMETYPE_EXT) - const urlMediaType = url.mediaType - return mimeTypes.includes(urlMediaType) && urlMediaType.startsWith('video/') + + return MIMETYPES.VIDEO.MIMETYPE_EXT[urlMediaType] && urlMediaType.startsWith('video/') } -function isAPStreamingPlaylistUrlObject (url: ActivityUrlObject): url is ActivityPlaylistUrlObject { +function isAPStreamingPlaylistUrlObject (url: any): url is ActivityPlaylistUrlObject { return url && url.mediaType === 'application/x-mpegURL' } @@ -527,21 +598,20 @@ function isAPHashTagObject (url: any): url is ActivityHashTagObject { return url && url.type === 'Hashtag' } -function isAPVideoFileMetadataObject (url: any): url is ActivityVideoFileMetadataObject { - return url && url.type === 'Link' && url.mediaType === 'application/json' && url.hasAttribute('rel') && url.rel.includes('metadata') -} - -async function createVideo (videoObject: VideoTorrentObject, channel: MChannelAccountLight, waitThumbnail = false) { +async function createVideo (videoObject: VideoObject, channel: MChannelAccountLight, waitThumbnail = false) { logger.debug('Adding remote video %s.', videoObject.id) const videoData = await videoActivityObjectToDBAttributes(channel, videoObject, videoObject.to) const video = VideoModel.build(videoData) as MVideoThumbnail - const promiseThumbnail = createVideoMiniatureFromUrl(getThumbnailFromIcons(videoObject).url, video, ThumbnailType.MINIATURE) - .catch(err => { - logger.error('Cannot create miniature from url.', { err }) - return undefined - }) + const promiseThumbnail = createVideoMiniatureFromUrl({ + downloadUrl: getThumbnailFromIcons(videoObject).url, + video, + type: ThumbnailType.MINIATURE + }).catch(err => { + logger.error('Cannot create miniature from url.', { err }) + return undefined + }) let thumbnailModel: MThumbnail if (waitThumbnail === true) { @@ -549,67 +619,102 @@ async function createVideo (videoObject: VideoTorrentObject, channel: MChannelAc } const { autoBlacklisted, videoCreated } = await sequelizeTypescript.transaction(async t => { - const sequelizeOptions = { transaction: t } + try { + const sequelizeOptions = { transaction: t } - const videoCreated = await video.save(sequelizeOptions) as MVideoFullLight - videoCreated.VideoChannel = channel + const videoCreated = await video.save(sequelizeOptions) as MVideoFullLight + videoCreated.VideoChannel = channel - if (thumbnailModel) await videoCreated.addAndSaveThumbnail(thumbnailModel, t) + if (thumbnailModel) await videoCreated.addAndSaveThumbnail(thumbnailModel, t) - const previewIcon = getPreviewFromIcons(videoObject) - const previewUrl = previewIcon - ? previewIcon.url - : buildRemoteVideoBaseUrl(videoCreated, join(STATIC_PATHS.PREVIEWS, video.generatePreviewName())) - const previewModel = createPlaceholderThumbnail(previewUrl, videoCreated, ThumbnailType.PREVIEW, PREVIEWS_SIZE) + const previewIcon = getPreviewFromIcons(videoObject) + if (previewIcon) { + const previewModel = createPlaceholderThumbnail({ + fileUrl: previewIcon.url, + video: videoCreated, + type: ThumbnailType.PREVIEW, + size: previewIcon + }) - if (thumbnailModel) await videoCreated.addAndSaveThumbnail(previewModel, t) + await videoCreated.addAndSaveThumbnail(previewModel, t) + } - // Process files - const videoFileAttributes = videoFileActivityUrlToDBAttributes(videoCreated, videoObject.url) + // Process files + const videoFileAttributes = videoFileActivityUrlToDBAttributes(videoCreated, videoObject.url) - const videoFilePromises = videoFileAttributes.map(f => VideoFileModel.create(f, { transaction: t })) - const videoFiles = await Promise.all(videoFilePromises) + const videoFilePromises = videoFileAttributes.map(f => VideoFileModel.create(f, { transaction: t })) + const videoFiles = await Promise.all(videoFilePromises) - const streamingPlaylistsAttributes = streamingPlaylistActivityUrlToDBAttributes(videoCreated, videoObject, videoFiles) - videoCreated.VideoStreamingPlaylists = [] + const streamingPlaylistsAttributes = streamingPlaylistActivityUrlToDBAttributes(videoCreated, videoObject, videoFiles) + videoCreated.VideoStreamingPlaylists = [] - for (const playlistAttributes of streamingPlaylistsAttributes) { - const playlistModel = await VideoStreamingPlaylistModel.create(playlistAttributes, { transaction: t }) + for (const playlistAttributes of streamingPlaylistsAttributes) { + const playlist = await VideoStreamingPlaylistModel.create(playlistAttributes, { transaction: t }) as MStreamingPlaylistFilesVideo + playlist.Video = videoCreated - const playlistFiles = videoFileActivityUrlToDBAttributes(playlistModel, playlistAttributes.tagAPObject) - const videoFilePromises = playlistFiles.map(f => VideoFileModel.create(f, { transaction: t })) - playlistModel.VideoFiles = await Promise.all(videoFilePromises) + const playlistFiles = videoFileActivityUrlToDBAttributes(playlist, playlistAttributes.tagAPObject) + const videoFilePromises = playlistFiles.map(f => VideoFileModel.create(f, { transaction: t })) + playlist.VideoFiles = await Promise.all(videoFilePromises) - videoCreated.VideoStreamingPlaylists.push(playlistModel) - } + videoCreated.VideoStreamingPlaylists.push(playlist) + } - // Process tags - const tags = videoObject.tag - .filter(isAPHashTagObject) - .map(t => t.name) - const tagInstances = await TagModel.findOrCreateTags(tags, t) - await videoCreated.$set('Tags', tagInstances, sequelizeOptions) + // Process tags + const tags = videoObject.tag + .filter(isAPHashTagObject) + .map(t => t.name) + await setVideoTags({ video: videoCreated, tags, transaction: t }) + + // Process captions + const videoCaptionsPromises = videoObject.subtitleLanguage.map(c => { + const caption = new VideoCaptionModel({ + videoId: videoCreated.id, + filename: VideoCaptionModel.generateCaptionName(c.identifier), + language: c.identifier, + fileUrl: c.url + }) as MVideoCaption + + return VideoCaptionModel.insertOrReplaceLanguage(caption, t) + }) + await Promise.all(videoCaptionsPromises) - // Process captions - const videoCaptionsPromises = videoObject.subtitleLanguage.map(c => { - return VideoCaptionModel.insertOrReplaceLanguage(videoCreated.id, c.identifier, c.url, t) - }) - await Promise.all(videoCaptionsPromises) + // Process trackers + { + const trackers = getTrackerUrls(videoObject, videoCreated) + await setVideoTrackers({ video: videoCreated, trackers, transaction: t }) + } - videoCreated.VideoFiles = videoFiles - videoCreated.Tags = tagInstances + videoCreated.VideoFiles = videoFiles - const autoBlacklisted = await autoBlacklistVideoIfNeeded({ - video: videoCreated, - user: undefined, - isRemote: true, - isNew: true, - transaction: t - }) + if (videoCreated.isLive) { + const videoLive = new VideoLiveModel({ + streamKey: null, + saveReplay: videoObject.liveSaveReplay, + permanentLive: videoObject.permanentLive, + videoId: videoCreated.id + }) + + videoCreated.VideoLive = await videoLive.save({ transaction: t }) + } + + const autoBlacklisted = await autoBlacklistVideoIfNeeded({ + video: videoCreated, + user: undefined, + isRemote: true, + isNew: true, + transaction: t + }) + + logger.info('Remote video with uuid %s inserted.', videoObject.uuid) - logger.info('Remote video with uuid %s inserted.', videoObject.uuid) + return { autoBlacklisted, videoCreated } + } catch (err) { + // FIXME: Use rollback hook when https://github.com/sequelize/sequelize/pull/13038 is released + // Remove thumbnail + if (thumbnailModel) await thumbnailModel.removeThumbnail() - return { autoBlacklisted, videoCreated } + throw err + } }) if (waitThumbnail === false) { @@ -627,7 +732,7 @@ async function createVideo (videoObject: VideoTorrentObject, channel: MChannelAc return { autoBlacklisted, videoCreated } } -function videoActivityObjectToDBAttributes (videoChannel: MChannelId, videoObject: VideoTorrentObject, to: string[] = []) { +function videoActivityObjectToDBAttributes (videoChannel: MChannelId, videoObject: VideoObject, to: string[] = []) { const privacy = to.includes(ACTIVITY_PUB.PUBLIC) ? VideoPrivacy.PUBLIC : VideoPrivacy.UNLISTED @@ -659,6 +764,7 @@ function videoActivityObjectToDBAttributes (videoChannel: MChannelId, videoObjec commentsEnabled: videoObject.commentsEnabled, downloadEnabled: videoObject.downloadEnabled, waitTranscoding: videoObject.waitTranscoding, + isLive: videoObject.isLiveBroadcast, state: videoObject.state, channelId: videoChannel.id, duration: parseInt(duration, 10), @@ -679,7 +785,7 @@ function videoActivityObjectToDBAttributes (videoChannel: MChannelId, videoObjec } function videoFileActivityUrlToDBAttributes ( - videoOrPlaylist: MVideo | MStreamingPlaylist, + videoOrPlaylist: MVideo | MStreamingPlaylistVideo, urls: (ActivityTagObject | ActivityUrlObject)[] ) { const fileUrls = urls.filter(u => isAPVideoUrlObject(u)) as ActivityVideoUrlObject[] @@ -699,26 +805,42 @@ function videoFileActivityUrlToDBAttributes ( throw new Error('Cannot parse magnet URI ' + magnet.href) } + const torrentUrl = Array.isArray(parsed.xs) + ? parsed.xs[0] + : parsed.xs + // Fetch associated metadata url, if any - const metadata = urls.filter(isAPVideoFileMetadataObject) - .find(u => - u.height === fileUrl.height && - u.fps === fileUrl.fps && - u.rel.includes(fileUrl.mediaType) - ) - - const mediaType = fileUrl.mediaType + const metadata = urls.filter(isAPVideoFileUrlMetadataObject) + .find(u => { + return u.height === fileUrl.height && + u.fps === fileUrl.fps && + u.rel.includes(fileUrl.mediaType) + }) + + const extname = getExtFromMimetype(MIMETYPES.VIDEO.MIMETYPE_EXT, fileUrl.mediaType) + const resolution = fileUrl.height + const videoId = (videoOrPlaylist as MStreamingPlaylist).playlistUrl ? null : videoOrPlaylist.id + const videoStreamingPlaylistId = (videoOrPlaylist as MStreamingPlaylist).playlistUrl ? videoOrPlaylist.id : null + const attribute = { - extname: MIMETYPES.VIDEO.MIMETYPE_EXT[mediaType], + extname, infoHash: parsed.infoHash, - resolution: fileUrl.height, + resolution, size: fileUrl.size, fps: fileUrl.fps || -1, metadataUrl: metadata?.href, + // Use the name of the remote file because we don't proxify video file requests + filename: basename(fileUrl.href), + fileUrl: fileUrl.href, + + torrentUrl, + // Use our own torrent name since we proxify torrent requests + torrentFilename: generateTorrentFileName(videoOrPlaylist, resolution), + // This is a video file owned by a video or by a streaming playlist - videoId: (videoOrPlaylist as MStreamingPlaylist).playlistUrl ? null : videoOrPlaylist.id, - videoStreamingPlaylistId: (videoOrPlaylist as MStreamingPlaylist).playlistUrl ? videoOrPlaylist.id : null + videoId, + videoStreamingPlaylistId } attributes.push(attribute) @@ -727,7 +849,7 @@ function videoFileActivityUrlToDBAttributes ( return attributes } -function streamingPlaylistActivityUrlToDBAttributes (video: MVideoId, videoObject: VideoTorrentObject, videoFiles: MVideoFile[]) { +function streamingPlaylistActivityUrlToDBAttributes (video: MVideoId, videoObject: VideoObject, videoFiles: MVideoFile[]) { const playlistUrls = videoObject.url.filter(u => isAPStreamingPlaylistUrlObject(u)) as ActivityPlaylistUrlObject[] if (playlistUrls.length === 0) return [] @@ -761,7 +883,7 @@ function streamingPlaylistActivityUrlToDBAttributes (video: MVideoId, videoObjec return attributes } -function getThumbnailFromIcons (videoObject: VideoTorrentObject) { +function getThumbnailFromIcons (videoObject: VideoObject) { let validIcons = videoObject.icon.filter(i => i.width > THUMBNAILS_SIZE.minWidth) // Fallback if there are not valid icons if (validIcons.length === 0) validIcons = videoObject.icon @@ -769,10 +891,38 @@ function getThumbnailFromIcons (videoObject: VideoTorrentObject) { return minBy(validIcons, 'width') } -function getPreviewFromIcons (videoObject: VideoTorrentObject) { +function getPreviewFromIcons (videoObject: VideoObject) { const validIcons = videoObject.icon.filter(i => i.width > PREVIEWS_SIZE.minWidth) - // FIXME: don't put a fallback here for compatibility with PeerTube <2.2 - return maxBy(validIcons, 'width') } + +function getTrackerUrls (object: VideoObject, video: MVideoWithHost) { + let wsFound = false + + const trackers = object.url.filter(u => isAPVideoTrackerUrlObject(u)) + .map((u: ActivityTrackerUrlObject) => { + if (isArray(u.rel) && u.rel.includes('websocket')) wsFound = true + + return u.href + }) + + if (wsFound) return trackers + + return [ + buildRemoteVideoBaseUrl(video, '/tracker/socket', REMOTE_SCHEME.WS), + buildRemoteVideoBaseUrl(video, '/tracker/announce') + ] +} + +async function setVideoTrackers (options: { + video: MVideo + trackers: string[] + transaction?: Transaction +}) { + const { video, trackers, transaction } = options + + const trackerInstances = await TrackerModel.findOrCreateTrackers(trackers, transaction) + + await video.$set('Trackers', trackerInstances, { transaction }) +}