From 79743bf227438ab83c37c4fe4ee90eccdafc18ce Mon Sep 17 00:00:00 2001
From: Elbert Alias <elbert@alias.io>
Date: Sat, 21 Mar 2015 17:11:28 +1100
Subject: [PATCH] Proper error handling in PhantomJS driver

---
 src/drivers/phantomjs/driver.js | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/drivers/phantomjs/driver.js b/src/drivers/phantomjs/driver.js
index 1a8360ac9..efd672720 100644
--- a/src/drivers/phantomjs/driver.js
+++ b/src/drivers/phantomjs/driver.js
@@ -92,11 +92,20 @@
 
 				page = require('webpage').create();
 
+				page.settings.loadImages      = false;
+				page.settings.userAgent       = 'Mozilla/5.0 (compatible; Wappalyzer; +https://github.com/AliasIO/Wappalyzer)';
+				page.settings.resourceTimeout = 3000;
+
 				page.onConsoleMessage = function(message) {
 					wappalyzer.log(message);
 				};
+
 				page.onError = function(message) {
-					wappalyzer.log('Page error: ' + message);
+					throw new Error(message);
+				};
+
+				page.onResourceTimeout = function() {
+					throw new Error('Resource timeout');
 				};
 
 				page.onResourceReceived = function(response) {
@@ -118,8 +127,6 @@
 				page.open(url, function(status) {
 					var html, environmentVars;
 
-					wappalyzer.log('page.open: ' + status);
-
 					if ( status === 'success' ) {
 						html = page.content;
 
@@ -147,9 +154,11 @@
 							headers: headers,
 							env:     environmentVars
 						});
+					} else {
+						wappalyzer.log('Failed to fetch page');
 					}
 
-					phantom.exit();
+					phantom.exit(status === 'success' ? 0 : 1);
 				});
 			}
 		};
@@ -158,6 +167,6 @@
 	} catch ( e ) {
 		console.error(e);
 
-		phantom.exit();
+		phantom.exit(1);
 	}
 })();