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

Implement sync protocol changes

Browse source 
Update protobuf definitions and refactor message receive and decrypt
codepath to support new protocol, including various flavors of sync
messages (sent messages, contacts, and groups).

Also cleans up background.js and lets libtextsecure internalize
textsecure.processDecrypted and ensure that it is called before handing
DataMessages off to the application.

The Envelope structure now has a generic content field and a
legacyMessage field for backwards compatibility. We'll send outgoing
messages as legacy messages, and sync messages as "content" while
continuing to support both legacy and non-legacy messages on the receive
side until old clients have a chance to transition.
This commit is contained in:
lilia 2015-06-01 14:08:21 -07:00
parent 757bcd4e50
commit a833d62a71
13 changed files with 756 additions and 379 deletions
Download patch file Download diff file Expand all files Collapse all files

115
js/background.js
View file

@ -45,28 +45,65 @@
// initialize the socket and start listening for messages
messageReceiver = new textsecure.MessageReceiver(window);
window.addEventListener('signal', function(ev) {
var proto = ev.proto;
if (proto.type === textsecure.protobuf.IncomingPushMessageSignal.Type.RECEIPT) {
onDeliveryReceipt(proto);
} else {
onMessageReceived(proto);
}
});
window.addEventListener('contact', onContactReceived);
window.addEventListener('receipt', onDeliveryReceipt);
window.addEventListener('message', onMessageReceived);
window.addEventListener('group', onGroupReceived);
window.addEventListener('sent', onSentMessage);
window.addEventListener('error', onError);
messageReceiver.connect();
}
function onMessageReceived(pushMessage) {
function onContactReceived(contactInfo) {
new Whisper.Conversation({
name: contactInfo.name,
id: contactInfo.number,
avatar: contactInfo.avatar,
type: 'private',
active_at: null
}).save();
}
function onGroupReceived(group) {
new Whisper.Conversation({
members: group.members,
name: group.name,
id: group.id,
avatar: group.avatar,
type: 'group',
active_at: null
}).save();
}
function onMessageReceived(ev) {
var data = ev.data;
var message = initIncomingMessage(data.source, data.timestamp);
message.handlePushMessageContent(data.message);
}
function onSentMessage(ev) {
var now = new Date().getTime();
var timestamp = pushMessage.timestamp.toNumber();
var data = ev.data;
var message = new Whisper.Message({
source : pushMessage.source,
sourceDevice : pushMessage.sourceDevice,
relay : pushMessage.relay,
source : textsecure.storage.user.getNumber(),
sent_at : data.timestamp,
received_at : now,
conversationId : data.destination,
type : 'outgoing'
});
message.handlePushMessageContent(data.message);
}
function initIncomingMessage(source, timestamp) {
var now = new Date().getTime();
var message = new Whisper.Message({
source : source,
sent_at : timestamp,
received_at : now,
conversationId : pushMessage.source,
conversationId : source,
type : 'incoming'
});
@ -74,36 +111,38 @@
storage.put("unreadCount", newUnreadCount);
extension.navigator.setBadgeText(newUnreadCount);
message.save().then(function() {
return new Promise(function(resolve) {
resolve(textsecure.protocol_wrapper.handleIncomingPushMessageProto(pushMessage).then(
function(pushMessageContent) {
message.handlePushMessageContent(pushMessageContent);
}
));
}).catch(function(e) {
if (e.name === 'IncomingIdentityKeyError') {
message.save({ errors : [e] }).then(function() {
extension.trigger('updateInbox');
notifyConversation(message);
});
} else if (e.message === 'Bad MAC') {
message.save({ errors : [ _.pick(e, ['name', 'message'])]}).then(function() {
extension.trigger('updateInbox');
notifyConversation(message);
});
} else {
console.log(e);
throw e;
}
return message;
}
function onError(ev) {
var e = ev.error;
if (!ev.proto) {
console.log(e);
throw e;
}
var envelope = ev.proto;
var message = initIncomingMessage(envelope.source, envelope.timestamp.toNumber());
if (e.name === 'IncomingIdentityKeyError') {
message.save({ errors : [e] }).then(function() {
extension.trigger('updateInbox');
notifyConversation(message);
});
});
} else if (e.message !== 'Bad MAC') {
message.save({ errors : [ _.pick(e, ['name', 'message'])]}).then(function() {
extension.trigger('updateInbox');
notifyConversation(message);
});
} else {
console.log(e);
throw e;
}
}
// lazy hack
window.receipts = new Backbone.Collection();
function onDeliveryReceipt(pushMessage) {
function onDeliveryReceipt(ev) {
var pushMessage = ev.proto;
var timestamp = pushMessage.timestamp.toNumber();
var messages = new Whisper.MessageCollection();
var groups = new Whisper.ConversationCollection();