Update consumers of WebsocketResources

js/libtextsecure.js

@@ -39387,7 +39387,9 @@ TextSecureServer = function () {
             return textsecure.protocol_wrapper.createIdentityKeyRecvSocket().then(function(cryptoInfo) {
                 return new Promise(function(resolve) {
                     var socket = TextSecureServer.getTempWebsocket();
-                    var wsr = new WebSocketResource(socket, function(request) {
+                    var wsr = new WebSocketResource(socket, {
+                        keepalive: { path: '/v1/keepalive' },
+                        handleRequest: function(request) {
                             if (request.path == "/v1/address" && request.verb == "PUT") {
                                 var proto = textsecure.protobuf.ProvisioningUuid.decode(request.body);
                                 setProvisioningUrl([
@@ -39415,8 +39417,7 @@ TextSecureServer = function () {
                             } else {
                                 console.log('Unknown websocket message', request.path);
                             }
-                    }, {
+                        }
-                        keepalive: { path: '/v1/keepalive' }
                     });
                 });
             }).then(function() {
@@ -39564,7 +39565,8 @@ function generateKeys(count, progressCallback) {
                 }
             };
 
-            this.wsr = new WebSocketResource(this.socket, this.handleRequest.bind(this), {
+            this.wsr = new WebSocketResource(this.socket, {
+                handleRequest: this.handleRequest.bind(this),
                 keepalive: { path: '/v1/keepalive', disconnect: true }
             });
 

libtextsecure/account_manager.js

@@ -44,7 +44,9 @@
             return textsecure.protocol_wrapper.createIdentityKeyRecvSocket().then(function(cryptoInfo) {
                 return new Promise(function(resolve) {
                     var socket = TextSecureServer.getTempWebsocket();
-                    var wsr = new WebSocketResource(socket, function(request) {
+                    var wsr = new WebSocketResource(socket, {
+                        keepalive: { path: '/v1/keepalive' },
+                        handleRequest: function(request) {
                             if (request.path == "/v1/address" && request.verb == "PUT") {
                                 var proto = textsecure.protobuf.ProvisioningUuid.decode(request.body);
                                 setProvisioningUrl([
@@ -72,8 +74,7 @@
                             } else {
                                 console.log('Unknown websocket message', request.path);
                             }
-                    }, {
+                        }
-                        keepalive: { path: '/v1/keepalive' }
                     });
                 });
             }).then(function() {

libtextsecure/message_receiver.js

@@ -44,7 +44,8 @@
                 }
             };
 
-            this.wsr = new WebSocketResource(this.socket, this.handleRequest.bind(this), {
+            this.wsr = new WebSocketResource(this.socket, {
+                handleRequest: this.handleRequest.bind(this),
                 keepalive: { path: '/v1/keepalive', disconnect: true }
             });