mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

WebSocket-Resources / websocket refactor

Browse source 
This commit provides the javascript complement to
[WebSocket-Resources](https://github.com/WhisperSystems/WebSocket-Resources),
allowing us to use a bi-directional request-response framework over
websockets.

See websocket-resources.js and websocket-resources_test.js
for usage details.

Along the way I also factored the websocket keepalive and reconnect
logic into its own file/wrapper object.
This commit is contained in:
lilia 2014-11-27 22:03:42 -08:00
parent ccbe837ca2
commit ee0d7edc0b
9 changed files with 324 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

17
js/helpers.js
View file

@ -240,19 +240,14 @@ window.textsecure.replay = function() {
window.textsecure.subscribeToPush = function(message_callback) {
var socket = textsecure.api.getMessageWebsocket();
socket.onmessage = function(message) {
textsecure.protocol.decryptWebsocketMessage(message.body).then(function(plaintext) {
var resource = new WebSocketResource(socket, function(request) {
// TODO: handle different types of requests. for now we only receive
// PUT /messages <base64-encoded encrypted IncomingPushMessageSignal>
textsecure.protocol.decryptWebsocketMessage(request.body).then(function(plaintext) {
var proto = textsecure.protobuf.IncomingPushMessageSignal.decode(plaintext);
// After this point, a) decoding errors are not the server's fault, and
// b) we should handle them gracefully and tell the user they received an invalid message
console.log("Successfully decoded message with id: " + message.id);
socket.send(
new textsecure.protobuf.WebSocketMessage({
response: { id: message.id, message: 'OK', status: 200 },
type: textsecure.protobuf.WebSocketMessage.Type.RESPONSE
}).encode().toArrayBuffer()
);
request.respond(200, 'OK');
return textsecure.protocol.handleIncomingPushMessageProto(proto).then(function(decrypted) {
// Delivery receipt
@ -348,7 +343,7 @@ window.textsecure.subscribeToPush = function(message_callback) {
console.log("Error handling incoming message: ");
console.log(e);
});
};
});
};
window.textsecure.registerSingleDevice = function(number, verificationCode, stepDone) {