Arsharth/hydrogen-web
1
0
Fork 0
forked from mystiq/hydrogen-web
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix TypeError when syncing a new e2ee room with keys at the same time

Browse source
This commit is contained in:
Bruno Windels 2021-03-05 11:50:54 +01:00
parent 5682e715e6
commit c1c8f11bf7
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/matrix/room/Room.js
View file

@ -55,8 +55,8 @@ export class Room extends EventEmitter {
this._observedEvents = null; this._observedEvents = null;
} }
async _getRetryDecryptEntriesForKey(roomKey, txn) { async _getRetryDecryptEntriesForKey(roomKey, roomEncryption, txn) {
const retryEventIds = await this._roomEncryption.getEventIdsForMissingKey(roomKey, txn); const retryEventIds = await roomEncryption.getEventIdsForMissingKey(roomKey, txn);
const retryEntries = []; const retryEntries = [];
if (retryEventIds) { if (retryEventIds) {
for (const eventId of retryEventIds) { for (const eventId of retryEventIds) {
@ -83,7 +83,7 @@ export class Room extends EventEmitter {
this._storage.storeNames.timelineEvents, this._storage.storeNames.timelineEvents,
this._storage.storeNames.inboundGroupSessions, this._storage.storeNames.inboundGroupSessions,
]); ]);
const retryEntries = await this._getRetryDecryptEntriesForKey(roomKey, txn); const retryEntries = await this._getRetryDecryptEntriesForKey(roomKey, this._roomEncryption, txn);
if (retryEntries.length) { if (retryEntries.length) {
const decryptRequest = this._decryptEntries(DecryptionSource.Retry, retryEntries, txn); const decryptRequest = this._decryptEntries(DecryptionSource.Retry, retryEntries, txn);
// this will close txn while awaiting decryption // this will close txn while awaiting decryption
@ -156,8 +156,8 @@ export class Room extends EventEmitter {
return request; return request;
} }
async _getSyncRetryDecryptEntries(newKeys, txn) { async _getSyncRetryDecryptEntries(newKeys, roomEncryption, txn) {
const entriesPerKey = await Promise.all(newKeys.map(key => this._getRetryDecryptEntriesForKey(key, txn))); const entriesPerKey = await Promise.all(newKeys.map(key => this._getRetryDecryptEntriesForKey(key, roomEncryption, txn)));
let retryEntries = entriesPerKey.reduce((allEntries, entries) => allEntries.concat(entries), []); let retryEntries = entriesPerKey.reduce((allEntries, entries) => allEntries.concat(entries), []);
// If we have the timeline open, see if there are more entries for the new keys // If we have the timeline open, see if there are more entries for the new keys
// as we only store missing session information for synced events, not backfilled. // as we only store missing session information for synced events, not backfilled.
@ -195,7 +195,7 @@ export class Room extends EventEmitter {
let eventsToDecrypt = roomResponse?.timeline?.events || []; let eventsToDecrypt = roomResponse?.timeline?.events || [];
// when new keys arrive, also see if any older events can now be retried to decrypt // when new keys arrive, also see if any older events can now be retried to decrypt
if (newKeys) { if (newKeys) {
retryEntries = await this._getSyncRetryDecryptEntries(newKeys, txn); retryEntries = await this._getSyncRetryDecryptEntries(newKeys, roomEncryption, txn);
if (retryEntries.length) { if (retryEntries.length) {
log.set("retry", retryEntries.length); log.set("retry", retryEntries.length);
eventsToDecrypt = eventsToDecrypt.concat(retryEntries.map(entry => entry.event)); eventsToDecrypt = eventsToDecrypt.concat(retryEntries.map(entry => entry.event));