X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Frequests.ts;h=64e3ce663b13f8668483296047577f956e171bdb;hb=73c695919c6569bfb667c36fc5a6b9b862130a0d;hp=ac3559c5896d214b65e7d995b3ba46202025b3d8;hpb=7006bc6378eb0d480bc5b60f2c18876f0bb2a97d;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/helpers/requests.ts b/server/helpers/requests.ts
index ac3559c58..64e3ce663 100644
--- a/server/helpers/requests.ts
+++ b/server/helpers/requests.ts
@@ -1,29 +1,29 @@
-import * as Promise from 'bluebird'
+import * as Bluebird from 'bluebird'
 import { createWriteStream } from 'fs'
-import { RequestResponse } from 'request'
 import * as request from 'request'
 import { ACTIVITY_PUB } from '../initializers'
-import Bluebird = require('bluebird')
 
 function doRequest (
   requestOptions: request.CoreOptions & request.UriOptions & { activityPub?: boolean }
-): Bluebird<{ response: RequestResponse, body: any }> {
+): 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 Promise<{ response: request.RequestResponse, body: any }>((res, rej) => {
+  return new Bluebird<{ response: request.RequestResponse, body: any }>((res, rej) => {
     request(requestOptions, (err, response, body) => err ? rej(err) : res({ response, body }))
   })
 }
 
 function doRequestAndSaveToFile (requestOptions: request.CoreOptions & request.UriOptions, destPath: string) {
-  return new Promise<request.RequestResponse>((res, rej) => {
+  return new Bluebird<void>((res, rej) => {
+    const file = createWriteStream(destPath)
+    file.on('finish', () => res())
+
     request(requestOptions)
-      .on('response', response => res(response as request.RequestResponse))
       .on('error', err => rej(err))
-      .pipe(createWriteStream(destPath))
+      .pipe(file)
   })
 }