matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-08-09 10:22:46 +03:00
Code Activity

fix uncaught exceptions in Backup Loop for rust sdk (#3907)

Browse Source 
* fix uncaught exceptions

* Update src/rust-crypto/backup.ts

Co-authored-by: Florian Duros <florianduros@element.io>

---------

Co-authored-by: Florian Duros <florianduros@element.io>
This commit is contained in:
Valere
2023-11-29 10:07:56 +01:00
committed by GitHub
parent 68911520d3
commit 3f246c6080
1 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/rust-crypto/backup.ts
View File

@@ -260,7 +260,7 @@ export class RustBackupManager extends TypedEventEmitter<RustBackupCryptoEvents,
} }
this.backupKeysLoopRunning = true; this.backupKeysLoopRunning = true;
logger.log(`Starting loop for ${this.activeBackupVersion}.`); logger.log(`Backup: Starting keys upload loop for backup version:${this.activeBackupVersion}.`);
// wait between 0 and `maxDelay` seconds, to avoid backup // wait between 0 and `maxDelay` seconds, to avoid backup
// requests from different clients hitting the server all at // requests from different clients hitting the server all at
@@ -273,28 +273,41 @@ export class RustBackupManager extends TypedEventEmitter<RustBackupCryptoEvents,
while (!this.stopped) { while (!this.stopped) {
// Get a batch of room keys to upload // Get a batch of room keys to upload
const request: RustSdkCryptoJs.KeysBackupRequest | null = await this.olmMachine.backupRoomKeys(); let request: RustSdkCryptoJs.KeysBackupRequest | null = null;
try {
request = await this.olmMachine.backupRoomKeys();
} catch (err) {
logger.error("Backup: Failed to get keys to backup from rust crypto-sdk", err);
}
if (!request || this.stopped || !this.activeBackupVersion) { if (!request || this.stopped || !this.activeBackupVersion) {
logger.log(`Ending loop for ${this.activeBackupVersion}.`); logger.log(`Backup: Ending loop for version ${this.activeBackupVersion}.`);
return; return;
} }
try { try {
await this.outgoingRequestProcessor.makeOutgoingRequest(request); await this.outgoingRequestProcessor.makeOutgoingRequest(request);
numFailures = 0; numFailures = 0;
if (this.stopped) break; if (this.stopped) break;
const keyCount: RustSdkCryptoJs.RoomKeyCounts = await this.olmMachine.roomKeyCounts(); try {
const remaining = keyCount.total - keyCount.backedUp; const keyCount = await this.olmMachine.roomKeyCounts();
this.emit(CryptoEvent.KeyBackupSessionsRemaining, remaining); const remaining = keyCount.total - keyCount.backedUp;
this.emit(CryptoEvent.KeyBackupSessionsRemaining, remaining);
} catch (err) {
logger.error("Backup: Failed to get key counts from rust crypto-sdk", err);
}
} catch (err) { } catch (err) {
numFailures++; numFailures++;
logger.error("Error processing backup request for rust crypto-sdk", err); logger.error("Backup: Error processing backup request for rust crypto-sdk", err);
if (err instanceof MatrixError) { if (err instanceof MatrixError) {
const errCode = err.data.errcode; const errCode = err.data.errcode;
if (errCode == "M_NOT_FOUND" || errCode == "M_WRONG_ROOM_KEYS_VERSION") { if (errCode == "M_NOT_FOUND" || errCode == "M_WRONG_ROOM_KEYS_VERSION") {
await this.disableKeyBackup(); logger.log(`Backup: Failed to upload keys to current vesion: ${errCode}.`);
try {
await this.disableKeyBackup();
} catch (error) {
logger.error("Backup: An error occurred while disabling key backup:", error);
}
this.emit(CryptoEvent.KeyBackupFailed, err.data.errcode!); this.emit(CryptoEvent.KeyBackupFailed, err.data.errcode!);
// There was an active backup and we are out of sync with the server // There was an active backup and we are out of sync with the server
// force a check server side // force a check server side