oxen-io/session-desktop
1
0
Fork 0
mirror of https://github.com/oxen-io/session-desktop.git synced 2023-12-14 02:12:57 +01:00
Code Issues Projects Releases Wiki Activity

Replace wrapDeferred with deferredToPromise

Browse source
This commit is contained in:
Daniel Gasienica 2018-03-26 16:33:23 -04:00
parent 40c40c800a
commit 579b01283e
2 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
js/background.js
View file

@ -105,7 +105,6 @@
BackboneMessageCollection: Whisper.MessageCollection, BackboneMessageCollection: Whisper.MessageCollection,
count: NUM_MESSAGE_UPGRADES_PER_IDLE, count: NUM_MESSAGE_UPGRADES_PER_IDLE,
upgradeMessageSchema, upgradeMessageSchema,
wrapDeferred,
}); });
console.log('Upgrade message schema:', results); console.log('Upgrade message schema:', results);

13
js/modules/messages_data_migrator.js
View file

@ -1,6 +1,8 @@
const isNumber = require('lodash/isNumber'); const isNumber = require('lodash/isNumber');
const isFunction = require('lodash/isFunction'); const isFunction = require('lodash/isFunction');
const Message = require('./types/message'); const Message = require('./types/message');
const { deferredToPromise } = require('./deferred_to_promise');
exports.processNext = async ({ exports.processNext = async ({
@ -8,7 +10,6 @@ exports.processNext = async ({
BackboneMessageCollection, BackboneMessageCollection,
count, count,
upgradeMessageSchema, upgradeMessageSchema,
wrapDeferred,
} = {}) => { } = {}) => {
if (!isFunction(BackboneMessage)) { if (!isFunction(BackboneMessage)) {
throw new TypeError('`BackboneMessage` (Whisper.Message) constructor is required'); throw new TypeError('`BackboneMessage` (Whisper.Message) constructor is required');
@ -27,10 +28,6 @@ exports.processNext = async ({
throw new TypeError('`upgradeMessageSchema` is required'); throw new TypeError('`upgradeMessageSchema` is required');
} }
if (!isFunction(wrapDeferred)) {
throw new TypeError('`wrapDeferred` is required');
}
const startTime = Date.now(); const startTime = Date.now();
const startFetchTime = Date.now(); const startFetchTime = Date.now();
@ -44,7 +41,7 @@ exports.processNext = async ({
const upgradeDuration = Date.now() - startUpgradeTime; const upgradeDuration = Date.now() - startUpgradeTime;
const startSaveTime = Date.now(); const startSaveTime = Date.now();
const saveMessage = _saveMessage({ BackboneMessage, wrapDeferred }); const saveMessage = _saveMessage({ BackboneMessage });
await Promise.all(upgradedMessages.map(saveMessage)); await Promise.all(upgradedMessages.map(saveMessage));
const saveDuration = Date.now() - startSaveTime; const saveDuration = Date.now() - startSaveTime;
@ -61,9 +58,9 @@ exports.processNext = async ({
}; };
}; };
const _saveMessage = ({ BackboneMessage, wrapDeferred } = {}) => (message) => { const _saveMessage = ({ BackboneMessage } = {}) => (message) => {
const backboneMessage = new BackboneMessage(message); const backboneMessage = new BackboneMessage(message);
return wrapDeferred(backboneMessage.save()); return deferredToPromise(backboneMessage.save());
}; };
const _fetchMessagesRequiringSchemaUpgrade = const _fetchMessagesRequiringSchemaUpgrade =