X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Frequests.ts;h=57299eee137c256d7a118c3a7fe98bb69ac1b105;hb=67eeec8b955339120ff5d3c8286fdf0715e6270c;hp=74ed1d78657cf6566819bfb5eefe8e7821df04c1;hpb=e81f6ccf989d4573b59ec7b2bf2812fe3e9fb534;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/helpers/requests.ts b/server/helpers/requests.ts index 74ed1d786..57299eee1 100644 --- a/server/helpers/requests.ts +++ b/server/helpers/requests.ts @@ -1,15 +1,15 @@ import { createWriteStream, remove } from 'fs-extra' -import got, { CancelableRequest, Options as GotOptions, RequestError } from 'got' +import got, { CancelableRequest, Options as GotOptions, RequestError, Response } from 'got' import { HttpProxyAgent, HttpsProxyAgent } from 'hpagent' import { join } from 'path' import { CONFIG } from '../initializers/config' -import { ACTIVITY_PUB, PEERTUBE_VERSION, REQUEST_TIMEOUT, WEBSERVER } from '../initializers/constants' +import { ACTIVITY_PUB, BINARY_CONTENT_TYPES, PEERTUBE_VERSION, REQUEST_TIMEOUT, WEBSERVER } from '../initializers/constants' import { pipelinePromise } from './core-utils' import { processImage } from './image-utils' import { logger } from './logger' import { getProxy, isProxyEnabled } from './proxy' -const httpSignature = require('http-signature') +const httpSignature = require('@peertube/http-signature') export interface PeerTubeRequestError extends Error { statusCode?: number @@ -180,13 +180,30 @@ function getUserAgent () { return `PeerTube/${PEERTUBE_VERSION} (+${WEBSERVER.URL})` } +function isBinaryResponse (result: Response) { + return BINARY_CONTENT_TYPES.has(result.headers['content-type']) +} + +async function findLatestRedirection (url: string, options: PeerTubeRequestOptions, iteration = 1) { + if (iteration > 10) throw new Error('Too much iterations to find final URL ' + url) + + const { headers } = await peertubeGot(url, { followRedirect: false, ...buildGotOptions(options) }) + + if (headers.location) return findLatestRedirection(headers.location, options, iteration + 1) + + return url +} + // --------------------------------------------------------------------------- export { doRequest, doJSONRequest, doRequestAndSaveToFile, - downloadImage + isBinaryResponse, + downloadImage, + findLatestRedirection, + peertubeGot } // ---------------------------------------------------------------------------