Skip to content

Fix deprecation warnings about Buffer api usage #53

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
mistic wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix deprecation warnings about Buffer api usage #53

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
14 changes: 12 additions & 2 deletions lib/byline.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,16 +140,26 @@ LineStream.prototype._flush = function(done) {
this._pushBuffer(this._chunkEncoding, 0, done);
};

LineStream.prototype._toBuffer = function(string, encoding) {
if (typeof Buffer.from === 'function') {
return Buffer.from(string, encoding);
} else {
// this was deprecated in node v5 in favor
// of Buffer.from(string, encoding)
return new Buffer(string, encoding);
}
}

// see Readable::push
LineStream.prototype._reencode = function(line, chunkEncoding) {
if (this.encoding && this.encoding != chunkEncoding) {
return new Buffer(line, chunkEncoding).toString(this.encoding);
return this._toBuffer(line, chunkEncoding).toString(this.encoding);
}
else if (this.encoding) {
// this should be the most common case, i.e. we're using an encoded source stream
return line;
}
else {
return new Buffer(line, chunkEncoding);
return this._toBuffer(line, chunkEncoding);
}
};