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

Fix "did reaction fully send?" logic

Browse source
This commit is contained in:
Evan Hahn 2022-01-11 18:50:11 -06:00 • committed by GitHub
parent 2dded88081
commit 0c12607e79
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 352 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

27
ts/jobs/helpers/sleepFor413RetryAfterTime.ts
View file

@ -1,11 +1,9 @@
// Copyright 2021 Signal Messenger, LLC
// Copyright 2021-2022 Signal Messenger, LLC
// SPDX-License-Identifier: AGPL-3.0-only
import type { LoggerType } from '../../types/Logging';
import { sleep } from '../../util/sleep';
import { parseRetryAfter } from '../../util/parseRetryAfter';
import { isRecord } from '../../util/isRecord';
import { HTTPError } from '../../textsecure/Errors';
import { findRetryAfterTimeFromError } from './findRetryAfterTimeFromError';
export async function sleepFor413RetryAfterTime({
err,
@ -20,10 +18,7 @@ export async function sleepFor413RetryAfterTime({
return;
}
const retryAfter = Math.min(
parseRetryAfter(findRetryAfterTime(err)),
timeRemaining
);
const retryAfter = Math.min(findRetryAfterTimeFromError(err), timeRemaining);
log.info(
`Got a 413 response code. Sleeping for ${retryAfter} millisecond(s)`
@ -31,19 +26,3 @@ export async function sleepFor413RetryAfterTime({
await sleep(retryAfter);
}
function findRetryAfterTime(err: unknown): unknown {
if (!isRecord(err)) {
return undefined;
}
if (isRecord(err.responseHeaders)) {
return err.responseHeaders['retry-after'];
}
if (err.httpError instanceof HTTPError) {
return err.httpError.responseHeaders?.['retry-after'];
}
return undefined;
}