Rearrange file and add check for file size.

Closes gardr/validator-web#25
gardr · Jun 25, 2014 · e43b8fd · e43b8fd
1 parent 66fdaf1
commit e43b8fd
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 27 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -79,6 +79,8 @@ internals.resolveIncludes = function(options){
     options.validate.forEach(readDependencies);
     options.preprocess.forEach(readDependencies);
 };
+
+internals.byPath = function(o){return o.path;};
 internals.run = function (options, callback) {
     if (!callback){
         throw new Error('Missing callback');
@@ -99,46 +101,65 @@ internals.run = function (options, callback) {
 
     options.validatorBase = validatorBase;
 
-    var byPath = function(o){return o.path;};
-    helpers.statFiles(options.instrument.map(byPath), function (err) {
+
+    helpers.statFiles(options.instrument.map(internals.byPath), function (err) {
         if (err) {
             if (process.env.NODE_ENV !== 'test'){
                 console.log('gardr-validator/lib/index.js statFiles error', err);
             }
             return callback(err, null);
         }
+        run();
+    });
 
+
+    function run(){
         // spawn phantomJS process
         spawn(options, internals.handleResult, function(processError, outputData){
             if (processError){
                 console.log('gardr-validator/lib/index.js Spawn error', processError);
-                callback(processError);
-            } else {
-                if (outputData && outputData.path){
-                    fs.readFile(outputData.path, function(err, harvestedData){
-                        if (err){
-                            return callback(err);
-                        }
-
-                        try{
-                            harvestedData = JSON.parse(harvestedData);
-                        }catch(e){
-                            err = e;
-                        }
-
-                        if (err){
-                            return  callback(err);
-                        }
-
-                        validate(harvestedData, options, callback);
-                    });
-                } else {
-                    console.log('gardr-validator/lib/index.js Missing output path from phantom / Output error:', outputData);
-                    callback(new Error('Missing output path from phantom'));
-                }
+                return callback(processError);
             }
+
+            if (outputData && outputData.path){
+                return readFile(outputData.path);
+            }
+
+            console.log('gardr-validator/lib/index.js Missing output path from phantom / Output error:', outputData);
+            callback(new Error('Missing output path from phantomJS result'));
         });
-    });
+
+
+        function readFile(path){
+            fs.stat(path, function(err, statObj){
+                if (err){
+                    return callback(err);
+                }
+
+                // if dump file is larger than 10MB it will most likely be a bug inside it
+                if (statObj && statObj.size > 10000000){
+                    return callback(new Error('Result from PhantomJS is to large.'));
+                }
+                fs.readFile(path, function(err, harvestedData){
+                    if (err){
+                        return callback(err);
+                    }
+
+                    try{
+                        harvestedData = JSON.parse(harvestedData);
+                    }catch(e){
+                        err = e;
+                    }
+
+                    if (err){
+                        return  callback(err);
+                    }
+
+                    validate(harvestedData, options, callback);
+                });
+            });
+        }
+    }
 };
 
 

diff --git a/test/runner/runner.test.js b/test/runner/runner.test.js
@@ -20,6 +20,9 @@ describe('Runner (phantomJs)', function() {
         'fs': {
             readFile: function(fileName, cb) {
                 cb(null, JSON.stringify(EXPECTED_VALID_REPORT_OBJECT));
+            },
+            stat: function(fileName, cb){
+                cb(null, {size: 1000});
             }
         },
         './spawn.js': function(options, handler, done) {