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

Clean up group credential fetcher

Browse source
This commit is contained in:
Fedor Indutny 2023-11-13 23:33:43 +01:00 • committed by GitHub
parent ec37b4ecf9
commit 592a6833df
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

35
ts/services/groupCredentialFetcher.ts
View file

@ -1,7 +1,7 @@
// Copyright 2020 Signal Messenger, LLC // Copyright 2020 Signal Messenger, LLC
// SPDX-License-Identifier: AGPL-3.0-only // SPDX-License-Identifier: AGPL-3.0-only
import { last, sortBy } from 'lodash'; import { first, last, sortBy } from 'lodash';
import { AuthCredentialWithPniResponse } from '@signalapp/libsignal-client/zkgroup'; import { AuthCredentialWithPniResponse } from '@signalapp/libsignal-client/zkgroup';
import { getClientZkAuthOperations } from '../util/zkgroup'; import { getClientZkAuthOperations } from '../util/zkgroup';
@ -109,7 +109,9 @@ export function getCheckedCredentialsForToday(
); );
if (todayIndex < 0) { if (todayIndex < 0) {
throw new Error( throw new Error(
'getCredentialsForToday: Cannot find credentials for today' 'getCredentialsForToday: Cannot find credentials for today. ' +
`First: ${first(data)?.redemptionTime}, ` +
`last: ${last(data)?.redemptionTime}`
); );
} }
@ -128,8 +130,8 @@ export async function maybeFetchNewCredentials(): Promise<void> {
return; return;
} }
const previous: CredentialsDataType | undefined = const previous: CredentialsDataType =
window.storage.get('groupCredentials'); window.storage.get('groupCredentials') ?? [];
const requestDates = getDatesForRequest(previous); const requestDates = getDatesForRequest(previous);
if (!requestDates) { if (!requestDates) {
log.info(`${logId}: no new credentials needed`); log.info(`${logId}: no new credentials needed`);
@ -195,23 +197,36 @@ export async function maybeFetchNewCredentials(): Promise<void> {
: []; : [];
const finalCredentials = [...previousCleaned, ...newCredentials]; const finalCredentials = [...previousCleaned, ...newCredentials];
log.info(`${logId}: Saving new credentials...`); log.info(
`${logId}: saving ${newCredentials.length} new credentials, ` +
`cleaning up ${previous.length - previousCleaned.length} old ` +
`credentials, haveToday=${haveToday(finalCredentials)}`
);
// Note: we don't wait for this to finish // Note: we don't wait for this to finish
await window.storage.put('groupCredentials', finalCredentials); await window.storage.put('groupCredentials', finalCredentials);
log.info(`${logId}: Save complete.`); log.info(`${logId}: Save complete.`);
} }
function haveToday(
data: CredentialsDataType,
today = toDayMillis(Date.now())
): boolean {
return data?.some(({ redemptionTime }) => redemptionTime === today);
}
export function getDatesForRequest( export function getDatesForRequest(
data?: CredentialsDataType data: CredentialsDataType
): RequestDatesType | undefined { ): RequestDatesType | undefined {
const today = toDayMillis(Date.now()); const today = toDayMillis(Date.now());
const sixDaysOut = today + 6 * durations.DAY; const sixDaysOut = today + 6 * durations.DAY;
const haveToday = data?.some(
({ redemptionTime }) => redemptionTime === today
);
const lastCredential = last(data); const lastCredential = last(data);
if (!haveToday || !lastCredential || lastCredential.redemptionTime < today) { if (
!haveToday(data, today) ||
!lastCredential ||
lastCredential.redemptionTime < today
) {
return { return {
startDayInMs: today, startDayInMs: today,
endDayInMs: sixDaysOut, endDayInMs: sixDaysOut,