* handle end and begin on same channel in same frame

* ensure protocol errors are passed in disconnect context

Author: grs

lib/connection.js

@@ -464,6 +464,7 @@ Connection.prototype.output = function () {
             }
         }
     } catch (e) {
+        this.saved_error = e;
         if (e.name === 'ProtocolError') {
             console.error('[' + this.options.id + '] error on write: ' + e + ' ' + this._get_peer_details() + ' ' + e.name);
             this.dispatch('protocol_error', e) || console.error('[' + this.options.id + '] error on write: ' + e + ' ' + this._get_peer_details());
@@ -511,6 +512,7 @@ Connection.prototype.input = function (buff) {
             this.heartbeat_out = setTimeout(this._write_frame.bind(this), this.remote.open.idle_time_out / 2);
         }
     } catch (e) {
+        this.saved_error = e;
         if (e.name === 'ProtocolError') {
             this.dispatch('protocol_error', e) ||
                 console.error('[' + this.options.id + '] error on read: ' + e + ' ' + this._get_peer_details() + ' (buffer:' + buffer_to_hex(buffer) + ')');
@@ -535,7 +537,9 @@ Connection.prototype.on_error = function (e) {
 };
 
 Connection.prototype.eof = function (e) {
-    this._disconnected(e);
+    var error = e || this.saved_error;
+    this.saved_error = undefined;
+    this._disconnected(error);
 };
 
 Connection.prototype._disconnected = function (error) {
@@ -734,8 +738,12 @@ Connection.prototype._context = function (c) {
 };
 
 Connection.prototype.remove_session = function (session) {
-    delete this.remote_channel_map[session.remote.channel];
-    delete this.local_channel_map[session.local.channel];
+    if (this.remote_channel_map[session.remote.channel] === session) {
+        delete this.remote_channel_map[session.remote.channel];
+    }
+    if (this.local_channel_map[session.local.channel] === session) {
+        delete this.local_channel_map[session.local.channel];
+    }
 };
 
 Connection.prototype.remove_all_sessions = function () {