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

Fix failover on failed sends, and improve logging

Browse source
This commit is contained in:
Scott Nonnenberg 2023-06-20 17:06:38 -07:00 committed by GitHub
parent 5e9bbb42f1
commit 65b6d9c2bc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ts/background.ts
View file

@ -1772,7 +1772,9 @@ export async function startApp(): Promise<void> {
} catch (error) {
log.error(
'connect: Error refreshing remote config:',
Errors.toLogFormat(error)
isNumber(error.code)
? `code: ${error.code}`
: Errors.toLogFormat(error)
);
}
}

5
ts/services/profiles.ts
View file

@ -3,6 +3,7 @@
import type { ProfileKeyCredentialRequestContext } from '@signalapp/libsignal-client/zkgroup';
import PQueue from 'p-queue';
import { isNumber } from 'lodash';
import type { ConversationModel } from '../models/conversations';
import type {
@ -496,7 +497,9 @@ async function doGetProfile(c: ConversationModel): Promise<void> {
log.warn(
'getProfile failure:',
idForLogging,
Errors.toLogFormat(error)
isNumber(error.code)
? `code: ${error.code}`
: Errors.toLogFormat(error)
);
return;
}

5
ts/textsecure/OutgoingMessage.ts
View file

@ -539,9 +539,12 @@ export default class OutgoingMessage {
},
async (error: Error) => {
if (
error instanceof HTTPError &&
error instanceof SendMessageNetworkError &&
(error.code === 401 || error.code === 403)
) {
log.warn(
`OutgoingMessage.doSendMessage: Failing over to unsealed send for identifier ${identifier}`
);
if (this.failoverIdentifiers.indexOf(identifier) === -1) {
this.failoverIdentifiers.push(identifier);
}

9
ts/util/sendToGroup.ts
View file

@ -843,7 +843,14 @@ export function _shouldFailSend(error: unknown, logId: string): boolean {
if (error instanceof SendMessageProtoError) {
if (!error.errors || !error.errors.length) {
logError('SendMessageProtoError had no errors, failing.');
logError('SendMessageProtoError had no errors but was thrown! Failing.');
return true;
}
if (error.successfulIdentifiers && error.successfulIdentifiers.length > 0) {
logError(
'SendMessageProtoError had successful sends; no further sends needed. Failing.'
);
return true;
}