thegamer/Cable-Desktop
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Update consumers of WebsocketResources

Browse source
This commit is contained in:
lilia 2015-07-28 14:58:55 -07:00
parent 1af8bd16b7
commit 1a06cb5cbe
3 changed files with 64 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
js/libtextsecure.js
View file

@ -39387,7 +39387,9 @@ TextSecureServer = function () {
return textsecure.protocol_wrapper.createIdentityKeyRecvSocket().then(function(cryptoInfo) { return textsecure.protocol_wrapper.createIdentityKeyRecvSocket().then(function(cryptoInfo) {
return new Promise(function(resolve) { return new Promise(function(resolve) {
var socket = TextSecureServer.getTempWebsocket(); 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") { if (request.path == "/v1/address" && request.verb == "PUT") {
var proto = textsecure.protobuf.ProvisioningUuid.decode(request.body); var proto = textsecure.protobuf.ProvisioningUuid.decode(request.body);
setProvisioningUrl([ setProvisioningUrl([
@ -39415,8 +39417,7 @@ TextSecureServer = function () {
} else { } else {
console.log('Unknown websocket message', request.path); console.log('Unknown websocket message', request.path);
} }
}, { }
keepalive: { path: '/v1/keepalive' }
}); });
}); });
}).then(function() { }).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 } keepalive: { path: '/v1/keepalive', disconnect: true }
}); });

7
libtextsecure/account_manager.js
View file

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

3
libtextsecure/message_receiver.js
View file

@ -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 } keepalive: { path: '/v1/keepalive', disconnect: true }
}); });