Skip to content

stream_base: expose bytesRead getter #6284

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
indutny wants to merge 6 commits into from
Closed

stream_base: expose bytesRead getter #6284

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
eb19df6
stream_base: expose `bytesRead` getter
indutny Apr 19, 2016
a6ee571
fixes
indutny Apr 20, 2016
6357f46
symbol
indutny Apr 20, 2016
783cae2
fix test
indutny Apr 20, 2016
4c50cc4
net: replace __defineGetter__ with defineProperty
indutny Apr 20, 2016
62a88cb
fix
indutny Apr 20, 2016
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
Prev Previous commit
Next Next commit
symbol
  • Loading branch information
@indutny
indutny committed Apr 20, 2016
commit 6357f469a89ab1f6fbf7560aebff545b66785d69
10 changes: 7 additions & 3 deletions lib/net.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,10 @@ function initSocketHandle(self) {
}
}


const BYTES_READ = Symbol('bytesRead');

@jasnell jasnell Apr 20, 2016

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 think the naming preference is something like kBytesRead

@indutny indutny Apr 20, 2016

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Is it?

lib/readline.js:const KEYPRESS_DECODER = Symbol('keypress-decoder');
lib/readline.js:const ESCAPE_DECODER = Symbol('escape-decoder');
lib/repl.js:exports.REPL_MODE_SLOPPY = Symbol('repl-sloppy');
lib/repl.js:exports.REPL_MODE_STRICT = Symbol('repl-strict');
lib/repl.js:exports.REPL_MODE_MAGIC = Symbol('repl-magic');

@jasnell jasnell Apr 20, 2016

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.

Ok, yep, I've seen comments both ways but the code doesn't lie ;-)



function Socket(options) {
if (!(this instanceof Socket)) return new Socket(options);

Expand Down Expand Up @@ -180,7 +184,7 @@ function Socket(options) {
this._server = null;

// Used after `.destroy()`
this._bytesRead = 0;
this[BYTES_READ] = 0;
}
util.inherits(Socket, stream.Duplex);

Expand Down Expand Up @@ -473,7 +477,7 @@ Socket.prototype._destroy = function(exception, cb) {
debug('close handle');
var isException = exception ? true : false;
// `bytesRead` should be accessible after `.destroy()`
this._bytesRead = this._handle.bytesRead;
this[BYTES_READ] = this._handle.bytesRead;

this._handle.close(() => {
debug('emit close');
Expand Down Expand Up @@ -582,7 +586,7 @@ Socket.prototype._getpeername = function() {
};

Socket.prototype.__defineGetter__('bytesRead', function() {

@jasnell jasnell Apr 20, 2016

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.

Since __defineGetter__ is deprecated now, can these be turned into proper Object.defineProperty() calls? Perhaps as a separate commit in this PR?

e.g.

Object.defineProperty(Socket.prototype, 'bytesRead', {
  configurable: false,
  enumerable: true,
  get: function() {
    return this._handle ? this.handle.bytesRead : this[BYTES_READ];
  }
});

@indutny indutny Apr 20, 2016

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Ack.

return this._handle ? this._handle.bytesRead : this._bytesRead;
return this._handle ? this._handle.bytesRead : this[BYTES_READ];
});

Socket.prototype.__defineGetter__('remoteAddress', function() {
Expand Down