Skip to content

Cleanup stream state in net#465

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

Closed
chrisdickinson wants to merge 6 commits into from
Closed

Cleanup stream state in net #465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f5c5ebe
doc: add release GPG fingerprint for chrisdickinson
chrisdickinson Feb 3, 2015
1d8ad7d
net: do not reach through writableState for decodeStrings
chrisdickinson Jan 16, 2015
0e02aaf
net: use pause() instead of changing _readableState.flowing
chrisdickinson Jan 16, 2015
cc402e5
net: do not reach through readableState for ended, do not maniplate .…
chrisdickinson Jan 16, 2015
30cce39
net,stream,tls: nix writableState.errorEmitted
chrisdickinson Jan 16, 2015
f05d1eb
style fixes
chrisdickinson Feb 4, 2015
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
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -262,6 +262,7 @@ information about the governance of the io.js project, see
* **Fedor Indutny** ([@indutny](https://github.com/indutny)) <fedor.indutny@gmail.com> (Technical Committee)
* **Trevor Norris** ([@trevnorris](https://github.com/trevnorris)) <trev.norris@gmail.com> (Technical Committee)
* **Chris Dickinson** ([@chrisdickinson](https://github.com/chrisdickinson)) <christopher.s.dickinson@gmail.com> (Technical Committee)
<br>Release GPG key: 9554F04D7259F04124DE6B476D5A82AC7E37093B

@indutnyindutnyFeb 4, 2015

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm... doesn't look like it belong here.

* **Colin Ihrig** ([@cjihrig](https://github.com/cjihrig)) &lt;cjihrig@gmail.com&gt; (Technical Committee)
* **Mikeal Rogers** ([@mikeal](https://github.com/mikeal)) &lt;mikeal.rogers@gmail.com&gt;
* **Rod Vagg** ([@rvagg](https://github.com/rvagg)) &lt;rod@vagg.org&gt;
Expand Down
4 changes: 0 additions & 4 deletions lib/_stream_writable.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,9 +104,6 @@ function WritableState(options, stream) {
// emit prefinish if the only thing we're waiting for is _write cbs
// This is relevant for synchronous Transform streams
this.prefinished = false;

// True if the error was already emitted and should not be thrown again
this.errorEmitted = false;
}

WritableState.prototype.getBuffer = function writableStateGetBuffer() {
Expand DownExpand Up@@ -299,7 +296,6 @@ function onwriteError(stream, state, sync, er, cb) {
cb(er);
}

stream._writableState.errorEmitted = true;
stream.emit('error', er);
}

Expand Down
4 changes: 2 additions & 2 deletions lib/_tls_wrap.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -306,9 +306,9 @@ TLSSocket.prototype._init = function(socket) {
}

this.ssl.onerror = function(err) {
if (self._writableState.errorEmitted)
if (self._errorEmitted)
return;
self._writableState.errorEmitted = true;
self._errorEmitted = true;

@indutnyindutnyFeb 3, 2015

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm... This was a bug fix, as far as I remember. Why doesn't it apply anymore?


// Destroy socket if error happened before handshake's finish
if (!this._secureEstablished) {
Expand Down
25 changes: 12 additions & 13 deletions lib/net.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -117,6 +117,7 @@ function initSocketHandle(self) {
function Socket(options) {
if (!(this instanceof Socket)) return new Socket(options);

this._errorEmitted = false;

@indutnyindutnyFeb 3, 2015

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see, you moved it here.

this._connecting = false;
this._hadError = false;
this._handle = null;
Expand All@@ -127,6 +128,8 @@ function Socket(options) {
else if (options === undefined)
options = {};

// handle strings directly
options.decodeStrings = false;
stream.Duplex.call(this, options);

if (options.handle) {
Expand DownExpand Up@@ -158,9 +161,6 @@ function Socket(options) {
this._pendingData = null;
this._pendingEncoding = '';

// handle strings directly
this._writableState.decodeStrings = false;

// default to *not* allowing half open sockets
this.allowHalfOpen = options && options.allowHalfOpen || false;

Expand All@@ -171,7 +171,7 @@ function Socket(options) {
// stop the handle from reading and pause the stream
this._handle.reading = false;
this._handle.readStop();
this._readableState.flowing = false;
this.pause();
} else {
this.read(0);
}
Expand All@@ -193,11 +193,10 @@ function onSocketFinish() {
}

debug('onSocketFinish');
if (!this.readable || this._readableState.ended) {
if (!this.readable) {
debug('oSF: ended, destroy', this._readableState);
return this.destroy();
}

debug('oSF: not ended, call shutdown()');

// otherwise, just shutdown, or destroy() if not possible
Expand DownExpand Up@@ -239,13 +238,10 @@ function onSocketEnd() {
// ended should already be true, since this is called *after*
// the EOF errno and onread has eof'ed
debug('onSocketEnd', this._readableState);
this._readableState.ended = true;
if (this._readableState.endEmitted) {
this.readable = false;
maybeDestroy(this);
} else {
this.once('end', function() {
this.readable = false;
maybeDestroy(this);
});
this.read(0);
Expand DownExpand Up@@ -425,12 +421,15 @@ Socket.prototype._destroy = function(exception, cb) {
var self = this;

function fireErrorCallbacks() {
if (cb) cb(exception);
if (exception && !self._writableState.errorEmitted) {
var hadSeenError = self._errorEmitted;
self._errorEmitted = self._errorEmitted || !!(exception);
if (cb) {
cb(exception);
} else if (exception && !hadSeenError) {
process.nextTick(function() {
self.emit('error', exception);
});
self._writableState.errorEmitted = true;
self._errorEmitted = true;
}
};

Expand DownExpand Up@@ -845,7 +844,7 @@ Socket.prototype.connect = function(options, cb) {
this._writableState.ended = false;
this._writableState.ending = false;
this._writableState.finished = false;
this._writableState.errorEmitted = false;
this._errorEmitted = false;
this.destroyed = false;
this._handle = null;
}
Expand Down