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

Defer unprocessed item attempt update

Browse source
This commit is contained in:
Fedor Indutny 2021-09-17 16:11:24 -07:00 • committed by GitHub
parent 7b5faa1cc1
commit b83c00f43f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 21 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ts/sql/Client.ts
View file

@ -233,7 +233,6 @@ const dataInterface: ClientInterface = {
getUnprocessedCount,
getAllUnprocessed,
getUnprocessedById,
updateUnprocessedAttempts,
updateUnprocessedWithData,
updateUnprocessedsWithData,
removeUnprocessed,
@ -1422,9 +1421,6 @@ async function getUnprocessedById(id: string) {
return channels.getUnprocessedById(id);
}
async function updateUnprocessedAttempts(id: string, attempts: number) {
await channels.updateUnprocessedAttempts(id, attempts);
}
async function updateUnprocessedWithData(
id: string,
data: UnprocessedUpdateType

1
ts/sql/Interface.ts
View file

@ -392,7 +392,6 @@ export type DataInterface = {
getUnprocessedCount: () => Promise<number>;
getAllUnprocessed: () => Promise<Array<UnprocessedType>>;
updateUnprocessedAttempts: (id: string, attempts: number) => Promise<void>;
updateUnprocessedWithData: (
id: string,
data: UnprocessedUpdateType

35
ts/sql/Server.ts
View file

@ -223,7 +223,6 @@ const dataInterface: ServerInterface = {
getUnprocessedCount,
getAllUnprocessed,
updateUnprocessedAttempts,
updateUnprocessedWithData,
updateUnprocessedsWithData,
getUnprocessedById,
@ -5118,6 +5117,8 @@ async function getTapToViewMessagesNeedingErase(): Promise<Array<MessageType>> {
return rows.map(row => jsonToObject(row.json));
}
const MAX_UNPROCESSED_ATTEMPTS = 3;
function saveUnprocessedSync(data: UnprocessedType): string {
const db = getInstance();
const {
@ -5137,6 +5138,11 @@ function saveUnprocessedSync(data: UnprocessedType): string {
throw new Error('saveUnprocessedSync: id was falsey');
}
if (attempts >= MAX_UNPROCESSED_ATTEMPTS) {
removeUnprocessedSync(id);
return id;
}
prepare(
db,
`
@ -5183,23 +5189,6 @@ function saveUnprocessedSync(data: UnprocessedType): string {
return id;
}
async function updateUnprocessedAttempts(
id: string,
attempts: number
): Promise<void> {
const db = getInstance();
db.prepare<Query>(
`
UPDATE unprocessed
SET attempts = $attempts
WHERE id = $id;
`
).run({
id,
attempts,
});
}
function updateUnprocessedWithDataSync(
id: string,
data: UnprocessedUpdateType
@ -5299,7 +5288,7 @@ function removeUnprocessedsSync(ids: Array<string>): void {
).run(ids);
}
async function removeUnprocessed(id: string | Array<string>): Promise<void> {
function removeUnprocessedSync(id: string | Array<string>): void {
if (!Array.isArray(id)) {
const db = getInstance();
@ -5309,10 +5298,14 @@ async function removeUnprocessed(id: string | Array<string>): Promise<void> {
}
if (!id.length) {
throw new Error('removeUnprocessed: No ids to delete!');
throw new Error('removeUnprocessedSync: No ids to delete!');
}
batchMultiVarQuery(id, removeUnprocessedsSync);
assertSync(batchMultiVarQuery(id, removeUnprocessedsSync));
}
async function removeUnprocessed(id: string | Array<string>): Promise<void> {
removeUnprocessedSync(id);
}
async function removeAllUnprocessed(): Promise<void> {