Removed minResponses and minContentLength from config options and det…

…ermine them dynamically based on the first and second responses.
thomasdavis · Sep 3, 2013 · 97285b9 · 97285b9
1 parent 3482ce6
commit 97285b9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/bin/config.json b/bin/config.json
@@ -1,8 +1,6 @@
 {
     "verbose": true,
     "debug": false,
-    "minResponses": 5,
-    "minContentLength": 4000,
     "checkCompleteInterval": 10,
     "checkCompleteTimeDiff": 300,
     "checkCompleteTimeout": 10000

diff --git a/lib/phantom-server.js b/lib/phantom-server.js
@@ -5,6 +5,8 @@ var page = require('webpage').create(),
     requestCount = 0,
     responseCount = 0,
     requestIds = [],
+    minContentLength,
+    minResponses,
     checkComplete,
     checkCompleteInterval;
 
@@ -31,6 +33,12 @@ page.onResourceReceived = function(response) {
                 response.redirectURL
             );
         }
+        if (response.id === 1) { // first response
+            minContentLength = response.bodySize;
+        }
+        if (responseCount === 1) { // second response
+            minResponses = requestCount;
+        }
         lastReceived = new Date().getTime();
         responseCount++;
         requestIds[requestIds.indexOf(response.id)] = null;
@@ -39,8 +47,8 @@ page.onResourceReceived = function(response) {
 
 checkComplete = function () {
     var timeDiff = new Date().getTime() - lastReceived;
-    if (responseCount >= config.minResponses &&
-        page.content.length >= config.minContentLength &&
+    if (responseCount >= minResponses &&
+        page.content.length >= minContentLength &&
         timeDiff > config.checkCompleteTimeDiff &&
         requestCount === responseCount) {
         clearInterval(checkCompleteInterval);