From ee81ab02d5943622e6f82abece18d7e9e9b21865 Mon Sep 17 00:00:00 2001 From: Simo Kinnunen Date: Wed, 17 Dec 2014 21:58:56 +0900 Subject: [PATCH] Use the request module for fetching screenshots. Makes it easier to use https if necessary. --- lib/units/storage/plugins/image/task/get.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/units/storage/plugins/image/task/get.js b/lib/units/storage/plugins/image/task/get.js index 73a12ea2..6633d999 100644 --- a/lib/units/storage/plugins/image/task/get.js +++ b/lib/units/storage/plugins/image/task/get.js @@ -1,18 +1,21 @@ var util = require('util') -var http = require('http') +var stream = require('stream') var url = require('url') var Promise = require('bluebird') +var request = require('request') module.exports = function(path, options) { return new Promise(function(resolve, reject) { - http.get(url.resolve(options.storageUrl, path)) - .on('response', function(res) { + var res = request.get(url.resolve(options.storageUrl, path)) + , ret = new stream.Readable().wrap(res) // Wrap old-style stream + + res.on('response', function(res) { if (res.statusCode !== 200) { reject(new Error(util.format('HTTP %d', res.statusCode))) } else { - resolve(res) + resolve(ret) } }) .on('error', reject)