import * as magnetUtil from 'magnet-uri'
import * as request from 'request'
import {
- ActivityIconObject,
+ ActivityHashTagObject,
+ ActivityMagnetUrlObject,
ActivityPlaylistSegmentHashesObject,
- ActivityPlaylistUrlObject,
+ ActivityPlaylistUrlObject, ActivitypubHttpFetcherPayload,
+ ActivityTagObject,
ActivityUrlObject,
ActivityVideoUrlObject,
VideoState
} from '../../../shared/index'
import { VideoTorrentObject } from '../../../shared/models/activitypub/objects'
import { VideoPrivacy } from '../../../shared/models/videos'
-import { sanitizeAndCheckVideoTorrentObject } from '../../helpers/custom-validators/activitypub/videos'
+import { isAPVideoFileMetadataObject, sanitizeAndCheckVideoTorrentObject } from '../../helpers/custom-validators/activitypub/videos'
import { isVideoFileInfoHashValid } from '../../helpers/custom-validators/videos'
-import { resetSequelizeInstance, retryTransactionWrapper } from '../../helpers/database-utils'
+import { deleteNonExistingModels, resetSequelizeInstance, retryTransactionWrapper } from '../../helpers/database-utils'
import { logger } from '../../helpers/logger'
-import { doRequest, downloadImage } from '../../helpers/requests'
+import { doRequest } from '../../helpers/requests'
import {
ACTIVITY_PUB,
MIMETYPES,
P2P_MEDIA_LOADER_PEER_VERSION,
+ PREVIEWS_SIZE,
REMOTE_SCHEME,
- sequelizeTypescript,
+ STATIC_PATHS,
THUMBNAILS_SIZE
-} from '../../initializers'
-import { ActorModel } from '../../models/activitypub/actor'
+} from '../../initializers/constants'
import { TagModel } from '../../models/video/tag'
import { VideoModel } from '../../models/video/video'
-import { VideoChannelModel } from '../../models/video/video-channel'
import { VideoFileModel } from '../../models/video/video-file'
import { getOrCreateActorAndServerAndModel } from './actor'
import { addVideoComments } from './video-comments'
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 { AccountModel } from '../../models/account/account'
import { fetchVideoByUrl, VideoFetchByUrlType } from '../../helpers/video'
-import { checkUrlsSameHost, getAPId } from '../../helpers/activitypub'
+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 { FilteredModelAttributes } from 'sequelize-typescript/lib/models/Model'
import { AccountVideoRateModel } from '../../models/account/account-video-rate'
import { VideoShareModel } from '../../models/video/video-share'
import { VideoCommentModel } from '../../models/video/video-comment'
-import { CONFIG } from '../../initializers/config'
-
-async function federateVideoIfNeeded (video: VideoModel, isNewVideo: boolean, transaction?: sequelize.Transaction) {
- // If the video is not private and is published, we federate it
- if (video.privacy !== VideoPrivacy.PRIVATE && video.state === VideoState.PUBLISHED) {
+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 '../../types/sequelize'
+import { autoBlacklistVideoIfNeeded } from '../video-blacklist'
+import { ActorFollowScoreCache } from '../files-cache'
+import {
+ MAccountIdActor,
+ MChannelAccountLight,
+ MChannelDefault,
+ MChannelId,
+ MStreamingPlaylist,
+ MVideo,
+ MVideoAccountLight,
+ MVideoAccountLightBlacklistAllFiles,
+ MVideoAP,
+ MVideoAPWithoutCaption,
+ MVideoFile,
+ MVideoFullLight,
+ MVideoId,
+ MVideoImmutable,
+ MVideoThumbnail
+} from '../../types/models'
+import { MThumbnail } from '../../types/models/video/thumbnail'
+import { maxBy, minBy } from 'lodash'
+
+async function federateVideoIfNeeded (videoArg: MVideoAPWithoutCaption, isNewVideo: boolean, transaction?: sequelize.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
+ ) {
// 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' ],
transaction
- }) as VideoCaptionModel[]
+ })
}
if (isNewVideo) {
logger.info('Fetching remote video %s.', videoUrl)
- const { response, body } = await doRequest(options)
+ const { response, body } = await doRequest<any>(options)
if (sanitizeAndCheckVideoTorrentObject(body) === false || checkUrlsSameHost(body.id, videoUrl) !== true) {
logger.debug('Remote video JSON is not valid.', { body })
return { response, videoObject: body }
}
-async function fetchRemoteVideoDescription (video: VideoModel) {
+async function fetchRemoteVideoDescription (video: MVideoAccountLight) {
const host = video.VideoChannel.Account.Actor.Server.host
const path = video.getDescriptionAPIPath()
const options = {
json: true
}
- const { body } = await doRequest(options)
+ const { body } = await doRequest<any>(options)
return body.description ? body.description : ''
}
-function fetchRemoteVideoStaticFile (video: VideoModel, path: string, reject: Function) {
- const host = video.VideoChannel.Account.Actor.Server.host
-
- // We need to provide a callback, if no we could have an uncaught exception
- return request.get(REMOTE_SCHEME.HTTP + '://' + host + path, err => {
- if (err) reject(err)
- })
-}
-
-function generateThumbnailFromUrl (video: VideoModel, icon: ActivityIconObject) {
- const thumbnailName = video.getThumbnailName()
-
- return downloadImage(icon.url, CONFIG.STORAGE.THUMBNAILS_DIR, thumbnailName, THUMBNAILS_SIZE)
-}
-
function getOrCreateVideoChannelFromVideoObject (videoObject: VideoTorrentObject) {
const channel = videoObject.attributedTo.find(a => a.type === 'Group')
if (!channel) throw new Error('Cannot find associated video channel to video ' + videoObject.url)
thumbnail: boolean
refreshVideo?: boolean
}
-async function syncVideoExternalAttributes (video: VideoModel, fetchedVideo: VideoTorrentObject, syncParam: SyncParam) {
+async function syncVideoExternalAttributes (video: MVideo, fetchedVideo: VideoTorrentObject, syncParam: SyncParam) {
logger.info('Adding likes/dislikes/shares/comments of video %s.', video.uuid)
const jobPayloads: ActivitypubHttpFetcherPayload[] = []
const cleaner = crawlStartDate => AccountVideoRateModel.cleanOldRatesOf(video.id, 'like' as 'like', crawlStartDate)
await crawlCollectionPage<string>(fetchedVideo.likes, handler, cleaner)
- .catch(err => logger.error('Cannot add likes of video %s.', video.uuid, { err }))
+ .catch(err => logger.error('Cannot add likes of video %s.', video.uuid, { err, rootUrl: fetchedVideo.likes }))
} else {
jobPayloads.push({ uri: fetchedVideo.likes, videoId: video.id, type: 'video-likes' as 'video-likes' })
}
const cleaner = crawlStartDate => AccountVideoRateModel.cleanOldRatesOf(video.id, 'dislike' as 'dislike', crawlStartDate)
await crawlCollectionPage<string>(fetchedVideo.dislikes, handler, cleaner)
- .catch(err => logger.error('Cannot add dislikes of video %s.', video.uuid, { err }))
+ .catch(err => logger.error('Cannot add dislikes of video %s.', video.uuid, { err, rootUrl: fetchedVideo.dislikes }))
} else {
jobPayloads.push({ uri: fetchedVideo.dislikes, videoId: video.id, type: 'video-dislikes' as 'video-dislikes' })
}
const cleaner = crawlStartDate => VideoShareModel.cleanOldSharesOf(video.id, crawlStartDate)
await crawlCollectionPage<string>(fetchedVideo.shares, handler, cleaner)
- .catch(err => logger.error('Cannot add shares of video %s.', video.uuid, { err }))
+ .catch(err => logger.error('Cannot add shares of video %s.', video.uuid, { err, rootUrl: fetchedVideo.shares }))
} else {
jobPayloads.push({ uri: fetchedVideo.shares, videoId: video.id, type: 'video-shares' as 'video-shares' })
}
if (syncParam.comments === true) {
- const handler = items => addVideoComments(items, video)
+ const handler = items => addVideoComments(items)
const cleaner = crawlStartDate => VideoCommentModel.cleanOldCommentsOf(video.id, crawlStartDate)
await crawlCollectionPage<string>(fetchedVideo.comments, handler, cleaner)
- .catch(err => logger.error('Cannot add comments of video %s.', video.uuid, { err }))
+ .catch(err => logger.error('Cannot add comments of video %s.', video.uuid, { err, rootUrl: fetchedVideo.comments }))
} else {
jobPayloads.push({ uri: fetchedVideo.comments, videoId: video.id, type: 'video-comments' as 'video-comments' })
}
- await Bluebird.map(jobPayloads, payload => JobQueue.Instance.createJob({ type: 'activitypub-http-fetcher', payload }))
+ await Bluebird.map(jobPayloads, payload => JobQueue.Instance.createJobWithPromise({ type: 'activitypub-http-fetcher', payload }))
}
-async function getOrCreateVideoAndAccountAndChannel (options: {
- videoObject: { id: string } | string,
- syncParam?: SyncParam,
- fetchType?: VideoFetchByUrlType,
- allowRefresh?: boolean // true by default
-}) {
+type GetVideoResult <T> = Promise<{
+ video: T
+ created: boolean
+ autoBlacklisted?: boolean
+}>
+
+type GetVideoParamAll = {
+ videoObject: { id: string } | string
+ syncParam?: SyncParam
+ fetchType?: 'all'
+ allowRefresh?: boolean
+}
+
+type GetVideoParamImmutable = {
+ videoObject: { id: string } | string
+ syncParam?: SyncParam
+ fetchType: 'only-immutable-attributes'
+ allowRefresh: false
+}
+
+type GetVideoParamOther = {
+ videoObject: { id: string } | string
+ syncParam?: SyncParam
+ fetchType?: 'all' | 'only-video'
+ allowRefresh?: boolean
+}
+
+function getOrCreateVideoAndAccountAndChannel (options: GetVideoParamAll): GetVideoResult<MVideoAccountLightBlacklistAllFiles>
+function getOrCreateVideoAndAccountAndChannel (options: GetVideoParamImmutable): GetVideoResult<MVideoImmutable>
+function getOrCreateVideoAndAccountAndChannel (
+ options: GetVideoParamOther
+): GetVideoResult<MVideoAccountLightBlacklistAllFiles | MVideoThumbnail>
+async function getOrCreateVideoAndAccountAndChannel (
+ options: GetVideoParamAll | GetVideoParamImmutable | GetVideoParamOther
+): GetVideoResult<MVideoAccountLightBlacklistAllFiles | MVideoThumbnail | MVideoImmutable> {
// Default params
const syncParam = options.syncParam || { likes: true, dislikes: true, shares: true, comments: true, thumbnail: true, refreshVideo: false }
const fetchType = options.fetchType || 'all'
// Get video url
const videoUrl = getAPId(options.videoObject)
-
let videoFromDatabase = await fetchVideoByUrl(videoUrl, fetchType)
+
if (videoFromDatabase) {
- if (videoFromDatabase.isOutdated() && allowRefresh === true) {
+ // If allowRefresh is true, we could not call this function using 'only-immutable-attributes' fetch type
+ if (allowRefresh === true && (videoFromDatabase as MVideoThumbnail).isOutdated()) {
const refreshOptions = {
- video: videoFromDatabase,
+ video: videoFromDatabase as MVideoThumbnail,
fetchedType: fetchType,
syncParam
}
- if (syncParam.refreshVideo === true) videoFromDatabase = await refreshVideoIfNeeded(refreshOptions)
- else await JobQueue.Instance.createJob({ type: 'activitypub-refresher', payload: { type: 'video', url: videoFromDatabase.url } })
+ if (syncParam.refreshVideo === true) {
+ videoFromDatabase = await refreshVideoIfNeeded(refreshOptions)
+ } else {
+ await JobQueue.Instance.createJobWithPromise({
+ type: 'activitypub-refresher',
+ payload: { type: 'video', url: videoFromDatabase.url }
+ })
+ }
}
return { video: videoFromDatabase, created: false }
const { videoObject: fetchedVideo } = await fetchRemoteVideo(videoUrl)
if (!fetchedVideo) throw new Error('Cannot fetch remote video with url: ' + videoUrl)
- const channelActor = await getOrCreateVideoChannelFromVideoObject(fetchedVideo)
- const video = await retryTransactionWrapper(createVideo, fetchedVideo, channelActor, syncParam.thumbnail)
+ const actor = await getOrCreateVideoChannelFromVideoObject(fetchedVideo)
+ const videoChannel = actor.VideoChannel
+
+ try {
+ const { autoBlacklisted, videoCreated } = await retryTransactionWrapper(createVideo, fetchedVideo, videoChannel, syncParam.thumbnail)
+
+ await syncVideoExternalAttributes(videoCreated, fetchedVideo, syncParam)
- await syncVideoExternalAttributes(video, fetchedVideo, syncParam)
+ 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 }
+ }
- return { video, created: true }
+ throw err
+ }
}
async function updateVideoFromAP (options: {
- video: VideoModel,
- videoObject: VideoTorrentObject,
- account: AccountModel,
- channel: VideoChannelModel,
+ video: MVideoAccountLightBlacklistAllFiles
+ videoObject: VideoTorrentObject
+ account: MAccountIdActor
+ channel: MChannelDefault
overrideTo?: string[]
}) {
- logger.debug('Updating remote video "%s".', options.videoObject.uuid)
+ const { video, videoObject, account, channel, overrideTo } = options
+
+ logger.debug('Updating remote video "%s".', options.videoObject.uuid, { account, channel })
let videoFieldsSave: any
- const wasPrivateVideo = options.video.privacy === VideoPrivacy.PRIVATE
- const wasUnlistedVideo = options.video.privacy === VideoPrivacy.UNLISTED
+ const wasPrivateVideo = video.privacy === VideoPrivacy.PRIVATE
+ const wasUnlistedVideo = video.privacy === VideoPrivacy.UNLISTED
try {
- await sequelizeTypescript.transaction(async t => {
+ let thumbnailModel: MThumbnail
+
+ try {
+ thumbnailModel = await createVideoMiniatureFromUrl(getThumbnailFromIcons(videoObject).url, video, ThumbnailType.MINIATURE)
+ } catch (err) {
+ logger.warn('Cannot generate thumbnail of %s.', videoObject.id, { err })
+ }
+
+ const videoUpdated = await sequelizeTypescript.transaction(async t => {
const sequelizeOptions = { transaction: t }
- videoFieldsSave = options.video.toJSON()
+ videoFieldsSave = video.toJSON()
// Check actor has the right to update the video
- const videoChannel = options.video.VideoChannel
- if (videoChannel.Account.id !== options.account.id) {
- throw new Error('Account ' + options.account.Actor.url + ' does not own video channel ' + videoChannel.Actor.url)
+ 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)
}
- const to = options.overrideTo ? options.overrideTo : options.videoObject.to
- const videoData = await videoActivityObjectToDBAttributes(options.channel, options.videoObject, to)
- options.video.set('name', videoData.name)
- options.video.set('uuid', videoData.uuid)
- options.video.set('url', videoData.url)
- options.video.set('category', videoData.category)
- options.video.set('licence', videoData.licence)
- options.video.set('language', videoData.language)
- options.video.set('description', videoData.description)
- options.video.set('support', videoData.support)
- options.video.set('nsfw', videoData.nsfw)
- options.video.set('commentsEnabled', videoData.commentsEnabled)
- options.video.set('downloadEnabled', videoData.downloadEnabled)
- options.video.set('waitTranscoding', videoData.waitTranscoding)
- options.video.set('state', videoData.state)
- options.video.set('duration', videoData.duration)
- options.video.set('createdAt', videoData.createdAt)
- options.video.set('publishedAt', videoData.publishedAt)
- options.video.set('originallyPublishedAt', videoData.originallyPublishedAt)
- options.video.set('privacy', videoData.privacy)
- options.video.set('channelId', videoData.channelId)
- options.video.set('views', videoData.views)
-
- await options.video.save(sequelizeOptions)
+ const to = overrideTo || videoObject.to
+ const videoData = await videoActivityObjectToDBAttributes(channel, videoObject, to)
+ video.name = videoData.name
+ video.uuid = videoData.uuid
+ video.url = videoData.url
+ video.category = videoData.category
+ video.licence = videoData.licence
+ video.language = videoData.language
+ video.description = videoData.description
+ video.support = videoData.support
+ video.nsfw = videoData.nsfw
+ video.commentsEnabled = videoData.commentsEnabled
+ video.downloadEnabled = videoData.downloadEnabled
+ video.waitTranscoding = videoData.waitTranscoding
+ video.state = videoData.state
+ video.duration = videoData.duration
+ video.createdAt = videoData.createdAt
+ video.publishedAt = videoData.publishedAt
+ video.originallyPublishedAt = videoData.originallyPublishedAt
+ video.privacy = videoData.privacy
+ video.channelId = videoData.channelId
+ video.views = videoData.views
+
+ 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)
+ await videoUpdated.addAndSaveThumbnail(previewModel, t)
+ }
{
- const videoFileAttributes = videoFileActivityUrlToDBAttributes(options.video, options.videoObject)
+ const videoFileAttributes = videoFileActivityUrlToDBAttributes(videoUpdated, videoObject.url)
const newVideoFiles = videoFileAttributes.map(a => new VideoFileModel(a))
// Remove video files that do not exist anymore
- const destroyTasks = options.video.VideoFiles
- .filter(f => !newVideoFiles.find(newFile => newFile.hasSameUniqueKeysThan(f)))
- .map(f => f.destroy(sequelizeOptions))
+ const destroyTasks = deleteNonExistingModels(videoUpdated.VideoFiles, newVideoFiles, t)
await Promise.all(destroyTasks)
// Update or add other one
- const upsertTasks = videoFileAttributes.map(a => {
- return VideoFileModel.upsert<VideoFileModel>(a, { returning: true, transaction: t })
- .then(([ file ]) => file)
- })
-
- options.video.VideoFiles = await Promise.all(upsertTasks)
+ const upsertTasks = newVideoFiles.map(f => VideoFileModel.customUpsert(f, 'video', t))
+ videoUpdated.VideoFiles = await Promise.all(upsertTasks)
}
{
- const streamingPlaylistAttributes = streamingPlaylistActivityUrlToDBAttributes(
- options.video,
- options.videoObject,
- options.video.VideoFiles
- )
+ const streamingPlaylistAttributes = streamingPlaylistActivityUrlToDBAttributes(videoUpdated, videoObject, videoUpdated.VideoFiles)
const newStreamingPlaylists = streamingPlaylistAttributes.map(a => new VideoStreamingPlaylistModel(a))
- // Remove video files that do not exist anymore
- const destroyTasks = options.video.VideoStreamingPlaylists
- .filter(f => !newStreamingPlaylists.find(newPlaylist => newPlaylist.hasSameUniqueKeysThan(f)))
- .map(f => f.destroy(sequelizeOptions))
+ // Remove video playlists that do not exist anymore
+ const destroyTasks = deleteNonExistingModels(videoUpdated.VideoStreamingPlaylists, newStreamingPlaylists, t)
await Promise.all(destroyTasks)
- // Update or add other one
- const upsertTasks = streamingPlaylistAttributes.map(a => {
- return VideoStreamingPlaylistModel.upsert<VideoStreamingPlaylistModel>(a, { returning: true, transaction: t })
- .then(([ streamingPlaylist ]) => streamingPlaylist)
- })
+ let oldStreamingPlaylistFiles: MVideoFile[] = []
+ for (const videoStreamingPlaylist of videoUpdated.VideoStreamingPlaylists) {
+ oldStreamingPlaylistFiles = oldStreamingPlaylistFiles.concat(videoStreamingPlaylist.VideoFiles)
+ }
+
+ videoUpdated.VideoStreamingPlaylists = []
- options.video.VideoStreamingPlaylists = await Promise.all(upsertTasks)
+ for (const playlistAttributes of streamingPlaylistAttributes) {
+ const streamingPlaylistModel = await VideoStreamingPlaylistModel.upsert(playlistAttributes, { returning: true, transaction: t })
+ .then(([ streamingPlaylist ]) => streamingPlaylist)
+
+ const newVideoFiles: MVideoFile[] = videoFileActivityUrlToDBAttributes(streamingPlaylistModel, playlistAttributes.tagAPObject)
+ .map(a => new VideoFileModel(a))
+ const destroyTasks = deleteNonExistingModels(oldStreamingPlaylistFiles, newVideoFiles, t)
+ await Promise.all(destroyTasks)
+
+ // Update or add other one
+ const upsertTasks = newVideoFiles.map(f => VideoFileModel.customUpsert(f, 'streaming-playlist', t))
+ streamingPlaylistModel.VideoFiles = await Promise.all(upsertTasks)
+
+ videoUpdated.VideoStreamingPlaylists.push(streamingPlaylistModel)
+ }
}
{
// Update Tags
- const tags = options.videoObject.tag.map(tag => tag.name)
+ const tags = videoObject.tag
+ .filter(isAPHashTagObject)
+ .map(tag => tag.name)
const tagInstances = await TagModel.findOrCreateTags(tags, t)
- await options.video.$set('Tags', tagInstances, sequelizeOptions)
+ await videoUpdated.$set('Tags', tagInstances, sequelizeOptions)
}
{
// Update captions
- await VideoCaptionModel.deleteAllCaptionsOfRemoteVideo(options.video.id, t)
+ await VideoCaptionModel.deleteAllCaptionsOfRemoteVideo(videoUpdated.id, t)
- const videoCaptionsPromises = options.videoObject.subtitleLanguage.map(c => {
- return VideoCaptionModel.insertOrReplaceLanguage(options.video.id, c.identifier, t)
+ const videoCaptionsPromises = videoObject.subtitleLanguage.map(c => {
+ return VideoCaptionModel.insertOrReplaceLanguage(videoUpdated.id, c.identifier, c.url, t)
})
- options.video.VideoCaptions = await Promise.all(videoCaptionsPromises)
+ await Promise.all(videoCaptionsPromises)
}
+
+ return videoUpdated
})
- // Notify our users?
- if (wasPrivateVideo || wasUnlistedVideo) {
- Notifier.Instance.notifyOnNewVideo(options.video)
- }
+ await autoBlacklistVideoIfNeeded({
+ video: videoUpdated,
+ user: undefined,
+ isRemote: true,
+ isNew: false,
+ transaction: undefined
+ })
- logger.info('Remote video with uuid %s updated', options.videoObject.uuid)
+ if (wasPrivateVideo || wasUnlistedVideo) Notifier.Instance.notifyOnNewVideoIfNeeded(videoUpdated) // Notify our users?
+
+ logger.info('Remote video with uuid %s updated', videoObject.uuid)
+
+ return videoUpdated
} catch (err) {
- if (options.video !== undefined && videoFieldsSave !== undefined) {
- resetSequelizeInstance(options.video, videoFieldsSave)
+ if (video !== undefined && videoFieldsSave !== undefined) {
+ resetSequelizeInstance(video, videoFieldsSave)
}
// This is just a debug because we will retry the insert
logger.debug('Cannot update the remote video.', { err })
throw err
}
-
- try {
- await generateThumbnailFromUrl(options.video, options.videoObject.icon)
- } catch (err) {
- logger.warn('Cannot generate thumbnail of %s.', options.videoObject.id, { err })
- }
}
async function refreshVideoIfNeeded (options: {
- video: VideoModel,
- fetchedType: VideoFetchByUrlType,
+ video: MVideoThumbnail
+ fetchedType: VideoFetchByUrlType
syncParam: SyncParam
-}): Promise<VideoModel> {
+}): Promise<MVideoThumbnail> {
if (!options.video.isOutdated()) return options.video
// We need more attributes if the argument video was fetched with not enough joints
- const video = options.fetchedType === 'all' ? options.video : await VideoModel.loadByUrlAndPopulateAccount(options.video.url)
+ const video = options.fetchedType === 'all'
+ ? options.video as MVideoAccountLightBlacklistAllFiles
+ : await VideoModel.loadByUrlAndPopulateAccount(options.video.url)
try {
const { response, videoObject } = await fetchRemoteVideo(video.url)
}
const channelActor = await getOrCreateVideoChannelFromVideoObject(videoObject)
- const account = await AccountModel.load(channelActor.VideoChannel.accountId)
const updateOptions = {
video,
videoObject,
- account,
+ account: channelActor.VideoChannel.Account,
channel: channelActor.VideoChannel
}
await retryTransactionWrapper(updateVideoFromAP, updateOptions)
await syncVideoExternalAttributes(video, videoObject, options.syncParam)
+ ActorFollowScoreCache.Instance.addGoodServerId(video.VideoChannel.Actor.serverId)
+
return video
} catch (err) {
logger.warn('Cannot refresh video %s.', options.video.url, { err })
+ ActorFollowScoreCache.Instance.addBadServerId(video.VideoChannel.Actor.serverId)
+
// Don't refresh in loop
await video.setAsRefreshed()
return video
federateVideoIfNeeded,
fetchRemoteVideo,
getOrCreateVideoAndAccountAndChannel,
- fetchRemoteVideoStaticFile,
fetchRemoteVideoDescription,
- generateThumbnailFromUrl,
getOrCreateVideoChannelFromVideoObject
}
// ---------------------------------------------------------------------------
-function isAPVideoUrlObject (url: ActivityUrlObject): url is ActivityVideoUrlObject {
+function isAPVideoUrlObject (url: any): url is ActivityVideoUrlObject {
const mimeTypes = Object.keys(MIMETYPES.VIDEO.MIMETYPE_EXT)
- const urlMediaType = url.mediaType || url.mimeType
- return mimeTypes.indexOf(urlMediaType) !== -1 && urlMediaType.startsWith('video/')
+ const urlMediaType = url.mediaType
+ return mimeTypes.includes(urlMediaType) && urlMediaType.startsWith('video/')
}
function isAPStreamingPlaylistUrlObject (url: ActivityUrlObject): url is ActivityPlaylistUrlObject {
- const urlMediaType = url.mediaType || url.mimeType
-
- return urlMediaType === 'application/x-mpegURL'
+ return url && url.mediaType === 'application/x-mpegURL'
}
function isAPPlaylistSegmentHashesUrlObject (tag: any): tag is ActivityPlaylistSegmentHashesObject {
- const urlMediaType = tag.mediaType || tag.mimeType
+ return tag && tag.name === 'sha256' && tag.type === 'Link' && tag.mediaType === 'application/json'
+}
- return tag.name === 'sha256' && tag.type === 'Link' && urlMediaType === 'application/json'
+function isAPMagnetUrlObject (url: any): url is ActivityMagnetUrlObject {
+ return url && url.mediaType === 'application/x-bittorrent;x-scheme-handler/magnet'
}
-async function createVideo (videoObject: VideoTorrentObject, channelActor: ActorModel, waitThumbnail = false) {
+function isAPHashTagObject (url: any): url is ActivityHashTagObject {
+ return url && url.type === 'Hashtag'
+}
+
+async function createVideo (videoObject: VideoTorrentObject, channel: MChannelAccountLight, waitThumbnail = false) {
logger.debug('Adding remote video %s.', videoObject.id)
- const videoCreated: VideoModel = await sequelizeTypescript.transaction(async t => {
+ 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
+ })
+
+ let thumbnailModel: MThumbnail
+ if (waitThumbnail === true) {
+ thumbnailModel = await promiseThumbnail
+ }
+
+ const { autoBlacklisted, videoCreated } = await sequelizeTypescript.transaction(async t => {
const sequelizeOptions = { transaction: t }
- const videoData = await videoActivityObjectToDBAttributes(channelActor.VideoChannel, videoObject, videoObject.to)
- const video = VideoModel.build(videoData)
+ const videoCreated = await video.save(sequelizeOptions) as MVideoFullLight
+ videoCreated.VideoChannel = channel
+
+ if (thumbnailModel) await videoCreated.addAndSaveThumbnail(thumbnailModel, t)
- const videoCreated = await video.save(sequelizeOptions)
+ 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)
+
+ if (thumbnailModel) await videoCreated.addAndSaveThumbnail(previewModel, t)
// Process files
- const videoFileAttributes = videoFileActivityUrlToDBAttributes(videoCreated, videoObject)
- if (videoFileAttributes.length === 0) {
- throw new Error('Cannot find valid files for video %s ' + videoObject.url)
- }
+ const videoFileAttributes = videoFileActivityUrlToDBAttributes(videoCreated, videoObject.url)
const videoFilePromises = videoFileAttributes.map(f => VideoFileModel.create(f, { transaction: t }))
const videoFiles = await Promise.all(videoFilePromises)
- const videoStreamingPlaylists = streamingPlaylistActivityUrlToDBAttributes(videoCreated, videoObject, videoFiles)
- const playlistPromises = videoStreamingPlaylists.map(p => VideoStreamingPlaylistModel.create(p, { transaction: t }))
- await Promise.all(playlistPromises)
+ const streamingPlaylistsAttributes = streamingPlaylistActivityUrlToDBAttributes(videoCreated, videoObject, videoFiles)
+ videoCreated.VideoStreamingPlaylists = []
+
+ for (const playlistAttributes of streamingPlaylistsAttributes) {
+ const playlistModel = await VideoStreamingPlaylistModel.create(playlistAttributes, { transaction: t })
+
+ const playlistFiles = videoFileActivityUrlToDBAttributes(playlistModel, playlistAttributes.tagAPObject)
+ const videoFilePromises = playlistFiles.map(f => VideoFileModel.create(f, { transaction: t }))
+ playlistModel.VideoFiles = await Promise.all(videoFilePromises)
+
+ videoCreated.VideoStreamingPlaylists.push(playlistModel)
+ }
// Process tags
const tags = videoObject.tag
- .filter(t => t.type === 'Hashtag')
+ .filter(isAPHashTagObject)
.map(t => t.name)
const tagInstances = await TagModel.findOrCreateTags(tags, t)
await videoCreated.$set('Tags', tagInstances, sequelizeOptions)
// Process captions
const videoCaptionsPromises = videoObject.subtitleLanguage.map(c => {
- return VideoCaptionModel.insertOrReplaceLanguage(videoCreated.id, c.identifier, t)
+ return VideoCaptionModel.insertOrReplaceLanguage(videoCreated.id, c.identifier, c.url, t)
})
await Promise.all(videoCaptionsPromises)
+ videoCreated.VideoFiles = videoFiles
+ videoCreated.Tags = tagInstances
+
+ const autoBlacklisted = await autoBlacklistVideoIfNeeded({
+ video: videoCreated,
+ user: undefined,
+ isRemote: true,
+ isNew: true,
+ transaction: t
+ })
+
logger.info('Remote video with uuid %s inserted.', videoObject.uuid)
- videoCreated.VideoChannel = channelActor.VideoChannel
- return videoCreated
+ return { autoBlacklisted, videoCreated }
})
- const p = generateThumbnailFromUrl(videoCreated, videoObject.icon)
- .catch(err => logger.warn('Cannot generate thumbnail of %s.', videoObject.id, { err }))
+ if (waitThumbnail === false) {
+ // Error is already caught above
+ // eslint-disable-next-line @typescript-eslint/no-floating-promises
+ promiseThumbnail.then(thumbnailModel => {
+ if (!thumbnailModel) return
- if (waitThumbnail === true) await p
+ thumbnailModel = videoCreated.id
+
+ return thumbnailModel.save()
+ })
+ }
- return videoCreated
+ return { autoBlacklisted, videoCreated }
}
-async function videoActivityObjectToDBAttributes (
- videoChannel: VideoChannelModel,
- videoObject: VideoTorrentObject,
- to: string[] = []
-) {
- const privacy = to.indexOf(ACTIVITY_PUB.PUBLIC) !== -1 ? VideoPrivacy.PUBLIC : VideoPrivacy.UNLISTED
+function videoActivityObjectToDBAttributes (videoChannel: MChannelId, videoObject: VideoTorrentObject, to: string[] = []) {
+ const privacy = to.includes(ACTIVITY_PUB.PUBLIC)
+ ? VideoPrivacy.PUBLIC
+ : VideoPrivacy.UNLISTED
+
const duration = videoObject.duration.replace(/[^\d]+/, '')
+ const language = videoObject.language?.identifier
- let language: string | undefined
- if (videoObject.language) {
- language = videoObject.language.identifier
- }
+ const category = videoObject.category
+ ? parseInt(videoObject.category.identifier, 10)
+ : undefined
- let category: number | undefined
- if (videoObject.category) {
- category = parseInt(videoObject.category.identifier, 10)
- }
-
- let licence: number | undefined
- if (videoObject.licence) {
- licence = parseInt(videoObject.licence.identifier, 10)
- }
+ const licence = videoObject.licence
+ ? parseInt(videoObject.licence.identifier, 10)
+ : undefined
const description = videoObject.content || null
const support = videoObject.support || null
duration: parseInt(duration, 10),
createdAt: new Date(videoObject.published),
publishedAt: new Date(videoObject.published),
- originallyPublishedAt: videoObject.originallyPublishedAt ? new Date(videoObject.originallyPublishedAt) : null,
- // FIXME: updatedAt does not seems to be considered by Sequelize
+
+ originallyPublishedAt: videoObject.originallyPublishedAt
+ ? new Date(videoObject.originallyPublishedAt)
+ : null,
+
updatedAt: new Date(videoObject.updated),
views: videoObject.views,
likes: 0,
}
}
-function videoFileActivityUrlToDBAttributes (video: VideoModel, videoObject: VideoTorrentObject) {
- const fileUrls = videoObject.url.filter(u => isAPVideoUrlObject(u)) as ActivityVideoUrlObject[]
+function videoFileActivityUrlToDBAttributes (
+ videoOrPlaylist: MVideo | MStreamingPlaylist,
+ urls: (ActivityTagObject | ActivityUrlObject)[]
+) {
+ const fileUrls = urls.filter(u => isAPVideoUrlObject(u)) as ActivityVideoUrlObject[]
- if (fileUrls.length === 0) {
- throw new Error('Cannot find video files for ' + video.url)
- }
+ if (fileUrls.length === 0) return []
const attributes: FilteredModelAttributes<VideoFileModel>[] = []
for (const fileUrl of fileUrls) {
// Fetch associated magnet uri
- const magnet = videoObject.url.find(u => {
- const mediaType = u.mediaType || u.mimeType
- return mediaType === 'application/x-bittorrent;x-scheme-handler/magnet' && (u as any).height === fileUrl.height
- })
+ const magnet = urls.filter(isAPMagnetUrlObject)
+ .find(u => u.height === fileUrl.height)
if (!magnet) throw new Error('Cannot find associated magnet uri for file ' + fileUrl.href)
throw new Error('Cannot parse magnet URI ' + magnet.href)
}
- const mediaType = fileUrl.mediaType || fileUrl.mimeType
+ // Fetch associated metadata url, if any
+ const metadata = urls.filter(isAPVideoFileMetadataObject)
+ .find(u => {
+ return u.height === fileUrl.height &&
+ u.fps === fileUrl.fps &&
+ u.rel.includes(fileUrl.mediaType)
+ })
+
+ const mediaType = fileUrl.mediaType
const attribute = {
- extname: MIMETYPES.VIDEO.MIMETYPE_EXT[ mediaType ],
+ extname: MIMETYPES.VIDEO.MIMETYPE_EXT[mediaType],
infoHash: parsed.infoHash,
resolution: fileUrl.height,
size: fileUrl.size,
- videoId: video.id,
- fps: fileUrl.fps || -1
+ fps: fileUrl.fps || -1,
+ metadataUrl: metadata?.href,
+
+ // 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
}
attributes.push(attribute)
return attributes
}
-function streamingPlaylistActivityUrlToDBAttributes (video: VideoModel, videoObject: VideoTorrentObject, videoFiles: VideoFileModel[]) {
+function streamingPlaylistActivityUrlToDBAttributes (video: MVideoId, videoObject: VideoTorrentObject, videoFiles: MVideoFile[]) {
const playlistUrls = videoObject.url.filter(u => isAPStreamingPlaylistUrlObject(u)) as ActivityPlaylistUrlObject[]
if (playlistUrls.length === 0) return []
- const attributes: FilteredModelAttributes<VideoStreamingPlaylistModel>[] = []
+ const attributes: (FilteredModelAttributes<VideoStreamingPlaylistModel> & { tagAPObject?: ActivityTagObject[] })[] = []
for (const playlistUrlObject of playlistUrls) {
- const segmentsSha256UrlObject = playlistUrlObject.tag
- .find(t => {
- return isAPPlaylistSegmentHashesUrlObject(t)
- }) as ActivityPlaylistSegmentHashesObject
+ const segmentsSha256UrlObject = playlistUrlObject.tag.find(isAPPlaylistSegmentHashesUrlObject)
+
+ let files: unknown[] = playlistUrlObject.tag.filter(u => isAPVideoUrlObject(u)) as ActivityVideoUrlObject[]
+
+ // FIXME: backward compatibility introduced in v2.1.0
+ if (files.length === 0) files = videoFiles
+
if (!segmentsSha256UrlObject) {
logger.warn('No segment sha256 URL found in AP playlist object.', { playlistUrl: playlistUrlObject })
continue
type: VideoStreamingPlaylistType.HLS,
playlistUrl: playlistUrlObject.href,
segmentsSha256Url: segmentsSha256UrlObject.href,
- p2pMediaLoaderInfohashes: VideoStreamingPlaylistModel.buildP2PMediaLoaderInfoHashes(playlistUrlObject.href, videoFiles),
+ p2pMediaLoaderInfohashes: VideoStreamingPlaylistModel.buildP2PMediaLoaderInfoHashes(playlistUrlObject.href, files),
p2pMediaLoaderPeerVersion: P2P_MEDIA_LOADER_PEER_VERSION,
- videoId: video.id
+ videoId: video.id,
+ tagAPObject: playlistUrlObject.tag
}
attributes.push(attribute)
return attributes
}
+
+function getThumbnailFromIcons (videoObject: VideoTorrentObject) {
+ 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
+
+ return minBy(validIcons, 'width')
+}
+
+function getPreviewFromIcons (videoObject: VideoTorrentObject) {
+ 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')
+}
projects / oweals / peertube.git / blobdiff