X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Frequests.ts;h=ce185a2c0248b3999e0902f2c08cb73abaf3956a;hb=265ba139ebf56bbdc1c65f6ea4f367774c691fc0;hp=b40fc8e39083101de377f64c70a9c60f35348e0f;hpb=69818c9394366b954b6ba3bd697bd9d2b09f2a16;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/helpers/requests.ts b/server/helpers/requests.ts
index b40fc8e39..ce185a2c0 100644
--- a/server/helpers/requests.ts
+++ b/server/helpers/requests.ts
@@ -1,78 +1,31 @@
-import * as replay from 'request-replay'
+import * as Promise from 'bluebird'
+import { createWriteStream } from 'fs'
 import * as request from 'request'
+import { ACTIVITY_PUB } from '../initializers'
 
-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: {}
-  }
-
-  if (params.method !== 'POST') {
-    return callback(new Error('Cannot make a secure request with a non POST method.'), null, null)
+function doRequest (requestOptions: request.CoreOptions & request.UriOptions & { activityPub?: boolean }) {
+  if (requestOptions.activityPub === true) {
+    if (!Array.isArray(requestOptions.headers)) requestOptions.headers = {}
+    requestOptions.headers['accept'] = ACTIVITY_PUB.ACCEPT_HEADER
   }
 
-  // Add signature if it is specified in the params
-  if (params.sign === true) {
-    const host = CONFIG.WEBSERVER.HOST
-
-    let dataToSign
-    if (params.data) {
-      dataToSign = params.data
-    } else {
-      // We do not have data to sign so we just take our host
-      // It is not ideal but the connection should be in HTTPS
-      dataToSign = host
-    }
-
-    requestParams.json['signature'] = {
-      host, // Which host we pretend to be
-      signature: sign(dataToSign)
-    }
-  }
-
-  // If there are data informations
-  if (params.data) {
-    requestParams.json['data'] = params.data
-  }
+  return new Promise<{ response: request.RequestResponse, body: any }>((res, rej) => {
+    request(requestOptions, (err, response, body) => err ? rej(err) : res({ response, body }))
+  })
+}
 
-  request.post(requestParams, callback)
+function doRequestAndSaveToFile (requestOptions: request.CoreOptions & request.UriOptions, destPath: string) {
+  return new Promise<request.RequestResponse>((res, rej) => {
+    request(requestOptions)
+      .on('response', response => res(response as request.RequestResponse))
+      .on('error', err => rej(err))
+      .pipe(createWriteStream(destPath))
+  })
 }
 
 // ---------------------------------------------------------------------------
 
 export {
-  makeRetryRequest,
-  makeSecureRequest
+  doRequest,
+  doRequestAndSaveToFile
 }