0305db28c9
* Add support for saving video files to object storage * Add support for custom url generation on s3 stored files Uses two config keys to support url generation that doesn't directly go to (compatible s3). Can be used to generate urls to any cache server or CDN. * Upload files to s3 concurrently and delete originals afterwards * Only publish after move to object storage is complete * Use base url instead of url template * Fix mistyped config field * Add rudenmentary way to download before transcode * Implement Chocobozzz suggestions https://github.com/Chocobozzz/PeerTube/pull/4290#issuecomment-891670478 The remarks in question: Try to use objectStorage prefix instead of s3 prefix for your function/variables/config names Prefer to use a tree for the config: s3.streaming_playlists_bucket -> object_storage.streaming_playlists.bucket Use uppercase for config: S3.STREAMING_PLAYLISTS_BUCKETINFO.bucket -> OBJECT_STORAGE.STREAMING_PLAYLISTS.BUCKET (maybe BUCKET_NAME instead of BUCKET) I suggest to rename moveJobsRunning to pendingMovingJobs (or better, create a dedicated videoJobInfo table with a pendingMove & videoId columns so we could also use this table to track pending transcoding jobs) https://github.com/Chocobozzz/PeerTube/pull/4290/files#diff-3e26d41ca4bda1de8e1747af70ca2af642abcc1e9e0bfb94239ff2165acfbde5R19 uses a string instead of an integer I think we should store the origin object storage URL in fileUrl, without base_url injection. Instead, inject the base_url at "runtime" so admins can easily change this configuration without running a script to update DB URLs * Import correct function * Support multipart upload * Remove import of node 15.0 module stream/promises * Extend maximum upload job length Using the same value as for redundancy downloading seems logical * Use dynamic part size for really large uploads Also adds very small part size for local testing * Fix decreasePendingMove query * Resolve various PR comments * Move to object storage after optimize * Make upload size configurable and increase default * Prune webtorrent files that are stored in object storage * Move files after transcoding jobs * Fix federation * Add video path manager * Support move to external storage job in client * Fix live object storage tests Co-authored-by: Chocobozzz <me@florianbigard.com>
310 lines
9.8 KiB
TypeScript
310 lines
9.8 KiB
TypeScript
/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
|
|
|
|
import 'mocha'
|
|
import * as chai from 'chai'
|
|
import { FfmpegCommand } from 'fluent-ffmpeg'
|
|
import {
|
|
checkLiveCleanupAfterSave,
|
|
cleanupTests,
|
|
ConfigCommand,
|
|
createMultipleServers,
|
|
doubleFollow,
|
|
PeerTubeServer,
|
|
setAccessTokensToServers,
|
|
setDefaultVideoChannel,
|
|
stopFfmpeg,
|
|
testFfmpegStreamError,
|
|
wait,
|
|
waitJobs,
|
|
waitUntilLivePublishedOnAllServers,
|
|
waitUntilLiveSavedOnAllServers
|
|
} from '@shared/extra-utils'
|
|
import { HttpStatusCode, LiveVideoCreate, VideoPrivacy, VideoState } from '@shared/models'
|
|
|
|
const expect = chai.expect
|
|
|
|
describe('Save replay setting', function () {
|
|
let servers: PeerTubeServer[] = []
|
|
let liveVideoUUID: string
|
|
let ffmpegCommand: FfmpegCommand
|
|
|
|
async function createLiveWrapper (saveReplay: boolean) {
|
|
if (liveVideoUUID) {
|
|
try {
|
|
await servers[0].videos.remove({ id: liveVideoUUID })
|
|
await waitJobs(servers)
|
|
} catch {}
|
|
}
|
|
|
|
const attributes: LiveVideoCreate = {
|
|
channelId: servers[0].store.channel.id,
|
|
privacy: VideoPrivacy.PUBLIC,
|
|
name: 'my super live',
|
|
saveReplay
|
|
}
|
|
|
|
const { uuid } = await servers[0].live.create({ fields: attributes })
|
|
return uuid
|
|
}
|
|
|
|
async function checkVideosExist (videoId: string, existsInList: boolean, expectedStatus?: number) {
|
|
for (const server of servers) {
|
|
const length = existsInList ? 1 : 0
|
|
|
|
const { data, total } = await server.videos.list()
|
|
expect(data).to.have.lengthOf(length)
|
|
expect(total).to.equal(length)
|
|
|
|
if (expectedStatus) {
|
|
await server.videos.get({ id: videoId, expectedStatus })
|
|
}
|
|
}
|
|
}
|
|
|
|
async function checkVideoState (videoId: string, state: VideoState) {
|
|
for (const server of servers) {
|
|
const video = await server.videos.get({ id: videoId })
|
|
expect(video.state.id).to.equal(state)
|
|
}
|
|
}
|
|
|
|
before(async function () {
|
|
this.timeout(120000)
|
|
|
|
servers = await createMultipleServers(2)
|
|
|
|
// Get the access tokens
|
|
await setAccessTokensToServers(servers)
|
|
await setDefaultVideoChannel(servers)
|
|
|
|
// Server 1 and server 2 follow each other
|
|
await doubleFollow(servers[0], servers[1])
|
|
|
|
await servers[0].config.updateCustomSubConfig({
|
|
newConfig: {
|
|
live: {
|
|
enabled: true,
|
|
allowReplay: true,
|
|
maxDuration: -1,
|
|
transcoding: {
|
|
enabled: false,
|
|
resolutions: ConfigCommand.getCustomConfigResolutions(true)
|
|
}
|
|
}
|
|
}
|
|
})
|
|
})
|
|
|
|
describe('With save replay disabled', function () {
|
|
|
|
before(async function () {
|
|
this.timeout(10000)
|
|
})
|
|
|
|
it('Should correctly create and federate the "waiting for stream" live', async function () {
|
|
this.timeout(20000)
|
|
|
|
liveVideoUUID = await createLiveWrapper(false)
|
|
|
|
await waitJobs(servers)
|
|
|
|
await checkVideosExist(liveVideoUUID, false, HttpStatusCode.OK_200)
|
|
await checkVideoState(liveVideoUUID, VideoState.WAITING_FOR_LIVE)
|
|
})
|
|
|
|
it('Should correctly have updated the live and federated it when streaming in the live', async function () {
|
|
this.timeout(30000)
|
|
|
|
ffmpegCommand = await servers[0].live.sendRTMPStreamInVideo({ videoId: liveVideoUUID })
|
|
|
|
await waitUntilLivePublishedOnAllServers(servers, liveVideoUUID)
|
|
|
|
await waitJobs(servers)
|
|
|
|
await checkVideosExist(liveVideoUUID, true, HttpStatusCode.OK_200)
|
|
await checkVideoState(liveVideoUUID, VideoState.PUBLISHED)
|
|
})
|
|
|
|
it('Should correctly delete the video files after the stream ended', async function () {
|
|
this.timeout(40000)
|
|
|
|
await stopFfmpeg(ffmpegCommand)
|
|
|
|
for (const server of servers) {
|
|
await server.live.waitUntilEnded({ videoId: liveVideoUUID })
|
|
}
|
|
await waitJobs(servers)
|
|
|
|
// Live still exist, but cannot be played anymore
|
|
await checkVideosExist(liveVideoUUID, false, HttpStatusCode.OK_200)
|
|
await checkVideoState(liveVideoUUID, VideoState.LIVE_ENDED)
|
|
|
|
// No resolutions saved since we did not save replay
|
|
await checkLiveCleanupAfterSave(servers[0], liveVideoUUID, [])
|
|
})
|
|
|
|
it('Should correctly terminate the stream on blacklist and delete the live', async function () {
|
|
this.timeout(40000)
|
|
|
|
liveVideoUUID = await createLiveWrapper(false)
|
|
|
|
ffmpegCommand = await servers[0].live.sendRTMPStreamInVideo({ videoId: liveVideoUUID })
|
|
|
|
await waitUntilLivePublishedOnAllServers(servers, liveVideoUUID)
|
|
|
|
await waitJobs(servers)
|
|
await checkVideosExist(liveVideoUUID, true, HttpStatusCode.OK_200)
|
|
|
|
await Promise.all([
|
|
servers[0].blacklist.add({ videoId: liveVideoUUID, reason: 'bad live', unfederate: true }),
|
|
testFfmpegStreamError(ffmpegCommand, true)
|
|
])
|
|
|
|
await waitJobs(servers)
|
|
|
|
await checkVideosExist(liveVideoUUID, false)
|
|
|
|
await servers[0].videos.get({ id: liveVideoUUID, expectedStatus: HttpStatusCode.UNAUTHORIZED_401 })
|
|
await servers[1].videos.get({ id: liveVideoUUID, expectedStatus: HttpStatusCode.NOT_FOUND_404 })
|
|
|
|
await wait(5000)
|
|
await waitJobs(servers)
|
|
await checkLiveCleanupAfterSave(servers[0], liveVideoUUID, [])
|
|
})
|
|
|
|
it('Should correctly terminate the stream on delete and delete the video', async function () {
|
|
this.timeout(40000)
|
|
|
|
liveVideoUUID = await createLiveWrapper(false)
|
|
|
|
ffmpegCommand = await servers[0].live.sendRTMPStreamInVideo({ videoId: liveVideoUUID })
|
|
|
|
await waitUntilLivePublishedOnAllServers(servers, liveVideoUUID)
|
|
|
|
await waitJobs(servers)
|
|
await checkVideosExist(liveVideoUUID, true, HttpStatusCode.OK_200)
|
|
|
|
await Promise.all([
|
|
testFfmpegStreamError(ffmpegCommand, true),
|
|
servers[0].videos.remove({ id: liveVideoUUID })
|
|
])
|
|
|
|
await wait(5000)
|
|
await waitJobs(servers)
|
|
|
|
await checkVideosExist(liveVideoUUID, false, HttpStatusCode.NOT_FOUND_404)
|
|
await checkLiveCleanupAfterSave(servers[0], liveVideoUUID, [])
|
|
})
|
|
})
|
|
|
|
describe('With save replay enabled', function () {
|
|
|
|
it('Should correctly create and federate the "waiting for stream" live', async function () {
|
|
this.timeout(20000)
|
|
|
|
liveVideoUUID = await createLiveWrapper(true)
|
|
|
|
await waitJobs(servers)
|
|
|
|
await checkVideosExist(liveVideoUUID, false, HttpStatusCode.OK_200)
|
|
await checkVideoState(liveVideoUUID, VideoState.WAITING_FOR_LIVE)
|
|
})
|
|
|
|
it('Should correctly have updated the live and federated it when streaming in the live', async function () {
|
|
this.timeout(20000)
|
|
|
|
ffmpegCommand = await servers[0].live.sendRTMPStreamInVideo({ videoId: liveVideoUUID })
|
|
await waitUntilLivePublishedOnAllServers(servers, liveVideoUUID)
|
|
|
|
await waitJobs(servers)
|
|
|
|
await checkVideosExist(liveVideoUUID, true, HttpStatusCode.OK_200)
|
|
await checkVideoState(liveVideoUUID, VideoState.PUBLISHED)
|
|
})
|
|
|
|
it('Should correctly have saved the live and federated it after the streaming', async function () {
|
|
this.timeout(30000)
|
|
|
|
await stopFfmpeg(ffmpegCommand)
|
|
|
|
await waitUntilLiveSavedOnAllServers(servers, liveVideoUUID)
|
|
await waitJobs(servers)
|
|
|
|
// Live has been transcoded
|
|
await checkVideosExist(liveVideoUUID, true, HttpStatusCode.OK_200)
|
|
await checkVideoState(liveVideoUUID, VideoState.PUBLISHED)
|
|
})
|
|
|
|
it('Should update the saved live and correctly federate the updated attributes', async function () {
|
|
this.timeout(30000)
|
|
|
|
await servers[0].videos.update({ id: liveVideoUUID, attributes: { name: 'video updated' } })
|
|
await waitJobs(servers)
|
|
|
|
for (const server of servers) {
|
|
const video = await server.videos.get({ id: liveVideoUUID })
|
|
expect(video.name).to.equal('video updated')
|
|
expect(video.isLive).to.be.false
|
|
}
|
|
})
|
|
|
|
it('Should have cleaned up the live files', async function () {
|
|
await checkLiveCleanupAfterSave(servers[0], liveVideoUUID, [ 720 ])
|
|
})
|
|
|
|
it('Should correctly terminate the stream on blacklist and blacklist the saved replay video', async function () {
|
|
this.timeout(40000)
|
|
|
|
liveVideoUUID = await createLiveWrapper(true)
|
|
|
|
ffmpegCommand = await servers[0].live.sendRTMPStreamInVideo({ videoId: liveVideoUUID })
|
|
await waitUntilLivePublishedOnAllServers(servers, liveVideoUUID)
|
|
|
|
await waitJobs(servers)
|
|
await checkVideosExist(liveVideoUUID, true, HttpStatusCode.OK_200)
|
|
|
|
await Promise.all([
|
|
servers[0].blacklist.add({ videoId: liveVideoUUID, reason: 'bad live', unfederate: true }),
|
|
testFfmpegStreamError(ffmpegCommand, true)
|
|
])
|
|
|
|
await waitJobs(servers)
|
|
|
|
await checkVideosExist(liveVideoUUID, false)
|
|
|
|
await servers[0].videos.get({ id: liveVideoUUID, expectedStatus: HttpStatusCode.UNAUTHORIZED_401 })
|
|
await servers[1].videos.get({ id: liveVideoUUID, expectedStatus: HttpStatusCode.NOT_FOUND_404 })
|
|
|
|
await wait(5000)
|
|
await waitJobs(servers)
|
|
await checkLiveCleanupAfterSave(servers[0], liveVideoUUID, [ 720 ])
|
|
})
|
|
|
|
it('Should correctly terminate the stream on delete and delete the video', async function () {
|
|
this.timeout(40000)
|
|
|
|
liveVideoUUID = await createLiveWrapper(true)
|
|
|
|
ffmpegCommand = await servers[0].live.sendRTMPStreamInVideo({ videoId: liveVideoUUID })
|
|
await waitUntilLivePublishedOnAllServers(servers, liveVideoUUID)
|
|
|
|
await waitJobs(servers)
|
|
await checkVideosExist(liveVideoUUID, true, HttpStatusCode.OK_200)
|
|
|
|
await Promise.all([
|
|
servers[0].videos.remove({ id: liveVideoUUID }),
|
|
testFfmpegStreamError(ffmpegCommand, true)
|
|
])
|
|
|
|
await wait(5000)
|
|
await waitJobs(servers)
|
|
|
|
await checkVideosExist(liveVideoUUID, false, HttpStatusCode.NOT_FOUND_404)
|
|
await checkLiveCleanupAfterSave(servers[0], liveVideoUUID, [])
|
|
})
|
|
})
|
|
|
|
after(async function () {
|
|
await cleanupTests(servers)
|
|
})
|
|
})
|