X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmodels%2Fvideo%2Fvideo-format-utils.ts;h=89b0f50500b3cd0a39da31386d27b3b9870d0279;hb=4282dafc826f5ca72598aa5446122eb6da3aed27;hp=905e8444997e8306d07773213960491ad9b41261;hpb=71e318b4fe66175d03c7c82357d60062eb68af81;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/models/video/video-format-utils.ts b/server/models/video/video-format-utils.ts index 905e84449..89b0f5050 100644 --- a/server/models/video/video-format-utils.ts +++ b/server/models/video/video-format-utils.ts @@ -1,30 +1,41 @@ -import { Video, VideoDetails, VideoFile } from '../../../shared/models/videos' +import { Video, VideoDetails } from '../../../shared/models/videos' import { VideoModel } from './video' -import { VideoFileModel } from './video-file' -import { ActivityUrlObject, VideoTorrentObject } from '../../../shared/models/activitypub/objects' -import { CONFIG, THUMBNAILS_SIZE, VIDEO_EXT_MIMETYPE } from '../../initializers' +import { ActivityTagObject, ActivityUrlObject, VideoTorrentObject } from '../../../shared/models/activitypub/objects' +import { MIMETYPES, WEBSERVER } from '../../initializers/constants' import { VideoCaptionModel } from './video-caption' import { getVideoCommentsActivityPubUrl, getVideoDislikesActivityPubUrl, getVideoLikesActivityPubUrl, getVideoSharesActivityPubUrl -} from '../../lib/activitypub' +} from '../../lib/activitypub/url' import { isArray } from '../../helpers/custom-validators/misc' +import { VideoStreamingPlaylist } from '../../../shared/models/videos/video-streaming-playlist.model' +import { + MStreamingPlaylistRedundanciesOpt, + MStreamingPlaylistVideo, + MVideo, + MVideoAP, + MVideoFile, + MVideoFormattable, + MVideoFormattableDetails +} from '../../typings/models' +import { MVideoFileRedundanciesOpt } from '../../typings/models/video/video-file' +import { VideoFile } from '@shared/models/videos/video-file.model' +import { generateMagnetUri } from '@server/helpers/webtorrent' +import { extractVideo } from '@server/helpers/video' export type VideoFormattingJSONOptions = { completeDescription?: boolean additionalAttributes: { - state?: boolean, - waitTranscoding?: boolean, - scheduledUpdate?: boolean, + state?: boolean + waitTranscoding?: boolean + scheduledUpdate?: boolean blacklistInfo?: boolean } } -function videoModelToFormattedJSON (video: VideoModel, options?: VideoFormattingJSONOptions): Video { - const formattedAccount = video.VideoChannel.Account.toFormattedJSON() - const formattedVideoChannel = video.VideoChannel.toFormattedJSON() +function videoModelToFormattedJSON (video: MVideoFormattable, options?: VideoFormattingJSONOptions): Video { const userHistory = isArray(video.UserVideoHistories) ? video.UserVideoHistories[0] : undefined const videoObject: Video = { @@ -54,30 +65,16 @@ function videoModelToFormattedJSON (video: VideoModel, options?: VideoFormatting views: video.views, likes: video.likes, dislikes: video.dislikes, - thumbnailPath: video.getThumbnailStaticPath(), + thumbnailPath: video.getMiniatureStaticPath(), previewPath: video.getPreviewStaticPath(), embedPath: video.getEmbedStaticPath(), createdAt: video.createdAt, updatedAt: video.updatedAt, publishedAt: video.publishedAt, - account: { - id: formattedAccount.id, - uuid: formattedAccount.uuid, - name: formattedAccount.name, - displayName: formattedAccount.displayName, - url: formattedAccount.url, - host: formattedAccount.host, - avatar: formattedAccount.avatar - }, - channel: { - id: formattedVideoChannel.id, - uuid: formattedVideoChannel.uuid, - name: formattedVideoChannel.name, - displayName: formattedVideoChannel.displayName, - url: formattedVideoChannel.url, - host: formattedVideoChannel.host, - avatar: formattedVideoChannel.avatar - }, + originallyPublishedAt: video.originallyPublishedAt, + + account: video.VideoChannel.Account.toFormattedSummaryJSON(), + channel: video.VideoChannel.toFormattedSummaryJSON(), userHistory: userHistory ? { currentTime: userHistory.currentTime @@ -112,7 +109,7 @@ function videoModelToFormattedJSON (video: VideoModel, options?: VideoFormatting return videoObject } -function videoModelToFormattedDetailsJSON (video: VideoModel): VideoDetails { +function videoModelToFormattedDetailsJSON (video: MVideoFormattableDetails): VideoDetails { const formattedJson = video.toFormattedJSON({ additionalAttributes: { scheduledUpdate: true, @@ -120,7 +117,12 @@ function videoModelToFormattedDetailsJSON (video: VideoModel): VideoDetails { } }) + const { baseUrlHttp, baseUrlWs } = video.getBaseUrls() + const tags = video.Tags ? video.Tags.map(t => t.name) : [] + + const streamingPlaylists = streamingPlaylistsModelToFormattedJSON(video, video.VideoStreamingPlaylists) + const detailsJson = { support: video.support, descriptionPath: video.getDescriptionAPIPath(), @@ -128,49 +130,130 @@ function videoModelToFormattedDetailsJSON (video: VideoModel): VideoDetails { account: video.VideoChannel.Account.toFormattedJSON(), tags, commentsEnabled: video.commentsEnabled, + downloadEnabled: video.downloadEnabled, waitTranscoding: video.waitTranscoding, state: { id: video.state, label: VideoModel.getStateLabel(video.state) }, - files: [] + + trackerUrls: video.getTrackerUrls(baseUrlHttp, baseUrlWs), + + files: [], + streamingPlaylists } // Format and sort video files - detailsJson.files = videoFilesModelToFormattedJSON(video, video.VideoFiles) + detailsJson.files = videoFilesModelToFormattedJSON(video, baseUrlHttp, baseUrlWs, video.VideoFiles) return Object.assign(formattedJson, detailsJson) } -function videoFilesModelToFormattedJSON (video: VideoModel, videoFiles: VideoFileModel[]): VideoFile[] { +function streamingPlaylistsModelToFormattedJSON (video: MVideo, playlists: MStreamingPlaylistRedundanciesOpt[]): VideoStreamingPlaylist[] { + if (isArray(playlists) === false) return [] + const { baseUrlHttp, baseUrlWs } = video.getBaseUrls() - return videoFiles - .map(videoFile => { - let resolutionLabel = videoFile.resolution + 'p' + return playlists + .map(playlist => { + const playlistWithVideo = Object.assign(playlist, { Video: video }) + + const redundancies = isArray(playlist.RedundancyVideos) + ? playlist.RedundancyVideos.map(r => ({ baseUrl: r.fileUrl })) + : [] + + const files = videoFilesModelToFormattedJSON(playlistWithVideo, baseUrlHttp, baseUrlWs, playlist.VideoFiles) + + return { + id: playlist.id, + type: playlist.type, + playlistUrl: playlist.playlistUrl, + segmentsSha256Url: playlist.segmentsSha256Url, + redundancies, + files + } + }) +} +function sortByResolutionDesc (fileA: MVideoFile, fileB: MVideoFile) { + if (fileA.resolution < fileB.resolution) return 1 + if (fileA.resolution === fileB.resolution) return 0 + return -1 +} + +function videoFilesModelToFormattedJSON ( + model: MVideo | MStreamingPlaylistVideo, + baseUrlHttp: string, + baseUrlWs: string, + videoFiles: MVideoFileRedundanciesOpt[] +): VideoFile[] { + const video = extractVideo(model) + + return [ ...videoFiles ] + .sort(sortByResolutionDesc) + .map(videoFile => { return { resolution: { id: videoFile.resolution, - label: resolutionLabel + label: videoFile.resolution + 'p' }, - magnetUri: video.generateMagnetUri(videoFile, baseUrlHttp, baseUrlWs), + magnetUri: generateMagnetUri(model, videoFile, baseUrlHttp, baseUrlWs), size: videoFile.size, fps: videoFile.fps, - torrentUrl: video.getTorrentUrl(videoFile, baseUrlHttp), - torrentDownloadUrl: video.getTorrentDownloadUrl(videoFile, baseUrlHttp), - fileUrl: video.getVideoFileUrl(videoFile, baseUrlHttp), - fileDownloadUrl: video.getVideoFileDownloadUrl(videoFile, baseUrlHttp) + torrentUrl: model.getTorrentUrl(videoFile, baseUrlHttp), + torrentDownloadUrl: model.getTorrentDownloadUrl(videoFile, baseUrlHttp), + fileUrl: model.getVideoFileUrl(videoFile, baseUrlHttp), + fileDownloadUrl: model.getVideoFileDownloadUrl(videoFile, baseUrlHttp), + metadataUrl: video.getVideoFileMetadataUrl(videoFile, baseUrlHttp) } as VideoFile }) - .sort((a, b) => { - if (a.resolution.id < b.resolution.id) return 1 - if (a.resolution.id === b.resolution.id) return 0 - return -1 +} + +function addVideoFilesInAPAcc ( + acc: ActivityUrlObject[] | ActivityTagObject[], + model: MVideoAP | MStreamingPlaylistVideo, + baseUrlHttp: string, + baseUrlWs: string, + files: MVideoFile[] +) { + const sortedFiles = [ ...files ].sort(sortByResolutionDesc) + + for (const file of sortedFiles) { + acc.push({ + type: 'Link', + mediaType: MIMETYPES.VIDEO.EXT_MIMETYPE[file.extname] as any, + href: model.getVideoFileUrl(file, baseUrlHttp), + height: file.resolution, + size: file.size, + fps: file.fps }) + + acc.push({ + type: 'Link', + rel: [ 'metadata', MIMETYPES.VIDEO.EXT_MIMETYPE[file.extname] ], + mediaType: 'application/json' as 'application/json', + href: extractVideo(model).getVideoFileMetadataUrl(file, baseUrlHttp), + height: file.resolution, + fps: file.fps + }) + + acc.push({ + type: 'Link', + mediaType: 'application/x-bittorrent' as 'application/x-bittorrent', + href: model.getTorrentUrl(file, baseUrlHttp), + height: file.resolution + }) + + acc.push({ + type: 'Link', + mediaType: 'application/x-bittorrent;x-scheme-handler/magnet' as 'application/x-bittorrent;x-scheme-handler/magnet', + href: generateMagnetUri(model, file, baseUrlHttp, baseUrlWs), + height: file.resolution + }) + } } -function videoModelToActivityPubObject (video: VideoModel): VideoTorrentObject { +function videoModelToActivityPubObject (video: MVideoAP): VideoTorrentObject { const { baseUrlHttp, baseUrlWs } = video.getBaseUrls() if (!video.Tags) video.Tags = [] @@ -203,47 +286,49 @@ function videoModelToActivityPubObject (video: VideoModel): VideoTorrentObject { } } - const url: ActivityUrlObject[] = [] - for (const file of video.VideoFiles) { - url.push({ + const url: ActivityUrlObject[] = [ + // HTML url should be the first element in the array so Mastodon correctly displays the embed + { type: 'Link', - mimeType: VIDEO_EXT_MIMETYPE[ file.extname ] as any, - href: video.getVideoFileUrl(file, baseUrlHttp), - height: file.resolution, - size: file.size, - fps: file.fps - }) + mediaType: 'text/html', + href: WEBSERVER.URL + '/videos/watch/' + video.uuid + } + ] - url.push({ + addVideoFilesInAPAcc(url, video, baseUrlHttp, baseUrlWs, video.VideoFiles || []) + + for (const playlist of (video.VideoStreamingPlaylists || [])) { + const tag = playlist.p2pMediaLoaderInfohashes + .map(i => ({ type: 'Infohash' as 'Infohash', name: i })) as ActivityTagObject[] + tag.push({ type: 'Link', - mimeType: 'application/x-bittorrent' as 'application/x-bittorrent', - href: video.getTorrentUrl(file, baseUrlHttp), - height: file.resolution + name: 'sha256', + mediaType: 'application/json' as 'application/json', + href: playlist.segmentsSha256Url }) + const playlistWithVideo = Object.assign(playlist, { Video: video }) + addVideoFilesInAPAcc(tag, playlistWithVideo, baseUrlHttp, baseUrlWs, playlist.VideoFiles || []) + url.push({ type: 'Link', - mimeType: 'application/x-bittorrent;x-scheme-handler/magnet' as 'application/x-bittorrent;x-scheme-handler/magnet', - href: video.generateMagnetUri(file, baseUrlHttp, baseUrlWs), - height: file.resolution + mediaType: 'application/x-mpegURL' as 'application/x-mpegURL', + href: playlist.playlistUrl, + tag }) } - // Add video url too - url.push({ - type: 'Link', - mimeType: 'text/html', - href: CONFIG.WEBSERVER.URL + '/videos/watch/' + video.uuid - }) - const subtitleLanguage = [] for (const caption of video.VideoCaptions) { subtitleLanguage.push({ identifier: caption.language, - name: VideoCaptionModel.getLanguageLabel(caption.language) + name: VideoCaptionModel.getLanguageLabel(caption.language), + url: caption.getFileUrl(video) }) } + const icons = [ video.getMiniature(), video.getPreview() ] + return { type: 'Video' as 'Video', id: video.url, @@ -259,19 +344,21 @@ function videoModelToActivityPubObject (video: VideoModel): VideoTorrentObject { waitTranscoding: video.waitTranscoding, state: video.state, commentsEnabled: video.commentsEnabled, + downloadEnabled: video.downloadEnabled, published: video.publishedAt.toISOString(), + originallyPublishedAt: video.originallyPublishedAt ? video.originallyPublishedAt.toISOString() : null, updated: video.updatedAt.toISOString(), mediaType: 'text/markdown', - content: video.getTruncatedDescription(), + content: video.description, support: video.support, subtitleLanguage, - icon: { + icon: icons.map(i => ({ type: 'Image', - url: video.getThumbnailUrl(baseUrlHttp), + url: i.getFileUrl(video), mediaType: 'image/jpeg', - width: THUMBNAILS_SIZE.width, - height: THUMBNAILS_SIZE.height - }, + width: i.width, + height: i.height + })), url, likes: getVideoLikesActivityPubUrl(video), dislikes: getVideoDislikesActivityPubUrl(video),