Merge pull request #56 from AnyFetch/no-more-black-magic

No more black magic

Author: Neamar

lib/helpers/child-process.js

@@ -48,38 +48,25 @@ process.on('message', function(task) {
     function downloadFile(cb) {
       if(task.file_path) {
         // Download the file
-        var stream = fs.createWriteStream(path);
-
-        // Store error if statusCode !== 200
-        var err;
-        stream.on("finish", function() {
-          cb(err);
-        });
-
         var apiUrl = url.parse(task.file_path, false, true);
-        var req = request(apiUrl.protocol + "//" + apiUrl.host)
-          .get(apiUrl.path);
-
-        // Warning, Black magic.
-        // Streaming and checking for status code is no easy task...
-        req.end(function() {}).req.once('response', function(res) {
-          if(res.statusCode !== 200) {
-            if(res.statusCode === 410) {
-              err = new Error('410 Gone');
-              err.skip = true;
+        request(apiUrl.protocol + "//" + apiUrl.host)
+          .get(apiUrl.path)
+          .expect(200)
+          .end(function(err, res) {
+            if(err) {
+              if(err.toString().match(/410/)) {
+                err.skip = true;
+              }
+              else {
+                err = new Error('Error downloading file: ' + err.toString());
+              }
+              return cb(err);
             }
-            else {
-              err = new Error('Error downloading file, got status ' + res.statusCode);
-            }
-
-            stream.end();
-            this.abort();
-          }
-        });
-        req.pipe(stream);
+            fs.writeFile(path, res.text, {encoding: 'binary'}, cb);
+          });
       }
       else {
-        cb(null);
+        cb();
       }
     },
     function startHydration(cb) {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "anyfetch-hydrater",
   "description": "Create hydrater for AnyFetch.",
-  "version": "2.0.8",
+  "version": "2.0.9",
   "author": "Matthieu Bacconnier <[email protected]>",
   "scripts": {
     "test": "NODE_ENV=test mocha --recursive -R spec test/",

test/errors.js

@@ -66,7 +66,8 @@ describe('Errors', function() {
       fakeApi.patch('/result', function(req, res, next) {
         res.send(204);
         next();
-        if(req.params.hydration_error.toString() === 'Error: Error downloading file, got status 404') {
+
+        if(req.params.hydration_error.toString() === 'Error: Error downloading file: Error: expected 200 "OK", got 404 "Not Found"') {
           done();
         }
         else {