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.

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

Jump to bottom

add support for passing connection parameters as an object #159

Merged
merged 3 commits into from
Jun 21, 2015
Merged

add support for passing connection parameters as an object #159

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8b08ada
add support for passing connection parameters as an object
ben-page May 26, 2015
24859f2
don't mutate url
ben-page May 26, 2015
7d9a25c
removed tabs added by editor
ben-page May 26, 2015
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
50 changes: 32 additions & 18 deletions lib/connect.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,17 +42,14 @@ var CLIENT_PROPERTIES = {
}
};


// Construct the main frames used in the opening handshake
function openFrames(parts, credentials, extraClientProperties) {

var vhost = parts.pathname;
function openFrames(vhost, query, credentials, extraClientProperties) {
if (!vhost)
vhost = '/';
else
vhost = QS.unescape(vhost.substr(1));
vhost = QS.unescape(vhost);

var q = parts.query || {};
var query = query || {};

function intOrDefault(val, def) {
return (val === undefined) ? def : parseInt(val);
Expand All @@ -65,12 +62,12 @@ function openFrames(parts, credentials, extraClientProperties) {
'clientProperties': copyInto(extraClientProperties, clientProperties),
'mechanism': credentials.mechanism,
'response': credentials.response(),
'locale': q.locale || 'en_US',
'locale': query.locale || 'en_US',

// tune-ok
'channelMax': intOrDefault(q.channelMax, 0),
'frameMax': intOrDefault(q.frameMax, 0x1000),
'heartbeat': intOrDefault(q.heartbeat, 0),
'channelMax': intOrDefault(query.channelMax, 0),
'frameMax': intOrDefault(query.frameMax, 0x1000),
'heartbeat': intOrDefault(query.heartbeat, 0),

// open
'virtualHost': vhost,
Expand All @@ -97,22 +94,39 @@ function connect(url, socketOptions, openCallback) {
// than using `Object.create()`.
var sockopts = clone(socketOptions || {});
url = url || 'amqp://localhost';

var parts = URL.parse(url, true); // yes, parse the query string
var protocol = parts.protocol;

var noDelay = !!sockopts.noDelay;
var timeout = sockopts.timeout;
var keepAlive = !!sockopts.keepAlive;
// 0 is default for node
var keepAliveDelay = sockopts.keepAliveDelay || 0;

var extraClientProperties = sockopts.clientProperties || {};
var credentials = sockopts.credentials || credentialsFromUrl(parts);

var protocol, fields;
if (typeof url === 'object') {
protocol = (url.protocol || 'amqp') + ':';
sockopts.host = url.hostname;
sockopts.port = url.port || ((protocol === 'amqp:') ? 5672 : 5671);

var user, pass;
if (!url.username) {
user = 'guest';
pass = url.password || 'guest';
} else {
user = url.username;
pass = url.password;
}

var fields = openFrames(parts, credentials, extraClientProperties);
var port = parts.port || ((protocol === 'amqp:') ? 5672 : 5671);
sockopts.host = parts.hostname;
sockopts.port = parseInt(port);
fields = openFrames(url.vhost, null, sockopts.credentials || credentials.plain(user, pass), extraClientProperties);
} else {
var parts = URL.parse(url, true); // yes, parse the query string
protocol = parts.protocol;
sockopts.host = parts.hostname;
sockopts.port = parseInt(parts.port) || ((protocol === 'amqp:') ? 5672 : 5671);
var vhost = parts.pathname ? parts.pathname.substr(1) : null;
fields = openFrames(vhost, parts.query, sockopts.credentials || credentialsFromUrl(parts), extraClientProperties);
}

var sockok = false;
var sock;
Expand Down