f6d6e7f861
* 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>
161 lines
5.1 KiB
TypeScript
161 lines
5.1 KiB
TypeScript
import { UploadFilesForCheck } from 'express'
|
|
import { values } from 'lodash'
|
|
import * as magnetUtil from 'magnet-uri'
|
|
import validator from 'validator'
|
|
import { VideoFilter, VideoPrivacy, VideoRateType } from '../../../shared'
|
|
import {
|
|
CONSTRAINTS_FIELDS,
|
|
MIMETYPES,
|
|
VIDEO_CATEGORIES,
|
|
VIDEO_LICENCES,
|
|
VIDEO_LIVE,
|
|
VIDEO_PRIVACIES,
|
|
VIDEO_RATE_TYPES,
|
|
VIDEO_STATES
|
|
} from '../../initializers/constants'
|
|
import { exists, isArray, isDateValid, isFileMimeTypeValid, isFileValid } from './misc'
|
|
|
|
const VIDEOS_CONSTRAINTS_FIELDS = CONSTRAINTS_FIELDS.VIDEOS
|
|
|
|
function isVideoFilterValid (filter: VideoFilter) {
|
|
return filter === 'local' || filter === 'all-local' || filter === 'all'
|
|
}
|
|
|
|
function isVideoCategoryValid (value: any) {
|
|
return value === null || VIDEO_CATEGORIES[value] !== undefined
|
|
}
|
|
|
|
function isVideoStateValid (value: any) {
|
|
return exists(value) && VIDEO_STATES[value] !== undefined
|
|
}
|
|
|
|
function isVideoLicenceValid (value: any) {
|
|
return value === null || VIDEO_LICENCES[value] !== undefined
|
|
}
|
|
|
|
function isVideoLanguageValid (value: any) {
|
|
return value === null ||
|
|
(typeof value === 'string' && validator.isLength(value, VIDEOS_CONSTRAINTS_FIELDS.LANGUAGE))
|
|
}
|
|
|
|
function isVideoDurationValid (value: string) {
|
|
return exists(value) && validator.isInt(value + '', VIDEOS_CONSTRAINTS_FIELDS.DURATION)
|
|
}
|
|
|
|
function isVideoTruncatedDescriptionValid (value: string) {
|
|
return exists(value) && validator.isLength(value, VIDEOS_CONSTRAINTS_FIELDS.TRUNCATED_DESCRIPTION)
|
|
}
|
|
|
|
function isVideoDescriptionValid (value: string) {
|
|
return value === null || (exists(value) && validator.isLength(value, VIDEOS_CONSTRAINTS_FIELDS.DESCRIPTION))
|
|
}
|
|
|
|
function isVideoSupportValid (value: string) {
|
|
return value === null || (exists(value) && validator.isLength(value, VIDEOS_CONSTRAINTS_FIELDS.SUPPORT))
|
|
}
|
|
|
|
function isVideoNameValid (value: string) {
|
|
return exists(value) && validator.isLength(value, VIDEOS_CONSTRAINTS_FIELDS.NAME)
|
|
}
|
|
|
|
function isVideoTagValid (tag: string) {
|
|
return exists(tag) && validator.isLength(tag, VIDEOS_CONSTRAINTS_FIELDS.TAG)
|
|
}
|
|
|
|
function isVideoTagsValid (tags: string[]) {
|
|
return tags === null || (
|
|
isArray(tags) &&
|
|
validator.isInt(tags.length.toString(), VIDEOS_CONSTRAINTS_FIELDS.TAGS) &&
|
|
tags.every(tag => isVideoTagValid(tag))
|
|
)
|
|
}
|
|
|
|
function isVideoViewsValid (value: string) {
|
|
return exists(value) && validator.isInt(value + '', VIDEOS_CONSTRAINTS_FIELDS.VIEWS)
|
|
}
|
|
|
|
function isVideoRatingTypeValid (value: string) {
|
|
return value === 'none' || values(VIDEO_RATE_TYPES).includes(value as VideoRateType)
|
|
}
|
|
|
|
function isVideoFileExtnameValid (value: string) {
|
|
return exists(value) && (value === VIDEO_LIVE.EXTENSION || MIMETYPES.VIDEO.EXT_MIMETYPE[value] !== undefined)
|
|
}
|
|
|
|
function isVideoFileMimeTypeValid (files: UploadFilesForCheck) {
|
|
return isFileMimeTypeValid(files, MIMETYPES.VIDEO.MIMETYPES_REGEX, 'videofile')
|
|
}
|
|
|
|
const videoImageTypes = CONSTRAINTS_FIELDS.VIDEOS.IMAGE.EXTNAME
|
|
.map(v => v.replace('.', ''))
|
|
.join('|')
|
|
const videoImageTypesRegex = `image/(${videoImageTypes})`
|
|
|
|
function isVideoImage (files: { [ fieldname: string ]: Express.Multer.File[] } | Express.Multer.File[], field: string) {
|
|
return isFileValid(files, videoImageTypesRegex, field, CONSTRAINTS_FIELDS.VIDEOS.IMAGE.FILE_SIZE.max, true)
|
|
}
|
|
|
|
function isVideoPrivacyValid (value: number) {
|
|
return VIDEO_PRIVACIES[value] !== undefined
|
|
}
|
|
|
|
function isScheduleVideoUpdatePrivacyValid (value: number) {
|
|
return value === VideoPrivacy.UNLISTED || value === VideoPrivacy.PUBLIC || value === VideoPrivacy.INTERNAL
|
|
}
|
|
|
|
function isVideoOriginallyPublishedAtValid (value: string | null) {
|
|
return value === null || isDateValid(value)
|
|
}
|
|
|
|
function isVideoFileInfoHashValid (value: string | null | undefined) {
|
|
return exists(value) && validator.isLength(value, VIDEOS_CONSTRAINTS_FIELDS.INFO_HASH)
|
|
}
|
|
|
|
function isVideoFileResolutionValid (value: string) {
|
|
return exists(value) && validator.isInt(value + '')
|
|
}
|
|
|
|
function isVideoFPSResolutionValid (value: string) {
|
|
return value === null || validator.isInt(value + '')
|
|
}
|
|
|
|
function isVideoFileSizeValid (value: string) {
|
|
return exists(value) && validator.isInt(value + '', VIDEOS_CONSTRAINTS_FIELDS.FILE_SIZE)
|
|
}
|
|
|
|
function isVideoMagnetUriValid (value: string) {
|
|
if (!exists(value)) return false
|
|
|
|
const parsed = magnetUtil.decode(value)
|
|
return parsed && isVideoFileInfoHashValid(parsed.infoHash)
|
|
}
|
|
|
|
// ---------------------------------------------------------------------------
|
|
|
|
export {
|
|
isVideoCategoryValid,
|
|
isVideoLicenceValid,
|
|
isVideoLanguageValid,
|
|
isVideoTruncatedDescriptionValid,
|
|
isVideoDescriptionValid,
|
|
isVideoFileInfoHashValid,
|
|
isVideoNameValid,
|
|
isVideoTagsValid,
|
|
isVideoFPSResolutionValid,
|
|
isScheduleVideoUpdatePrivacyValid,
|
|
isVideoOriginallyPublishedAtValid,
|
|
isVideoMagnetUriValid,
|
|
isVideoStateValid,
|
|
isVideoViewsValid,
|
|
isVideoRatingTypeValid,
|
|
isVideoFileExtnameValid,
|
|
isVideoFileMimeTypeValid,
|
|
isVideoDurationValid,
|
|
isVideoTagValid,
|
|
isVideoPrivacyValid,
|
|
isVideoFileResolutionValid,
|
|
isVideoFileSizeValid,
|
|
isVideoImage,
|
|
isVideoSupportValid,
|
|
isVideoFilterValid
|
|
}
|