aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/controllers
diff options
context:
space:
mode:
authorJelle Besseling <jelle@pingiun.com>2021-08-17 08:26:20 +0200
committerGitHub <noreply@github.com>2021-08-17 08:26:20 +0200
commit0305db28c98fd6cf43a3c50ba92c76215e99d512 (patch)
tree33b753a19728d9f453c1aa4f19b36ac797e5fe80 /server/controllers
parentf88ae8f5bc223579313b28582de9101944a4a814 (diff)
downloadPeerTube-0305db28c98fd6cf43a3c50ba92c76215e99d512.tar.gz
PeerTube-0305db28c98fd6cf43a3c50ba92c76215e99d512.tar.zst
PeerTube-0305db28c98fd6cf43a3c50ba92c76215e99d512.zip
Add support for saving video files to object storage (#4290)
* 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>
Diffstat (limited to 'server/controllers')
-rw-r--r--server/controllers/api/videos/upload.ts34
-rw-r--r--server/controllers/download.ts25
2 files changed, 42 insertions, 17 deletions
diff --git a/server/controllers/api/videos/upload.ts b/server/controllers/api/videos/upload.ts
index 89f50714d..5c740c041 100644
--- a/server/controllers/api/videos/upload.ts
+++ b/server/controllers/api/videos/upload.ts
@@ -1,12 +1,21 @@
1import * as express from 'express' 1import * as express from 'express'
2import { move } from 'fs-extra' 2import { move } from 'fs-extra'
3import { basename } from 'path'
3import { getLowercaseExtension } from '@server/helpers/core-utils' 4import { getLowercaseExtension } from '@server/helpers/core-utils'
4import { deleteResumableUploadMetaFile, getResumableUploadPath } from '@server/helpers/upload' 5import { deleteResumableUploadMetaFile, getResumableUploadPath } from '@server/helpers/upload'
5import { uuidToShort } from '@server/helpers/uuid' 6import { uuidToShort } from '@server/helpers/uuid'
6import { createTorrentAndSetInfoHash } from '@server/helpers/webtorrent' 7import { createTorrentAndSetInfoHash } from '@server/helpers/webtorrent'
7import { getLocalVideoActivityPubUrl } from '@server/lib/activitypub/url' 8import { getLocalVideoActivityPubUrl } from '@server/lib/activitypub/url'
8import { addOptimizeOrMergeAudioJob, buildLocalVideoFromReq, buildVideoThumbnailsFromReq, setVideoTags } from '@server/lib/video' 9import { generateWebTorrentVideoFilename } from '@server/lib/paths'
9import { generateWebTorrentVideoFilename, getVideoFilePath } from '@server/lib/video-paths' 10import {
11 addMoveToObjectStorageJob,
12 addOptimizeOrMergeAudioJob,
13 buildLocalVideoFromReq,
14 buildVideoThumbnailsFromReq,
15 setVideoTags
16} from '@server/lib/video'
17import { VideoPathManager } from '@server/lib/video-path-manager'
18import { buildNextVideoState } from '@server/lib/video-state'
10import { openapiOperationDoc } from '@server/middlewares/doc' 19import { openapiOperationDoc } from '@server/middlewares/doc'
11import { MVideo, MVideoFile, MVideoFullLight } from '@server/types/models' 20import { MVideo, MVideoFile, MVideoFullLight } from '@server/types/models'
12import { uploadx } from '@uploadx/core' 21import { uploadx } from '@uploadx/core'
@@ -139,23 +148,20 @@ async function addVideo (options: {
139 148
140 const videoData = buildLocalVideoFromReq(videoInfo, videoChannel.id) 149 const videoData = buildLocalVideoFromReq(videoInfo, videoChannel.id)
141 150
142 videoData.state = CONFIG.TRANSCODING.ENABLED 151 videoData.state = buildNextVideoState()
143 ? VideoState.TO_TRANSCODE
144 : VideoState.PUBLISHED
145
146 videoData.duration = videoPhysicalFile.duration // duration was added by a previous middleware 152 videoData.duration = videoPhysicalFile.duration // duration was added by a previous middleware
147 153
148 const video = new VideoModel(videoData) as MVideoFullLight 154 const video = new VideoModel(videoData) as MVideoFullLight
149 video.VideoChannel = videoChannel 155 video.VideoChannel = videoChannel
150 video.url = getLocalVideoActivityPubUrl(video) // We use the UUID, so set the URL after building the object 156 video.url = getLocalVideoActivityPubUrl(video) // We use the UUID, so set the URL after building the object
151 157
152 const videoFile = await buildNewFile(video, videoPhysicalFile) 158 const videoFile = await buildNewFile(videoPhysicalFile)
153 159
154 // Move physical file 160 // Move physical file
155 const destination = getVideoFilePath(video, videoFile) 161 const destination = VideoPathManager.Instance.getFSVideoFileOutputPath(video, videoFile)
156 await move(videoPhysicalFile.path, destination) 162 await move(videoPhysicalFile.path, destination)
157 // This is important in case if there is another attempt in the retry process 163 // This is important in case if there is another attempt in the retry process
158 videoPhysicalFile.filename = getVideoFilePath(video, videoFile) 164 videoPhysicalFile.filename = basename(destination)
159 videoPhysicalFile.path = destination 165 videoPhysicalFile.path = destination
160 166
161 const [ thumbnailModel, previewModel ] = await buildVideoThumbnailsFromReq({ 167 const [ thumbnailModel, previewModel ] = await buildVideoThumbnailsFromReq({
@@ -210,9 +216,13 @@ async function addVideo (options: {
210 216
211 createTorrentFederate(video, videoFile) 217 createTorrentFederate(video, videoFile)
212 .then(() => { 218 .then(() => {
213 if (video.state !== VideoState.TO_TRANSCODE) return 219 if (video.state === VideoState.TO_MOVE_TO_EXTERNAL_STORAGE) {
220 return addMoveToObjectStorageJob(video)
221 }
214 222
215 return addOptimizeOrMergeAudioJob(videoCreated, videoFile, user) 223 if (video.state === VideoState.TO_TRANSCODE) {
224 return addOptimizeOrMergeAudioJob(videoCreated, videoFile, user)
225 }
216 }) 226 })
217 .catch(err => logger.error('Cannot add optimize/merge audio job for %s.', videoCreated.uuid, { err, ...lTags(videoCreated.uuid) })) 227 .catch(err => logger.error('Cannot add optimize/merge audio job for %s.', videoCreated.uuid, { err, ...lTags(videoCreated.uuid) }))
218 228
@@ -227,7 +237,7 @@ async function addVideo (options: {
227 }) 237 })
228} 238}
229 239
230async function buildNewFile (video: MVideo, videoPhysicalFile: express.VideoUploadFile) { 240async function buildNewFile (videoPhysicalFile: express.VideoUploadFile) {
231 const videoFile = new VideoFileModel({ 241 const videoFile = new VideoFileModel({
232 extname: getLowercaseExtension(videoPhysicalFile.filename), 242 extname: getLowercaseExtension(videoPhysicalFile.filename),
233 size: videoPhysicalFile.size, 243 size: videoPhysicalFile.size,
diff --git a/server/controllers/download.ts b/server/controllers/download.ts
index ddacc1b68..ffe40d57e 100644
--- a/server/controllers/download.ts
+++ b/server/controllers/download.ts
@@ -3,9 +3,9 @@ import * as express from 'express'
3import { logger } from '@server/helpers/logger' 3import { logger } from '@server/helpers/logger'
4import { VideosTorrentCache } from '@server/lib/files-cache/videos-torrent-cache' 4import { VideosTorrentCache } from '@server/lib/files-cache/videos-torrent-cache'
5import { Hooks } from '@server/lib/plugins/hooks' 5import { Hooks } from '@server/lib/plugins/hooks'
6import { getVideoFilePath } from '@server/lib/video-paths' 6import { VideoPathManager } from '@server/lib/video-path-manager'
7import { MStreamingPlaylist, MVideo, MVideoFile, MVideoFullLight } from '@server/types/models' 7import { MStreamingPlaylist, MVideo, MVideoFile, MVideoFullLight } from '@server/types/models'
8import { HttpStatusCode, VideoStreamingPlaylistType } from '@shared/models' 8import { HttpStatusCode, VideoStorage, VideoStreamingPlaylistType } from '@shared/models'
9import { STATIC_DOWNLOAD_PATHS } from '../initializers/constants' 9import { STATIC_DOWNLOAD_PATHS } from '../initializers/constants'
10import { asyncMiddleware, videosDownloadValidator } from '../middlewares' 10import { asyncMiddleware, videosDownloadValidator } from '../middlewares'
11 11
@@ -81,7 +81,15 @@ async function downloadVideoFile (req: express.Request, res: express.Response) {
81 81
82 if (!checkAllowResult(res, allowParameters, allowedResult)) return 82 if (!checkAllowResult(res, allowParameters, allowedResult)) return
83 83
84 return res.download(getVideoFilePath(video, videoFile), `${video.name}-${videoFile.resolution}p${videoFile.extname}`) 84 if (videoFile.storage === VideoStorage.OBJECT_STORAGE) {
85 return res.redirect(videoFile.getObjectStorageUrl())
86 }
87
88 await VideoPathManager.Instance.makeAvailableVideoFile(video, videoFile, path => {
89 const filename = `${video.name}-${videoFile.resolution}p${videoFile.extname}`
90
91 return res.download(path, filename)
92 })
85} 93}
86 94
87async function downloadHLSVideoFile (req: express.Request, res: express.Response) { 95async function downloadHLSVideoFile (req: express.Request, res: express.Response) {
@@ -107,8 +115,15 @@ async function downloadHLSVideoFile (req: express.Request, res: express.Response
107 115
108 if (!checkAllowResult(res, allowParameters, allowedResult)) return 116 if (!checkAllowResult(res, allowParameters, allowedResult)) return
109 117
110 const filename = `${video.name}-${videoFile.resolution}p-${streamingPlaylist.getStringType()}${videoFile.extname}` 118 if (videoFile.storage === VideoStorage.OBJECT_STORAGE) {
111 return res.download(getVideoFilePath(streamingPlaylist, videoFile), filename) 119 return res.redirect(videoFile.getObjectStorageUrl())
120 }
121
122 await VideoPathManager.Instance.makeAvailableVideoFile(streamingPlaylist, videoFile, path => {
123 const filename = `${video.name}-${videoFile.resolution}p-${streamingPlaylist.getStringType()}${videoFile.extname}`
124
125 return res.download(path, filename)
126 })
112} 127}
113 128
114function getVideoFile (req: express.Request, files: MVideoFile[]) { 129function getVideoFile (req: express.Request, files: MVideoFile[]) {