import {
buildServerDirectory,
cleanupTests,
- createLive,
flushAndRunServer,
- getConfig,
getVideo,
PluginsCommand,
- sendRTMPStreamInVideo,
ServerInfo,
setAccessTokensToServers,
setDefaultVideoChannel,
testFfmpegStreamError,
- updateCustomSubConfig,
uploadVideoAndGetId,
- waitJobs,
- waitUntilLivePublished
+ waitJobs
} from '@shared/extra-utils'
-import { ServerConfig, VideoDetails, VideoPrivacy } from '@shared/models'
+import { VideoDetails, VideoPrivacy } from '@shared/models'
async function createLiveWrapper (server: ServerInfo) {
const liveAttributes = {
privacy: VideoPrivacy.PUBLIC
}
- const res = await createLive(server.url, server.accessToken, liveAttributes)
- return res.body.video.uuid
+ const { uuid } = await server.liveCommand.create({ fields: liveAttributes })
+
+ return uuid
}
function updateConf (server: ServerInfo, vodProfile: string, liveProfile: string) {
- return updateCustomSubConfig(server.url, server.accessToken, {
- transcoding: {
- enabled: true,
- profile: vodProfile,
- hls: {
- enabled: true
- },
- webtorrent: {
- enabled: true
- },
- resolutions: {
- '240p': true,
- '360p': false,
- '480p': false,
- '720p': true
- }
- },
- live: {
+ return server.configCommand.updateCustomSubConfig({
+ newConfig: {
transcoding: {
- profile: liveProfile,
enabled: true,
+ profile: vodProfile,
+ hls: {
+ enabled: true
+ },
+ webtorrent: {
+ enabled: true
+ },
resolutions: {
'240p': true,
'360p': false,
'480p': false,
'720p': true
}
+ },
+ live: {
+ transcoding: {
+ profile: liveProfile,
+ enabled: true,
+ resolutions: {
+ '240p': true,
+ '360p': false,
+ '480p': false,
+ '720p': true
+ }
+ }
}
}
})
})
it('Should have the appropriate available profiles', async function () {
- const res = await getConfig(server.url)
- const config = res.body as ServerConfig
+ const config = await server.configCommand.getConfig()
expect(config.transcoding.availableProfiles).to.have.members([ 'default', 'low-vod', 'input-options-vod', 'bad-scale-vod' ])
expect(config.live.transcoding.availableProfiles).to.have.members([ 'default', 'low-live', 'input-options-live', 'bad-scale-live' ])
const liveVideoId = await createLiveWrapper(server)
- await sendRTMPStreamInVideo(server.url, server.accessToken, liveVideoId, 'video_short2.webm')
- await waitUntilLivePublished(server.url, server.accessToken, liveVideoId)
+ await server.liveCommand.sendRTMPStreamInVideo({ videoId: liveVideoId, fixtureName: 'video_short2.webm' })
+ await server.liveCommand.waitUntilPublished({ videoId: liveVideoId })
await waitJobs([ server ])
await checkLiveFPS(liveVideoId, 'above', 20)
const liveVideoId = await createLiveWrapper(server)
- await sendRTMPStreamInVideo(server.url, server.accessToken, liveVideoId, 'video_short2.webm')
- await waitUntilLivePublished(server.url, server.accessToken, liveVideoId)
+ await server.liveCommand.sendRTMPStreamInVideo({ videoId: liveVideoId, fixtureName: 'video_short2.webm' })
+ await server.liveCommand.waitUntilPublished({ videoId: liveVideoId })
await waitJobs([ server ])
await checkLiveFPS(liveVideoId, 'below', 12)
const liveVideoId = await createLiveWrapper(server)
- await sendRTMPStreamInVideo(server.url, server.accessToken, liveVideoId, 'video_short2.webm')
- await waitUntilLivePublished(server.url, server.accessToken, liveVideoId)
+ await server.liveCommand.sendRTMPStreamInVideo({ videoId: liveVideoId, fixtureName: 'video_short2.webm' })
+ await server.liveCommand.waitUntilPublished({ videoId: liveVideoId })
await waitJobs([ server ])
await checkLiveFPS(liveVideoId, 'below', 6)
const liveVideoId = await createLiveWrapper(server)
- const command = await sendRTMPStreamInVideo(server.url, server.accessToken, liveVideoId, 'video_short2.webm')
+ const command = await server.liveCommand.sendRTMPStreamInVideo({ videoId: liveVideoId, fixtureName: 'video_short2.webm' })
await testFfmpegStreamError(command, true)
})
await server.pluginsCommand.uninstall({ npmName: 'peertube-plugin-test-transcoding-one' })
- const res = await getConfig(server.url)
- const config = res.body as ServerConfig
+ const config = await server.configCommand.getConfig()
expect(config.transcoding.availableProfiles).to.deep.equal([ 'default' ])
expect(config.live.transcoding.availableProfiles).to.deep.equal([ 'default' ])
const liveVideoId = await createLiveWrapper(server)
- await sendRTMPStreamInVideo(server.url, server.accessToken, liveVideoId, 'video_short2.webm')
- await waitUntilLivePublished(server.url, server.accessToken, liveVideoId)
+ await server.liveCommand.sendRTMPStreamInVideo({ videoId: liveVideoId, fixtureName: 'video_short2.webm' })
+ await server.liveCommand.waitUntilPublished({ videoId: liveVideoId })
await waitJobs([ server ])
const playlistUrl = `${server.url}/static/streaming-playlists/hls/${liveVideoId}/0.m3u8`