Skip to content

Commit 470c8d5

Browse files
committed
fix(mobile): retry acknowledged outbox cleanup
1 parent 76b34ee commit 470c8d5

2 files changed

Lines changed: 84 additions & 0 deletions

File tree

‎apps/mobile/src/state/use-thread-outbox-drain.test.ts‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ import {
133133
completeQueuedMessageDelivery,
134134
prepareQueuedMessageAttachments,
135135
recoverEditedCreationAfterDelivery,
136+
removeAcknowledgedExistingThreadMessage,
136137
restoreRejectedQueuedMessage,
137138
} from "./use-thread-outbox-drain";
138139

@@ -320,6 +321,25 @@ describe("thread outbox attachment preparation", () => {
320321
});
321322

322323
describe("thread outbox drain delivery cleanup", () => {
324+
it("retries only cleanup after an acknowledged send removal fails", async () => {
325+
const message = queuedMessage({ messageId: "message-acknowledged", text: "delivered" });
326+
const acknowledged = new Set([message.messageId]);
327+
harness.removeOutboxMessage.mockRejectedValueOnce(new Error("storage unavailable"));
328+
await harness.manager.enqueue(message);
329+
330+
await expect(removeAcknowledgedExistingThreadMessage(message, acknowledged)).resolves.toBe(
331+
false,
332+
);
333+
expect(remainingMessages()).toEqual([message]);
334+
expect(acknowledged).toEqual(new Set([message.messageId]));
335+
336+
await expect(removeAcknowledgedExistingThreadMessage(message, acknowledged)).resolves.toBe(
337+
true,
338+
);
339+
expect(remainingMessages()).toEqual([]);
340+
expect(acknowledged).toEqual(new Set());
341+
});
342+
323343
it("keeps an edited message and its files when delivery cleanup loses the revision race", async () => {
324344
const message = queuedMessage({
325345
messageId: "message-edited",

‎apps/mobile/src/state/use-thread-outbox-drain.ts‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,28 @@ export async function completeQueuedMessageDelivery(
215215
}
216216
}
217217

218+
/** Retries local cleanup for an existing-thread send acknowledged in this drain lifetime. */
219+
export async function removeAcknowledgedExistingThreadMessage(
220+
queuedMessage: QueuedThreadMessage,
221+
acknowledgedMessageIds: Set<MessageId>,
222+
): Promise<boolean> {
223+
try {
224+
const removed = await removeThreadOutboxMessage(queuedMessage);
225+
if (removed) {
226+
acknowledgedMessageIds.delete(queuedMessage.messageId);
227+
}
228+
return removed;
229+
} catch (error) {
230+
console.warn("[thread-outbox] failed to remove acknowledged queued message", {
231+
environmentId: queuedMessage.environmentId,
232+
threadId: queuedMessage.threadId,
233+
messageId: queuedMessage.messageId,
234+
error,
235+
});
236+
return false;
237+
}
238+
}
239+
218240
/**
219241
* A creation delivered its startTurn but an edit won the cleanup race, so the
220242
* edited payload is still queued. The next drain would see the created thread
@@ -485,6 +507,7 @@ export function useThreadOutboxDrain(): void {
485507
const retryAttemptRef = useRef(new Map<MessageId, number>());
486508
const retryNotBeforeRef = useRef(new Map<MessageId, number>());
487509
const retryTimersRef = useRef(new Map<MessageId, ReturnType<typeof setTimeout>>());
510+
const acknowledgedExistingThreadMessageIdsRef = useRef(new Set<MessageId>());
488511
const blockedRecoverySubscriptionsRef = useRef(
489512
new Map<
490513
MessageId,
@@ -700,9 +723,11 @@ export function useThreadOutboxDrain(): void {
700723
if (failure?.action === "restore") {
701724
return restoreQueuedMessage(persistedMessage, failure.message);
702725
}
726+
acknowledgedExistingThreadMessageIdsRef.current.add(persistedMessage.messageId);
703727
const delivered =
704728
(await completeQueuedMessageDelivery(persistedMessage, deliveryRevision)) === "removed";
705729
if (delivered) {
730+
acknowledgedExistingThreadMessageIdsRef.current.delete(persistedMessage.messageId);
706731
// The delivered turn holds its own copy of the bytes. A failed delete
707732
// is surfaced (never fails the delivered turn); the server also
708733
// expires leaked pending uploads.
@@ -821,11 +846,50 @@ export function useThreadOutboxDrain(): void {
821846
return;
822847
}
823848

849+
const queuedMessageIds = new Set(
850+
Object.values(queuedMessagesByThreadKey)
851+
.flat()
852+
.map((message) => message.messageId),
853+
);
854+
for (const messageId of acknowledgedExistingThreadMessageIdsRef.current) {
855+
if (!queuedMessageIds.has(messageId)) {
856+
acknowledgedExistingThreadMessageIdsRef.current.delete(messageId);
857+
}
858+
}
859+
824860
for (const [threadKey, queuedMessages] of Object.entries(queuedMessagesByThreadKey)) {
825861
const nextQueuedMessage = queuedMessages[0];
826862
if (!nextQueuedMessage) {
827863
continue;
828864
}
865+
if (
866+
nextQueuedMessage.creation === undefined &&
867+
acknowledgedExistingThreadMessageIdsRef.current.has(nextQueuedMessage.messageId)
868+
) {
869+
if ((retryNotBeforeRef.current.get(nextQueuedMessage.messageId) ?? 0) > Date.now()) {
870+
continue;
871+
}
872+
beginDispatchingQueuedMessage(nextQueuedMessage.messageId);
873+
void removeAcknowledgedExistingThreadMessage(
874+
nextQueuedMessage,
875+
acknowledgedExistingThreadMessageIdsRef.current,
876+
)
877+
.then((removed) => {
878+
if (!removed) {
879+
scheduleQueuedMessageRetry(nextQueuedMessage.messageId);
880+
return;
881+
}
882+
retryAttemptRef.current.delete(nextQueuedMessage.messageId);
883+
retryNotBeforeRef.current.delete(nextQueuedMessage.messageId);
884+
const pendingTimer = retryTimersRef.current.get(nextQueuedMessage.messageId);
885+
if (pendingTimer !== undefined) {
886+
clearTimeout(pendingTimer);
887+
retryTimersRef.current.delete(nextQueuedMessage.messageId);
888+
}
889+
})
890+
.finally(() => finishDispatchingQueuedMessage(nextQueuedMessage.messageId));
891+
return;
892+
}
829893
if (editingQueuedMessageIds[nextQueuedMessage.messageId]) {
830894
continue;
831895
}

0 commit comments

Comments
 (0)