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

Add context to Message.upgradeSchema

Browse source 
Allows us to pass in Electron/Node.js specific functions. This allows better
unit testing in Mocha where we don’t have access to Electron APIs.
This commit is contained in:
Daniel Gasienica 2018-03-14 19:07:34 -04:00
parent ebe2a769c9
commit aa82a2a5fb
1 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
js/modules/types/message.js
View file

@ -73,7 +73,7 @@ exports.initializeSchemaVersion = (message) => {
};
// Middleware
// type UpgradeStep = Message -> Promise Message
// type UpgradeStep = (Message, Context) -> Promise Message
// SchemaVersion -> UpgradeStep -> UpgradeStep
exports._withSchemaVersion = (schemaVersion, upgrade) => {
@ -84,7 +84,7 @@ exports._withSchemaVersion = (schemaVersion, upgrade) => {
throw new TypeError('`upgrade` must be a function');
}
return async (message) => {
return async (message, context) => {
if (!exports.isValid(message)) {
console.log('Message._withSchemaVersion: Invalid input message:', message);
return message;
@ -109,7 +109,7 @@ exports._withSchemaVersion = (schemaVersion, upgrade) => {
let upgradedMessage;
try {
upgradedMessage = await upgrade(message);
upgradedMessage = await upgrade(message, context);
} catch (error) {
console.log(
'Message._withSchemaVersion: error:',
@ -137,16 +137,14 @@ exports._withSchemaVersion = (schemaVersion, upgrade) => {
// Public API
// _mapAttachments :: (Attachment -> Promise Attachment) ->
// Message ->
// (Message, Context) ->
// Promise Message
exports._mapAttachments = upgradeAttachment => async message =>
Object.assign(
{},
message,
{
attachments: await Promise.all(message.attachments.map(upgradeAttachment)),
}
);
exports._mapAttachments = upgradeAttachment => async (message, context) => {
const upgradeWithContext = attachment =>
upgradeAttachment(attachment, context);
const attachments = await Promise.all(message.attachments.map(upgradeWithContext));
return Object.assign({}, message, { attachments });
};
const toVersion0 = async message =>
exports.initializeSchemaVersion(message);
@ -159,7 +157,11 @@ const toVersion2 = exports._withSchemaVersion(
2,
exports._mapAttachments(Attachment.replaceUnicodeOrderOverrides)
);
const toVersion3 = exports._withSchemaVersion(
3,
exports._mapAttachments(Attachment.migrateDataToFileSystem)
);
// UpgradeStep
exports.upgradeSchema = async message =>
exports.upgradeSchema = async (message, context) =>
toVersion2(await toVersion1(await toVersion0(message)));