Play nicer with RabbitMQ.

Author: Tony Young

lib/frame.js

@@ -64,16 +64,24 @@ Frame.prototype.build_frame = function(args, want_receipt) {
 Frame.prototype.as_string = function() {
     var self = this,
         header_strs = [],
-        frame = null,
+        frame = "",
         command = this.command,
         headers = this.headers,
         body = this.body;
 
     for (var header in headers) {
-        header_strs.push(header + ': ' + headers[header]);
+        header_strs.push(header + ':' + headers[header]);
     }
 
-    frame = command + '\n' + header_strs.join('\n') + '\n\n' + body + '\x00';
+    frame += command + "\n";
+    frame += header_strs.join('\n');
+    frame += "\n";
+
+    if(body)
+        frame += '\n' + body + '\x00';
+
+    frame += '\n\x00';
+
     return frame;
 };
 

lib/stomp.js

@@ -98,8 +98,8 @@ function _connect(stomp) {
 
     socket.on('connect', function() {
         log.debug('Connected to socket');
-        if (utils.really_defined(stomp.login)
-                && utils.really_defined(stomp.passcode)) {
+        if (utils.really_defined(stomp.login) &&
+            utils.really_defined(stomp.passcode)) {
             stomp_connect(stomp, {login: stomp.login, passcode: stomp.passcode});
         }
         else {
@@ -117,8 +117,6 @@ function _connect(stomp) {
         var frames = buffer.split('\0\n');
         var parsed_frame = null;
         var _frame = null;
-        buffer = frames.pop();
-
         while (_frame = frames.shift()) {
             parsed_frame = parse_frame(_frame + '\0\n')
             stomp.handle_new_frame(parsed_frame);
@@ -138,6 +136,7 @@ function _connect(stomp) {
         log.debug('disconnected');
         if (error)
             log.error('Disconnected with error: ' + error);
+        stomp.emit("disconnected");
     });
 };
 
@@ -150,6 +149,7 @@ function stomp_connect(stomp, headers) {
     args['headers'] = headers;
 
     var frame_to_send = _frame.build_frame(args);
+
     send_frame(stomp, frame_to_send);
     log.debug('Connected to STOMP');
 };