Another possible fix for issue #15. Preserve the original buffer that comes in off the socket. slice off the rest of the stuff and extract commands/headers

Author: benjaminws

lib/stomp.js

@@ -29,19 +29,22 @@ var net = require('net'),
     utils = new stomp_utils.StompUtils(),
     log = null;
 
-function parse_command(data) {
+function extract_command(data) {
     var command,
         this_string = data.toString('utf8', start=0, end=data.length);
     command = this_string.split('\n');
     return command[0];
 };
 
-function parse_headers(headers_str) {
+function extract_headers(data) {
     var these_headers = {},
         one_header = [],
         header_key = null,
         header_val = null,
-        headers_split = headers_str.split('\n');
+        data_str = data.toString('utf8', start=0, end=data.length);
+
+        headers_str = data_str.split('\n\n', 1);
+        headers_split = headers_str[0].split('\n');
 
     for (var i = 0; i < headers_split.length; i++) {
         one_header = headers_split[i].split(':');
@@ -54,37 +57,33 @@ function parse_headers(headers_str) {
             these_headers[one_header[0]] = one_header[1];
         }
     }
-    return these_headers;
+    return {length: headers_str[0].length, headers: these_headers};
 };
 
-function make_body_buffer(body) {
-    buffer = new Buffer(body, encoding='utf8');
-    return buffer;
-}
-
 function parse_frame(chunk) {
     var args = {},
         data = null,
         command = null,
         headers = null,
         body = null,
-        headers_str = null;
+        headers_str = null,
+        log = new StompLogging(true);
 
     if (!utils.really_defined(chunk))
         return null;
 
-    command = parse_command(chunk);
-    data = chunk.slice(command.length + 1, chunk.length);
-    data = data.toString('utf8', start=0, end=data.length);
+    command = extract_command(chunk);
+    chunk = chunk.slice(command.length + 1, chunk.length);
 
-    the_rest = data.split('\n\n');
-    headers = parse_headers(the_rest[0]);
-    body = the_rest.slice(1, the_rest.length);
+    header_data = extract_headers(chunk);
+    chunk = chunk.slice(header_data.length + 1, chunk.length);
 
-    if ('content-length' in headers) {
+    headers = header_data.headers;
+
+    body = chunk;
+
+    if ('content-length' in headers)
         headers['bytes_message'] = true;
-        body = make_body_buffer(body);
-    }
 
     args = {
         command: command,