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

Simplify envelope drop due to stopped processing

Browse source
This commit is contained in:
Fedor Indutny 2021-08-25 16:10:09 -07:00 • committed by GitHub
parent 0e7f641dc1
commit fff4e9e97f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

22
ts/textsecure/MessageReceiver.ts
View file

@ -795,7 +795,8 @@ export default class MessageReceiver
window.log.info(
'MessageReceiver.decryptAndCacheBatch storing ' +
`${decrypted.length} decrypted envelopes`
`${decrypted.length} decrypted envelopes, keeping ` +
`${failed.length} failed envelopes.`
);
// Store both decrypted and failed unprocessed envelopes
@ -926,10 +927,6 @@ export default class MessageReceiver
const task = createTaskWithTimeout(async (): Promise<DecryptResult> => {
const unsealedEnvelope = await this.unsealEnvelope(stores, envelope);
if (!unsealedEnvelope) {
// Envelope was dropped
return { envelope, plaintext: undefined };
}
logId = this.getEnvelopeId(unsealedEnvelope);
@ -950,10 +947,7 @@ export default class MessageReceiver
} else {
window.log.error(...args);
}
return {
plaintext: undefined,
envelope,
};
throw error;
}
}
@ -1002,12 +996,12 @@ export default class MessageReceiver
private async unsealEnvelope(
stores: LockedStores,
envelope: ProcessedEnvelope
): Promise<UnsealedEnvelope | undefined> {
): Promise<UnsealedEnvelope> {
const logId = this.getEnvelopeId(envelope);
if (this.stoppingProcessing) {
window.log.info(`MessageReceiver.unsealEnvelope(${logId}): dropping`);
return undefined;
window.log.warn(`MessageReceiver.unsealEnvelope(${logId}): dropping`);
throw new Error('Sealed envelope dropped due to stopping processing');
}
if (envelope.type !== Proto.Envelope.Type.UNIDENTIFIED_SENDER) {
@ -1068,10 +1062,10 @@ export default class MessageReceiver
const logId = this.getEnvelopeId(envelope);
if (this.stoppingProcessing) {
window.log.info(
window.log.warn(
`MessageReceiver.decryptEnvelope(${logId}): dropping unsealed`
);
return { plaintext: undefined, envelope };
throw new Error('Unsealed envelope dropped due to stopping processing');
}
if (envelope.type === Proto.Envelope.Type.RECEIPT) {