import 'mocha'
import * as chai from 'chai'
import { readdir } from 'fs-extra'
-import * as magnetUtil from 'magnet-uri'
-import { join } from 'path'
-import { HttpStatusCode } from '@shared/core-utils'
+import magnetUtil from 'magnet-uri'
+import { basename, join } from 'path'
import {
checkSegmentHash,
checkVideoFilesWereRemoved,
cleanupTests,
+ createMultipleServers,
doubleFollow,
- flushAndRunMultipleServers,
killallServers,
- makeGetRequest,
- reRunServer,
+ makeRawRequest,
+ PeerTubeServer,
root,
- ServerInfo,
+ saveVideoInServers,
setAccessTokensToServers,
wait,
waitJobs
} from '@shared/extra-utils'
-import { VideoPrivacy, VideoRedundancyStrategy, VideoRedundancyStrategyWithManual } from '@shared/models'
+import {
+ HttpStatusCode,
+ VideoDetails,
+ VideoFile,
+ VideoPrivacy,
+ VideoRedundancyStrategy,
+ VideoRedundancyStrategyWithManual
+} from '@shared/models'
const expect = chai.expect
-let servers: ServerInfo[] = []
-let video1Server2UUID: string
-let video1Server2Id: number
+let servers: PeerTubeServer[] = []
+let video1Server2: VideoDetails
-function checkMagnetWebseeds (file: { magnetUri: string, resolution: { id: number } }, baseWebseeds: string[], server: ServerInfo) {
+async function checkMagnetWebseeds (file: VideoFile, baseWebseeds: string[], server: PeerTubeServer) {
const parsed = magnetUtil.decode(file.magnetUri)
for (const ws of baseWebseeds) {
- const found = parsed.urlList.find(url => url === `${ws}-${file.resolution.id}.mp4`)
+ const found = parsed.urlList.find(url => url === `${ws}${basename(file.fileUrl)}`)
expect(found, `Webseed ${ws} not found in ${file.magnetUri} on server ${server.url}`).to.not.be.undefined
}
expect(parsed.urlList).to.have.lengthOf(baseWebseeds.length)
+
+ for (const url of parsed.urlList) {
+ await makeRawRequest(url, HttpStatusCode.OK_200)
+ }
}
-async function flushAndRunServers (strategy: VideoRedundancyStrategy | null, additionalParams: any = {}, withWebtorrent = true) {
+async function createServers (strategy: VideoRedundancyStrategy | null, additionalParams: any = {}, withWebtorrent = true) {
const strategies: any[] = []
if (strategy !== null) {
}
}
- servers = await flushAndRunMultipleServers(3, config)
+ servers = await createMultipleServers(3, config)
// Get the access tokens
await setAccessTokensToServers(servers)
{
- const { uuid, id } = await servers[1].videosCommand.upload({ attributes: { name: 'video 1 server 2' } })
- video1Server2UUID = uuid
- video1Server2Id = id
+ const { id } = await servers[1].videos.upload({ attributes: { name: 'video 1 server 2' } })
+ video1Server2 = await servers[1].videos.get({ id })
- await servers[1].videosCommand.view({ id: video1Server2UUID })
+ await servers[1].videos.view({ id })
}
await waitJobs(servers)
await waitJobs(servers)
}
+async function ensureSameFilenames (videoUUID: string) {
+ let webtorrentFilenames: string[]
+ let hlsFilenames: string[]
+
+ for (const server of servers) {
+ const video = await server.videos.getWithToken({ id: videoUUID })
+
+ // Ensure we use the same filenames that the origin
+
+ const localWebtorrentFilenames = video.files.map(f => basename(f.fileUrl)).sort()
+ const localHLSFilenames = video.streamingPlaylists[0].files.map(f => basename(f.fileUrl)).sort()
+
+ if (webtorrentFilenames) expect(webtorrentFilenames).to.deep.equal(localWebtorrentFilenames)
+ else webtorrentFilenames = localWebtorrentFilenames
+
+ if (hlsFilenames) expect(hlsFilenames).to.deep.equal(localHLSFilenames)
+ else hlsFilenames = localHLSFilenames
+ }
+
+ return { webtorrentFilenames, hlsFilenames }
+}
+
async function check1WebSeed (videoUUID?: string) {
- if (!videoUUID) videoUUID = video1Server2UUID
+ if (!videoUUID) videoUUID = video1Server2.uuid
const webseeds = [
- `http://localhost:${servers[1].port}/static/webseed/${videoUUID}`
+ `http://localhost:${servers[1].port}/static/webseed/`
]
for (const server of servers) {
// With token to avoid issues with video follow constraints
- const video = await server.videosCommand.getWithToken({ id: videoUUID })
+ const video = await server.videos.getWithToken({ id: videoUUID })
for (const f of video.files) {
- checkMagnetWebseeds(f, webseeds, server)
+ await checkMagnetWebseeds(f, webseeds, server)
}
}
+
+ await ensureSameFilenames(videoUUID)
}
async function check2Webseeds (videoUUID?: string) {
- if (!videoUUID) videoUUID = video1Server2UUID
+ if (!videoUUID) videoUUID = video1Server2.uuid
const webseeds = [
- `http://localhost:${servers[0].port}/static/redundancy/${videoUUID}`,
- `http://localhost:${servers[1].port}/static/webseed/${videoUUID}`
+ `http://localhost:${servers[0].port}/static/redundancy/`,
+ `http://localhost:${servers[1].port}/static/webseed/`
]
for (const server of servers) {
- const video = await server.videosCommand.get({ id: videoUUID })
+ const video = await server.videos.get({ id: videoUUID })
for (const file of video.files) {
- checkMagnetWebseeds(file, webseeds, server)
-
- await makeGetRequest({
- url: servers[0].url,
- statusCodeExpected: HttpStatusCode.OK_200,
- path: '/static/redundancy/' + `${videoUUID}-${file.resolution.id}.mp4`,
- contentType: null
- })
- await makeGetRequest({
- url: servers[1].url,
- statusCodeExpected: HttpStatusCode.OK_200,
- path: `/static/webseed/${videoUUID}-${file.resolution.id}.mp4`,
- contentType: null
- })
+ await checkMagnetWebseeds(file, webseeds, server)
}
}
+ const { webtorrentFilenames } = await ensureSameFilenames(videoUUID)
+
const directories = [
'test' + servers[0].internalServerNumber + '/redundancy',
'test' + servers[1].internalServerNumber + '/videos'
const files = await readdir(join(root(), directory))
expect(files).to.have.length.at.least(4)
- for (const resolution of [ 240, 360, 480, 720 ]) {
- expect(files.find(f => f === `${videoUUID}-${resolution}.mp4`)).to.not.be.undefined
- }
+ // Ensure we files exist on disk
+ expect(files.find(f => webtorrentFilenames.includes(f))).to.exist
}
}
async function check0PlaylistRedundancies (videoUUID?: string) {
- if (!videoUUID) videoUUID = video1Server2UUID
+ if (!videoUUID) videoUUID = video1Server2.uuid
for (const server of servers) {
// With token to avoid issues with video follow constraints
- const video = await server.videosCommand.getWithToken({ id: videoUUID })
+ const video = await server.videos.getWithToken({ id: videoUUID })
expect(video.streamingPlaylists).to.be.an('array')
expect(video.streamingPlaylists).to.have.lengthOf(1)
expect(video.streamingPlaylists[0].redundancies).to.have.lengthOf(0)
}
+
+ await ensureSameFilenames(videoUUID)
}
async function check1PlaylistRedundancies (videoUUID?: string) {
- if (!videoUUID) videoUUID = video1Server2UUID
+ if (!videoUUID) videoUUID = video1Server2.uuid
for (const server of servers) {
- const video = await server.videosCommand.get({ id: videoUUID })
+ const video = await server.videos.get({ id: videoUUID })
expect(video.streamingPlaylists).to.have.lengthOf(1)
expect(video.streamingPlaylists[0].redundancies).to.have.lengthOf(1)
expect(redundancy.baseUrl).to.equal(servers[0].url + '/static/redundancy/hls/' + videoUUID)
}
- const baseUrlPlaylist = servers[1].url + '/static/streaming-playlists/hls'
- const baseUrlSegment = servers[0].url + '/static/redundancy/hls'
+ const baseUrlPlaylist = servers[1].url + '/static/streaming-playlists/hls/' + videoUUID
+ const baseUrlSegment = servers[0].url + '/static/redundancy/hls/' + videoUUID
- const video = await servers[0].videosCommand.get({ id: videoUUID })
+ const video = await servers[0].videos.get({ id: videoUUID })
const hlsPlaylist = video.streamingPlaylists[0]
for (const resolution of [ 240, 360, 480, 720 ]) {
- await checkSegmentHash({ server: servers[1], baseUrlPlaylist, baseUrlSegment, videoUUID, resolution, hlsPlaylist })
+ await checkSegmentHash({ server: servers[1], baseUrlPlaylist, baseUrlSegment, resolution, hlsPlaylist })
}
+ const { hlsFilenames } = await ensureSameFilenames(videoUUID)
+
const directories = [
'test' + servers[0].internalServerNumber + '/redundancy/hls',
'test' + servers[1].internalServerNumber + '/streaming-playlists/hls'
const files = await readdir(join(root(), directory, videoUUID))
expect(files).to.have.length.at.least(4)
- for (const resolution of [ 240, 360, 480, 720 ]) {
- const filename = `${videoUUID}-${resolution}-fragmented.mp4`
-
- expect(files.find(f => f === filename)).to.not.be.undefined
- }
+ // Ensure we files exist on disk
+ expect(files.find(f => hlsFilenames.includes(f))).to.exist
}
}
statsLength = 2
}
- const data = await servers[0].statsCommand.get()
+ const data = await servers[0].stats.get()
expect(data.videosRedundancy).to.have.lengthOf(statsLength)
const stat = data.videosRedundancy[0]
}
async function findServerFollows () {
- const body = await servers[0].followsCommand.getFollowings({ start: 0, count: 5, sort: '-createdAt' })
+ const body = await servers[0].follows.getFollowings({ start: 0, count: 5, sort: '-createdAt' })
const follows = body.data
const server2 = follows.find(f => f.following.host === `localhost:${servers[1].port}`)
const server3 = follows.find(f => f.following.host === `localhost:${servers[2].port}`)
}
async function enableRedundancyOnServer1 () {
- await servers[0].redundancyCommand.updateRedundancy({ host: servers[1].host, redundancyAllowed: true })
+ await servers[0].redundancy.updateRedundancy({ host: servers[1].host, redundancyAllowed: true })
const { server2, server3 } = await findServerFollows()
}
async function disableRedundancyOnServer1 () {
- await servers[0].redundancyCommand.updateRedundancy({ host: servers[1].host, redundancyAllowed: false })
+ await servers[0].redundancy.updateRedundancy({ host: servers[1].host, redundancyAllowed: false })
const { server2, server3 } = await findServerFollows()
before(function () {
this.timeout(120000)
- return flushAndRunServers(strategy)
+ return createServers(strategy)
})
it('Should have 1 webseed on the first video', async function () {
this.timeout(80000)
await waitJobs(servers)
- await servers[0].serversCommand.waitUntilLog('Duplicated ', 5)
+ await servers[0].servers.waitUntilLog('Duplicated ', 5)
await waitJobs(servers)
await check2Webseeds()
await check1WebSeed()
await check0PlaylistRedundancies()
- await checkVideoFilesWereRemoved(video1Server2UUID, servers[0], [ 'videos', join('playlists', 'hls') ])
+ await checkVideoFilesWereRemoved({ server: servers[0], video: video1Server2, onlyVideoFiles: true })
})
after(async function () {
before(function () {
this.timeout(120000)
- return flushAndRunServers(strategy)
+ return createServers(strategy)
})
it('Should have 1 webseed on the first video', async function () {
this.timeout(80000)
await waitJobs(servers)
- await servers[0].serversCommand.waitUntilLog('Duplicated ', 5)
+ await servers[0].servers.waitUntilLog('Duplicated ', 5)
+ await waitJobs(servers)
+
+ await check2Webseeds()
+ await check1PlaylistRedundancies()
+ await checkStatsWith1Redundancy(strategy)
+ })
+
+ it('Should unfollow server 3 and keep duplicated videos', async function () {
+ this.timeout(80000)
+
+ await servers[0].follows.unfollow({ target: servers[2] })
+
await waitJobs(servers)
+ await wait(5000)
await check2Webseeds()
await check1PlaylistRedundancies()
await checkStatsWith1Redundancy(strategy)
})
- it('Should unfollow on server 1 and remove duplicated videos', async function () {
+ it('Should unfollow server 2 and remove duplicated videos', async function () {
this.timeout(80000)
- await servers[0].followsCommand.unfollow({ target: servers[1] })
+ await servers[0].follows.unfollow({ target: servers[1] })
await waitJobs(servers)
await wait(5000)
await check1WebSeed()
await check0PlaylistRedundancies()
- await checkVideoFilesWereRemoved(video1Server2UUID, servers[0], [ 'videos' ])
+ await checkVideoFilesWereRemoved({ server: servers[0], video: video1Server2, onlyVideoFiles: true })
})
after(async function () {
before(function () {
this.timeout(120000)
- return flushAndRunServers(strategy, { min_views: 3 })
+ return createServers(strategy, { min_views: 3 })
})
it('Should have 1 webseed on the first video', async function () {
it('Should view 2 times the first video to have > min_views config', async function () {
this.timeout(80000)
- await servers[0].videosCommand.view({ id: video1Server2UUID })
- await servers[2].videosCommand.view({ id: video1Server2UUID })
+ await servers[0].videos.view({ id: video1Server2.uuid })
+ await servers[2].videos.view({ id: video1Server2.uuid })
await wait(10000)
await waitJobs(servers)
this.timeout(80000)
await waitJobs(servers)
- await servers[0].serversCommand.waitUntilLog('Duplicated ', 5)
+ await servers[0].servers.waitUntilLog('Duplicated ', 5)
await waitJobs(servers)
await check2Webseeds()
it('Should remove the video and the redundancy files', async function () {
this.timeout(20000)
- await servers[1].videosCommand.remove({ id: video1Server2UUID })
+ await saveVideoInServers(servers, video1Server2.uuid)
+ await servers[1].videos.remove({ id: video1Server2.uuid })
await waitJobs(servers)
for (const server of servers) {
- await checkVideoFilesWereRemoved(video1Server2UUID, server)
+ await checkVideoFilesWereRemoved({ server, video: server.store.videoDetails })
}
})
before(async function () {
this.timeout(120000)
- await flushAndRunServers(strategy, { min_views: 3 }, false)
+ await createServers(strategy, { min_views: 3 }, false)
})
it('Should have 0 playlist redundancy on the first video', async function () {
it('Should have 1 redundancy on the first video', async function () {
this.timeout(160000)
- await servers[0].videosCommand.view({ id: video1Server2UUID })
- await servers[2].videosCommand.view({ id: video1Server2UUID })
+ await servers[0].videos.view({ id: video1Server2.uuid })
+ await servers[2].videos.view({ id: video1Server2.uuid })
await wait(10000)
await waitJobs(servers)
await waitJobs(servers)
- await servers[0].serversCommand.waitUntilLog('Duplicated ', 1)
+ await servers[0].servers.waitUntilLog('Duplicated ', 1)
await waitJobs(servers)
await check1PlaylistRedundancies()
it('Should remove the video and the redundancy files', async function () {
this.timeout(20000)
- await servers[1].videosCommand.remove({ id: video1Server2UUID })
+ await saveVideoInServers(servers, video1Server2.uuid)
+ await servers[1].videos.remove({ id: video1Server2.uuid })
await waitJobs(servers)
for (const server of servers) {
- await checkVideoFilesWereRemoved(video1Server2UUID, server)
+ await checkVideoFilesWereRemoved({ server, video: server.store.videoDetails })
}
})
before(function () {
this.timeout(120000)
- return flushAndRunServers(null)
+ return createServers(null)
})
it('Should have 1 webseed on the first video', async function () {
})
it('Should create a redundancy on first video', async function () {
- await servers[0].redundancyCommand.addVideo({ videoId: video1Server2Id })
+ await servers[0].redundancy.addVideo({ videoId: video1Server2.id })
})
it('Should have 2 webseeds on the first video', async function () {
this.timeout(80000)
await waitJobs(servers)
- await servers[0].serversCommand.waitUntilLog('Duplicated ', 5)
+ await servers[0].servers.waitUntilLog('Duplicated ', 5)
await waitJobs(servers)
await check2Webseeds()
it('Should manually remove redundancies on server 1 and remove duplicated videos', async function () {
this.timeout(80000)
- const body = await servers[0].redundancyCommand.listVideos({ target: 'remote-videos' })
+ const body = await servers[0].redundancy.listVideos({ target: 'remote-videos' })
const videos = body.data
expect(videos).to.have.lengthOf(1)
const video = videos[0]
for (const r of video.redundancies.files.concat(video.redundancies.streamingPlaylists)) {
- await servers[0].redundancyCommand.removeVideo({ redundancyId: r.id })
+ await servers[0].redundancy.removeVideo({ redundancyId: r.id })
}
await waitJobs(servers)
await check1WebSeed()
await check0PlaylistRedundancies()
- await checkVideoFilesWereRemoved(video1Server2UUID, servers[0], [ 'videos' ])
+ await checkVideoFilesWereRemoved({ server: servers[0], video: video1Server2, onlyVideoFiles: true })
})
after(async function () {
describe('Test expiration', function () {
const strategy = 'recently-added'
- async function checkContains (servers: ServerInfo[], str: string) {
+ async function checkContains (servers: PeerTubeServer[], str: string) {
for (const server of servers) {
- const video = await server.videosCommand.get({ id: video1Server2UUID })
+ const video = await server.videos.get({ id: video1Server2.uuid })
for (const f of video.files) {
expect(f.magnetUri).to.contain(str)
}
}
- async function checkNotContains (servers: ServerInfo[], str: string) {
+ async function checkNotContains (servers: PeerTubeServer[], str: string) {
for (const server of servers) {
- const video = await server.videosCommand.get({ id: video1Server2UUID })
+ const video = await server.videos.get({ id: video1Server2.uuid })
for (const f of video.files) {
expect(f.magnetUri).to.not.contain(str)
before(async function () {
this.timeout(120000)
- await flushAndRunServers(strategy, { min_lifetime: '7 seconds', min_views: 0 })
+ await createServers(strategy, { min_lifetime: '7 seconds', min_views: 0 })
await enableRedundancyOnServer1()
})
before(async function () {
this.timeout(120000)
- await flushAndRunServers(strategy, { min_lifetime: '7 seconds', min_views: 0 })
+ await createServers(strategy, { min_lifetime: '7 seconds', min_views: 0 })
await enableRedundancyOnServer1()
await waitJobs(servers)
- await servers[0].serversCommand.waitUntilLog('Duplicated ', 5)
+ await servers[0].servers.waitUntilLog('Duplicated ', 5)
await waitJobs(servers)
- await check2Webseeds(video1Server2UUID)
- await check1PlaylistRedundancies(video1Server2UUID)
+ await check2Webseeds()
+ await check1PlaylistRedundancies()
await checkStatsWith1Redundancy(strategy)
- const { uuid } = await servers[1].videosCommand.upload({ attributes: { name: 'video 2 server 2', privacy: VideoPrivacy.PRIVATE } })
+ const { uuid } = await servers[1].videos.upload({ attributes: { name: 'video 2 server 2', privacy: VideoPrivacy.PRIVATE } })
video2Server2UUID = uuid
// Wait transcoding before federation
await waitJobs(servers)
- await servers[1].videosCommand.update({ id: video2Server2UUID, attributes: { privacy: VideoPrivacy.PUBLIC } })
+ await servers[1].videos.update({ id: video2Server2UUID, attributes: { privacy: VideoPrivacy.PUBLIC } })
})
it('Should cache video 2 webseeds on the first video', async function () {
await wait(1000)
try {
- await check1WebSeed(video1Server2UUID)
- await check0PlaylistRedundancies(video1Server2UUID)
+ await check1WebSeed()
+ await check0PlaylistRedundancies()
await check2Webseeds(video2Server2UUID)
await check1PlaylistRedundancies(video2Server2UUID)
await waitJobs(servers)
await killallServers([ servers[0] ])
- await reRunServer(servers[0], {
+ await servers[0].run({
redundancy: {
videos: {
check_interval: '1 second',
await waitJobs(servers)
- await checkVideoFilesWereRemoved(video1Server2UUID, servers[0], [ join('redundancy', 'hls') ])
+ await checkVideoFilesWereRemoved({ server: servers[0], video: video1Server2, onlyVideoFiles: true })
})
after(async function () {