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

Refactor sendMessageToDevices

Browse source 
Split into separate encrypt and transmit functions. Let the encryption
function also handle all wire formatting (ie, jsonification and base64
encoding), which simplifes TextSecureServer.sendMessages, removes a
TODO, and lets us save fewer params to make network errors replayable.

// FREEBIE
This commit is contained in:
lilia 2015-10-10 15:45:07 -07:00
parent e9bc39bc56
commit 816a206892
4 changed files with 52 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
js/libtextsecure.js
View file

@ -74,10 +74,10 @@
OutgoingMessageError.prototype = new ReplayableError(); OutgoingMessageError.prototype = new ReplayableError();
OutgoingMessageError.prototype.constructor = OutgoingMessageError; OutgoingMessageError.prototype.constructor = OutgoingMessageError;
function SendMessageNetworkError(number, jsonData, legacy, httpError) { function SendMessageNetworkError(number, jsonData, httpError) {
ReplayableError.call(this, { ReplayableError.call(this, {
functionCode : Type.TRANSMIT_MESSAGE, functionCode : Type.TRANSMIT_MESSAGE,
args : [number, jsonData, legacy] args : [number, jsonData]
}); });
this.name = 'SendMessageNetworkError'; this.name = 'SendMessageNetworkError';
this.number = number; this.number = number;
@ -38954,15 +38954,7 @@ var TextSecureServer = (function() {
return res; return res;
}); });
}, },
sendMessages: function(destination, messageArray, legacy) { sendMessages: function(destination, messageArray) {
//TODO: Do this conversion somewhere else?
for (var i = 0; i < messageArray.length; i++) {
messageArray[i].content = btoa(messageArray[i].content);
if (legacy) {
messageArray[i].body = messageArray[i].content;
delete messageArray[i].content;
}
}
var jsonData = { messages: messageArray }; var jsonData = { messages: messageArray };
jsonData.timestamp = messageArray[0].timestamp; jsonData.timestamp = messageArray[0].timestamp;
@ -39627,8 +39619,9 @@ function MessageSender(url, username, password) {
MessageSender.prototype = { MessageSender.prototype = {
constructor: MessageSender, constructor: MessageSender,
// message == DataMessage or ContentMessage proto // message == DataMessage or ContentMessage proto
sendMessageToDevices: function(timestamp, number, deviceObjectList, message) { encryptToDevices: function(timestamp, number, deviceObjectList, message) {
var legacy = (message instanceof textsecure.protobuf.DataMessage);
var relay = deviceObjectList[0].relay; var relay = deviceObjectList[0].relay;
for (var i=1; i < deviceObjectList.length; ++i) { for (var i=1; i < deviceObjectList.length; ++i) {
if (deviceObjectList[i].relay !== relay) { if (deviceObjectList[i].relay !== relay) {
@ -39643,7 +39636,6 @@ MessageSender.prototype = {
type: encryptedMsg.type, type: encryptedMsg.type,
destinationDeviceId: textsecure.utils.unencodeNumber(device.encodedNumber)[1], destinationDeviceId: textsecure.utils.unencodeNumber(device.encodedNumber)[1],
destinationRegistrationId: registrationId, destinationRegistrationId: registrationId,
content: encryptedMsg.body,
timestamp: timestamp timestamp: timestamp
}; };
@ -39651,20 +39643,26 @@ MessageSender.prototype = {
json.relay = device.relay; json.relay = device.relay;
} }
var content = btoa(encryptedMsg.body);
if (legacy) {
json.body = content;
} else {
json.content = content;
}
return json; return json;
}); });
}); });
}); });
})).then(function(jsonData) { }));
var legacy = (message instanceof textsecure.protobuf.DataMessage);
return this.sendMessageRequest(number, jsonData, legacy);
}.bind(this));
}, },
sendMessageRequest: function(number, jsonData, legacy) { transmitMessage: function(number, jsonData) {
return this.server.sendMessages(number, jsonData, legacy).catch(function(e) { return this.server.sendMessages(number, jsonData).catch(function(e) {
if (e.name === 'HTTPError' && (e.code !== 409 && e.code !== 410)) { if (e.name === 'HTTPError' && (e.code !== 409 && e.code !== 410)) {
throw new textsecure.SendMessageNetworkError(number, jsonData, legacy, e); // 409 and 410 should bubble and be handled by doSendMessage
// all other network errors can be retried later.
throw new textsecure.SendMessageNetworkError(number, jsonData, e);
} }
throw e; throw e;
}); });
@ -39759,10 +39757,12 @@ MessageSender.prototype = {
}.bind(this); }.bind(this);
var doSendMessage = function(number, devicesForNumber, recurse) { var doSendMessage = function(number, devicesForNumber, recurse) {
return this.sendMessageToDevices(timestamp, number, devicesForNumber, message).then(function(result) { return this.encryptToDevices(timestamp, number, devicesForNumber, message).then(function(jsonData) {
successfulNumbers[successfulNumbers.length] = number; return this.transmitMessage(number, jsonData).then(function() {
numberCompleted(); successfulNumbers[successfulNumbers.length] = number;
}).catch(function(error) { numberCompleted();
}.bind(this));
}.bind(this)).catch(function(error) {
if (error instanceof Error && error.name == "HTTPError" && (error.code == 410 || error.code == 409)) { if (error instanceof Error && error.name == "HTTPError" && (error.code == 410 || error.code == 409)) {
if (!recurse) if (!recurse)
return registerError(number, "Hit retry limit attempting to reload device list", error); return registerError(number, "Hit retry limit attempting to reload device list", error);
@ -40047,7 +40047,7 @@ window.textsecure = window.textsecure || {};
textsecure.MessageSender = function(url, username, password) { textsecure.MessageSender = function(url, username, password) {
var sender = new MessageSender(url, username, password); var sender = new MessageSender(url, username, password);
textsecure.replay.registerFunction(sender.tryMessageAgain.bind(sender), textsecure.replay.Type.ENCRYPT_MESSAGE); textsecure.replay.registerFunction(sender.tryMessageAgain.bind(sender), textsecure.replay.Type.ENCRYPT_MESSAGE);
textsecure.replay.registerFunction(sender.sendMessageRequest.bind(sender), textsecure.replay.Type.TRANSMIT_MESSAGE); textsecure.replay.registerFunction(sender.transmitMessage.bind(sender), textsecure.replay.Type.TRANSMIT_MESSAGE);
this.sendRequestGroupSyncMessage = sender.sendRequestGroupSyncMessage .bind(sender); this.sendRequestGroupSyncMessage = sender.sendRequestGroupSyncMessage .bind(sender);
this.sendRequestContactSyncMessage = sender.sendRequestContactSyncMessage.bind(sender); this.sendRequestContactSyncMessage = sender.sendRequestContactSyncMessage.bind(sender);

10
libtextsecure/api.js
View file

@ -230,15 +230,7 @@ var TextSecureServer = (function() {
return res; return res;
}); });
}, },
sendMessages: function(destination, messageArray, legacy) { sendMessages: function(destination, messageArray) {
//TODO: Do this conversion somewhere else?
for (var i = 0; i < messageArray.length; i++) {
messageArray[i].content = btoa(messageArray[i].content);
if (legacy) {
messageArray[i].body = messageArray[i].content;
delete messageArray[i].content;
}
}
var jsonData = { messages: messageArray }; var jsonData = { messages: messageArray };
jsonData.timestamp = messageArray[0].timestamp; jsonData.timestamp = messageArray[0].timestamp;

4
libtextsecure/errors.js
View file

@ -73,10 +73,10 @@
OutgoingMessageError.prototype = new ReplayableError(); OutgoingMessageError.prototype = new ReplayableError();
OutgoingMessageError.prototype.constructor = OutgoingMessageError; OutgoingMessageError.prototype.constructor = OutgoingMessageError;
function SendMessageNetworkError(number, jsonData, legacy, httpError) { function SendMessageNetworkError(number, jsonData, httpError) {
ReplayableError.call(this, { ReplayableError.call(this, {
functionCode : Type.TRANSMIT_MESSAGE, functionCode : Type.TRANSMIT_MESSAGE,
args : [number, jsonData, legacy] args : [number, jsonData]
}); });
this.name = 'SendMessageNetworkError'; this.name = 'SendMessageNetworkError';
this.number = number; this.number = number;

38
libtextsecure/sendmessage.js
View file

@ -7,8 +7,9 @@ function MessageSender(url, username, password) {
MessageSender.prototype = { MessageSender.prototype = {
constructor: MessageSender, constructor: MessageSender,
// message == DataMessage or ContentMessage proto // message == DataMessage or ContentMessage proto
sendMessageToDevices: function(timestamp, number, deviceObjectList, message) { encryptToDevices: function(timestamp, number, deviceObjectList, message) {
var legacy = (message instanceof textsecure.protobuf.DataMessage);
var relay = deviceObjectList[0].relay; var relay = deviceObjectList[0].relay;
for (var i=1; i < deviceObjectList.length; ++i) { for (var i=1; i < deviceObjectList.length; ++i) {
if (deviceObjectList[i].relay !== relay) { if (deviceObjectList[i].relay !== relay) {
@ -23,7 +24,6 @@ MessageSender.prototype = {
type: encryptedMsg.type, type: encryptedMsg.type,
destinationDeviceId: textsecure.utils.unencodeNumber(device.encodedNumber)[1], destinationDeviceId: textsecure.utils.unencodeNumber(device.encodedNumber)[1],
destinationRegistrationId: registrationId, destinationRegistrationId: registrationId,
content: encryptedMsg.body,
timestamp: timestamp timestamp: timestamp
}; };
@ -31,20 +31,26 @@ MessageSender.prototype = {
json.relay = device.relay; json.relay = device.relay;
} }
var content = btoa(encryptedMsg.body);
if (legacy) {
json.body = content;
} else {
json.content = content;
}
return json; return json;
}); });
}); });
}); });
})).then(function(jsonData) { }));
var legacy = (message instanceof textsecure.protobuf.DataMessage);
return this.sendMessageRequest(number, jsonData, legacy);
}.bind(this));
}, },
sendMessageRequest: function(number, jsonData, legacy) { transmitMessage: function(number, jsonData) {
return this.server.sendMessages(number, jsonData, legacy).catch(function(e) { return this.server.sendMessages(number, jsonData).catch(function(e) {
if (e.name === 'HTTPError' && (e.code !== 409 && e.code !== 410)) { if (e.name === 'HTTPError' && (e.code !== 409 && e.code !== 410)) {
throw new textsecure.SendMessageNetworkError(number, jsonData, legacy, e); // 409 and 410 should bubble and be handled by doSendMessage
// all other network errors can be retried later.
throw new textsecure.SendMessageNetworkError(number, jsonData, e);
} }
throw e; throw e;
}); });
@ -139,10 +145,12 @@ MessageSender.prototype = {
}.bind(this); }.bind(this);
var doSendMessage = function(number, devicesForNumber, recurse) { var doSendMessage = function(number, devicesForNumber, recurse) {
return this.sendMessageToDevices(timestamp, number, devicesForNumber, message).then(function(result) { return this.encryptToDevices(timestamp, number, devicesForNumber, message).then(function(jsonData) {
successfulNumbers[successfulNumbers.length] = number; return this.transmitMessage(number, jsonData).then(function() {
numberCompleted(); successfulNumbers[successfulNumbers.length] = number;
}).catch(function(error) { numberCompleted();
}.bind(this));
}.bind(this)).catch(function(error) {
if (error instanceof Error && error.name == "HTTPError" && (error.code == 410 || error.code == 409)) { if (error instanceof Error && error.name == "HTTPError" && (error.code == 410 || error.code == 409)) {
if (!recurse) if (!recurse)
return registerError(number, "Hit retry limit attempting to reload device list", error); return registerError(number, "Hit retry limit attempting to reload device list", error);
@ -427,7 +435,7 @@ window.textsecure = window.textsecure || {};
textsecure.MessageSender = function(url, username, password) { textsecure.MessageSender = function(url, username, password) {
var sender = new MessageSender(url, username, password); var sender = new MessageSender(url, username, password);
textsecure.replay.registerFunction(sender.tryMessageAgain.bind(sender), textsecure.replay.Type.ENCRYPT_MESSAGE); textsecure.replay.registerFunction(sender.tryMessageAgain.bind(sender), textsecure.replay.Type.ENCRYPT_MESSAGE);
textsecure.replay.registerFunction(sender.sendMessageRequest.bind(sender), textsecure.replay.Type.TRANSMIT_MESSAGE); textsecure.replay.registerFunction(sender.transmitMessage.bind(sender), textsecure.replay.Type.TRANSMIT_MESSAGE);
this.sendRequestGroupSyncMessage = sender.sendRequestGroupSyncMessage .bind(sender); this.sendRequestGroupSyncMessage = sender.sendRequestGroupSyncMessage .bind(sender);
this.sendRequestContactSyncMessage = sender.sendRequestContactSyncMessage.bind(sender); this.sendRequestContactSyncMessage = sender.sendRequestContactSyncMessage.bind(sender);