X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Frequests.ts;h=ee9e804040e8364a00723f2312d3917c221fd830;hb=993cef4b6e000ee425087e5195dfe40cd0840243;hp=e8d77b15b5789cfd74aff8b8254f99c903bd3d88;hpb=633868bc2c638ab15c31513bc0da7de92944bffc;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/helpers/requests.ts b/server/helpers/requests.ts
index e8d77b15b..ee9e80404 100644
--- a/server/helpers/requests.ts
+++ b/server/helpers/requests.ts
@@ -1,8 +1,7 @@
-import * as Promise from 'bluebird'
-import { createWriteStream } from 'fs'
+import * as Bluebird from 'bluebird'
+import { createWriteStream } from 'fs-extra'
 import * as request from 'request'
 import { ACTIVITY_PUB } from '../initializers'
-import Bluebird = require('bluebird')
 
 function doRequest (
   requestOptions: request.CoreOptions & request.UriOptions & { activityPub?: boolean }
@@ -12,17 +11,19 @@ function doRequest (
     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)
   })
 }