Skip to content

Commit 0d2cc68

Browse files
[chore] Release 2.1.0 (#550)
1 parent 3ba6fa1 commit 0d2cc68

File tree

3 files changed

+14
-5
lines changed

3 files changed

+14
-5
lines changed

History.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
11

2+
2.1.0 / 2017-03-11
3+
===================
4+
5+
* [chore] Bump engine.io-parser to version 2.0.1 (#549)
6+
* [chore] Bump concat-stream to version 1.5.2 (#548)
7+
* [feat] Allow to set the protocols for the websocket transport (#546)
8+
29
2.0.2 / 2017-02-16
310
===================
411

engine.io.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,8 @@ return /******/ (function(modules) { // webpackBootstrap
276276
extraHeaders: options.extraHeaders || this.extraHeaders,
277277
forceNode: options.forceNode || this.forceNode,
278278
localAddress: options.localAddress || this.localAddress,
279-
requestTimeout: options.requestTimeout || this.requestTimeout
279+
requestTimeout: options.requestTimeout || this.requestTimeout,
280+
protocols: options.protocols || void 0
280281
});
281282

282283
return transport;
@@ -4346,6 +4347,7 @@ return /******/ (function(modules) { // webpackBootstrap
43464347
}
43474348
this.perMessageDeflate = opts.perMessageDeflate;
43484349
this.usingBrowserWebSocket = BrowserWebSocket && !opts.forceNode;
4350+
this.protocols = opts.protocols;
43494351
if (!this.usingBrowserWebSocket) {
43504352
WebSocket = NodeWebSocket;
43514353
}
@@ -4385,7 +4387,7 @@ return /******/ (function(modules) { // webpackBootstrap
43854387
}
43864388

43874389
var uri = this.uri();
4388-
var protocols = void 0;
4390+
var protocols = this.protocols;
43894391
var opts = {
43904392
agent: this.agent,
43914393
perMessageDeflate: this.perMessageDeflate
@@ -4407,7 +4409,7 @@ return /******/ (function(modules) { // webpackBootstrap
44074409
}
44084410

44094411
try {
4410-
this.ws = this.usingBrowserWebSocket ? new WebSocket(uri) : new WebSocket(uri, protocols, opts);
4412+
this.ws = this.usingBrowserWebSocket ? protocols ? new WebSocket(uri, protocols) : new WebSocket(uri) : new WebSocket(uri, protocols, opts);
44114413
} catch (err) {
44124414
return this.emit('error', err);
44134415
}

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "engine.io-client",
33
"description": "Client for the realtime Engine",
44
"license": "MIT",
5-
"version": "2.0.2",
5+
"version": "2.1.0",
66
"homepage": "https://github.com/socketio/engine.io-client",
77
"contributors": [
88
{
@@ -45,7 +45,7 @@
4545
"concat-stream": "1.5.2",
4646
"del": "2.2.0",
4747
"derequire": "1.2.0",
48-
"engine.io": "2.0.2",
48+
"engine.io": "2.1.0",
4949
"eslint-config-standard": "4.4.0",
5050
"eslint-plugin-standard": "1.3.1",
5151
"expect.js": "0.2.0",

0 commit comments

Comments
 (0)