Skip to content
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.

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

Parser performance boost #573

Merged
merged 3 commits into from Oct 12, 2011
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
102 changes: 50 additions & 52 deletions lib/parser.js
Expand Up @@ -13,35 +13,38 @@
* Packet types.
*/

var packets = exports.packets = [
'disconnect'
, 'connect'
, 'heartbeat'
, 'message'
, 'json'
, 'event'
, 'ack'
, 'error'
, 'noop'
];
var packets = exports.packets = {
'disconnect': 0
, 'connect': 1
, 'heartbeat': 2
, 'message': 3
, 'json': 4
, 'event': 5
, 'ack': 6
, 'error': 7
, 'noop': 8
}
, packetslist = Object.keys(packets);

/**
* Errors reasons.
*/

var reasons = exports.reasons = [
'transport not supported'
, 'client not handshaken'
, 'unauthorized'
];
var reasons = exports.reasons = {
'transport not supported': 0
, 'client not handshaken': 1
, 'unauthorized': 2
}
, reasonslist = Object.keys(reasons);

/**
* Errors advice.
*/

var advice = exports.advice = [
'reconnect'
];
var advice = exports.advice = {
'reconnect': 0
}
, advicelist = Object.keys(advice);

/**
* Encodes a packet.
Expand All @@ -50,22 +53,13 @@ var advice = exports.advice = [
*/

exports.encodePacket = function (packet) {
var type = packets.indexOf(packet.type)
var type = packets[packet.type]
, id = packet.id || ''
, endpoint = packet.endpoint || ''
, ack = packet.ack
, data = null;

switch (packet.type) {
case 'error':
var reason = packet.reason ? reasons.indexOf(packet.reason) : ''
, adv = packet.advice ? advice.indexOf(packet.advice) : ''

if (reason !== '' || adv !== '')
data = reason + (adv !== '' ? ('+' + adv) : '')

break;

case 'message':
if (packet.data !== '')
data = packet.data;
Expand All @@ -85,15 +79,24 @@ exports.encodePacket = function (packet) {
data = JSON.stringify(packet.data);
break;

case 'ack':
data = packet.ackId
+ (packet.args && packet.args.length
? '+' + JSON.stringify(packet.args) : '');
break;

case 'connect':
if (packet.qs)
data = packet.qs;
break;

case 'ack':
data = packet.ackId
+ (packet.args && packet.args.length
? '+' + JSON.stringify(packet.args) : '');
case 'error':
var reason = packet.reason ? reasons[packet.reason] : ''
, adv = packet.advice ? advice[packet.advice] : ''

if (reason !== '' || adv !== '')
data = reason + (adv !== '' ? ('+' + adv) : '')

break;
}

Expand Down Expand Up @@ -141,14 +144,15 @@ exports.encodePayload = function (packets) {
var regexp = /([^:]+):([0-9]+)?(\+)?:([^:]+)?:?([\s\S]*)?/;

exports.decodePacket = function (data) {
var pieces = data.match(regexp);
var pieces = data.match(regexp)
, parse = JSON.parse;

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Surely a micro-optimisation?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I saw a small increase of decoding per sec because of it.


if (!pieces) return {};

var id = pieces[2] || ''
, data = pieces[5] || ''
, packet = {
type: packets[pieces[1]]
type: packetslist[pieces[1]]
, endpoint: pieces[4] || ''
};

Expand All @@ -163,54 +167,48 @@ exports.decodePacket = function (data) {

// handle different packet types
switch (packet.type) {
case 'error':
var pieces = data.split('+');
packet.reason = reasons[pieces[0]] || '';
packet.advice = advice[pieces[1]] || '';
break;

case 'message':
packet.data = data || '';
break;

case 'event':
try {
var opts = JSON.parse(data);
packet.name = opts.name;
packet.args = opts.args;
pieces = parse(data);
packet.name = pieces.name;
packet.args = pieces.args;
} catch (e) { }

packet.args = packet.args || [];
break;

case 'json':
try {
packet.data = JSON.parse(data);
packet.data = parse(data);
} catch (e) { }
break;

case 'connect':
packet.qs = data || '';
break;

case 'ack':
var pieces = data.match(/^([0-9]+)(\+)?(.*)/);
pieces = data.match(/^([0-9]+)(\+)?(.*)/);
if (pieces) {
packet.ackId = pieces[1];
packet.args = [];

if (pieces[3]) {
try {
packet.args = pieces[3] ? JSON.parse(pieces[3]) : [];
packet.args = pieces[3] ? parse(pieces[3]) : [];
} catch (e) { }
}
}
break;

case 'disconnect':
case 'heartbeat':
break;
};
case 'error':
pieces = data.split('+');
packet.reason = reasonslist[pieces[0]] || '';
packet.advice = advicelist[pieces[1]] || '';
}

return packet;
};
Expand Down