Skip to content

Fix double utf8 encoding for payloads #81

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

Merged
darrachequesne merged 1 commit into from
Dec 21, 2016
Merged

Fix double utf8 encoding for payloads #81

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions lib/browser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ exports.encodePayload = function (packets, supportsBinary, callback) {
}

function encodeOne(packet, doneCallback) {
exports.encodePacket(packet, !isBinary ? false : supportsBinary, true, function(message) {
exports.encodePacket(packet, !isBinary ? false : supportsBinary, false, function(message) {
doneCallback(null, setLengthHeader(message));
});
}
Expand Down Expand Up @@ -407,7 +407,7 @@ exports.decodePayload = function (data, binaryType, callback) {
}

if (msg.length) {
packet = exports.decodePacket(msg, binaryType, true);
packet = exports.decodePacket(msg, binaryType, false);

if (err.type == packet.type && err.data == packet.data) {
// parser error in individual packet - ignoring payload
Expand Down
4 changes: 2 additions & 2 deletions lib/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ exports.encodePayload = function (packets, supportsBinary, callback) {
}

function encodeOne(packet, doneCallback) {
exports.encodePacket(packet, supportsBinary, true, function(message) {
exports.encodePacket(packet, supportsBinary, false, function(message) {
doneCallback(null, setLengthHeader(message));
});
}
Expand Down Expand Up @@ -302,7 +302,7 @@ exports.decodePayload = function (data, binaryType, callback) {
}

if (msg.length) {
packet = exports.decodePacket(msg, binaryType, true);
packet = exports.decodePacket(msg, binaryType, false);

if (err.type == packet.type && err.data == packet.data) {
// parser error in individual packet - ignoring payload
Expand Down
13 changes: 6 additions & 7 deletions test/parser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,12 @@ module.exports = function(parser) {
});
});
});

it('should not utf8 encode when dealing with strings only', function() {
encPayload([{ type: 'message', data: '€€€' }, { type: 'message', data: 'α' }], function(data) {
expect(data).to.eql('4:4€€€2:4α');
});
});
});

describe('decoding error handling', function () {
Expand Down Expand Up @@ -255,13 +261,6 @@ module.exports = function(parser) {
});
});

it('should err on invalid utf8', function () {
decPayload('2:4\uffff', function (packet, index, total) {
var isLast = index + 1 == total;
expect(packet).to.eql(err);
expect(isLast).to.eql(true);
});
});
});
});
});
Expand Down