Fixed linter errors.

Author: linusjf

.jshintrc

@@ -5,7 +5,7 @@
     "maxerr": 50, // {int} Maximum error before stopping
 
     // Enforcing
-    "bitwise": false, // true: Prohibit bitwise operators (&, |, ^, etc.)
+    "bitwise": true, // true: Prohibit bitwise operators (&, |, ^, etc.)
     "camelcase": false, // true: Identifiers must be in camelCase
     "curly": false, // true: Require {} for every new block or scope
     "eqeqeq": true, // true: Require triple equals (===) for comparison

spider2/spider.js

@@ -1,6 +1,7 @@
 /*jshint globalstrict: true*/
 /*jshint node: true */
 /*jshint esversion: 6 */
+/*jshint latedef: false */
 "use strict";
 
 const request = require('request');
@@ -40,6 +41,33 @@ function download(url,filename,callback)
 downloaded = true;
 }
 
+function iterateSeries(collection,nesting,iter,finalCallback)
+{
+	iter(collection,0,nesting,finalCallback); 
+}
+
+
+function iterate( collection,index,nesting,finalCallback) { 
+		if( index === collection.length)  
+			return finalCallback(null,filename,downloaded); 
+		spider( collection[ index], nesting - 1, function( err) { 
+			if( err) 
+				return finalCallback( err); 
+			iterate( collection,index + 1,nesting-1,finalCallback);
+		});
+}
+
+function spiderLinks( currentUrl, body, nesting, callback) {
+	if( nesting <= 0) 
+		return process.nextTick( callback);
+	 
+	var links = utilities.getPageLinks( currentUrl, body);
+
+	
+iterateSeries(links,nesting,iterate,callback);
+
+}
+
 function spider( url, nesting, callback) 
 { 
 	filename = utilities.urlToFilename( url);
@@ -65,34 +93,12 @@ function spider( url, nesting, callback)
 }); 
 } 
 
-function spiderLinks( currentUrl, body, nesting, callback) {
-	if( nesting <= 0) 
-		return process.nextTick( callback);
-	 
-	var links = utilities.getPageLinks( currentUrl, body);
-
-	
-iterateSeries(links,nesting,iterate,callback);
-
-}
-
-
-function iterate( collection,index,nesting,finalCallback) { 
-		if( index === collection.length)  
-			return finalCallback(null,filename,downloaded); 
-		spider( collection[ index], nesting - 1, function( err) { 
-			if( err) 
-				return finalCallback( err); 
-			iterate( collection,index + 1,nesting-1,finalCallback);
-		});
-}
-
-function iterateSeries(collection,nesting,iter,finalCallback)
+function exitMessage()
 {
-	iter(collection,0,nesting,finalCallback); 
+    console.error('Usage: node spider.js url {level}.\nLevel defaults to 1.');
+    process.exit(1);
 }
 
-
 let url = process.argv[2];
 var level;
 if (process.argv[3])
@@ -123,10 +129,4 @@ else
 	exitMessage();
 
 
-function exitMessage()
-{
-    console.error('Usage: node spider.js url {level}.\nLevel defaults to 1.');
-    process.exit(1);
-}
-
 

spider3/spider.js

@@ -1,6 +1,7 @@
 /*jshint globalstrict: true*/
 /*jshint node: true */
 /*jshint esversion: 6 */
+/*jshint latedef: false */
 "use strict";
 
 const request = require('request');
@@ -9,9 +10,9 @@ const mkdirp = require('mkdirp');
 const path = require('path');
 const utilities = require('./utilities');
 
-//var filename;
 var downloaded = false;
 var spidering = new Map();
+var url;
 
 function saveFile(filename, body, callback) {
     mkdirp(path.dirname(filename), err => {
@@ -59,9 +60,8 @@ function spider(url, nesting, callback) {
     });
 }
 
-
 function spiderLinks(currentUrl, body, nesting, callback) {
-    if (nesting <= 0)
+    if (nesting === 0)
         return process.nextTick(callback);
 
     var links = utilities.getPageLinks(currentUrl, body);
@@ -86,9 +86,12 @@ function spiderLinks(currentUrl, body, nesting, callback) {
 
 }
 
+function exitMessage() {
+    console.error('Usage: node spider.js url {level}.\nLevel defaults to 1.');
+    process.exit(1);
+}
 
-
-let url = process.argv[2];
+url = process.argv[2];
 var level;
 if (process.argv[3]) {
     level = parseInt(process.argv[3]);
@@ -112,9 +115,3 @@ if (url) {
     });
 } else
     exitMessage();
-
-
-function exitMessage() {
-    console.error('Usage: node spider.js url {level}.\nLevel defaults to 1.');
-    process.exit(1);
-}

spider4/package-lock.json

@@ -17,7 +17,6 @@
     "cheerio": "^1.0.0-rc.3",
     "debug": "^4.1.1",
     "fs": "0.0.1-security",
-    "http": "0.0.0",
     "mkdirp": "^0.5.1",
     "path": "^0.12.7",
     "request": "^2.88.0",

spider4/package.json

@@ -1,8 +1,8 @@
 /*jshint globalstrict: true*/
 /*jshint node: true */
 /*jshint esversion: 6 */
+/*jshint latedef: false */
 "use strict";
-const http = require('http');
 const request = require('request');
 const fs = require('fs');
 const mkdirp = require('mkdirp');
@@ -13,7 +13,7 @@ debug.enabled = false;
 var downloaded = false;
 var spidering  = new Map();
 var errors = [];
-
+var url,concurrency;
 function saveFile(filename,body,callback)
 {
         mkdirp(path.dirname(filename), err => {
@@ -66,24 +66,28 @@ function spider( url, nesting, callback)
 	});
 }
 
-
 function spiderLinks( currentUrl, body, nesting, callback) {
-	if( nesting <= 0) 
+	if( nesting === 0) 
 		return process.nextTick( callback,null,currentUrl,downloaded);
 
 	var links = utilities.getPageLinks( currentUrl, body);
-debug(links.length);
 if (links.length === 0)
 	return process.nextTick(callback,null,currentUrl,downloaded);
 let completed = 0;
 let running = 0;
 let index = 0;
 let inError = false;
 let error = null;
+	function done( err) 
+	{ 
+		if( err) 
+		{ 
+			inError = true; 
+			return callback( err);
+		} 
+		return callback(null,url,downloaded);
+	}
 function next() {
-	debug('index = '+index);
-	debug('running = '+running);
-	debug(links.length);
 	while( running < concurrency && index < links.length) {
 		const link = links[index++];
 
@@ -94,7 +98,6 @@ function next() {
 				error = err;
 				return callback(err);
 			}
-			debug('completed = '+completed);
 			if ( completed === links.length && !inError) 
 				return done();
 			completed++, running--;next();
@@ -106,20 +109,15 @@ if ( completed === links.length && !inError)
 } 
 next();
 
-	function done( err) 
-	{ 
-		if( err) 
-		{ 
-			inError = true; 
-			return callback( err);
-		} 
-		debug('Into done: callback');
-		return callback(null,url,downloaded);
-	}
 }
 
+function exitMessage()
+{
+    console.error('Usage: node spider.js url {level} {concurrency}.\nLevel defaults to 1.\nConcurrency defaults to 2.');
+    process.exit(1);
+}
 
-let url = process.argv[2];
+url = process.argv[2];
 var level;
 if (process.argv[3])
 {
@@ -130,7 +128,6 @@ if (isNaN(level) || level <= 0)
 }
 else
 	level = 1;
-var concurrency;
 if (process.argv[4])
 {
 	concurrency = parseInt(process.argv[4]);
@@ -167,10 +164,5 @@ else
 	exitMessage();
 
 
-function exitMessage()
-{
-    console.error('Usage: node spider.js url {level} {concurrency}.\nLevel defaults to 1.\nConcurrency defaults to 2.');
-    process.exit(1);
-}
 
 

spider4/spider.js

@@ -2,6 +2,14 @@
 /*jshint node: true */
 /*jshint esversion: 6 */
 "use strict";
+
+function fullURL(url)
+{
+	if (!url.startsWith('http'))
+		return 'http://' + url;
+	return url;
+}
+
 const cmdOptions = [
   { name: 'help',
     description: 'Display usage guide.',
@@ -26,12 +34,6 @@ const cmdOptions = [
 	description:'Url to be traversed'}
 ]; 
 
-function fullURL(url)
-{
-	if (!url.startsWith('http'))
-		return 'http://' + url;
-	return url;
-}
 
 const sections = [
   {

spider5/cmdconfig.js

@@ -1,6 +1,7 @@
 /*jshint globalstrict: true*/
 /*jshint node: true */
 /*jshint esversion: 6*/
+/*jshint latedef: false */
 "use strict";
 
 const request = require('request');

spider5/spider.js

@@ -2,6 +2,14 @@
 /*jshint node: true */
 /*jshint esversion: 6*/
 "use strict";
+
+function fullURL(url)
+{
+	if (!url.startsWith('http'))
+		return 'http://' + url;
+	return url;
+}
+
 const cmdOptions = [
   { name: 'help',
     description: 'Display usage guide.',
@@ -26,12 +34,6 @@ const cmdOptions = [
 	description:'Url to be traversed'}
 ]; 
 
-function fullURL(url)
-{
-	if (!url.startsWith('http'))
-		return 'http://' + url;
-	return url;
-}
 
 const sections = [
   {

spiderparallel/cmdconfig.js

@@ -1,6 +1,7 @@
 /*jshint globalstrict: true*/
 /*jshint node: true */
 /*jshint esversion: 6 */
+/*jshint latedef: false */
 "use strict";
 
 const request = require('request');