-
-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, callback: request.RequestCallback) {
- replay(
- request(params, callback),
- {
- retries: RETRY_REQUESTS,
- factor: 3,
- maxTimeout: Infinity,
- errorCodes: [ 'EADDRINFO', 'ETIMEDOUT', 'ECONNRESET', 'ESOCKETTIMEDOUT', 'ENOTFOUND', 'ECONNREFUSED' ]
- }
- )
-}
-
-type MakeSecureRequestParams = {
- method: 'GET'|'POST'
- toPod: PodInstance
- path: string
- sign: boolean
- data?: Object
-}
-function makeSecureRequest (params: MakeSecureRequestParams, callback: request.RequestCallback) {
- const requestParams = {
- url: REMOTE_SCHEME.HTTP + '://' + params.toPod.host + params.path,
- json: {}
+import { ACTIVITY_PUB } from '../initializers'
+
+function doRequest (
+ requestOptions: request.CoreOptions & request.UriOptions & { activityPub?: boolean }
+): Bluebird<{ response: request.RequestResponse, body: any }> {
+ if (requestOptions.activityPub === true) {
+ if (!Array.isArray(requestOptions.headers)) requestOptions.headers = {}
+ requestOptions.headers['accept'] = ACTIVITY_PUB.ACCEPT_HEADER