Skip to content

Enable to utf8-decode string payloads #88

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
merged 1 commit into from
Mar 21, 2017
Merged

Enable to utf8-decode string payloads #88

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
14 changes: 13 additions & 1 deletion lib/browser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ function map(ary, each, done) {
* @api public
*/

exports.decodePayload = function (data, binaryType, callback) {
exports.decodePayload = function (data, binaryType, utf8decode, callback) {
if (typeof data !== 'string') {
return exports.decodePayloadAsBinary(data, binaryType, callback);
}
Expand All @@ -379,12 +379,24 @@ exports.decodePayload = function (data, binaryType, callback) {
binaryType = null;
}

if (typeof utf8decode === 'function') {
callback = utf8decode;
utf8decode = null;
}

var packet;
if (data === '') {
// parser error - ignoring payload
return callback(err, 0, 1);
}

if (utf8decode) {
data = tryDecode(data);
if (data === false) {
return callback(err, 0, 1);
}
}

var length = '', n, msg;

for (var i = 0, l = data.length; i < l; i++) {
Expand Down
14 changes: 13 additions & 1 deletion lib/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ function map(ary, each, done) {
* @api public
*/

exports.decodePayload = function (data, binaryType, callback) {
exports.decodePayload = function (data, binaryType, utf8decode, callback) {
if (typeof data !== 'string') {
return exports.decodePayloadAsBinary(data, binaryType, callback);
}
Expand All @@ -275,11 +275,23 @@ exports.decodePayload = function (data, binaryType, callback) {
binaryType = null;
}

if (typeof utf8decode === 'function') {
callback = utf8decode;
utf8decode = null;
}

if (data === '') {
// parser error - ignoring payload
return callback(err, 0, 1);
}

if (utf8decode) {
data = tryDecode(data);
if (data === false) {
return callback(err, 0, 1);
}
}

var length = '', n, msg, packet;

for (var i = 0, l = data.length; i < l; i++) {
Expand Down