Skip to content

Bug fix for international character support #46

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
hpalz wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Bug fix for international character support #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4d054a0
Demonstrating international character issue with test
HarryPalz Apr 3, 2018
0bd0408
Using string length instead of byte length to support international char
HarryPalz Apr 3, 2018
bab45ff
Correcting internation char tests with proper string length
HarryPalz Apr 3, 2018
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/json-socket.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ JsonSocket.prototype = {
}
}
if (this._contentLength != null) {
var length = Buffer.byteLength(this._buffer, 'utf8');
var length = this._buffer.length;
if (length == this._contentLength) {
this._handleMessage(this._buffer);
} else if (length > this._contentLength) {
Expand Down Expand Up @@ -156,7 +156,7 @@ JsonSocket.prototype = {
},
_formatMessageData: function(message) {
var messageData = JSON.stringify(message);
var length = Buffer.byteLength(messageData, 'utf8');
var length = messageData.length;
var data = length + this._opts.delimeter + messageData;
return data;
},
Expand Down
44 changes: 43 additions & 1 deletion test/message-parsing.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,27 @@ describe('JsonSocket message parsing', function() {
assert.equal(socket._buffer, '');
});

it('should format message with string length', function () {
var message = socket._formatMessageData("Please take out the søppel");
var i = message.indexOf('#');
var rawContentLength = message.substring(0, i);
var contentLength = parseInt(rawContentLength);
assert.equal(contentLength, 28);
socket._handleData(message);
assert.equal(messages[0], 'Please take out the søppel');
assert.equal(socket._buffer, '');
});

it('should parse multiple messages (with IC) in one packet', function () {
var message = socket._formatMessageData("søppel");
message += socket._formatMessageData("rubbish");
socket._handleData(message);
assert.equal(messages.length, 2);
assert.equal(messages[0], 'søppel');
assert.equal(messages[1], 'rubbish');
assert.equal(socket._buffer, '');
});

});

describe('JsonSocket message parsing with custom delimeter', function() {
Expand Down Expand Up @@ -215,4 +236,25 @@ describe('JsonSocket message parsing with custom delimeter', function() {
assert.equal(socket._buffer, '');
});

});
it('should format message with string length', function () {
var message = socket._formatMessageData("Please take out the søppel");
var i = message.indexOf(socket._opts.delimeter);
var rawContentLength = message.substring(0, i);
var contentLength = parseInt(rawContentLength);
assert.equal(contentLength, 28);
socket._handleData(message);
assert.equal(messages[0], 'Please take out the søppel');
assert.equal(socket._buffer, '');
});

it('should parse multiple messages (with IC) in one packet', function () {
var message = socket._formatMessageData("søppel");
message += socket._formatMessageData("rubbish");
socket._handleData(message);
assert.equal(messages.length, 2);
assert.equal(messages[0], 'søppel');
assert.equal(messages[1], 'rubbish');
assert.equal(socket._buffer, '');
});

});