Peers communication protocol change to WS - Closes #446

.eslintrc.json

@@ -6,7 +6,7 @@
   "rules": {
     "semi": "error",
     "no-eq-null": "off",
-    "indent": ["error", "tab", { "flatTernaryExpressions": true }],
+    "indent": ["error", "tab", { "flatTernaryExpressions": true, "SwitchCase": 1 }],
     "eqeqeq": "off",
     "curly": "error",
     "no-undef": "error",

.gitignore

@@ -15,3 +15,6 @@ tmp
 sftp-config.json
 *.swp
 *.swo
+test/integration/logs/
+test/integration/configs/
+!test/integration/configs/config.non-forge.json

Gruntfile.js

@@ -6,6 +6,7 @@ var util = require('util');
 module.exports = function (grunt) {
 	var files = [
 		'logger.js',
+		'workersController.js',
 		'api/**/*.js',
 		'helpers/**/*.js',
 		'modules/**/*.js',
@@ -41,6 +42,7 @@ module.exports = function (grunt) {
 						util.format('mkdir -p %s/logs', version_dir),
 						util.format('mkdir -p %s/pids', version_dir),
 						util.format('cp %s/app.js %s', release_dir, version_dir),
+						util.format('cp %s/workersController.js %s', release_dir, version_dir),
 						util.format('cp %s/config.json %s', __dirname, version_dir),
 						util.format('cp %s/package.json %s', __dirname, version_dir),
 						util.format('cp %s/genesisBlock.json %s', __dirname, version_dir),
@@ -70,10 +72,26 @@ module.exports = function (grunt) {
 				maxBuffer: maxBufferSize
 			},
 
+			coverageUnit: {
+				command: 'node_modules/.bin/istanbul cover --dir test/.coverage-unit ./node_modules/.bin/_mocha test/unit/index.js',
+				maxBuffer: maxBufferSize
+			},
+
+			testFunctional: {
+				command: './node_modules/.bin/mocha test/api/index.js',
+				maxBuffer: maxBufferSize
+			},
+
 			fetchCoverage: {
 				command: 'rm -rf ./test/.coverage-func.zip; curl -o ./test/.coverage-func.zip $HOST/coverage/download',
 				maxBuffer: maxBufferSize
 			},
+
+			createBundles: {
+				command: 'npm run create-bundles',
+				maxBuffer: maxBufferSize
+			},
+
 			coverageReport: {
 				command: 'rm -f ./test/.coverage-unit/lcov.info; ./node_modules/.bin/istanbul report --root ./test/.coverage-unit/ --dir ./test/.coverage-unit'
 			}
@@ -118,11 +136,13 @@ module.exports = function (grunt) {
 	grunt.loadNpmTasks('grunt-eslint');
 
 	grunt.registerTask('default', ['release']);
-	grunt.registerTask('release', ['exec:folder', 'obfuscator', 'exec:package', 'exec:build', 'compress']);
+	grunt.registerTask('release', ['exec:folder', 'obfuscator', 'exec:createBundles', 'exec:package', 'exec:build', 'compress']);
 	grunt.registerTask('jenkins', ['exec:coverageSingle']);
 	grunt.registerTask('coverageReport', ['exec:coverageReport']);
 	grunt.registerTask('eslint-nofix', ['eslint']);
 	grunt.registerTask('test', ['eslint', 'exec:coverage']);
+	grunt.registerTask('test-unit', ['eslint', 'exec:coverageUnit']);
+	grunt.registerTask('test-functional', ['eslint', 'exec:testFunctional']);
 
 	grunt.registerTask('eslint-fix', 'Run eslint and fix formatting', function () {
 		grunt.config.set('eslint.options.fix', true);

Jenkinsfile

@@ -206,10 +206,10 @@ lock(resource: "Lisk-Core-Nodes", inversePrecedence: true) {
 				'''
 				}
 			}, //End node-01 tests
-			"Functional Peer - Peer" : {
+			"Functional Peer - Peers" : {
 				node('node-02'){
 					sh '''
-					export TEST=test/api/peer.js TEST_TYPE='FUNC'
+					export TEST=test/api/peers.js TEST_TYPE='FUNC'
 					cd "$(echo $WORKSPACE | cut -f 1 -d '@')"
 					npm run jenkins
 					'''
@@ -218,7 +218,7 @@ lock(resource: "Lisk-Core-Nodes", inversePrecedence: true) {
 			"Functional Peer - Blocks" : {
 				node('node-02'){
 					sh '''
-					export TEST=test/api/peer.blocks.js TEST_TYPE='FUNC'
+					export TEST=test/api/peer/peer.blocks.ws.js TEST_TYPE='FUNC'
 					cd "$(echo $WORKSPACE | cut -f 1 -d '@')"
 					npm run jenkins
 					'''
@@ -227,7 +227,7 @@ lock(resource: "Lisk-Core-Nodes", inversePrecedence: true) {
 			"Functional Peer - Signatures" : {
 				node('node-02'){
 					sh '''
-					export TEST=test/api/peer.signatures.js TEST_TYPE='FUNC'
+					export TEST=test/api/peer/peer.signatures.ws.js TEST_TYPE='FUNC'
 					cd "$(echo $WORKSPACE | cut -f 1 -d '@')"
 					npm run jenkins
 					'''
@@ -236,7 +236,7 @@ lock(resource: "Lisk-Core-Nodes", inversePrecedence: true) {
 			"Functional Peer - Transactions Collision" : {
 				node('node-02'){
 					sh '''
-					export TEST=test/api/peer.transactions.collision.js TEST_TYPE='FUNC'
+					export TEST=test/api/peer/peer.transactions.collision.ws.js TEST_TYPE='FUNC'
 					cd "$(echo $WORKSPACE | cut -f 1 -d '@')"
 					npm run jenkins
 					'''
@@ -245,7 +245,7 @@ lock(resource: "Lisk-Core-Nodes", inversePrecedence: true) {
 			"Functional Peer - Transactions Delegates" : {
 				node('node-02'){
 					sh '''
-					export TEST=test/api/peer.transactions.delegates.js TEST_TYPE='FUNC'
+					export TEST=test/api/peer/peer.transactions.delegates.ws.js TEST_TYPE='FUNC'
 					cd "$(echo $WORKSPACE | cut -f 1 -d '@')"
 					npm run jenkins
 					'''
@@ -254,7 +254,7 @@ lock(resource: "Lisk-Core-Nodes", inversePrecedence: true) {
 			"Functional Peer - Transactions Main" : {
 				node('node-02'){
 					sh '''
-					export TEST=test/api/peer.transactions.main.js  TEST_TYPE='FUNC'
+					export TEST=test/api/peer/peer.transactions.main.ws.js  TEST_TYPE='FUNC'
 					cd "$(echo $WORKSPACE | cut -f 1 -d '@')"
 					npm run jenkins
 					'''
@@ -263,16 +263,25 @@ lock(resource: "Lisk-Core-Nodes", inversePrecedence: true) {
 			"Functional Peer - Transaction Signatures" : {
 				node('node-02'){
 					sh '''
-					export TEST=test/api/peer.transactions.signatures.js  TEST_TYPE='FUNC'
+					export TEST=test/api/peer/peer.transactions.signatures.ws.js TEST_TYPE='FUNC'
 					cd "$(echo $WORKSPACE | cut -f 1 -d '@')"
 					npm run jenkins
 					'''
 				}
 			},
-			"Functional Peer - Peers" : {
+			"Functional Peer - Transport" : {
 				node('node-02'){
 					sh '''
-					export TEST=test/api/peers.js TEST_TYPE='FUNC'
+					export TEST=test/api/peer/transport.js TEST_TYPE='FUNC'
+					cd "$(echo $WORKSPACE | cut -f 1 -d '@')"
+					npm run jenkins
+					'''
+				}
+			},
+			"Functional Peer - Peers websockets" : {
+				node('node-02'){
+					sh '''
+					export TEST=test/api/peer/peer.ws.js TEST_TYPE='FUNC'
 					cd "$(echo $WORKSPACE | cut -f 1 -d '@')"
 					npm run jenkins
 					'''
@@ -281,7 +290,7 @@ lock(resource: "Lisk-Core-Nodes", inversePrecedence: true) {
 			"Functional Peer - Votes" : {
 				node('node-02'){
 					sh '''
-					export TEST=test/api/peer.transactions.votes.js TEST_TYPE='FUNC'
+					export TEST=test/api/peer/peer.transactions.votes.ws.js TEST_TYPE='FUNC'
 					cd "$(echo $WORKSPACE | cut -f 1 -d '@')"
 					npm run jenkins
 					'''
@@ -338,7 +347,7 @@ lock(resource: "Lisk-Core-Nodes", inversePrecedence: true) {
 			"Functional Stress - Transactions" : {
 				node('node-04'){
 					sh '''
-					export TEST=test/api/peer.transactions.stress.js TEST_TYPE='FUNC'
+					export TEST=test/api/peer/peer.transactions.stress.ws.js TEST_TYPE='FUNC'
 					cd "$(echo $WORKSPACE | cut -f 1 -d '@')"
 					npm run jenkins
 					'''

api/http/transport.js

@@ -1,111 +0,0 @@
-'use strict';
-
-var Router = require('../../helpers/router');
-var httpApi = require('../../helpers/httpApi');
-var schema = require('../../schema/transport');
-
-/**
- * Binds api with modules and creates common url.
- * - End point: `/peer`
- * - Private API:
- * 	- get	/blocks/common
- * 	- get	/blocks
- * 	- get	/list
- * 	- get	/height
- * 	- get	/ping
- * 	- get	/signatures
- * 	- get	/transactions
- * 	- post	/blocks
- * 	- post	/signatures
- * 	- post	/transactions
- * @memberof module:transport
- * @requires helpers/Router
- * @requires helpers/httpApi
- * @constructor
- * @param {Object} transportModule - Module transport instance.
- * @param {scope} app - Network app.
- * @param {function} logger
- */
-// Constructor
-function TransportHttpApi (transportModule, app, logger, cache) {
-
-	var router = new Router();
-
-	router.use(httpApi.middleware.attachResponseHeaders.bind(null, transportModule.headers));
-	router.use(httpApi.middleware.blockchainReady.bind(null, transportModule.isLoaded));
-
-	router.use(handshakeMiddleware);
-
-	router.get('/blocks/common', getCommonBlocksMiddleware);
-	router.get('/blocks', httpApi.middleware.sanitize('query', schema.blocks, transportModule.internal.blocks));
-
-	router.map(transportModule.internal, {
-		'get /list': 'list',
-		'get /height': 'height',
-		'get /ping': 'ping',
-		'get /signatures': 'getSignatures',
-		'get /transactions': 'getTransactions'
-
-	});
-
-	// Custom parameters internal functions
-	router.post('/blocks', function (req, res) {
-		transportModule.internal.postBlock(req.body.block, req.peer, req.method + ' ' + req.url, httpApi.respond.bind(null, res));
-	});
-
-	router.post('/signatures', function (req, res) {
-		transportModule.internal.postSignatures({signatures: req.body.signatures, signature: req.body.signature}, httpApi.respond.bind(null, res));
-	});
-
-	router.post('/transactions', function (req, res) {
-		transportModule.internal.postTransactions({
-			transactions: req.body.transactions,
-			transaction: req.body.transaction
-		}, req.peer, req.method + ' ' + req.url, httpApi.respond.bind(null, res));
-	});
-
-	router.use(httpApi.middleware.notFound);
-
-	app.use('/peer', router);
-
-	function handshakeMiddleware (req, res, next) {
-		transportModule.internal.handshake(req.ip, req.headers.port, req.headers, validateHeaders, function (err, peer) {
-			if (err) {
-				return res.status(500).send(err);
-			}
-
-			req.peer = peer;
-
-			return next();
-		});
-
-		function validateHeaders (headers, cb) {
-			return req.sanitize(headers, schema.headers, function (err, report, sanitized) {
-				if (err) {
-					return cb(err.toString());
-				} else if (!report.isValid) {
-					return cb(report.issues);
-				}
-
-				return cb();
-			});
-		}
-	}
-
-	function getCommonBlocksMiddleware (req, res, next) {
-		req.sanitize(req.query, schema.commonBlock, function (err, report, query) {
-			if (err) {
-				logger.debug('Common block request validation failed', {err: err.toString(), req: req.query});
-				return next(err);
-			}
-			if (!report.isValid) {
-				logger.debug('Common block request validation failed', {err: report, req: req.query});
-				return res.json({success: false, error: report.issues});
-			}
-
-			return transportModule.internal.blocksCommon(query.ids, req.peer, req.method + ' ' + req.url, httpApi.respond.bind(null, res));
-		});
-	}
-}
-
-module.exports = TransportHttpApi;