faye 1.2.3 → 1.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,37 +1,48 @@
1
- { "name" : "faye"
2
- , "description" : "Simple pub/sub messaging for the web"
3
- , "homepage" : "https://faye.jcoglan.com"
4
- , "author" : "James Coglan <jcoglan@gmail.com> (http://jcoglan.com/)"
5
- , "keywords" : ["comet", "websocket", "pubsub", "bayeux", "ajax", "http"]
6
- , "license" : "MIT"
7
-
8
- , "version" : "1.2.3"
9
- , "engines" : {"node": ">=0.6.0"}
10
- , "main" : "src/faye_node"
11
- , "browser" : "src/faye_browser"
12
-
13
- , "dependencies" : { "asap": "*"
14
- , "csprng": "*"
15
- , "faye-websocket": ">=0.9.1"
16
- , "tough-cookie": "*"
17
- , "tunnel-agent": "*"
18
- }
19
- , "devDependencies" : { "jstest": "~1.0.0"
20
- , "mime": "~1.2.0"
21
- , "permessage-deflate": ">=0.1.0"
22
- , "promises-aplus-tests": "~2.1.0"
23
- , "uglifyjs": "*"
24
- , "webpack": "*"
25
- , "imports-loader": "*"
26
- }
27
-
28
- , "scripts" : { "test" : "find spec -name '*_spec.js' | xargs jstest"
29
- , "promise" : "promises-aplus-tests src/util/promise.js"
30
- }
31
-
32
- , "repository" : { "type" : "git"
33
- , "url" : "git://github.com/faye/faye.git"
34
- }
35
-
36
- , "bugs" : "https://github.com/faye/faye/issues"
1
+ {
2
+ "name": "faye",
3
+ "description": "Simple pub/sub messaging for the web",
4
+ "homepage": "https://faye.jcoglan.com",
5
+ "author": "James Coglan <jcoglan@gmail.com> (http://jcoglan.com/)",
6
+ "keywords": [
7
+ "comet",
8
+ "websocket",
9
+ "pubsub",
10
+ "bayeux",
11
+ "ajax",
12
+ "http"
13
+ ],
14
+ "license": "Apache-2.0",
15
+ "version": "1.4.0",
16
+ "engines": {
17
+ "node": ">=0.8.0"
18
+ },
19
+ "main": "src/faye_node",
20
+ "browser": "src/faye_browser",
21
+ "dependencies": {
22
+ "asap": "*",
23
+ "csprng": "*",
24
+ "faye-websocket": ">=0.9.1",
25
+ "safe-buffer": "*",
26
+ "tough-cookie": "*",
27
+ "tunnel-agent": "*"
28
+ },
29
+ "devDependencies": {
30
+ "jstest": "~1.0.0",
31
+ "mime": "~1.2.0",
32
+ "permessage-deflate": ">=0.1.0",
33
+ "promises-aplus-tests": "~2.1.0",
34
+ "webpack": "*",
35
+ "webpack-cli": "*",
36
+ "imports-loader": "<1.0.0"
37
+ },
38
+ "scripts": {
39
+ "start": "webpack --watch",
40
+ "test": "find spec -name '*_spec.js' | xargs jstest",
41
+ "promise": "promises-aplus-tests src/util/promise.js"
42
+ },
43
+ "repository": {
44
+ "type": "git",
45
+ "url": "git://github.com/faye/faye.git"
46
+ },
47
+ "bugs": "https://github.com/faye/faye/issues"
37
48
  }
@@ -1,5 +1,5 @@
1
1
  module.exports = {
2
- TYPE_JSON: {'Content-Type': 'application/json; charset=utf-8'},
3
- TYPE_SCRIPT: {'Content-Type': 'text/javascript; charset=utf-8'},
4
- TYPE_TEXT: {'Content-Type': 'text/plain; charset=utf-8'}
2
+ TYPE_JSON: { 'Content-Type': 'application/json; charset=utf-8' },
3
+ TYPE_SCRIPT: { 'Content-Type': 'text/javascript; charset=utf-8' },
4
+ TYPE_TEXT: { 'Content-Type': 'text/plain; charset=utf-8' }
5
5
  };
@@ -1,13 +1,14 @@
1
1
  'use strict';
2
2
 
3
- var path = require('path'),
3
+ var Buffer = require('safe-buffer').Buffer,
4
+ path = require('path'),
4
5
  querystring = require('querystring'),
5
6
  url = require('url'),
6
7
  WebSocket = require('faye-websocket'),
7
8
  EventSource = WebSocket.EventSource;
8
9
 
9
10
  var constants = require('../util/constants'),
10
- extend = require('../util/extend'),
11
+ assign = require('../util/assign'),
11
12
  idFromMessages = require('../util/id_from_messages'),
12
13
  toJSON = require('../util/to_json'),
13
14
  validateOptions = require('../util/validate_options'),
@@ -118,7 +119,7 @@ var NodeAdapter = Class({ className: 'NodeAdapter',
118
119
 
119
120
  // http://groups.google.com/group/faye-users/browse_thread/thread/4a01bb7d25d3636a
120
121
  if (requestMethod === 'OPTIONS' || request.headers['access-control-request-method'] === 'POST')
121
- return this._handleOptions(response);
122
+ return this._handleOptions(request, response);
122
123
 
123
124
  if (EventSource.isEventSource(request))
124
125
  return this.handleEventSource(request, response);
@@ -130,19 +131,19 @@ var NodeAdapter = Class({ className: 'NodeAdapter',
130
131
  return this._concatStream(request, function(data) {
131
132
  var type = (request.headers['content-type'] || '').split(';')[0],
132
133
  params = (type === 'application/json')
133
- ? {message: data}
134
+ ? { message: data }
134
135
  : querystring.parse(data);
135
136
 
136
137
  request.body = data;
137
138
  this._callWithParams(request, response, params);
138
139
  }, this);
139
140
 
140
- this._returnError(response, {message: 'Unrecognized request type'});
141
+ this._returnError(response, { message: 'Unrecognized request type' });
141
142
  },
142
143
 
143
144
  _callWithParams: function(request, response, params) {
144
145
  if (!params.message)
145
- return this._returnError(response, {message: 'Received request with no message: ' + this._formatRequest(request)});
146
+ return this._returnError(response, { message: 'Received request with no message: ' + this._formatRequest(request) });
146
147
 
147
148
  try {
148
149
  this.debug('Received message via HTTP ' + request.method + ': ?', params.message);
@@ -151,16 +152,20 @@ var NodeAdapter = Class({ className: 'NodeAdapter',
151
152
  jsonp = params.jsonp || constants.JSONP_CALLBACK,
152
153
  isGet = (request.method === 'GET'),
153
154
  type = isGet ? contenttypes.TYPE_SCRIPT : contenttypes.TYPE_JSON,
154
- headers = extend({}, type),
155
+ headers = assign({}, type),
155
156
  origin = request.headers.origin;
156
157
 
157
158
  if (!this.VALID_JSONP_CALLBACK.test(jsonp))
158
- return this._returnError(response, {message: 'Invalid JSON-P callback: ' + jsonp});
159
+ return this._returnError(response, { message: 'Invalid JSON-P callback: ' + jsonp });
159
160
 
160
- if (origin) headers['Access-Control-Allow-Origin'] = origin;
161
161
  headers['Cache-Control'] = 'no-cache, no-store';
162
162
  headers['X-Content-Type-Options'] = 'nosniff';
163
163
 
164
+ if (origin) {
165
+ headers['Access-Control-Allow-Credentials'] = 'true';
166
+ headers['Access-Control-Allow-Origin'] = origin;
167
+ }
168
+
164
169
  this._server.process(message, request, function(replies) {
165
170
  var body = toJSON(replies);
166
171
 
@@ -169,7 +174,7 @@ var NodeAdapter = Class({ className: 'NodeAdapter',
169
174
  headers['Content-Disposition'] = 'attachment; filename=f.txt';
170
175
  }
171
176
 
172
- headers['Content-Length'] = new Buffer(body, 'utf8').length.toString();
177
+ headers['Content-Length'] = Buffer.from(body, 'utf8').length.toString();
173
178
 
174
179
  this.debug('HTTP response: ?', body);
175
180
  response.writeHead(200, headers);
@@ -185,7 +190,7 @@ var NodeAdapter = Class({ className: 'NodeAdapter',
185
190
  },
186
191
 
187
192
  handleUpgrade: function(request, socket, head) {
188
- var options = {extensions: this._extensions, ping: this._options.ping},
193
+ var options = { extensions: this._extensions, ping: this._options.ping },
189
194
  ws = new WebSocket(request, socket, head, [], options),
190
195
  clientId = null,
191
196
  self = this;
@@ -219,7 +224,7 @@ var NodeAdapter = Class({ className: 'NodeAdapter',
219
224
  },
220
225
 
221
226
  handleEventSource: function(request, response) {
222
- var es = new EventSource(request, response, {ping: this._options.ping}),
227
+ var es = new EventSource(request, response, { ping: this._options.ping }),
223
228
  clientId = es.url.split('/').pop(),
224
229
  self = this;
225
230
 
@@ -232,12 +237,13 @@ var NodeAdapter = Class({ className: 'NodeAdapter',
232
237
  };
233
238
  },
234
239
 
235
- _handleOptions: function(response) {
240
+ _handleOptions: function(request, response) {
241
+ var origin = request.headers.origin || request.headers.referer;
236
242
  var headers = {
237
- 'Access-Control-Allow-Credentials': 'false',
243
+ 'Access-Control-Allow-Credentials': 'true',
238
244
  'Access-Control-Allow-Headers': 'Accept, Authorization, Content-Type, Pragma, X-Requested-With',
239
245
  'Access-Control-Allow-Methods': 'POST, GET',
240
- 'Access-Control-Allow-Origin': '*',
246
+ 'Access-Control-Allow-Origin': origin || '*',
241
247
  'Access-Control-Max-Age': '86400'
242
248
  };
243
249
 
@@ -255,7 +261,7 @@ var NodeAdapter = Class({ className: 'NodeAdapter',
255
261
  });
256
262
 
257
263
  stream.on('end', function() {
258
- var buffer = new Buffer(length),
264
+ var buffer = Buffer.alloc(length),
259
265
  offset = 0;
260
266
 
261
267
  for (var i = 0, n = chunks.length; i < n; i++) {
@@ -302,6 +308,6 @@ for (var method in Publisher) (function(method) {
302
308
  };
303
309
  })(method);
304
310
 
305
- extend(NodeAdapter.prototype, Logging);
311
+ assign(NodeAdapter.prototype, Logging);
306
312
 
307
313
  module.exports = NodeAdapter;
@@ -6,7 +6,7 @@ var crypto = require('crypto'),
6
6
  url = require('url');
7
7
 
8
8
  var Class = require('../util/class'),
9
- extend = require('../util/extend'),
9
+ assign = require('../util/assign'),
10
10
  contenttypes = require('./content_types');
11
11
 
12
12
  var StaticServer = Class({
@@ -62,7 +62,7 @@ var StaticServer = Class({
62
62
  }
63
63
  else {
64
64
  headers['Content-Length'] = cache.content.length;
65
- extend(headers, contenttypes[type]);
65
+ assign(headers, contenttypes[type]);
66
66
  response.writeHead(200, headers);
67
67
  response.end(cache.content);
68
68
  }
@@ -1,7 +1,7 @@
1
1
  'use strict';
2
2
 
3
3
  var Class = require('../util/class'),
4
- extend = require('../util/extend'),
4
+ assign = require('../util/assign'),
5
5
  Deferrable = require('../mixins/deferrable'),
6
6
  Timeouts = require('../mixins/timeouts');
7
7
 
@@ -51,7 +51,7 @@ var Connection = Class({
51
51
  }
52
52
  });
53
53
 
54
- extend(Connection.prototype, Deferrable);
55
- extend(Connection.prototype, Timeouts);
54
+ assign(Connection.prototype, Deferrable);
55
+ assign(Connection.prototype, Timeouts);
56
56
 
57
57
  module.exports = Connection;
@@ -1,7 +1,7 @@
1
1
  'use strict';
2
2
 
3
3
  var copyObject = require('../util/copy_object'),
4
- extend = require('../util/extend'),
4
+ assign = require('../util/assign'),
5
5
  Namespace = require('../util/namespace'),
6
6
  Set = require('../util/set'),
7
7
  Timeouts = require('../mixins/timeouts');
@@ -132,6 +132,6 @@ Memory.prototype = {
132
132
  }
133
133
  };
134
134
 
135
- extend(Memory.prototype, Timeouts);
135
+ assign(Memory.prototype, Timeouts);
136
136
 
137
137
  module.exports = Memory;
@@ -1,7 +1,7 @@
1
1
  'use strict';
2
2
 
3
3
  var asap = require('asap'),
4
- extend = require('../util/extend'),
4
+ assign = require('../util/assign'),
5
5
  random = require('../util/random'),
6
6
  Class = require('../util/class'),
7
7
  Promise = require('../util/promise'),
@@ -11,7 +11,7 @@ var asap = require('asap'),
11
11
  Connection = require('./connection'),
12
12
  Memory = require('./memory');
13
13
 
14
- var Proxy = extend(Class({ className: 'Engine.Proxy',
14
+ var Proxy = assign(Class({ className: 'Engine.Proxy',
15
15
  MAX_DELAY: 0,
16
16
  INTERVAL: 0,
17
17
  TIMEOUT: 60,
@@ -120,7 +120,7 @@ METHODS.forEach(function(method) {
120
120
  };
121
121
  });
122
122
 
123
- extend(Proxy.prototype, Publisher);
124
- extend(Proxy.prototype, Logging);
123
+ assign(Proxy.prototype, Publisher);
124
+ assign(Proxy.prototype, Logging);
125
125
 
126
126
  module.exports = Proxy;
@@ -1,6 +1,6 @@
1
1
  'use strict';
2
2
 
3
- var extend = require('../util/extend'),
3
+ var assign = require('../util/assign'),
4
4
  EventEmitter = require('../util/event_emitter');
5
5
 
6
6
  var Publisher = {
@@ -31,7 +31,7 @@ var Publisher = {
31
31
  }
32
32
  };
33
33
 
34
- extend(Publisher, EventEmitter.prototype);
34
+ assign(Publisher, EventEmitter.prototype);
35
35
  Publisher.trigger = Publisher.emit;
36
36
 
37
37
  module.exports = Publisher;
@@ -1,7 +1,7 @@
1
1
  'use strict';
2
2
 
3
3
  var Class = require('../util/class'),
4
- extend = require('../util/extend'),
4
+ assign = require('../util/assign'),
5
5
  Publisher = require('../mixins/publisher'),
6
6
  Grammar = require('./grammar');
7
7
 
@@ -19,9 +19,9 @@ var Channel = Class({
19
19
  }
20
20
  });
21
21
 
22
- extend(Channel.prototype, Publisher);
22
+ assign(Channel.prototype, Publisher);
23
23
 
24
- extend(Channel, {
24
+ assign(Channel, {
25
25
  HANDSHAKE: '/meta/handshake',
26
26
  CONNECT: '/meta/connect',
27
27
  SUBSCRIBE: '/meta/subscribe',
@@ -3,11 +3,10 @@
3
3
  var asap = require('asap'),
4
4
  Class = require('../util/class'),
5
5
  Promise = require('../util/promise'),
6
- URI = require('../util/uri'),
7
6
  array = require('../util/array'),
8
7
  browser = require('../util/browser'),
9
8
  constants = require('../util/constants'),
10
- extend = require('../util/extend'),
9
+ assign = require('../util/assign'),
11
10
  validateOptions = require('../util/validate_options'),
12
11
  Deferrable = require('../mixins/deferrable'),
13
12
  Logging = require('../mixins/logging'),
@@ -20,19 +19,19 @@ var asap = require('asap'),
20
19
  Subscription = require('./subscription');
21
20
 
22
21
  var Client = Class({ className: 'Client',
23
- UNCONNECTED: 1,
24
- CONNECTING: 2,
25
- CONNECTED: 3,
26
- DISCONNECTED: 4,
22
+ UNCONNECTED: 1,
23
+ CONNECTING: 2,
24
+ CONNECTED: 3,
25
+ DISCONNECTED: 4,
27
26
 
28
- HANDSHAKE: 'handshake',
29
- RETRY: 'retry',
30
- NONE: 'none',
27
+ HANDSHAKE: 'handshake',
28
+ RETRY: 'retry',
29
+ NONE: 'none',
31
30
 
32
31
  CONNECTION_TIMEOUT: 60,
33
32
 
34
- DEFAULT_ENDPOINT: '/bayeux',
35
- INTERVAL: 0,
33
+ DEFAULT_ENDPOINT: '/bayeux',
34
+ INTERVAL: 0,
36
35
 
37
36
  initialize: function(endpoint, options) {
38
37
  this.info('New client created for ?', endpoint);
@@ -102,7 +101,7 @@ var Client = Class({ className: 'Client',
102
101
  this._state = this.CONNECTING;
103
102
  var self = this;
104
103
 
105
- this.info('Initiating handshake with ?', URI.stringify(this._dispatcher.endpoint));
104
+ this.info('Initiating handshake with ?', this._dispatcher.endpoint.href);
106
105
  this._dispatcher.selectTransport(constants.MANDATORY_CONNECTION_TYPES);
107
106
 
108
107
  this._sendMessage({
@@ -352,7 +351,7 @@ var Client = Class({ className: 'Client',
352
351
  },
353
352
 
354
353
  _handleAdvice: function(advice) {
355
- extend(this._advice, advice);
354
+ assign(this._advice, advice);
356
355
  this._dispatcher.timeout = this._advice.timeout / 1000;
357
356
 
358
357
  if (this._advice.reconnect === this.HANDSHAKE && this._state !== this.DISCONNECTED) {
@@ -378,9 +377,9 @@ var Client = Class({ className: 'Client',
378
377
  }
379
378
  });
380
379
 
381
- extend(Client.prototype, Deferrable);
382
- extend(Client.prototype, Publisher);
383
- extend(Client.prototype, Logging);
384
- extend(Client.prototype, Extensible);
380
+ assign(Client.prototype, Deferrable);
381
+ assign(Client.prototype, Publisher);
382
+ assign(Client.prototype, Logging);
383
+ assign(Client.prototype, Extensible);
385
384
 
386
385
  module.exports = Client;
@@ -3,7 +3,7 @@
3
3
  var Class = require('../util/class'),
4
4
  URI = require('../util/uri'),
5
5
  cookies = require('../util/cookies'),
6
- extend = require('../util/extend'),
6
+ assign = require('../util/assign'),
7
7
  Logging = require('../mixins/logging'),
8
8
  Publisher = require('../mixins/publisher'),
9
9
  Transport = require('../transport'),
@@ -32,7 +32,7 @@ var Dispatcher = Class({ className: 'Dispatcher',
32
32
  this.wsExtensions = [];
33
33
 
34
34
  this.proxy = options.proxy || {};
35
- if (typeof this._proxy === 'string') this._proxy = {origin: this._proxy};
35
+ if (typeof this._proxy === 'string') this._proxy = { origin: this._proxy };
36
36
 
37
37
  var exts = options.websocketExtensions;
38
38
  if (exts) {
@@ -60,6 +60,7 @@ var Dispatcher = Class({ className: 'Dispatcher',
60
60
 
61
61
  disable: function(feature) {
62
62
  this._disabled.push(feature);
63
+ Transport.disable(feature);
63
64
  },
64
65
 
65
66
  setHeader: function(name, value) {
@@ -78,7 +79,7 @@ var Dispatcher = Class({ className: 'Dispatcher',
78
79
 
79
80
  selectTransport: function(transportTypes) {
80
81
  Transport.get(this, transportTypes, this._disabled, function(transport) {
81
- this.debug('Selected ? transport for ?', transport.connectionType, URI.stringify(transport.endpoint));
82
+ this.debug('Selected ? transport for ?', transport.connectionType, transport.endpoint.href);
82
83
 
83
84
  if (transport === this._transport) return;
84
85
  if (this._transport) this._transport.close();
@@ -98,8 +99,8 @@ var Dispatcher = Class({ className: 'Dispatcher',
98
99
  scheduler;
99
100
 
100
101
  if (!envelope) {
101
- scheduler = new this._scheduler(message, {timeout: timeout, interval: this.retry, attempts: attempts, deadline: deadline});
102
- envelope = this._envelopes[id] = {message: message, scheduler: scheduler};
102
+ scheduler = new this._scheduler(message, { timeout: timeout, interval: this.retry, attempts: attempts, deadline: deadline });
103
+ envelope = this._envelopes[id] = { message: message, scheduler: scheduler };
103
104
  }
104
105
 
105
106
  this._sendEnvelope(envelope);
@@ -179,7 +180,7 @@ Dispatcher.create = function(client, endpoint, options) {
179
180
  return new Dispatcher(client, endpoint, options);
180
181
  };
181
182
 
182
- extend(Dispatcher.prototype, Publisher);
183
- extend(Dispatcher.prototype, Logging);
183
+ assign(Dispatcher.prototype, Publisher);
184
+ assign(Dispatcher.prototype, Logging);
184
185
 
185
186
  module.exports = Dispatcher;
@@ -1,6 +1,6 @@
1
1
  'use strict';
2
2
 
3
- var extend = require('../util/extend'),
3
+ var assign = require('../util/assign'),
4
4
  Logging = require('../mixins/logging');
5
5
 
6
6
  var Extensible = {
@@ -42,6 +42,6 @@ var Extensible = {
42
42
  }
43
43
  };
44
44
 
45
- extend(Extensible, Logging);
45
+ assign(Extensible, Logging);
46
46
 
47
47
  module.exports = Extensible;
@@ -1,6 +1,6 @@
1
1
  'use strict';
2
2
 
3
- var extend = require('../util/extend');
3
+ var assign = require('../util/assign');
4
4
 
5
5
  var Scheduler = function(message, options) {
6
6
  this.message = message;
@@ -8,7 +8,7 @@ var Scheduler = function(message, options) {
8
8
  this.attempts = 0;
9
9
  };
10
10
 
11
- extend(Scheduler.prototype, {
11
+ assign(Scheduler.prototype, {
12
12
  getTimeout: function() {
13
13
  return this.options.timeout;
14
14
  },
@@ -2,7 +2,7 @@
2
2
 
3
3
  var Class = require('../util/class'),
4
4
  array = require('../util/array'),
5
- extend = require('../util/extend'),
5
+ assign = require('../util/assign'),
6
6
  constants = require('../util/constants'),
7
7
  Logging = require('../mixins/logging'),
8
8
  Engine = require('../engines/proxy'),
@@ -13,8 +13,6 @@ var Class = require('../util/class'),
13
13
  Socket = require('./socket');
14
14
 
15
15
  var Server = Class({ className: 'Server',
16
- META_METHODS: ['handshake', 'connect', 'disconnect', 'subscribe', 'unsubscribe'],
17
-
18
16
  initialize: function(options) {
19
17
  this._options = options || {};
20
18
  var engineOpts = this._options.engine || {};
@@ -60,7 +58,7 @@ var Server = Class({ className: 'Server',
60
58
  };
61
59
 
62
60
  var handleReply = function(replies) {
63
- var extended = 0, expected = replies.length;
61
+ var assigned = 0, expected = replies.length;
64
62
  if (expected === 0) gatherReplies(replies);
65
63
 
66
64
  for (var i = 0, n = replies.length; i < n; i++) {
@@ -68,8 +66,8 @@ var Server = Class({ className: 'Server',
68
66
  (function(index) {
69
67
  self.pipeThroughExtensions('outgoing', replies[index], request, function(message) {
70
68
  replies[index] = message;
71
- extended += 1;
72
- if (extended === expected) gatherReplies(replies);
69
+ assigned += 1;
70
+ if (assigned === expected) gatherReplies(replies);
73
71
  });
74
72
  })(i);
75
73
  }
@@ -120,10 +118,10 @@ var Server = Class({ className: 'Server',
120
118
  },
121
119
 
122
120
  _handleMeta: function(message, local, callback, context) {
123
- var method = Channel.parse(message.channel)[1],
121
+ var method = this._methodFor(message),
124
122
  response;
125
123
 
126
- if (array.indexOf(this.META_METHODS, method) < 0) {
124
+ if (method === null) {
127
125
  response = this._makeResponse(message);
128
126
  response.error = Error.channelForbidden(message.channel);
129
127
  response.successful = false;
@@ -137,6 +135,18 @@ var Server = Class({ className: 'Server',
137
135
  }, this);
138
136
  },
139
137
 
138
+ _methodFor: function(message) {
139
+ var channel = message.channel;
140
+
141
+ if (channel === Channel.HANDSHAKE) return 'handshake';
142
+ if (channel === Channel.CONNECT) return 'connect';
143
+ if (channel === Channel.SUBSCRIBE) return 'subscribe';
144
+ if (channel === Channel.UNSUBSCRIBE) return 'unsubscribe';
145
+ if (channel === Channel.DISCONNECT) return 'disconnect';
146
+
147
+ return null;
148
+ },
149
+
140
150
  _advize: function(response, connectionType) {
141
151
  if (array.indexOf([Channel.HANDSHAKE, Channel.CONNECT], response.channel) < 0)
142
152
  return;
@@ -152,9 +162,9 @@ var Server = Class({ className: 'Server',
152
162
 
153
163
  response.advice = response.advice || {};
154
164
  if (response.error) {
155
- extend(response.advice, {reconnect: 'handshake'}, false);
165
+ assign(response.advice, { reconnect: 'handshake' }, false);
156
166
  } else {
157
- extend(response.advice, {
167
+ assign(response.advice, {
158
168
  reconnect: 'retry',
159
169
  interval: interval,
160
170
  timeout: timeout
@@ -327,7 +337,7 @@ Server.create = function(options) {
327
337
  return new Server(options);
328
338
  };
329
339
 
330
- extend(Server.prototype, Logging);
331
- extend(Server.prototype, Extensible);
340
+ assign(Server.prototype, Logging);
341
+ assign(Server.prototype, Extensible);
332
342
 
333
343
  module.exports = Server;
@@ -1,7 +1,7 @@
1
1
  'use strict';
2
2
 
3
3
  var Class = require('../util/class'),
4
- extend = require('../util/extend'),
4
+ assign = require('../util/assign'),
5
5
  Deferrable = require('../mixins/deferrable');
6
6
 
7
7
  var Subscription = Class({
@@ -39,6 +39,6 @@ var Subscription = Class({
39
39
  }
40
40
  });
41
41
 
42
- extend(Subscription.prototype, Deferrable);
42
+ assign(Subscription.prototype, Deferrable);
43
43
 
44
44
  module.exports = Subscription;
@@ -3,11 +3,11 @@
3
3
  var Class = require('../util/class'),
4
4
  Set = require('../util/set'),
5
5
  URI = require('../util/uri'),
6
- extend = require('../util/extend'),
6
+ assign = require('../util/assign'),
7
7
  toJSON = require('../util/to_json'),
8
8
  Transport = require('./transport');
9
9
 
10
- var CORS = extend(Class(Transport, {
10
+ var CORS = assign(Class(Transport, {
11
11
  encode: function(messages) {
12
12
  return 'message=' + encodeURIComponent(toJSON(messages));
13
13
  },
@@ -20,7 +20,8 @@ var CORS = extend(Class(Transport, {
20
20
  self = this,
21
21
  key;
22
22
 
23
- xhr.open('POST', URI.stringify(this.endpoint), true);
23
+ xhr.open('POST', this.endpoint.href, true);
24
+ xhr.withCredentials = true;
24
25
 
25
26
  if (xhr.setRequestHeader) {
26
27
  xhr.setRequestHeader('Pragma', 'no-cache');
@@ -57,7 +58,7 @@ var CORS = extend(Class(Transport, {
57
58
  xhr.onprogress = function() {};
58
59
 
59
60
  if (xhrClass === global.XDomainRequest)
60
- CORS._pending.add({id: id, xhr: xhr});
61
+ CORS._pending.add({ id: id, xhr: xhr });
61
62
 
62
63
  xhr.send(this.encode(messages));
63
64
  return xhr;