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

Replace getAll with cursor

Browse source 
This reduces the likelihood of IPC message size error.
This commit is contained in:
Daniel Gasienica 2018-04-03 12:31:22 -04:00
parent ed77378293
commit 5b1a0c45df
1 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

23
js/modules/messages_data_migrator.js
View file

@ -21,11 +21,6 @@ const { deferredToPromise } = require('./deferred_to_promise');
const MESSAGES_STORE_NAME = 'messages'; const MESSAGES_STORE_NAME = 'messages';
// WARNING: Valus higher than `1` can cause ‘Maximum IPC message size exceeded’
// error message on messages (attachments) that are too large:
// - https://github.com/zincbase/zincdb/issues/17
// - https://cs.chromium.org/chromium/src/content/browser/indexed_db/indexed_db_database.cc?l=1157&rcl=9431dd78cdccecea92415c25babad70c217d57a4
const NUM_MESSAGES_PER_BATCH = 1; const NUM_MESSAGES_PER_BATCH = 1;
exports.processNext = async ({ exports.processNext = async ({
@ -316,13 +311,23 @@ const _dangerouslyFetchMessagesRequiringSchemaUpgradeWithoutIndex =
const messagesStore = transaction.objectStore(MESSAGES_STORE_NAME); const messagesStore = transaction.objectStore(MESSAGES_STORE_NAME);
const excludeLowerBound = true; const excludeLowerBound = true;
const query = hasLastIndex const range = hasLastIndex
? IDBKeyRange.lowerBound(lastIndex, excludeLowerBound) ? IDBKeyRange.lowerBound(lastIndex, excludeLowerBound)
: undefined; : undefined;
const request = messagesStore.getAll(query, count);
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
request.onsuccess = event => const items = [];
resolve(event.target.result); const request = messagesStore.openCursor(range);
request.onsuccess = (event) => {
const cursor = event.target.result;
const hasMoreData = Boolean(cursor);
if (!hasMoreData || items.length === count) {
resolve(items);
return;
}
const item = cursor.value;
items.push(item);
cursor.continue();
};
request.onerror = event => request.onerror = event =>
reject(event.target.error); reject(event.target.error);
}); });