github/socket.io
1
1
Fork 0
mirror of https://github.com/socketio/socket.io.git synced 2026-04-30 03:00:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

socket: constructor can accept uri/opts simultaneously

Browse Source
This commit is contained in:
Guillermo Rauch
2012-12-16 20:34:18 -03:00
parent 0660b5ce27
commit 00a5640a12
1 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
lib/socket.js
View File

@@ -22,30 +22,43 @@ var global = util.global();
/**
* Socket constructor.
*
* @param {String|Object} uri or options
* @param {Object} options
* @api public
*/
function Socket(opts){
if (!(this instanceof Socket)) return new Socket(opts);
function Socket(uri, opts){
if (!(this instanceof Socket)) return new Socket(uri, opts);
if ('string' == typeof opts) {
var uri = util.parseUri(opts);
opts = opts || {};
if ('object' == typeof uri) {
opts = uri;
uri = null;
}
if (uri) {
uri = util.parseUri(uri);
opts = arguments[1] || {};
opts.host = uri.host;
opts.secure = uri.protocol == 'https' || uri.protocol == 'wss';
opts.port = uri.port;
}
opts = opts || {};
this.secure = null != opts.secure ? opts.secure : (global.location && 'https:' == location.protocol);
this.secure = null != opts.secure ? opts.secure :
(global.location && 'https:' == location.protocol);
if (opts.host) {
var pieces = opts.host.split(':');
opts.hostname = pieces.shift();
if (pieces.length) opts.port = pieces.pop();
}
this.hostname = opts.hostname || (global.location ? location.hostname : 'localhost');
this.port = opts.port || (global.location && location.port ? location.port : (this.secure ? 443 : 80));
this.hostname = opts.hostname ||
(global.location ? location.hostname : 'localhost');
this.port = opts.port || (global.location && location.port ?
location.port :
(this.secure ? 443 : 80));
this.query = opts.query || {};
this.query.uid = rnd();
this.upgrade = false !== opts.upgrade;