fixing tests to deal with new transcoding parameters

[github/Chocobozzz/PeerTube.git] / server / helpers / requests.ts

diff --git a/server/helpers/requests.ts b/server/helpers/requests.ts
index b31074373e2c9c449db2a20c475ff0846a6ee455..64e3ce663b13f8668483296047577f956e171bdb 100644 (file)
--- a/server/helpers/requests.ts
+++ b/server/helpers/requests.ts
@@ -1,83 +1,35 @@
-import * as replay from 'request-replay'
+import * as Bluebird from 'bluebird'
+import { createWriteStream } from 'fs'
 import * as request from 'request'
-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'
+
+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
+  }
+
+  return new Bluebird<{ response: request.RequestResponse, body: any }>((res, rej) => {
+    request(requestOptions, (err, response, body) => err ? rej(err) : res({ response, body }))
   })
 }
 
-type MakeSecureRequestParams = {
-  method: 'GET'|'POST'
-  toPod: PodInstance
-  path: string
-  sign: boolean
-  data?: Object
-}
-function makeSecureRequest (params: MakeSecureRequestParams) {
-  return new Promise<{ response: request.RequestResponse, body: any }>((res, rej) => {
-    const requestParams = {
-      url: REMOTE_SCHEME.HTTP + '://' + params.toPod.host + params.path,
-      json: {}
-    }
-
-    if (params.method !== 'POST') {
-      return rej(new Error('Cannot make a secure request with a non POST method.'))
-    }
-
-    // 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
-    }
+function doRequestAndSaveToFile (requestOptions: request.CoreOptions & request.UriOptions, destPath: string) {
+  return new Bluebird<void>((res, rej) => {
+    const file = createWriteStream(destPath)
+    file.on('finish', () => res())
 
-    request.post(requestParams, (err, response, body) => err ? rej(err) : res({ response, body }))
+    request(requestOptions)
+      .on('error', err => rej(err))
+      .pipe(file)
   })
 }
 
 // ---------------------------------------------------------------------------
 
 export {
-  makeRetryRequest,
-  makeSecureRequest
+  doRequest,
+  doRequestAndSaveToFile
 }