@remit/web-client 0.0.223 → 0.0.225

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remit/web-client",
-  "version": "0.0.223",
+  "version": "0.0.225",
   "type": "module",
   "description": "Remit web client, published as composable primitives — the app shell, auth shells, and runtime config. A distributor imports what it composes and bundles it.",
   "exports": {

package/src/hooks/useRefreshControl.test.ts

@@ -0,0 +1,129 @@
+import assert from "node:assert/strict";
+import { describe, test } from "node:test";
+import { type SyncStatusReading, waitForSettled } from "./useRefreshControl.js";
+
+const BASELINE = 1_700_000_000_000;
+const LATER = BASELINE + 5_000;
+
+/** Replays `readings` in order and holds on the last one, counting reads so a
+ * test can say when the wait made up its mind. */
+const scriptedReader = (readings: readonly SyncStatusReading[]) => {
+	const state = { reads: 0 };
+	const readStatus = async (): Promise<SyncStatusReading> => {
+		const reading = readings[Math.min(state.reads, readings.length - 1)];
+		state.reads += 1;
+		if (!reading) throw new Error("no reading scripted");
+		return reading;
+	};
+	return { state, readStatus };
+};
+
+const wait = (
+	readings: readonly SyncStatusReading[],
+	deadline = Date.now() + 10_000,
+) => {
+	const { state, readStatus } = scriptedReader(readings);
+	return {
+		state,
+		outcome: waitForSettled({
+			accountId: "a-1",
+			readStatus,
+			baselineLastSyncAt: BASELINE,
+			deadline,
+			pollMs: 0,
+		}),
+	};
+};
+
+describe("waitForSettled", () => {
+	// #953: the tab's own background poll, another tab, and every GET /config
+	// start rounds the user never clicked for. Seeing one of those in flight and
+	// then complete used to be read as confirmation, so the button showed a
+	// checkmark and invalidated the list with the clicked round still unrun —
+	// new mail stayed unshown until the next poll. Only the account's own
+	// round-start stamp moving past the pre-trigger reading counts.
+	test("does not confirm on a round that was already in flight at the trigger", async () => {
+		const { state, outcome } = wait([
+			{ syncPhase: "syncing_inbox", lastSyncAt: BASELINE },
+			{ syncPhase: "complete", lastSyncAt: BASELINE },
+			{ syncPhase: "complete", lastSyncAt: LATER },
+		]);
+
+		assert.equal(await outcome, undefined);
+		assert.equal(state.reads, 3);
+	});
+
+	test("a settled foreign round times out rather than confirming", async () => {
+		const { outcome } = wait(
+			[{ syncPhase: "complete", lastSyncAt: BASELINE }],
+			Date.now() - 1,
+		);
+
+		assert.deepEqual(await outcome, {
+			accountId: "a-1",
+			message: "Refresh is taking longer than usual",
+		});
+	});
+
+	test("confirms once the account's own round has started and settled", async () => {
+		const { state, outcome } = wait([
+			{ syncPhase: "complete", lastSyncAt: LATER },
+		]);
+
+		assert.equal(await outcome, undefined);
+		assert.equal(state.reads, 1);
+	});
+
+	test("reports the failure of a round that started after the trigger", async () => {
+		const { outcome } = wait([{ syncPhase: "error", lastSyncAt: LATER }]);
+
+		assert.deepEqual(await outcome, {
+			accountId: "a-1",
+			message: "Sync failed for this account",
+		});
+	});
+
+	// The stale-phase half of the same rule: POST /sync only enqueues, so the
+	// first reading back can still carry the previous round's error phase.
+	test("does not borrow the error phase of a round that predates the trigger", async () => {
+		const { outcome } = wait(
+			[{ syncPhase: "error", lastSyncAt: BASELINE }],
+			Date.now() - 1,
+		);
+
+		assert.deepEqual(await outcome, {
+			accountId: "a-1",
+			message: "Refresh is taking longer than usual",
+		});
+	});
+
+	test("an account that has never synced confirms on its first stamp", async () => {
+		const { state, readStatus } = scriptedReader([
+			{ syncPhase: "idle", lastSyncAt: undefined },
+			{ syncPhase: "complete", lastSyncAt: LATER },
+		]);
+
+		const outcome = await waitForSettled({
+			accountId: "a-1",
+			readStatus,
+			baselineLastSyncAt: 0,
+			deadline: Date.now() + 10_000,
+			pollMs: 0,
+		});
+
+		assert.equal(outcome, undefined);
+		assert.equal(state.reads, 2);
+	});
+
+	test("surfaces a failed status read", async () => {
+		const outcome = await waitForSettled({
+			accountId: "a-1",
+			readStatus: () => Promise.reject(new Error("signed out")),
+			baselineLastSyncAt: BASELINE,
+			deadline: Date.now() + 10_000,
+			pollMs: 0,
+		});
+
+		assert.deepEqual(outcome, { accountId: "a-1", message: "signed out" });
+	});
+});

package/src/hooks/useRefreshControl.ts

@@ -3,7 +3,7 @@ import {
 	syncOperationsGetSyncStatusOptions,
 } from "@remit/api-http-client/@tanstack/react-query.gen.ts";
 import { syncOperationsTriggerSync } from "@remit/api-http-client/sdk.gen.ts";
-import type { RemitImapMailboxSyncProgress } from "@remit/api-http-client/types.gen.ts";
+import type { RemitImapSyncPhase } from "@remit/api-http-client/types.gen.ts";
 import type { RefreshControlState } from "@remit/ui";
 import { type QueryClient, useQueryClient } from "@tanstack/react-query";
 import { useCallback, useEffect, useRef, useState } from "react";
@@ -41,14 +41,6 @@ const escalateIfFatal = (error: unknown): void => {
 	}
 };
 
-const maxLastSynced = (
-	mailboxes: readonly RemitImapMailboxSyncProgress[],
-): number =>
-	mailboxes.reduce(
-		(max, mailbox) => Math.max(max, mailbox.lastSyncedAt ?? 0),
-		0,
-	);
-
 /**
  * `getSyncStatus` for one account, always as a real network read: `staleTime:
  * 0` means even a reading `MailFreshnessProvider` fetched a moment ago is
@@ -71,59 +63,74 @@ const fetchStatus = (queryClient: QueryClient, accountId: string) =>
 		staleTime: 0,
 	});
 
-interface AccountOutcome {
+export interface AccountOutcome {
 	accountId: string;
 	message?: string;
 }
 
+/** The two fields of `getSyncStatus` that identify a round, named so the wait
+ * below can be driven from a scripted sequence of readings. */
+export interface SyncStatusReading {
+	syncPhase?: RemitImapSyncPhase;
+	lastSyncAt?: number;
+}
+
+export interface WaitForSettledOptions {
+	accountId: string;
+	readStatus: () => Promise<SyncStatusReading>;
+	/** `lastSyncAt` as it read immediately before this refresh triggered. */
+	baselineLastSyncAt: number;
+	deadline: number;
+	pollMs?: number;
+}
+
 /**
- * Poll one account's sync status until a round that started after
- * `baselineMaxLastSynced` was captured has settled, or `deadline` passes.
+ * Poll one account's sync status until a round that started at or after this
+ * refresh triggered has settled, or `deadline` passes.
  *
- * `POST /sync` only enqueues the round (the worker runs it later), so the
- * very first status read after triggering can still show the *previous*
- * round's phase — reading that as "settled" would report success, or a
- * stale failed phase, before the new round ever ran (#582 review). This
- * waits for positive evidence the triggered round actually happened: either
- * the phase was observed mid-flight, or some mailbox's `lastSyncedAt`
- * advanced past the baseline taken before the trigger.
+ * `account.lastSyncAt` is the worker's own once-per-round stamp, and it is the
+ * only thing here that tells one round from another. A phase seen mid-flight
+ * does not: the tab's background poll, another tab, and every `GET /config`
+ * trigger rounds nobody clicked for, so a click landing while one of those is
+ * in flight used to confirm on it — a checkmark and an invalidated list with
+ * the clicked round still unrun, and the new mail it would have fetched unseen
+ * until the next poll (#953). Requiring the stamp to pass the reading taken
+ * before the trigger admits only a round that started after it.
+ *
+ * `POST /sync` enqueues and returns, so the first reading after triggering
+ * still shows the previous round — including a previous round's `error` phase,
+ * which is why that phase only speaks once the stamp has moved.
  *
  * Read-only (`getSyncStatus`, no IMAP call, no queue write), so waiting costs
  * a handful of cheap GETs — never a refetch of the account's own message
  * list.
  */
-const waitForSettled = async (
-	queryClient: QueryClient,
-	accountId: string,
-	baselineMaxLastSynced: number,
-	deadline: number,
-): Promise<AccountOutcome | undefined> => {
-	let observedInProgress = false;
+export const waitForSettled = async ({
+	accountId,
+	readStatus,
+	baselineLastSyncAt,
+	deadline,
+	pollMs = REFRESH_POLL_MS,
+}: WaitForSettledOptions): Promise<AccountOutcome | undefined> => {
 	for (;;) {
-		const outcome = await fetchStatus(queryClient, accountId)
+		const outcome = await readStatus()
 			.then((data) => ({ ok: true as const, data }))
 			.catch((error: unknown) => ({ ok: false as const, error }));
 		if (!outcome.ok) {
 			return { accountId, message: messageFor(outcome.error) };
 		}
-		const { syncPhase, mailboxes } = outcome.data;
-		if (isSyncingPhase(syncPhase)) {
-			observedInProgress = true;
-		} else {
-			const confirmed =
-				observedInProgress ||
-				maxLastSynced(mailboxes ?? []) > baselineMaxLastSynced;
-			if (confirmed) {
-				if (syncPhase === "error") {
-					return { accountId, message: "Sync failed for this account" };
-				}
-				return undefined;
+		const { syncPhase, lastSyncAt } = outcome.data;
+		const startedAfterTrigger = (lastSyncAt ?? 0) > baselineLastSyncAt;
+		if (startedAfterTrigger && !isSyncingPhase(syncPhase)) {
+			if (syncPhase === "error") {
+				return { accountId, message: "Sync failed for this account" };
 			}
+			return undefined;
 		}
 		if (Date.now() >= deadline) {
 			return { accountId, message: "Refresh is taking longer than usual" };
 		}
-		await sleep(REFRESH_POLL_MS);
+		await sleep(pollMs);
 	}
 };
 
@@ -146,7 +153,7 @@ const refreshOneAccount = async (
 	const baseline = await fetchStatus(queryClient, accountId)
 		.then((data) => ({
 			ok: true as const,
-			maxLastSynced: maxLastSynced(data.mailboxes ?? []),
+			lastSyncAt: data.lastSyncAt ?? 0,
 		}))
 		.catch((error: unknown) => ({ ok: false as const, error }));
 	if (!baseline.ok) {
@@ -175,12 +182,12 @@ const refreshOneAccount = async (
 	}
 	telemetry.recordEvent("sync.triggered");
 
-	const settled = await waitForSettled(
-		queryClient,
+	const settled = await waitForSettled({
 		accountId,
-		baseline.maxLastSynced,
+		readStatus: () => fetchStatus(queryClient, accountId),
+		baselineLastSyncAt: baseline.lastSyncAt,
 		deadline,
-	);
+	});
 	if (settled)
 		return { accountId, enqueued: true, ok: false, message: settled.message };
 	return { accountId, enqueued: true, ok: true };

package/src/lib/organize/rule-model.ts

@@ -199,8 +199,8 @@ export const rulePredicate = (
  * all. Without an anchor it takes the vector-free literal arm, which reads no
  * message body and rejects a `HasWords` clause rather than narrowing the match
  * silently (`bodyContentRejection`, backend/service/organize.ts). Asking it
- * anyway is refused — a 400 on preview, a failed job row on a back-apply — so
- * the caller must not ask.
+ * anyway is refused with a 400, on preview and on a back-apply alike, so the
+ * caller must not ask.
  */
 export const isEvaluablePredicate = (
 	predicate: OrganizeMatchPredicate,