From 571389d43b8fc8aaf27e77c06f19b320b08dbbc9 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 10 Nov 2017 17:27:49 +0100 Subject: Make it compile at least --- server/helpers/requests.ts | 83 ++-------------------------------------------- 1 file changed, 2 insertions(+), 81 deletions(-) (limited to 'server/helpers/requests.ts') diff --git a/server/helpers/requests.ts b/server/helpers/requests.ts index 31cedd768..4b1deeadc 100644 --- a/server/helpers/requests.ts +++ b/server/helpers/requests.ts @@ -1,16 +1,6 @@ -import * as replay from 'request-replay' -import * as request from 'request' import * as Promise from 'bluebird' - -import { - RETRY_REQUESTS, - REMOTE_SCHEME, - CONFIG -} from '../initializers' -import { PodInstance } from '../models' -import { PodSignature } from '../../shared' -import { signObject } from './peertube-crypto' import { createWriteStream } from 'fs' +import * as request from 'request' function doRequest (requestOptions: request.CoreOptions & request.UriOptions) { return new Promise<{ response: request.RequestResponse, body: any }>((res, rej) => { @@ -27,78 +17,9 @@ function doRequestAndSaveToFile (requestOptions: request.CoreOptions & request.U }) } -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' ] - } - ) - }) -} - -type MakeSecureRequestParams = { - toPod: PodInstance - path: string - data?: Object -} -function makeSecureRequest (params: MakeSecureRequestParams) { - const requestParams: { - method: 'POST', - uri: string, - json: { - signature: PodSignature, - data: any - } - } = { - method: 'POST', - uri: REMOTE_SCHEME.HTTP + '://' + params.toPod.host + params.path, - json: { - signature: null, - data: null - } - } - - 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 - } - - sign(dataToSign).then(signature => { - requestParams.json.signature = { - host, // Which host we pretend to be - signature - } - - // If there are data information - if (params.data) { - requestParams.json.data = params.data - } - - return doRequest(requestParams) - }) -} - // --------------------------------------------------------------------------- export { doRequest, - doRequestAndSaveToFile, - makeRetryRequest, - makeSecureRequest + doRequestAndSaveToFile } -- cgit v1.2.3