Skip to content

Rebase main branch #1

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

Rebase main branch #1

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
5fdde65
implemented NACK
May 5, 2014
e7af174
The matching subscribed queue will be found in the subscription heade…
albanm Aug 1, 2014
d8d7527
add nack support copied from xFragger/stomp-js
albanm Aug 1, 2014
e3e5f8d
Add keep alive to socket
marcingasior Oct 12, 2014
21bbfde
fix check for missing subscription
nicksellen Apr 16, 2015
3cfe13d
Merge pull request #40 from nicksellen/master
victor73 Aug 8, 2015
602284a
Merge pull request #39 from marcingasior/master
victor73 Aug 8, 2015
613b897
Merge pull request #37 from xFragger/master
victor73 Aug 8, 2015
72af21c
If the length of the header array is 1 or 0 then it makes no sense to…
nenuadrian Nov 24, 2015
d75ef72
Merge pull request #43 from nenuadrian/master
victor73 Dec 26, 2015
d8c04c9
Fixed conflict and some formatting of PR.
Feb 28, 2017
c9cd1e2
Merge branch 'albanm-master'
Feb 28, 2017
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
39 changes: 35 additions & 4 deletions lib/stomp.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ function parse_headers(raw_headers) {
headers[header_key] = header_val;
continue;
}
headers[header[0].trim()] = header[1].trim();
}
return headers;
};
Expand Down Expand Up @@ -137,6 +136,8 @@ function _setupListeners(stomp) {

var socket = stomp.socket;

socket.setKeepAlive(true);

socket.on('drain', function(data) {
log.debug('draining');
});
Expand Down Expand Up @@ -284,7 +285,8 @@ Stomp.prototype.connect = function() {
// Takes a `Frame` object
//
Stomp.prototype.is_a_message = function(this_frame) {
return (this_frame.headers !== null && utils.really_defined(this_frame.headers['message-id']))
return (this_frame.headers !== null &&
utils.really_defined(this_frame.headers['message-id']))
}

// ## Stomp.should_run_message_callback
Expand All @@ -294,9 +296,13 @@ Stomp.prototype.is_a_message = function(this_frame) {
// Takes a `Frame` object
//
Stomp.prototype.should_run_message_callback = function(this_frame) {
var subscription = this._subscribed_to[this_frame.headers.destination];
// The matching subscribed queue will be found in the subscription headers
// in the case of a reply-to temp queue with rabbitmq
var subscription = this._subscribed_to[this_frame.headers.destination] ||
this._subscribed_to[this_frame.headers.subscription];
if (this_frame.headers.destination !== null && subscription !== null) {
if (subscription.enabled && subscription.callback !== null && typeof(subscription.callback) == 'function') {
if (subscription.enabled && subscription.callback !== null &&
typeof subscription.callback === 'function') {
subscription.callback(this_frame.body, this_frame.headers);
}
}
Expand Down Expand Up @@ -399,6 +405,31 @@ Stomp.prototype.ack = function(message_id) {
this.log.debug('acknowledged message: ' + message_id);
};


//
// ## Stomp.nack(message_id)
//
// **Deny received message**
//
// Takes a string representing the message id to nack
//
Stomp.prototype.nack = function(message_id) {
send_command(this, 'NACK', {'message-id': message_id});
this.log.debug('denied message: ' + message_id);
};

//
// ## Stomp.nack(message_id)
//
// **Deny received message**
//
// Takes a string representing the message id to nack
//
Stomp.prototype.nack = function(message_id) {
send_command(this, 'NACK', {'message-id': message_id});
this.log.debug('denied message: ' + message_id);
};

//
// ## Stomp.begin()
//
Expand Down