jcarr
/
noVNC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unregister event listeners from websock. 

Prevents possible memory and event notification leaks when tearing down
connection and reestablishing a new one.
This commit is contained in:
Jacob Swanner 2015-01-08 15:25:55 -05:00
parent fc00821eba
commit 155d78b399
3 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/rfb.js
View File

@ -197,6 +197,7 @@ var RFB;
} else {
this._fail("Server disconnected" + msg);
}
this._sock.off('close');
}.bind(this));
this._sock.on('error', function (e) {
Util.Warn("WebSocket on-error event");
@ -239,6 +240,9 @@ var RFB;
disconnect: function () {
this._updateState('disconnect', 'Disconnecting');
this._sock.off('error');
this._sock.off('message');
this._sock.off('open');
},
sendPassword: function (passwd) {

4
include/websock.js
View File

@ -200,6 +200,10 @@ function Websock() {
},
// Event Handlers
off: function (evt) {
this._eventHandlers[evt] = function () {};
},
on: function (evt, handler) {
this._eventHandlers[evt] = handler;
},

26
tests/test.rfb.js
View File

@ -62,6 +62,24 @@ describe('Remote Frame Buffer Protocol Client', function() {
expect(client._updateState).to.have.been.calledOnce;
expect(client._updateState).to.have.been.calledWith('disconnect');
});
it('should unregister error event handler', function () {
sinon.spy(client._sock, 'off');
client.disconnect();
expect(client._sock.off).to.have.been.calledWith('error');
});
it('should unregister message event handler', function () {
sinon.spy(client._sock, 'off');
client.disconnect();
expect(client._sock.off).to.have.been.calledWith('message');
});
it('should unregister open event handler', function () {
sinon.spy(client._sock, 'off');
client.disconnect();
expect(client._sock.off).to.have.been.calledWith('open');
});
});
describe('#sendPassword', function () {
@ -1710,6 +1728,14 @@ describe('Remote Frame Buffer Protocol Client', function() {
expect(client._rfb_state).to.equal('failed');
});
it('should unregister close event handler', function () {
sinon.spy(client._sock, 'off');
client.connect('host', 8675);
client._rfb_state = 'disconnect';
client._sock._websocket.close();
expect(client._sock.off).to.have.been.calledWith('close');
});
// error events do nothing
});
});