Merge branch 'release/0.3.11-beta'

Author: romansemko

CHANGELOG.md

@@ -6,7 +6,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
-## [0.3.10] - 2018-01-06
+## [0.3.11] - 2018-01-06
 
 ### Changed
 - Fixed IRI TCP negotiation bug #2

bin/nelson-0.3.10-linux bin/nelson-0.3.11-linux

@@ -326,7 +326,9 @@ var Node = function (_Base) {
                     UDPPort = _getHeaderIdentifiers2.UDPPort,
                     remoteKey = _getHeaderIdentifiers2.remoteKey,
                     name = _getHeaderIdentifiers2.name,
-                    protocol = _getHeaderIdentifiers2.protocol;
+                    wishedProtocol = _getHeaderIdentifiers2.protocol;
+
+                var protocol = _this7._negotiateProtocol(wishedProtocol);
 
                 _this7.list.add({
                     hostname: address,

bin/nelson-0.3.10-macos bin/nelson-0.3.11-macos

@@ -1,6 +1,6 @@
 {
   "name": "nelson.cli",
-  "version": "0.3.10",
+  "version": "0.3.11",
   "repository": {
     "type": "git",
     "url": "https://github.com/SemkoDev/nelson.cli.git"

bin/nelson-0.3.10-win.exe bin/nelson-0.3.11-win.exe

@@ -224,7 +224,8 @@ class Node extends Base {
         this.server.on('connection', (ws, req) => {
             this.log('incoming connection established'.green, req.connection.remoteAddress);
             const { remoteAddress: address } = req.connection;
-            const { port, TCPPort, UDPPort, remoteKey, name, protocol } = this._getHeaderIdentifiers(req.headers);
+            const { port, TCPPort, UDPPort, remoteKey, name, protocol: wishedProtocol } = this._getHeaderIdentifiers(req.headers);
+            const protocol = this._negotiateProtocol(wishedProtocol);
 
             this.list.add({
                 hostname: address,