Commit Graph

73 Commits

Author SHA1 Message Date
Jelle Besseling 0305db28c9
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>
2021-08-17 08:26:20 +02:00
Chocobozzz 2e980ed30d
Simplify createServer args 2021-07-22 12:08:02 +02:00
Chocobozzz 254d3579f5
Use an object to represent a server 2021-07-20 15:27:18 +02:00
Chocobozzz 89d241a79c
Shorter server command names 2021-07-20 15:27:18 +02:00
Chocobozzz d23dd9fbfc
Introduce videos command 2021-07-20 15:27:18 +02:00
Chocobozzz 7926c5f9b3
Introduce user command 2021-07-20 15:27:18 +02:00
Chocobozzz 41d1d07501
Introduce login command 2021-07-20 15:27:18 +02:00
Chocobozzz 6c5065a011
Introduce server commands 2021-07-20 15:27:18 +02:00
Chocobozzz dd0ebb7151
Introduce notifications command 2021-07-20 15:27:18 +02:00
Chocobozzz 9293139fde
Introduce sql command 2021-07-20 15:27:18 +02:00
Chocobozzz 078f17e6d9
Fix CLI tools 2021-07-20 15:27:18 +02:00
Chocobozzz 12edc1495a
Introduce comments command 2021-07-20 15:27:18 +02:00
Chocobozzz a54618880c
Introduce channels command 2021-07-20 15:27:18 +02:00
Chocobozzz 57f879a540
Introduce streaming playlists command 2021-07-20 15:27:18 +02:00
Chocobozzz 6910f20f11
Introduce import command 2021-07-20 15:27:18 +02:00
Chocobozzz 313228e9c3
Introduce history command 2021-07-20 15:27:18 +02:00
Chocobozzz e6346d59e6
Introduce playlist command 2021-07-20 15:27:18 +02:00
Chocobozzz 72cbfc5695
Introduce change ownership command 2021-07-20 15:27:18 +02:00
Chocobozzz a2470c9f4b
Introduce captions command 2021-07-20 15:27:17 +02:00
Chocobozzz e3d15a6a9a
Introduce blacklist command 2021-07-20 15:27:17 +02:00
Chocobozzz d897210c2d
Introduce services command 2021-07-20 15:27:17 +02:00
Chocobozzz 4f2199144e
Introduce live command 2021-07-20 15:27:17 +02:00
Chocobozzz 2c27e70471
Introduce subscriptions command 2021-07-20 15:27:17 +02:00
Chocobozzz 5f8bd4cbb1
Introduce blocklist command 2021-07-20 15:27:17 +02:00
Chocobozzz 9fff08cf83
Introduce accounts command 2021-07-20 15:27:17 +02:00
Chocobozzz 87e2635a50
Introduce socket io command 2021-07-20 15:27:17 +02:00
Chocobozzz 65e6e2602c
Introduce config command 2021-07-20 15:27:17 +02:00
Chocobozzz bc8090411d
Introduce stats command 2021-07-20 15:27:17 +02:00
Chocobozzz dab047092b
Introduce redundancy command 2021-07-20 15:27:17 +02:00
Chocobozzz ae2abfd3ae
Introduce plugins command 2021-07-20 15:27:17 +02:00
Chocobozzz 9c6327f803
Introduce jobs command 2021-07-20 15:27:17 +02:00
Chocobozzz c3d29f694b
Introduce follows command 2021-07-20 15:27:17 +02:00
Chocobozzz 883a901908
Introduce debug command 2021-07-20 15:27:17 +02:00
Chocobozzz a9c58393d3
Introduce contact form command 2021-07-20 15:27:17 +02:00
Chocobozzz af971e06c6
Introduce search command 2021-07-20 15:27:17 +02:00
Chocobozzz 23a3a8827c
Introduce overviews command 2021-07-20 15:27:17 +02:00
Chocobozzz 0c1a77e9cc
Introduce abuse command 2021-07-20 15:27:17 +02:00
Chocobozzz a92ddacb38
Introduce logs command 2021-07-20 15:27:16 +02:00
Chocobozzz c1bc8ee478
Introduce feed command 2021-07-20 15:27:16 +02:00
Chocobozzz e8bd7ce7cc
Introduce CustomPage command 2021-07-20 15:27:16 +02:00
Chocobozzz 329619b345
Introduce CLI command 2021-07-20 15:27:16 +02:00
Chocobozzz d4a8e7a65f Support short uuid for GET video/playlist 2021-06-29 14:56:35 +02:00
Chocobozzz aea0b0e7cd
Inject server config in HTML 2021-05-14 13:37:23 +02:00
kontrollanten f6d6e7f861
Resumable video uploads (#3933)
* WIP: resumable video uploads

relates to #324

* fix review comments

* video upload: error handling

* fix audio upload

* fixes after self review

* Update server/controllers/api/videos/index.ts

Co-authored-by: Rigel Kent <par@rigelk.eu>

* Update server/middlewares/validators/videos/videos.ts

Co-authored-by: Rigel Kent <par@rigelk.eu>

* Update server/controllers/api/videos/index.ts

Co-authored-by: Rigel Kent <par@rigelk.eu>

* update after code review

* refactor upload route

- restore multipart upload route
- move resumable to dedicated upload-resumable route
- move checks to middleware
- do not leak internal fs structure in response

* fix yarn.lock upon rebase

* factorize addVideo for reuse in both endpoints

* add resumable upload API to openapi spec

* add initial test and test helper for resumable upload

* typings for videoAddResumable middleware

* avoid including aws and google packages via node-uploadx, by only including uploadx/core

* rename ex-isAudioBg to more explicit name mentioning it is a preview file for audio

* add video-upload-tmp-folder-cleaner job

* stronger typing of video upload middleware

* reduce dependency to @uploadx/core

* add audio upload test

* refactor resumable uploads cleanup from job to scheduler

* refactor resumable uploads scheduler to compare to last execution time

* make resumable upload validator to always cleanup on failure

* move legacy upload request building outside of uploadVideo test helper

* filter upload-resumable middlewares down to POST, PUT, DELETE

also begin to type metadata

* merge add duration functions

* stronger typings and documentation for uploadx behaviour, move init validator up

* refactor(client/video-edit): options > uploadxOptions

* refactor(client/video-edit): remove obsolete else

* scheduler/remove-dangling-resum: rename tag

* refactor(server/video): add UploadVideoFiles type

* refactor(mw/validators): restructure eslint disable

* refactor(mw/validators/videos): rename import

* refactor(client/vid-upload): rename html elem id

* refactor(sched/remove-dangl): move fn to method

* refactor(mw/async): add method typing

* refactor(mw/vali/video): double quote > single

* refactor(server/upload-resum): express use > all

* proper http methud enum server/middlewares/async.ts

* properly type http methods

* factorize common video upload validation steps

* add check for maximum partially uploaded file size

* fix audioBg use

* fix extname(filename) in addVideo

* document parameters for uploadx's resumable protocol

* clear META files in scheduler

* last audio refactor before cramming preview in the initial POST form data

* refactor as mulitpart/form-data initial post request

this allows preview/thumbnail uploads alongside the initial request,
and cleans up the upload form

* Add more tests for resumable uploads

* Refactor remove dangling resumable uploads

* Prepare changelog

* Add more resumable upload tests

* Remove user quota check for resumable uploads

* Fix upload error handler

* Update nginx template for upload-resumable

* Cleanup comment

* Remove unused express methods

* Prefer to use got instead of raw http

* Don't retry on error 500

Co-authored-by: Rigel Kent <par@rigelk.eu>
Co-authored-by: Rigel Kent <sendmemail@rigelk.eu>
Co-authored-by: Chocobozzz <me@florianbigard.com>
2021-05-10 11:13:41 +02:00
Chocobozzz f43db2f46e
Refactor auth flow
Reimplement some node-oauth2-server methods to remove hacky code needed by our external
login workflow
2021-03-24 18:18:41 +01:00
Chocobozzz a35a22797c Remove previous thumbnail if needed 2021-02-16 10:36:44 +01:00
Chocobozzz 6302d599cd Generate a name for caption files 2021-02-16 10:36:44 +01:00
Chocobozzz d1a2ce5ef3
Fix tmp tests 2021-02-02 13:45:58 +01:00
Chocobozzz 78d62f4d18
Fix and add skipping ping log tests 2021-01-13 09:38:19 +01:00
Chocobozzz fcb7712228
Fix tests 2021-01-11 10:33:29 +01:00