diff options
author | kontrollanten <6680299+kontrollanten@users.noreply.github.com> | 2021-05-10 11:13:41 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-10 11:13:41 +0200 |
commit | f6d6e7f861189a4446f406efb775a29688764b48 (patch) | |
tree | c3dda9958c3f189d4c39e8743c738d8c1fef4c2d /client/src/app/helpers/utils.ts | |
parent | d29ced1a8582d99b776f664475a157adcf555d98 (diff) | |
download | PeerTube-f6d6e7f861189a4446f406efb775a29688764b48.tar.gz PeerTube-f6d6e7f861189a4446f406efb775a29688764b48.tar.zst PeerTube-f6d6e7f861189a4446f406efb775a29688764b48.zip |
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>
Diffstat (limited to 'client/src/app/helpers/utils.ts')
-rw-r--r-- | client/src/app/helpers/utils.ts | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/client/src/app/helpers/utils.ts b/client/src/app/helpers/utils.ts index 17eb5effc..d6ac5b9b4 100644 --- a/client/src/app/helpers/utils.ts +++ b/client/src/app/helpers/utils.ts | |||
@@ -173,8 +173,8 @@ function isXPercentInViewport (el: HTMLElement, percentVisible: number) { | |||
173 | ) | 173 | ) |
174 | } | 174 | } |
175 | 175 | ||
176 | function uploadErrorHandler (parameters: { | 176 | function genericUploadErrorHandler (parameters: { |
177 | err: HttpErrorResponse | 177 | err: Pick<HttpErrorResponse, 'message' | 'status' | 'headers'> |
178 | name: string | 178 | name: string |
179 | notifier: Notifier | 179 | notifier: Notifier |
180 | sticky?: boolean | 180 | sticky?: boolean |
@@ -186,6 +186,9 @@ function uploadErrorHandler (parameters: { | |||
186 | if (err instanceof ErrorEvent) { // network error | 186 | if (err instanceof ErrorEvent) { // network error |
187 | message = $localize`The connection was interrupted` | 187 | message = $localize`The connection was interrupted` |
188 | notifier.error(message, title, null, sticky) | 188 | notifier.error(message, title, null, sticky) |
189 | } else if (err.status === HttpStatusCode.INTERNAL_SERVER_ERROR_500) { | ||
190 | message = $localize`The server encountered an error` | ||
191 | notifier.error(message, title, null, sticky) | ||
189 | } else if (err.status === HttpStatusCode.REQUEST_TIMEOUT_408) { | 192 | } else if (err.status === HttpStatusCode.REQUEST_TIMEOUT_408) { |
190 | message = $localize`Your ${name} file couldn't be transferred before the set timeout (usually 10min)` | 193 | message = $localize`Your ${name} file couldn't be transferred before the set timeout (usually 10min)` |
191 | notifier.error(message, title, null, sticky) | 194 | notifier.error(message, title, null, sticky) |
@@ -216,5 +219,5 @@ export { | |||
216 | isInViewport, | 219 | isInViewport, |
217 | isXPercentInViewport, | 220 | isXPercentInViewport, |
218 | listUserChannels, | 221 | listUserChannels, |
219 | uploadErrorHandler | 222 | genericUploadErrorHandler |
220 | } | 223 | } |