Use http-request module for file downloads

Author: jmwohl

package.json

@@ -33,12 +33,12 @@
     "commander": "^2.8.1",
     "debug": "^2.2.0",
     "faye": "^1.1.2",
+    "http-request": "^0.7.0",
     "inquirer": "^0.11.1",
     "jsonfile": "^2.2.1",
     "openframe-glslviewer": "^0.1.1",
     "openframe-image": "^0.1.6",
     "openframe-website": "^0.1.1",
-    "request": "^2.69.0",
     "swagger-client": "^2.1.9"
   },
   "devDependencies": {

src/downloader.js

@@ -5,12 +5,10 @@
  */
 
 // Dependencies
-var fs = require('fs'),
-    exec = require('child_process').exec,
+var exec = require('child_process').exec,
     debug = require('debug')('openframe:downloader'),
-    url = require('url'),
     artworkDir = '/tmp',
-    request = require('request');
+    http = require('http-request');
 
 // unused at present
 function _mkdirp(dir) {
@@ -25,55 +23,27 @@ function _mkdirp(dir) {
 /**
  * Download a file using HTTP get.
  *
- * TODO: use Promises instead of a callback.
- *
  * @param  {String}   file_url
  * @param  {String}   file_output_name
  */
 function downloadFile(file_url, file_output_name, cb) {
     return new Promise(function(resolve, reject) {
         var file_name = file_output_name,
-            file_path = artworkDir + '/' + file_name,
-            file = fs.createWriteStream(file_path);
-
-        request.get(file_url)
-            .on('response', function(res) {
-                // create file write stream
-                res.pipe(file);
-
-                res.on('end', function() {
-                    // go on with processing
-                    file.close(function() {
-                        if (cb) cb();
-                        resolve(file);
-                    });
-                });
-
-                res.on('error', (e) => {
-                    debug(`Got error: ${e.message}`);
-                    reject(e);
-                });
-            }).on('error', (e) => {
-                debug(`Got error: ${e.message}`);
-                reject(e);
-            });
-
-        // http.get(file_url, function(res) {
-        //     res.pipe(file);
-        //     file.on('finish', function() {
-        //         file.close(function() {
-        //             if (cb) cb();
-        //             resolve(file);
-        //         }); // close() is async, call cb after close completes.
-        //     });
-        //     res.on('error', (e) => {
-        //         debug(`Got error: ${e.message}`);
-        //         reject(e);
-        //     });
-        // }).on('error', (e) => {
-        //     debug(`Got error: ${e.message}`);
-        //     reject(e);
-        // });
+            file_path = artworkDir + '/' + file_name;
+
+        // simplified download using http-request module
+        http.get({
+            url: file_url,
+            progress: function (current, total) {
+                debug('downloaded %d bytes from %d', current, total);
+            }
+        }, file_path, function (err, res) {
+            if (err) {
+                reject(err);
+                return;
+            }
+            resolve(res.file);
+        });
     });
 
 }

src/rest.js

@@ -22,6 +22,9 @@ rest.init = function() {
             rest.client = client;
             resolve(client);
         }).catch(function(err) {
+            console.log('\n');
+            console.log('[o]   ERROR: The server is not available.');
+            console.log('\n');
             reject(err);
         });
     });