-import * as Promise from 'bluebird'
-
-import {
- RETRY_REQUESTS,
- REMOTE_SCHEME,
- CONFIG
-} from '../initializers'
-import { PodInstance } from '../models'
-import { sign } from './peertube-crypto'
-
-type MakeRetryRequestParams = {
- url: string,
- method: 'GET'|'POST',
- json: Object
-}
-function makeRetryRequest (params: MakeRetryRequestParams) {
- return new Promise<{ response: request.RequestResponse, body: any }>((res, rej) => {
- replay(
- request(params, (err, response, body) => err ? rej(err) : res({ response, body })),
- {
- retries: RETRY_REQUESTS,
- factor: 3,
- maxTimeout: Infinity,
- errorCodes: [ 'EADDRINFO', 'ETIMEDOUT', 'ECONNRESET', 'ESOCKETTIMEDOUT', 'ENOTFOUND', 'ECONNREFUSED' ]
- }
- )
+import { ACTIVITY_PUB } from '../initializers/constants'
+import { processImage } from './image-utils'
+import { join } from 'path'
+import { logger } from './logger'
+import { CONFIG } from '../initializers/config'
+
+function doRequest <T> (
+ requestOptions: request.CoreOptions & request.UriOptions & { activityPub?: boolean },
+ bodyKBLimit = 1000 // 1MB
+): Bluebird<{ response: request.RequestResponse, body: T }> {
+ if (requestOptions.activityPub === true) {
+ if (!Array.isArray(requestOptions.headers)) requestOptions.headers = {}
+ requestOptions.headers['accept'] = ACTIVITY_PUB.ACCEPT_HEADER
+ }
+
+ return new Bluebird<{ response: request.RequestResponse, body: T }>((res, rej) => {
+ request(requestOptions, (err, response, body) => err ? rej(err) : res({ response, body }))
+ .on('data', onRequestDataLengthCheck(bodyKBLimit))