Fix thumbnail processing

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

diff --git a/server/helpers/requests.ts b/server/helpers/requests.ts
index d67d460446e99a2aa22d6116f7928af90f5e05f8..5760ad1c1854dc617f164b00aa68fbd8dd5a9fe4 100644 (file)
--- a/server/helpers/requests.ts
+++ b/server/helpers/requests.ts
@@ -1,91 +1,45 @@
-import * as replay from 'request-replay'
+import * as Bluebird from 'bluebird'
+import { createWriteStream } from 'fs-extra'
 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 { 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'
+import { processImage } from './image-utils'
+import { extname } from 'path'
+
+function doRequest <T> (
+  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: T }>((res, rej) => {
+    request(requestOptions, (err, response, body) => err ? rej(err) : res({ response, body }))
   })
 }
 
-type MakeSecureRequestParams = {
-  method: 'GET'|'POST'
-  toPod: PodInstance
-  path: string
-  data?: Object
-}
-function makeSecureRequest (params: MakeSecureRequestParams) {
-  return new Promise<{ response: request.RequestResponse, body: any }>((res, rej) => {
-    const requestParams: {
-      url: string,
-      json: {
-        signature: PodSignature,
-        data: any
-      }
-    } = {
-      url: REMOTE_SCHEME.HTTP + '://' + params.toPod.host + params.path,
-      json: {
-        signature: null,
-        data: null
-      }
-    }
-
-    if (params.method !== 'POST') {
-      return rej(new Error('Cannot make a secure request with a non POST method.'))
-    }
+function doRequestAndSaveToFile (requestOptions: request.CoreOptions & request.UriOptions, destPath: string) {
+  return new Bluebird<void>((res, rej) => {
+    const file = createWriteStream(destPath)
+    file.on('finish', () => res())
 
-    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
-      }
+    request(requestOptions)
+      .on('error', err => rej(err))
+      .pipe(file)
+  })
+}
 
-      // If there are data informations
-      if (params.data) {
-        requestParams.json.data = params.data
-      }
+async function downloadImage (url: string, destPath: string, size: { width: number, height: number }) {
+  const tmpPath = destPath + '.tmp' + extname(destPath)
+  await doRequestAndSaveToFile({ method: 'GET', uri: url }, tmpPath)
 
-      request.post(requestParams, (err, response, body) => err ? rej(err) : res({ response, body }))
-    })
-  })
+  await processImage({ path: tmpPath }, destPath, size)
 }
 
 // ---------------------------------------------------------------------------
 
 export {
-  makeRetryRequest,
-  makeSecureRequest
+  doRequest,
+  doRequestAndSaveToFile,
+  downloadImage
 }