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>
192 lines
5.1 KiB
TypeScript
192 lines
5.1 KiB
TypeScript
/* eslint-disable @typescript-eslint/no-floating-promises */
|
|
|
|
import * as request from 'supertest'
|
|
import { VideoChannelUpdate } from '../../models/videos/channel/video-channel-update.model'
|
|
import { VideoChannelCreate } from '../../models/videos/channel/video-channel-create.model'
|
|
import { makeDeleteRequest, makeGetRequest, updateImageRequest } from '../requests/requests'
|
|
import { ServerInfo } from '../server/servers'
|
|
import { MyUser, User } from '../../models/users/user.model'
|
|
import { getMyUserInformation } from '../users/users'
|
|
import { HttpStatusCode } from '../../../shared/core-utils/miscs/http-error-codes'
|
|
|
|
function getVideoChannelsList (url: string, start: number, count: number, sort?: string, withStats?: boolean) {
|
|
const path = '/api/v1/video-channels'
|
|
|
|
const req = request(url)
|
|
.get(path)
|
|
.query({ start: start })
|
|
.query({ count: count })
|
|
|
|
if (sort) req.query({ sort })
|
|
if (withStats) req.query({ withStats })
|
|
|
|
return req.set('Accept', 'application/json')
|
|
.expect(HttpStatusCode.OK_200)
|
|
.expect('Content-Type', /json/)
|
|
}
|
|
|
|
function getAccountVideoChannelsList (parameters: {
|
|
url: string
|
|
accountName: string
|
|
start?: number
|
|
count?: number
|
|
sort?: string
|
|
specialStatus?: HttpStatusCode
|
|
withStats?: boolean
|
|
search?: string
|
|
}) {
|
|
const {
|
|
url,
|
|
accountName,
|
|
start,
|
|
count,
|
|
sort = 'createdAt',
|
|
specialStatus = HttpStatusCode.OK_200,
|
|
withStats = false,
|
|
search
|
|
} = parameters
|
|
|
|
const path = '/api/v1/accounts/' + accountName + '/video-channels'
|
|
|
|
return makeGetRequest({
|
|
url,
|
|
path,
|
|
query: {
|
|
start,
|
|
count,
|
|
sort,
|
|
withStats,
|
|
search
|
|
},
|
|
statusCodeExpected: specialStatus
|
|
})
|
|
}
|
|
|
|
function addVideoChannel (
|
|
url: string,
|
|
token: string,
|
|
videoChannelAttributesArg: VideoChannelCreate,
|
|
expectedStatus = HttpStatusCode.OK_200
|
|
) {
|
|
const path = '/api/v1/video-channels/'
|
|
|
|
// Default attributes
|
|
let attributes = {
|
|
displayName: 'my super video channel',
|
|
description: 'my super channel description',
|
|
support: 'my super channel support'
|
|
}
|
|
attributes = Object.assign(attributes, videoChannelAttributesArg)
|
|
|
|
return request(url)
|
|
.post(path)
|
|
.send(attributes)
|
|
.set('Accept', 'application/json')
|
|
.set('Authorization', 'Bearer ' + token)
|
|
.expect(expectedStatus)
|
|
}
|
|
|
|
function updateVideoChannel (
|
|
url: string,
|
|
token: string,
|
|
channelName: string,
|
|
attributes: VideoChannelUpdate,
|
|
expectedStatus = HttpStatusCode.NO_CONTENT_204
|
|
) {
|
|
const body: any = {}
|
|
const path = '/api/v1/video-channels/' + channelName
|
|
|
|
if (attributes.displayName) body.displayName = attributes.displayName
|
|
if (attributes.description) body.description = attributes.description
|
|
if (attributes.support) body.support = attributes.support
|
|
if (attributes.bulkVideosSupportUpdate) body.bulkVideosSupportUpdate = attributes.bulkVideosSupportUpdate
|
|
|
|
return request(url)
|
|
.put(path)
|
|
.send(body)
|
|
.set('Accept', 'application/json')
|
|
.set('Authorization', 'Bearer ' + token)
|
|
.expect(expectedStatus)
|
|
}
|
|
|
|
function deleteVideoChannel (url: string, token: string, channelName: string, expectedStatus = HttpStatusCode.NO_CONTENT_204) {
|
|
const path = '/api/v1/video-channels/' + channelName
|
|
|
|
return request(url)
|
|
.delete(path)
|
|
.set('Accept', 'application/json')
|
|
.set('Authorization', 'Bearer ' + token)
|
|
.expect(expectedStatus)
|
|
}
|
|
|
|
function getVideoChannel (url: string, channelName: string) {
|
|
const path = '/api/v1/video-channels/' + channelName
|
|
|
|
return request(url)
|
|
.get(path)
|
|
.set('Accept', 'application/json')
|
|
.expect(HttpStatusCode.OK_200)
|
|
.expect('Content-Type', /json/)
|
|
}
|
|
|
|
function updateVideoChannelImage (options: {
|
|
url: string
|
|
accessToken: string
|
|
fixture: string
|
|
videoChannelName: string | number
|
|
type: 'avatar' | 'banner'
|
|
}) {
|
|
const path = `/api/v1/video-channels/${options.videoChannelName}/${options.type}/pick`
|
|
|
|
return updateImageRequest({ ...options, path, fieldname: options.type + 'file' })
|
|
}
|
|
|
|
function deleteVideoChannelImage (options: {
|
|
url: string
|
|
accessToken: string
|
|
videoChannelName: string | number
|
|
type: 'avatar' | 'banner'
|
|
}) {
|
|
const path = `/api/v1/video-channels/${options.videoChannelName}/${options.type}`
|
|
|
|
return makeDeleteRequest({
|
|
url: options.url,
|
|
token: options.accessToken,
|
|
path,
|
|
statusCodeExpected: 204
|
|
})
|
|
}
|
|
|
|
function setDefaultVideoChannel (servers: ServerInfo[]) {
|
|
const tasks: Promise<any>[] = []
|
|
|
|
for (const server of servers) {
|
|
const p = getMyUserInformation(server.url, server.accessToken)
|
|
.then(res => { server.videoChannel = (res.body as User).videoChannels[0] })
|
|
|
|
tasks.push(p)
|
|
}
|
|
|
|
return Promise.all(tasks)
|
|
}
|
|
|
|
async function getDefaultVideoChannel (url: string, token: string) {
|
|
const res = await getMyUserInformation(url, token)
|
|
|
|
return (res.body as MyUser).videoChannels[0].id
|
|
}
|
|
|
|
// ---------------------------------------------------------------------------
|
|
|
|
export {
|
|
updateVideoChannelImage,
|
|
getVideoChannelsList,
|
|
getAccountVideoChannelsList,
|
|
addVideoChannel,
|
|
updateVideoChannel,
|
|
deleteVideoChannel,
|
|
getVideoChannel,
|
|
setDefaultVideoChannel,
|
|
deleteVideoChannelImage,
|
|
getDefaultVideoChannel
|
|
}
|