X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmodels%2Fvideo%2Fvideo-streaming-playlist.ts;h=9957ffee3c3b3d1a4dea8bef5ed6338769ad615a;hb=b0f4204266057316c11fc034da0ce86a212dc0b3;hp=c9375b4338ac419c31e26411a6cfc5c11187b42a;hpb=90a8bd305de4153ec21137a73ff482dcc2e3e19b;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/models/video/video-streaming-playlist.ts b/server/models/video/video-streaming-playlist.ts index c9375b433..9957ffee3 100644 --- a/server/models/video/video-streaming-playlist.ts +++ b/server/models/video/video-streaming-playlist.ts @@ -1,16 +1,40 @@ -import * as memoizee from 'memoizee' +import memoizee from 'memoizee' import { join } from 'path' -import { Op, QueryTypes } from 'sequelize' -import { AllowNull, BelongsTo, Column, CreatedAt, DataType, ForeignKey, HasMany, Is, Model, Table, UpdatedAt } from 'sequelize-typescript' +import { Op } from 'sequelize' +import { + AllowNull, + BelongsTo, + Column, + CreatedAt, + DataType, + Default, + ForeignKey, + HasMany, + Is, + Model, + Table, + UpdatedAt +} from 'sequelize-typescript' +import { getHLSPublicFileUrl } from '@server/lib/object-storage' import { VideoFileModel } from '@server/models/video/video-file' -import { MStreamingPlaylist } from '@server/types/models' +import { MStreamingPlaylist, MVideo } from '@server/types/models' +import { sha1 } from '@shared/extra-utils' +import { VideoStorage } from '@shared/models' +import { AttributesOnly } from '@shared/typescript-utils' import { VideoStreamingPlaylistType } from '../../../shared/models/videos/video-streaming-playlist.type' -import { sha1 } from '../../helpers/core-utils' import { isActivityPubUrlValid } from '../../helpers/custom-validators/activitypub/misc' import { isArrayOf } from '../../helpers/custom-validators/misc' import { isVideoFileInfoHashValid } from '../../helpers/custom-validators/videos' -import { CONSTRAINTS_FIELDS, MEMOIZE_LENGTH, MEMOIZE_TTL, P2P_MEDIA_LOADER_PEER_VERSION, STATIC_PATHS } from '../../initializers/constants' +import { + CONSTRAINTS_FIELDS, + MEMOIZE_LENGTH, + MEMOIZE_TTL, + P2P_MEDIA_LOADER_PEER_VERSION, + STATIC_PATHS, + WEBSERVER +} from '../../initializers/constants' import { VideoRedundancyModel } from '../redundancy/video-redundancy' +import { doesExist } from '../shared' import { throwIfNotValid } from '../utils' import { VideoModel } from './video' @@ -30,7 +54,7 @@ import { VideoModel } from './video' } ] }) -export class VideoStreamingPlaylistModel extends Model { +export class VideoStreamingPlaylistModel extends Model>> { @CreatedAt createdAt: Date @@ -42,7 +66,11 @@ export class VideoStreamingPlaylistModel extends Model { type: VideoStreamingPlaylistType @AllowNull(false) - @Is('PlaylistUrl', value => throwIfNotValid(value, isActivityPubUrlValid, 'playlist url')) + @Column + playlistFilename: string + + @AllowNull(true) + @Is('PlaylistUrl', value => throwIfNotValid(value, isActivityPubUrlValid, 'playlist url', true)) @Column(DataType.STRING(CONSTRAINTS_FIELDS.VIDEOS.URL.max)) playlistUrl: string @@ -56,7 +84,11 @@ export class VideoStreamingPlaylistModel extends Model { p2pMediaLoaderPeerVersion: number @AllowNull(false) - @Is('VideoStreamingSegmentsSha256Url', value => throwIfNotValid(value, isActivityPubUrlValid, 'segments sha256 url')) + @Column + segmentsSha256Filename: string + + @AllowNull(true) + @Is('VideoStreamingSegmentsSha256Url', value => throwIfNotValid(value, isActivityPubUrlValid, 'segments sha256 url', true)) @Column segmentsSha256Url: string @@ -64,6 +96,11 @@ export class VideoStreamingPlaylistModel extends Model { @Column videoId: number + @AllowNull(false) + @Default(VideoStorage.FILE_SYSTEM) + @Column + storage: VideoStorage + @BelongsTo(() => VideoModel, { foreignKey: { allowNull: false @@ -97,14 +134,8 @@ export class VideoStreamingPlaylistModel extends Model { static doesInfohashExist (infoHash: string) { const query = 'SELECT 1 FROM "videoStreamingPlaylist" WHERE $infoHash = ANY("p2pMediaLoaderInfohashes") LIMIT 1' - const options = { - type: QueryTypes.SELECT as QueryTypes.SELECT, - bind: { infoHash }, - raw: true - } - return VideoModel.sequelize.query(query, options) - .then(results => results.length === 1) + return doesExist(query, { infoHash }) } static buildP2PMediaLoaderInfoHashes (playlistUrl: string, files: unknown[]) { @@ -124,7 +155,13 @@ export class VideoStreamingPlaylistModel extends Model { p2pMediaLoaderPeerVersion: { [Op.ne]: P2P_MEDIA_LOADER_PEER_VERSION } - } + }, + include: [ + { + model: VideoModel.unscoped(), + required: true + } + ] } return VideoStreamingPlaylistModel.findAll(query) @@ -143,7 +180,7 @@ export class VideoStreamingPlaylistModel extends Model { return VideoStreamingPlaylistModel.findByPk(id, options) } - static loadHLSPlaylistByVideo (videoId: number) { + static loadHLSPlaylistByVideo (videoId: number): Promise { const options = { where: { type: VideoStreamingPlaylistType.HLS, @@ -154,30 +191,46 @@ export class VideoStreamingPlaylistModel extends Model { return VideoStreamingPlaylistModel.findOne(options) } - static getHlsPlaylistFilename (resolution: number) { - return resolution + '.m3u8' - } + static async loadOrGenerate (video: MVideo) { + let playlist = await VideoStreamingPlaylistModel.loadHLSPlaylistByVideo(video.id) + if (!playlist) playlist = new VideoStreamingPlaylistModel() - static getMasterHlsPlaylistFilename () { - return 'master.m3u8' + return Object.assign(playlist, { videoId: video.id, Video: video }) } - static getHlsSha256SegmentsFilename () { - return 'segments-sha256.json' + static doesOwnedHLSPlaylistExist (videoUUID: string) { + const query = `SELECT 1 FROM "videoStreamingPlaylist" ` + + `INNER JOIN "video" ON "video"."id" = "videoStreamingPlaylist"."videoId" ` + + `AND "video"."remote" IS FALSE AND "video"."uuid" = $videoUUID ` + + `AND "storage" = ${VideoStorage.FILE_SYSTEM} LIMIT 1` + + return doesExist(query, { videoUUID }) } - static getHlsMasterPlaylistStaticPath (videoUUID: string) { - return join(STATIC_PATHS.STREAMING_PLAYLISTS.HLS, videoUUID, VideoStreamingPlaylistModel.getMasterHlsPlaylistFilename()) + assignP2PMediaLoaderInfoHashes (video: MVideo, files: unknown[]) { + const masterPlaylistUrl = this.getMasterPlaylistUrl(video) + + this.p2pMediaLoaderInfohashes = VideoStreamingPlaylistModel.buildP2PMediaLoaderInfoHashes(masterPlaylistUrl, files) } - static getHlsPlaylistStaticPath (videoUUID: string, resolution: number) { - return join(STATIC_PATHS.STREAMING_PLAYLISTS.HLS, videoUUID, VideoStreamingPlaylistModel.getHlsPlaylistFilename(resolution)) + getMasterPlaylistUrl (video: MVideo) { + if (this.storage === VideoStorage.OBJECT_STORAGE) { + return getHLSPublicFileUrl(this.playlistUrl) + } + + if (video.isOwned()) return WEBSERVER.URL + this.getMasterPlaylistStaticPath(video.uuid) + + return this.playlistUrl } - static getHlsSha256SegmentsStaticPath (videoUUID: string, isLive: boolean) { - if (isLive) return join('/live', 'segments-sha256', videoUUID) + getSha256SegmentsUrl (video: MVideo) { + if (this.storage === VideoStorage.OBJECT_STORAGE) { + return getHLSPublicFileUrl(this.segmentsSha256Url) + } + + if (video.isOwned()) return WEBSERVER.URL + this.getSha256SegmentsStaticPath(video.uuid, video.isLive) - return join(STATIC_PATHS.STREAMING_PLAYLISTS.HLS, videoUUID, VideoStreamingPlaylistModel.getHlsSha256SegmentsFilename()) + return this.segmentsSha256Url } getStringType () { @@ -194,4 +247,18 @@ export class VideoStreamingPlaylistModel extends Model { return this.type === other.type && this.videoId === other.videoId } + + withVideo (video: MVideo) { + return Object.assign(this, { Video: video }) + } + + private getMasterPlaylistStaticPath (videoUUID: string) { + return join(STATIC_PATHS.STREAMING_PLAYLISTS.HLS, videoUUID, this.playlistFilename) + } + + private getSha256SegmentsStaticPath (videoUUID: string, isLive: boolean) { + if (isLive) return join('/live', 'segments-sha256', videoUUID) + + return join(STATIC_PATHS.STREAMING_PLAYLISTS.HLS, videoUUID, this.segmentsSha256Filename) + } }