import * as chai from 'chai'
import { join } from 'path'
import { ffprobePromise, getVideoStreamFromFile } from '@server/helpers/ffprobe-utils'
-import { LiveVideo, LiveVideoCreate, Video, VideoDetails, VideoPrivacy, VideoState, VideoStreamingPlaylistType } from '@shared/models'
-import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
+import { HttpStatusCode } from '@shared/core-utils'
import {
- addVideoToBlacklist,
- buildServerDirectory,
checkLiveCleanup,
checkLiveSegmentHash,
checkResolutionsInMasterPlaylist,
cleanupTests,
doubleFollow,
flushAndRunMultipleServers,
- getMyVideosWithFilter,
- getPlaylist,
- getVideo,
- getVideosList,
- getVideosWithFilters,
killallServers,
LiveCommand,
makeRawRequest,
- removeVideo,
reRunServer,
sendRTMPStream,
ServerInfo,
stopFfmpeg,
testFfmpegStreamError,
testImage,
- uploadVideoAndGetId,
wait,
waitJobs,
waitUntilLivePublishedOnAllServers
-} from '../../../../shared/extra-utils'
+} from '@shared/extra-utils'
+import { LiveVideo, LiveVideoCreate, VideoDetails, VideoPrivacy, VideoState, VideoStreamingPlaylistType } from '@shared/models'
const expect = chai.expect
await setAccessTokensToServers(servers)
await setDefaultVideoChannel(servers)
- await servers[0].configCommand.updateCustomSubConfig({
+ await servers[0].config.updateCustomSubConfig({
newConfig: {
live: {
enabled: true,
// Server 1 and server 2 follow each other
await doubleFollow(servers[0], servers[1])
- commands = servers.map(s => s.liveCommand)
+ commands = servers.map(s => s.live)
})
describe('Live creation, update and delete', function () {
language: 'fr',
description: 'super live description',
support: 'support field',
- channelId: servers[0].videoChannel.id,
+ channelId: servers[0].store.channel.id,
nsfw: false,
waitTranscoding: false,
name: 'my super live',
thumbnailfile: 'video_short1.webm.jpg'
}
- const live = await commands[0].createLive({ fields: attributes })
+ const live = await commands[0].create({ fields: attributes })
liveVideoUUID = live.uuid
await waitJobs(servers)
for (const server of servers) {
- const resVideo = await getVideo(server.url, liveVideoUUID)
- const video: VideoDetails = resVideo.body
+ const video = await server.videos.get({ id: liveVideoUUID })
expect(video.category.id).to.equal(1)
expect(video.licence.id).to.equal(2)
expect(video.description).to.equal('super live description')
expect(video.support).to.equal('support field')
- expect(video.channel.name).to.equal(servers[0].videoChannel.name)
- expect(video.channel.host).to.equal(servers[0].videoChannel.host)
+ expect(video.channel.name).to.equal(servers[0].store.channel.name)
+ expect(video.channel.host).to.equal(servers[0].store.channel.host)
expect(video.isLive).to.be.true
await testImage(server.url, 'video_short1-preview.webm', video.previewPath)
await testImage(server.url, 'video_short1.webm', video.thumbnailPath)
- const live = await server.liveCommand.getLive({ videoId: liveVideoUUID })
+ const live = await server.live.get({ videoId: liveVideoUUID })
if (server.url === servers[0].url) {
expect(live.rtmpUrl).to.equal('rtmp://' + server.hostname + ':' + servers[0].rtmpPort + '/live')
const attributes: LiveVideoCreate = {
name: 'default live thumbnail',
- channelId: servers[0].videoChannel.id,
+ channelId: servers[0].store.channel.id,
privacy: VideoPrivacy.UNLISTED,
nsfw: true
}
- const live = await commands[0].createLive({ fields: attributes })
+ const live = await commands[0].create({ fields: attributes })
const videoId = live.uuid
await waitJobs(servers)
for (const server of servers) {
- const resVideo = await getVideo(server.url, videoId)
- const video: VideoDetails = resVideo.body
-
+ const video = await server.videos.get({ id: videoId })
expect(video.privacy.id).to.equal(VideoPrivacy.UNLISTED)
expect(video.nsfw).to.be.true
it('Should not have the live listed since nobody streams into', async function () {
for (const server of servers) {
- const res = await getVideosList(server.url)
+ const { total, data } = await server.videos.list()
- expect(res.body.total).to.equal(0)
- expect(res.body.data).to.have.lengthOf(0)
+ expect(total).to.equal(0)
+ expect(data).to.have.lengthOf(0)
}
})
it('Should not be able to update a live of another server', async function () {
- await commands[1].updateLive({ videoId: liveVideoUUID, fields: { saveReplay: false }, expectedStatus: HttpStatusCode.FORBIDDEN_403 })
+ await commands[1].update({ videoId: liveVideoUUID, fields: { saveReplay: false }, expectedStatus: HttpStatusCode.FORBIDDEN_403 })
})
it('Should update the live', async function () {
this.timeout(10000)
- await commands[0].updateLive({ videoId: liveVideoUUID, fields: { saveReplay: false } })
+ await commands[0].update({ videoId: liveVideoUUID, fields: { saveReplay: false } })
await waitJobs(servers)
})
it('Have the live updated', async function () {
for (const server of servers) {
- const live = await server.liveCommand.getLive({ videoId: liveVideoUUID })
+ const live = await server.live.get({ videoId: liveVideoUUID })
if (server.url === servers[0].url) {
expect(live.rtmpUrl).to.equal('rtmp://' + server.hostname + ':' + servers[0].rtmpPort + '/live')
it('Delete the live', async function () {
this.timeout(10000)
- await removeVideo(servers[0].url, servers[0].accessToken, liveVideoUUID)
+ await servers[0].videos.remove({ id: liveVideoUUID })
await waitJobs(servers)
})
it('Should have the live deleted', async function () {
for (const server of servers) {
- await getVideo(server.url, liveVideoUUID, HttpStatusCode.NOT_FOUND_404)
- await server.liveCommand.getLive({ videoId: liveVideoUUID, expectedStatus: HttpStatusCode.NOT_FOUND_404 })
+ await server.videos.get({ id: liveVideoUUID, expectedStatus: HttpStatusCode.NOT_FOUND_404 })
+ await server.live.get({ videoId: liveVideoUUID, expectedStatus: HttpStatusCode.NOT_FOUND_404 })
}
})
})
before(async function () {
this.timeout(120000)
- vodVideoId = (await uploadVideoAndGetId({ server: servers[0], videoName: 'vod video' })).uuid
+ vodVideoId = (await servers[0].videos.quickUpload({ name: 'vod video' })).uuid
- const liveOptions = { name: 'live', privacy: VideoPrivacy.PUBLIC, channelId: servers[0].videoChannel.id }
- const live = await commands[0].createLive({ fields: liveOptions })
+ const liveOptions = { name: 'live', privacy: VideoPrivacy.PUBLIC, channelId: servers[0].store.channel.id }
+ const live = await commands[0].create({ fields: liveOptions })
liveVideoId = live.uuid
- ffmpegCommand = await servers[0].liveCommand.sendRTMPStreamInVideo({ videoId: liveVideoId })
+ ffmpegCommand = await servers[0].live.sendRTMPStreamInVideo({ videoId: liveVideoId })
await waitUntilLivePublishedOnAllServers(servers, liveVideoId)
await waitJobs(servers)
})
it('Should only display lives', async function () {
- const res = await getVideosWithFilters(servers[0].url, { isLive: true })
+ const { data, total } = await servers[0].videos.list({ isLive: true })
- expect(res.body.total).to.equal(1)
- expect(res.body.data).to.have.lengthOf(1)
- expect(res.body.data[0].name).to.equal('live')
+ expect(total).to.equal(1)
+ expect(data).to.have.lengthOf(1)
+ expect(data[0].name).to.equal('live')
})
it('Should not display lives', async function () {
- const res = await getVideosWithFilters(servers[0].url, { isLive: false })
+ const { data, total } = await servers[0].videos.list({ isLive: false })
- expect(res.body.total).to.equal(1)
- expect(res.body.data).to.have.lengthOf(1)
- expect(res.body.data[0].name).to.equal('vod video')
+ expect(total).to.equal(1)
+ expect(data).to.have.lengthOf(1)
+ expect(data[0].name).to.equal('vod video')
})
it('Should display my lives', async function () {
await stopFfmpeg(ffmpegCommand)
await waitJobs(servers)
- const res = await getMyVideosWithFilter(servers[0].url, servers[0].accessToken, { isLive: true })
- const videos = res.body.data as Video[]
+ const { data } = await servers[0].videos.listMyVideos({ isLive: true })
- const result = videos.every(v => v.isLive)
+ const result = data.every(v => v.isLive)
expect(result).to.be.true
})
it('Should not display my lives', async function () {
- const res = await getMyVideosWithFilter(servers[0].url, servers[0].accessToken, { isLive: false })
- const videos = res.body.data as Video[]
+ const { data } = await servers[0].videos.listMyVideos({ isLive: false })
- const result = videos.every(v => !v.isLive)
+ const result = data.every(v => !v.isLive)
expect(result).to.be.true
})
after(async function () {
- await removeVideo(servers[0].url, servers[0].accessToken, vodVideoId)
- await removeVideo(servers[0].url, servers[0].accessToken, liveVideoId)
+ await servers[0].videos.remove({ id: vodVideoId })
+ await servers[0].videos.remove({ id: liveVideoId })
})
})
async function createLiveWrapper () {
const liveAttributes = {
name: 'user live',
- channelId: servers[0].videoChannel.id,
+ channelId: servers[0].store.channel.id,
privacy: VideoPrivacy.PUBLIC,
saveReplay: false
}
- const { uuid } = await commands[0].createLive({ fields: liveAttributes })
+ const { uuid } = await commands[0].create({ fields: liveAttributes })
- const live = await commands[0].getLive({ videoId: uuid })
- const resVideo = await getVideo(servers[0].url, uuid)
+ const live = await commands[0].get({ videoId: uuid })
+ const video = await servers[0].videos.get({ id: uuid })
- return Object.assign(resVideo.body as VideoDetails, live)
+ return Object.assign(video, live)
}
it('Should not allow a stream without the appropriate path', async function () {
it('Should list this live now someone stream into it', async function () {
for (const server of servers) {
- const res = await getVideosList(server.url)
-
- expect(res.body.total).to.equal(1)
- expect(res.body.data).to.have.lengthOf(1)
+ const { total, data } = await server.videos.list()
- const video: Video = res.body.data[0]
+ expect(total).to.equal(1)
+ expect(data).to.have.lengthOf(1)
+ const video = data[0]
expect(video.name).to.equal('user live')
expect(video.isLive).to.be.true
}
liveVideo = await createLiveWrapper()
- await addVideoToBlacklist(servers[0].url, servers[0].accessToken, liveVideo.uuid)
+ await servers[0].blacklist.add({ videoId: liveVideo.uuid })
const command = sendRTMPStream(rtmpUrl + '/live', liveVideo.streamKey)
await testFfmpegStreamError(command, true)
liveVideo = await createLiveWrapper()
- await removeVideo(servers[0].url, servers[0].accessToken, liveVideo.uuid)
+ await servers[0].videos.remove({ id: liveVideo.uuid })
const command = sendRTMPStream(rtmpUrl + '/live', liveVideo.streamKey)
await testFfmpegStreamError(command, true)
async function createLiveWrapper (saveReplay: boolean) {
const liveAttributes = {
name: 'live video',
- channelId: servers[0].videoChannel.id,
+ channelId: servers[0].store.channel.id,
privacy: VideoPrivacy.PUBLIC,
saveReplay
}
- const { uuid } = await commands[0].createLive({ fields: liveAttributes })
+ const { uuid } = await commands[0].create({ fields: liveAttributes })
return uuid
}
async function testVideoResolutions (liveVideoId: string, resolutions: number[]) {
for (const server of servers) {
- const resList = await getVideosList(server.url)
- const videos: Video[] = resList.body.data
-
- expect(videos.find(v => v.uuid === liveVideoId)).to.exist
+ const { data } = await server.videos.list()
+ expect(data.find(v => v.uuid === liveVideoId)).to.exist
- const resVideo = await getVideo(server.url, liveVideoId)
- const video: VideoDetails = resVideo.body
+ const video = await server.videos.get({ id: liveVideoId })
expect(video.streamingPlaylists).to.have.lengthOf(1)
// Only finite files are displayed
expect(hlsPlaylist.files).to.have.lengthOf(0)
- await checkResolutionsInMasterPlaylist(hlsPlaylist.playlistUrl, resolutions)
+ await checkResolutionsInMasterPlaylist({ server, playlistUrl: hlsPlaylist.playlistUrl, resolutions })
for (let i = 0; i < resolutions.length; i++) {
const segmentNum = 3
const segmentName = `${i}-00000${segmentNum}.ts`
- await commands[0].waitUntilLiveSegmentGeneration({ videoUUID: video.uuid, resolution: i, segment: segmentNum })
+ await commands[0].waitUntilSegmentGeneration({ videoUUID: video.uuid, resolution: i, segment: segmentNum })
- const res = await getPlaylist(`${servers[0].url}/static/streaming-playlists/hls/${video.uuid}/${i}.m3u8`)
- const subPlaylist = res.text
+ const subPlaylist = await servers[0].streamingPlaylists.get({
+ url: `${servers[0].url}/static/streaming-playlists/hls/${video.uuid}/${i}.m3u8`
+ })
expect(subPlaylist).to.contain(segmentName)
const baseUrlAndPath = servers[0].url + '/static/streaming-playlists/hls'
- await checkLiveSegmentHash(baseUrlAndPath, video.uuid, segmentName, hlsPlaylist)
+ await checkLiveSegmentHash({
+ server,
+ baseUrlSegment: baseUrlAndPath,
+ videoUUID: video.uuid,
+ segmentName,
+ hlsPlaylist
+ })
}
}
}
function updateConf (resolutions: number[]) {
- return servers[0].configCommand.updateCustomSubConfig({
+ return servers[0].config.updateCustomSubConfig({
newConfig: {
live: {
enabled: true,
await testVideoResolutions(liveVideoId, resolutions)
await stopFfmpeg(ffmpegCommand)
- await commands[0].waitUntilLiveEnded({ videoId: liveVideoId })
+ await commands[0].waitUntilEnded({ videoId: liveVideoId })
await waitJobs(servers)
}
for (const server of servers) {
- const resVideo = await getVideo(server.url, liveVideoId)
- const video: VideoDetails = resVideo.body
+ const video = await server.videos.get({ id: liveVideoId })
expect(video.state.id).to.equal(VideoState.PUBLISHED)
expect(video.duration).to.be.greaterThan(1)
}
const filename = `${video.uuid}-${resolution}-fragmented.mp4`
- const segmentPath = buildServerDirectory(servers[0], join('streaming-playlists', 'hls', video.uuid, filename))
+ const segmentPath = servers[0].servers.buildDirectory(join('streaming-playlists', 'hls', video.uuid, filename))
const probe = await ffprobePromise(segmentPath)
const videoStream = await getVideoStreamFromFile(segmentPath, probe)
async function createLiveWrapper (saveReplay: boolean) {
const liveAttributes = {
name: 'live video',
- channelId: servers[0].videoChannel.id,
+ channelId: servers[0].store.channel.id,
privacy: VideoPrivacy.PUBLIC,
saveReplay
}
- const { uuid } = await commands[0].createLive({ fields: liveAttributes })
+ const { uuid } = await commands[0].create({ fields: liveAttributes })
return uuid
}
])
await Promise.all([
- commands[0].waitUntilLivePublished({ videoId: liveVideoId }),
- commands[0].waitUntilLivePublished({ videoId: liveVideoReplayId })
+ commands[0].waitUntilPublished({ videoId: liveVideoId }),
+ commands[0].waitUntilPublished({ videoId: liveVideoReplayId })
])
- await commands[0].waitUntilLiveSegmentGeneration({ videoUUID: liveVideoId, resolution: 0, segment: 2 })
- await commands[0].waitUntilLiveSegmentGeneration({ videoUUID: liveVideoReplayId, resolution: 0, segment: 2 })
+ await commands[0].waitUntilSegmentGeneration({ videoUUID: liveVideoId, resolution: 0, segment: 2 })
+ await commands[0].waitUntilSegmentGeneration({ videoUUID: liveVideoReplayId, resolution: 0, segment: 2 })
await killallServers([ servers[0] ])
await reRunServer(servers[0])
it('Should cleanup lives', async function () {
this.timeout(60000)
- await commands[0].waitUntilLiveEnded({ videoId: liveVideoId })
+ await commands[0].waitUntilEnded({ videoId: liveVideoId })
})
it('Should save a live replay', async function () {
this.timeout(120000)
- await commands[0].waitUntilLivePublished({ videoId: liveVideoReplayId })
+ await commands[0].waitUntilPublished({ videoId: liveVideoReplayId })
})
})
projects / github / Chocobozzz / PeerTube.git / blobdiff