Commit 1d3101e

Carlos GottbergPatrickJS

Carlos Gottberg

authored and

committed

Allow ws options to be passed to constructors (#107)

This complies with the way ws behaves and is useful for specifying "low-level" ws options such as adding additional headers to the request (use case: authentication through jwt)

1 parent f0dec08 commit 1d3101eCopy full SHA for 1d3101e

File tree

1 file changed

-4

lines changed

src
- angular-websocket.js

1 file changed

-4

lines changed

`‎src/angular-websocket.js‎`

Lines changed: 8 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -43,12 +43,12 @@ if (!Array.prototype.indexOf) {`
`43`	`43`	`// $WebSocketProvider.$inject = ['$rootScope', '$q', '$timeout', '$websocketBackend'];`
`44`	`44`	`function $WebSocketProvider($rootScope, $q, $timeout, $websocketBackend) {`
`45`	`45`
`46`		`- function $WebSocket(url, protocols, options) {`
	`46`	`+ function $WebSocket(url, protocols, options,wsOptions={}) {`
`47`	`47`	`if (!options && isObject(protocols) && !isArray(protocols)) {`
`48`	`48`	`options = protocols;`
`49`	`49`	`protocols = undefined;`
`50`	`50`	`}`
`51`		`-`
	`51`	`+this.wsOptions=wsOptions;`
`52`	`52`	`this.protocols = protocols;`
`53`	`53`	`this.url = url \|\| 'Missing URL';`
`54`	`54`	`this.ssl = /(wss)/i.test(this.url);`
`@@ -121,7 +121,7 @@ function $WebSocketProvider($rootScope, $q, $timeout, $websocketBackend) {`
`121`	`121`
`122`	`122`	`$WebSocket.prototype._connect = function _connect(force) {`
`123`	`123`	`if (force \|\| !this.socket \|\| this.socket.readyState !== this._readyStateConstants.OPEN) {`
`124`		`- this.socket = $websocketBackend.create(this.url, this.protocols);`
	`124`	`+ this.socket = $websocketBackend.create(this.url, this.protocols,this.wsOptions);`
`125`	`125`	`this.socket.onmessage = angular.bind(this, this._onMessageHandler);`
`126`	`126`	`this.socket.onopen = angular.bind(this, this._onOpenHandler);`
`127`	`127`	`this.socket.onerror = angular.bind(this, this._onErrorHandler);`
`@@ -367,13 +367,17 @@ function $WebSocketProvider($rootScope, $q, $timeout, $websocketBackend) {`
`367`	`367`
`368`	`368`	`// $WebSocketBackendProvider.$inject = ['$log'];`
`369`	`369`	`function $WebSocketBackendProvider($log) {`
`370`		`- this.create = function create(url, protocols) {`
	`370`	`+ this.create = function create(url, protocols,options) {`
`371`	`371`	`var match = /wss?:\/\//.exec(url);`
`372`	`372`
`373`	`373`	`if (!match) {`
`374`	`374`	`throw new Error('Invalid url provided');`
`375`	`375`	`}`
`376`	`376`
	`377`	`+ if (options) {`
	`378`	`+ return new Socket(url, protocols, options);`
	`379`	`+ }`
	`380`	`+`
`377`	`381`	`if (protocols) {`
`378`	`382`	`return new Socket(url, protocols);`
`379`	`383`	`}`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 1d3101e

File tree

1 file changed

1 file changed

`‎src/angular-websocket.js‎`

0 commit comments