PeerTube/packages/server-commands/src/requests/requests.ts

302 lines
8.5 KiB
TypeScript
Raw Normal View History

2021-07-16 03:42:24 -05:00
/* eslint-disable @typescript-eslint/no-floating-promises */
2020-01-31 09:56:52 -06:00
2020-04-29 02:04:42 -05:00
import { decode } from 'querystring'
2021-08-27 07:32:44 -05:00
import request from 'supertest'
2021-07-06 08:33:39 -05:00
import { URL } from 'url'
2024-02-12 03:49:45 -06:00
import { pick, queryParamsToObject } from '@peertube/peertube-core-utils'
import { HttpStatusCode, HttpStatusCodeType } from '@peertube/peertube-models'
import { buildAbsoluteFixturePath } from '@peertube/peertube-node-utils'
2019-01-29 01:37:25 -06:00
2021-07-16 03:42:24 -05:00
export type CommonRequestParams = {
2020-01-31 09:56:52 -06:00
url: string
path?: string
contentType?: string
2023-04-21 08:00:01 -05:00
responseType?: string
range?: string
2020-04-29 02:04:42 -05:00
redirects?: number
accept?: string
2021-07-13 04:05:15 -05:00
host?: string
2021-07-16 03:42:24 -05:00
token?: string
headers?: { [ name: string ]: string }
type?: string
xForwardedFor?: string
expectedStatus?: HttpStatusCodeType
2021-07-16 03:42:24 -05:00
}
2017-12-28 07:29:57 -06:00
2024-02-12 03:49:45 -06:00
export function makeRawRequest (options: {
url: string
token?: string
expectedStatus?: HttpStatusCodeType
2024-02-12 03:49:45 -06:00
responseType?: string
range?: string
query?: { [ id: string ]: string }
2023-04-21 08:00:01 -05:00
method?: 'GET' | 'POST'
2024-02-12 03:49:45 -06:00
accept?: string
headers?: { [ name: string ]: string }
2024-02-12 03:49:45 -06:00
redirects?: number
}) {
2024-02-12 03:49:45 -06:00
const { host, protocol, pathname, searchParams } = new URL(options.url)
2023-04-21 08:00:01 -05:00
const reqOptions = {
url: `${protocol}//${host}`,
path: pathname,
2024-02-12 03:49:45 -06:00
2022-11-15 09:55:57 -06:00
contentType: undefined,
2017-12-28 07:29:57 -06:00
2024-02-12 03:49:45 -06:00
query: {
...(options.query || {}),
...queryParamsToObject(searchParams)
},
...pick(options, [ 'expectedStatus', 'range', 'token', 'headers', 'responseType', 'accept', 'redirects' ])
2023-04-21 08:00:01 -05:00
}
if (options.method === 'POST') {
return makePostBodyRequest(reqOptions)
}
return makeGetRequest(reqOptions)
2017-12-28 07:29:57 -06:00
}
feat(transcription): groundwork chore: fiddling around some more chore: add ctranslate2 and timestamped chore: add performance markers chore: refactor test chore: change worflow name chore: ensure Python3 chore(duration): convert to chai/mocha syntahx chore(transcription): add individual tests for others transcribers chore(transcription): implement formats test of all implementations Also compare result of other implementation to the reference implementation chore(transcription): add more test case with other language and models size and local model chore(test): wip ctranslate 2 adapat chore(transcription): wip transcript file and benchmark chore(test): clean a bit chore(test): clean a bit chore(test): refacto timestamed spec chore(test): update workflow chore(test): fix glob expansion with sh chore(test): extract some hw info chore(test): fix async tests chore(benchmark): add model info feat(transcription): allow use of a local mode in timestamped-whisper feat(transcription): extract run and profiling info in own value object feat(transcription): extract run concept in own class an run more bench chore(transcription): somplify run object only a uuid is now needed and add more benchmark scenario docs(transcription): creates own package readme docs(transcription): add local model usage docs(transcription): update README fix(transcription): use fr video for better comparison chore(transcription): make openai comparison passed docs(timestamped): clea chore(transcription): change transcribers transcribe method signature Introduce whisper builtin model. fix(transcription): activate language detection Forbid transcript creation without a language. Add `languageDetection` flag to an engine and some assertions. Fix an issue in `whisper-ctranslate2` : https://github.com/Softcatala/whisper-ctranslate2/pull/93 chore(transcription): use PeerTube time helpers instead of custom ones Update existing time function to output an integer number of seconds and add a ms human-readable time formatter with hints of tests. chore(transcription): use PeerTube UUID helpers chore(transcription): enable CER evaluation Thanks to this recent fix in Jiwer <3 https://github.com/jitsi/jiwer/issues/873 chore(jiwer): creates JiWer package I'm not very happy with the TranscriptFileEvaluator constructor... suggestions ? chore(JiWer): add usage in README docs(jiwer): update JiWer readme chore(transcription): use FunMOOC video in fixtures chore(transcription): add proper english video fixture chore(transcription): use os tmp directory where relevant chore(transcription): fix jiwer cli test reference.txt chore(transcription): move benchmark out of tests chore(transcription): remove transcription workflow docs(transcription): add benchmark info fix(transcription): use ms precision in other transcribers chore(transcription): simplify most of the tests chore(transcription): remove slashes when building path with join chore(transcription): make fromPath method async chore(transcription): assert path to model is a directory for CTranslate2 transcriber chore(transcription): ctranslate2 assertion chore(transcription): ctranslate2 assertion chore(transcription): add preinstall script for Python dependencies chore(transcription): add download and unzip utils functions chore(transcription): add download and unzip utils functions chore(transcription): download & unzip models fixtures chore(transcription): zip chore(transcription): raise download file test timeout chore(transcription): simplify download file test chore(transcription): add transcriptions test to CI chore(transcription): raise test preconditions timeout chore(transcription): run preinstall scripts before running ci chore(transcription): create dedicated tmp folder for transcriber tests chore(transcription): raise timeout some more chore(transcription): raise timeout some more chore(transcription): raise timeout some more chore(transcription): raise timeout some more chore(transcription): raise timeout some more chore(transcription): raise timeout some more chore(transcription): raise timeout some more chore(transcription): raise timeout some more chore(transcription): use short video for local model test chore(transcription): raise timeout some more chore(transcription): raise timeout some more chore(transcription): raise timeout some more chore(transcription): setup verbosity based on NODE_ENV value
2024-03-29 04:34:45 -05:00
export const makeFileRequest = (url: string) => {
return makeRawRequest({
url,
responseType: 'arraybuffer',
redirects: 1,
expectedStatus: HttpStatusCode.OK_200
})
}
2024-02-12 03:49:45 -06:00
export function makeGetRequest (options: CommonRequestParams & {
2021-07-16 03:42:24 -05:00
query?: any
2021-09-07 08:16:26 -05:00
rawQuery?: string
2017-12-28 07:29:57 -06:00
}) {
2021-07-16 03:42:24 -05:00
const req = request(options.url).get(options.path)
2021-09-07 08:16:26 -05:00
if (options.query) req.query(options.query)
if (options.rawQuery) req.query(options.rawQuery)
2017-12-28 07:29:57 -06:00
2021-07-16 03:42:24 -05:00
return buildRequest(req, { contentType: 'application/json', expectedStatus: HttpStatusCode.BAD_REQUEST_400, ...options })
}
2017-12-28 07:29:57 -06:00
2024-02-12 03:49:45 -06:00
export function makeHTMLRequest (url: string, path: string) {
2021-07-16 03:42:24 -05:00
return makeGetRequest({
url,
path,
accept: 'text/html',
expectedStatus: HttpStatusCode.OK_200
})
}
2017-12-28 07:29:57 -06:00
2024-02-12 03:49:45 -06:00
// ---------------------------------------------------------------------------
export function makeActivityPubGetRequest (url: string, path: string, expectedStatus: HttpStatusCodeType = HttpStatusCode.OK_200) {
2021-07-16 03:42:24 -05:00
return makeGetRequest({
url,
path,
2022-07-13 04:58:01 -05:00
expectedStatus,
2021-07-16 03:42:24 -05:00
accept: 'application/activity+json,text/html;q=0.9,\\*/\\*;q=0.8'
})
2017-09-04 14:21:47 -05:00
}
2024-02-12 03:49:45 -06:00
export function makeActivityPubRawRequest (url: string, expectedStatus: HttpStatusCodeType = HttpStatusCode.OK_200) {
return makeRawRequest({
url,
expectedStatus,
accept: 'application/activity+json,text/html;q=0.9,\\*/\\*;q=0.8'
})
}
// ---------------------------------------------------------------------------
export function makeDeleteRequest (options: CommonRequestParams & {
2021-09-09 02:31:50 -05:00
query?: any
rawQuery?: string
}) {
2021-07-16 03:42:24 -05:00
const req = request(options.url).delete(options.path)
2021-09-09 02:31:50 -05:00
if (options.query) req.query(options.query)
if (options.rawQuery) req.query(options.rawQuery)
2021-07-16 03:42:24 -05:00
return buildRequest(req, { accept: 'application/json', expectedStatus: HttpStatusCode.BAD_REQUEST_400, ...options })
}
2024-02-12 03:49:45 -06:00
export function makeUploadRequest (options: CommonRequestParams & {
2020-01-31 09:56:52 -06:00
method?: 'POST' | 'PUT'
2021-07-15 03:02:54 -05:00
2020-01-31 09:56:52 -06:00
fields: { [ fieldName: string ]: any }
2020-10-30 09:09:00 -05:00
attaches?: { [ attachName: string ]: any | any[] }
2017-09-04 14:21:47 -05:00
}) {
2021-07-16 03:42:24 -05:00
let req = options.method === 'PUT'
? request(options.url).put(options.path)
: request(options.url).post(options.path)
2017-09-04 14:21:47 -05:00
2021-07-16 03:42:24 -05:00
req = buildRequest(req, { accept: 'application/json', expectedStatus: HttpStatusCode.BAD_REQUEST_400, ...options })
2021-07-16 03:42:24 -05:00
buildFields(req, options.fields)
2017-09-04 14:21:47 -05:00
2020-10-30 09:09:00 -05:00
Object.keys(options.attaches || {}).forEach(attach => {
2017-09-04 14:21:47 -05:00
const value = options.attaches[attach]
2021-11-10 07:34:02 -06:00
if (!value) return
2021-07-16 03:42:24 -05:00
2018-08-06 04:45:24 -05:00
if (Array.isArray(value)) {
req.attach(
attach,
value[0] instanceof Buffer
? value[0]
: buildAbsoluteFixturePath(value[0]),
value[1]
)
2018-08-06 04:45:24 -05:00
} else {
req.attach(
attach,
value instanceof Buffer
? value
: buildAbsoluteFixturePath(value)
)
2018-08-06 04:45:24 -05:00
}
2017-09-04 14:21:47 -05:00
})
2021-07-15 03:02:54 -05:00
return req
2017-09-04 14:21:47 -05:00
}
2024-02-12 03:49:45 -06:00
export function makePostBodyRequest (options: CommonRequestParams & {
2020-01-31 09:56:52 -06:00
fields?: { [ fieldName: string ]: any }
2017-09-04 14:21:47 -05:00
}) {
2021-07-16 03:42:24 -05:00
const req = request(options.url).post(options.path)
.send(options.fields)
2017-09-04 14:21:47 -05:00
2021-07-16 03:42:24 -05:00
return buildRequest(req, { accept: 'application/json', expectedStatus: HttpStatusCode.BAD_REQUEST_400, ...options })
2017-09-04 14:21:47 -05:00
}
2024-02-12 03:49:45 -06:00
export function makePutBodyRequest (options: {
2020-01-31 09:56:52 -06:00
url: string
path: string
token?: string
fields: { [ fieldName: string ]: any }
expectedStatus?: HttpStatusCodeType
headers?: { [name: string]: string }
}) {
2021-07-16 03:42:24 -05:00
const req = request(options.url).put(options.path)
.send(options.fields)
2021-07-16 03:42:24 -05:00
return buildRequest(req, { accept: 'application/json', expectedStatus: HttpStatusCode.BAD_REQUEST_400, ...options })
}
2024-02-12 03:49:45 -06:00
// ---------------------------------------------------------------------------
export async function getRedirectionUrl (url: string, token?: string) {
2024-02-12 03:49:45 -06:00
const res = await makeRawRequest({
url,
token,
2024-02-12 03:49:45 -06:00
redirects: 0,
expectedStatus: HttpStatusCode.FOUND_302
})
return res.headers['location']
}
// ---------------------------------------------------------------------------
export function decodeQueryString (path: string) {
2020-04-29 02:04:42 -05:00
return decode(path.split('?')[1])
}
2023-04-21 08:00:01 -05:00
// ---------------------------------------------------------------------------
2024-02-12 03:49:45 -06:00
export function unwrapBody <T> (test: request.Test): Promise<T> {
2021-07-06 02:55:05 -05:00
return test.then(res => res.body)
}
2024-02-12 03:49:45 -06:00
export function unwrapText (test: request.Test): Promise<string> {
2021-07-06 03:21:35 -05:00
return test.then(res => res.text)
}
2024-02-12 03:49:45 -06:00
export function unwrapBodyOrDecodeToJSON <T> (test: request.Test): Promise<T> {
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 01:26:20 -05:00
return test.then(res => {
if (res.body instanceof Buffer) {
2022-10-04 06:57:56 -05:00
try {
return JSON.parse(new TextDecoder().decode(res.body))
} catch (err) {
2023-05-02 06:51:06 -05:00
console.error('Cannot decode JSON.', { res, body: res.body instanceof Buffer ? res.body.toString() : res.body })
2023-04-21 08:00:01 -05:00
throw err
}
}
if (res.text) {
try {
return JSON.parse(res.text)
} catch (err) {
2023-05-02 06:51:06 -05:00
console.error('Cannot decode json', { res, text: res.text })
2022-10-04 06:57:56 -05:00
throw err
}
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 01:26:20 -05:00
}
return res.body
})
}
2024-02-12 03:49:45 -06:00
export function unwrapTextOrDecode (test: request.Test): Promise<string> {
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 01:26:20 -05:00
return test.then(res => res.text || new TextDecoder().decode(res.body))
}
2017-09-04 14:21:47 -05:00
// ---------------------------------------------------------------------------
2024-02-12 03:49:45 -06:00
// Private
2021-07-16 03:42:24 -05:00
// ---------------------------------------------------------------------------
function buildRequest (req: request.Test, options: CommonRequestParams) {
if (options.contentType) req.set('Accept', options.contentType)
2023-04-21 08:00:01 -05:00
if (options.responseType) req.responseType(options.responseType)
2021-07-16 03:42:24 -05:00
if (options.token) req.set('Authorization', 'Bearer ' + options.token)
if (options.range) req.set('Range', options.range)
if (options.accept) req.set('Accept', options.accept)
if (options.host) req.set('Host', options.host)
if (options.redirects) req.redirects(options.redirects)
if (options.xForwardedFor) req.set('X-Forwarded-For', options.xForwardedFor)
if (options.type) req.type(options.type)
Object.keys(options.headers || {}).forEach(name => {
req.set(name, options.headers[name])
})
2023-04-21 08:00:01 -05:00
return req.expect(res => {
if (options.expectedStatus && res.status !== options.expectedStatus) {
2023-04-21 08:00:01 -05:00
const err = new Error(`Expected status ${options.expectedStatus}, got ${res.status}. ` +
`\nThe server responded: "${res.body?.error ?? res.text}".\n` +
'You may take a closer look at the logs. To see how to do so, check out this page: ' +
2023-04-21 08:00:01 -05:00
'https://github.com/Chocobozzz/PeerTube/blob/develop/support/doc/development/tests.md#debug-server-logs');
(err as any).res = res
throw err
}
2023-04-21 08:00:01 -05:00
return res
})
2021-07-16 03:42:24 -05:00
}
function buildFields (req: request.Test, fields: { [ fieldName: string ]: any }, namespace?: string) {
if (!fields) return
let formKey: string
for (const key of Object.keys(fields)) {
if (namespace) formKey = `${namespace}[${key}]`
else formKey = key
if (fields[key] === undefined) continue
if (Array.isArray(fields[key]) && fields[key].length === 0) {
2021-08-18 04:12:21 -05:00
req.field(key, [])
2021-07-16 03:42:24 -05:00
continue
}
if (fields[key] !== null && typeof fields[key] === 'object') {
buildFields(req, fields[key], formKey)
} else {
req.field(formKey, fields[key])
}
}
2017-09-04 14:21:47 -05:00
}