-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 }
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)
})
}