Added RightJS, formatting of PhantomJS driver output

src/apps.json

@@ -44,6 +44,7 @@
 				6
 			],
 			"headers": {
+				"Set-Cookie": "3dvisit",
 				"X-Powered-By": "3DCART"
 			},
 			"script": "(?:twlh(?:track)?\\.asp|3d_upsell\\.js)",
@@ -58,20 +59,6 @@
 			},
 			"website": "www.3ware.com"
 		},
-		"actionhero.js": {
-			"cats": [
-				1,
-				18,
-				22
-			],
-			"headers": {
-				"X-Powered-By": "actionhero API"
-			},
-			"env": "^actionheroClient$",
-			"script": "actionheroClient\\.js",
-			"implies": "node.js",
-			"website": "www.actionherojs.com"
-		},
 		"AMPcms": {
 			"cats": [
 				1
@@ -909,10 +896,10 @@
 				12,
 				18
 			],
+			"env": "^catberry$",
 			"headers": {
 				"X-Powered-By": "Catberry"
 			},
-			"env": "^catberry$",
 			"implies": "node.js",
 			"website": "catberry.org"
 		},
@@ -3197,7 +3184,6 @@
 				"^LITHIUM$"
 			],
 			"headers": {
-				"Set-Cookie": "LiSESSIONID=",
 				"Set-Cookie": "LithiumVisitor="
 			},
 			"html": " <a [^>]+Powered by Lithium",
@@ -3409,15 +3395,15 @@
 			"cats": [
 				12
 			],
-    			"implies": [
-    			      "MongoDB",	
-			      "Express",
-			      "AngularJS",
-			      "node.js"
-			],
 			"headers": {
 				"X-Powered-CMS": "Mean\\.io"
 			},
+			"implies": [
+				"MongoDB",
+				"Express",
+				"AngularJS",
+				"node.js"
+			],
 			"website": "mean.io"
 		},
 		"MediaElement.js": {
@@ -4659,6 +4645,14 @@
 			"script": "rickshaw(\\.min)?\\.js",
 			"website": "code.shutterstock.com/rickshaw/"
 		},
+		"RightJS": {
+			"cats": [
+				12
+			],
+			"env": "^RightJS$",
+			"script": "right\\.js",
+			"website": "rightjs.org"
+		},
 		"RiteCMS": {
 			"cats": [
 				1
@@ -6507,6 +6501,20 @@
 			},
 			"website": "zope.org"
 		},
+		"actionhero.js": {
+			"cats": [
+				1,
+				18,
+				22
+			],
+			"env": "^actionheroClient$",
+			"headers": {
+				"X-Powered-By": "actionhero API"
+			},
+			"implies": "node.js",
+			"script": "actionheroClient\\.js",
+			"website": "www.actionherojs.com"
+		},
 		"amCharts": {
 			"cats": [
 				25
@@ -7294,4 +7302,4 @@
 		"49": "feed-readers",
 		"50": "document-management-systems"
 	}
-}
+}

src/drivers/chrome/manifest.json

@@ -1,7 +1,7 @@
 { "name": "Wappalyzer",
 	"homepage_url": "https://wappalyzer.com?pk_campaign=chrome&pk_kwd=context",
 	"description": "Identifies software on the web",
-	"version": "2.35",
+	"version": "2.37",
 	"default_locale": "en",
 	"manifest_version": 2,
 	"icons": {

src/drivers/firefox/package.json

@@ -8,7 +8,7 @@
   "description": "Identifies software on the web",
   "author": "Elbert Alias",
   "license": "GPLv3",
-  "version": "3.0.13",
+  "version": "3.0.15",
 	"main": "driver",
 	"preferences": [{
 		"name": "tracking",

src/drivers/phantomjs/driver.js

@@ -56,16 +56,18 @@
 						});
 
 						apps.push({
-							url:         originalUrl,
+							name: app,
-							finalUrl:    url,
-							application: app,
 							confidence:  wappalyzer.detected[url][app].confidenceTotal,
 							version:     wappalyzer.detected[url][app].version,
 							categories:  cats
 						});
 					}
 
-					console.log(JSON.stringify(apps));
+					console.log(JSON.stringify({
+						url:          originalUrl,
+						finalUrl:     url,
+						applications: apps
+					}));
 				}
 			},