Skip to content

Process pending frames when handling socket end #436

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Process pending frames when handling socket end #436

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions lib/WebSocketConnection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ WebSocketConnection.prototype.handleSocketData = function(data) {
this.processReceivedData();
};

WebSocketConnection.prototype.processReceivedData = function() {
WebSocketConnection.prototype.processReceivedData = function(isSync = false) {
this._debug('processReceivedData');
// If we're not connected, we should ignore any data remaining on the buffer.
if (!this.connected) { return; }
Expand Down Expand Up @@ -320,7 +320,11 @@ WebSocketConnection.prototype.processReceivedData = function() {
process.nextTick(function() { self.emit('frame', frame); });
}

process.nextTick(function() { self.processFrame(frame); });
if (isSync) {
self.processFrame(frame);
} else {
process.nextTick(function() { self.processFrame(frame); });
}

this.currentFrame = new WebSocketFrame(this.maskBytes, this.frameHeader, this.config);

Expand All @@ -329,7 +333,11 @@ WebSocketConnection.prototype.processReceivedData = function() {
// processed. We use setImmediate here instead of process.nextTick to
// explicitly indicate that we wish for other I/O to be handled first.
if (this.bufferList.length > 0) {
setImmediateImpl(this.receivedDataHandler);
if (isSync) {
this.receivedDataHandler();
} else {
setImmediateImpl(this.receivedDataHandler);
}
}
};

Expand All @@ -353,6 +361,11 @@ WebSocketConnection.prototype.handleSocketError = function(error) {
};

WebSocketConnection.prototype.handleSocketEnd = function() {
// We might have socket data scheduled for a next tick, process it now.
if (this.bufferList.length > 0) {
this.receivedDataHandler(true);
}

this._debug('handleSocketEnd: received socket end. state = %s', this.state);
this.receivedEnd = true;
if (this.state === STATE_CLOSED) {
Expand Down