Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 7 additions & 4 deletions lib/byline.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@

var stream = require('stream'),
util = require('util'),
timers = require('timers');
timers = require('timers'),
StringDecoder = require('string_decoder').StringDecoder;


// convinience API
module.exports = function(readStream, options) {
Expand Down Expand Up @@ -90,12 +92,13 @@ LineStream.prototype._transform = function(chunk, encoding, done) {

if (Buffer.isBuffer(chunk)) {
if (encoding == 'buffer') {
chunk = chunk.toString(); // utf8
encoding = 'utf8';
}
else {
chunk = chunk.toString(encoding);
if(!this.decoder){
this.decoder = new StringDecoder(encoding)
}
chunk = this.decoder.write(chunk);
// chunk = chunk.toString(encoding);
}
this._chunkEncoding = encoding;

Expand Down
21 changes: 21 additions & 0 deletions test/tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,27 @@ describe('byline', function() {
readFile('test/rfc_huge.txt', done);
});

it('should not break multibyte unicode characters spanning chunks', function(done) {
var direct = fs.readFileSync('test/unicode.txt', 'utf8').split('\n')
var input = fs.createReadStream('test/unicode.txt');
var lineStream = byline(input, { keepEmptyLines: true });
lineStream.setEncoding('utf8');

var lines = [];
lineStream.on('data', function(line) {
lines.push(line);
});

lineStream.on('end', function() {
assert.equal(direct.length, lines.length);
lines.forEach((line, i) => {
var other = direct[i];
assert.equal(other, line)
})
done();
});
});

function readFile(filename, done) {
var input = fs.createReadStream(filename);
var lineStream = byline(input);
Expand Down
Loading