diff --git a/ui/src/lib/connectivity.test.ts b/ui/src/lib/connectivity.test.ts index 8fd2ef18907..071cb70cf61 100644 --- a/ui/src/lib/connectivity.test.ts +++ b/ui/src/lib/connectivity.test.ts @@ -2,6 +2,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; import { ApiError } from "@/api/client"; import { ApiUnavailableError } from "@/api/response"; import { createConnectivityStore, probeServerHealth, type ConnectivityStore, type ProbeResult } from "./connectivity"; +import { isIntentionalAbortReason } from "./intentional-abort"; const outage = new ApiError("Paperclip is restarting", 503, { error: "tenant_app_unavailable" }); const down: ProbeResult = { reachable: false, retryAfterMs: null }; @@ -281,4 +282,24 @@ describe("probeServerHealth", () => { ))); expect(await probeServerHealth()).toEqual({ reachable: false, retryAfterMs: 4_000 }); }); + + it("marks its own timeout abort as intentional", async () => { + vi.useFakeTimers(); + try { + let probeSignal: AbortSignal | undefined; + vi.stubGlobal("fetch", vi.fn((_input: RequestInfo | URL, init?: RequestInit) => { + probeSignal = init?.signal ?? undefined; + return new Promise((_resolve, reject) => { + probeSignal?.addEventListener("abort", () => reject(probeSignal?.reason), { once: true }); + }); + })); + const result = probeServerHealth(); + await vi.advanceTimersByTimeAsync(10_000); + expect(await result).toEqual({ reachable: false, retryAfterMs: null }); + expect(probeSignal?.aborted).toBe(true); + expect(isIntentionalAbortReason(probeSignal?.reason)).toBe(true); + } finally { + vi.useRealTimers(); + } + }); }); diff --git a/ui/src/lib/connectivity.ts b/ui/src/lib/connectivity.ts index 5551ea05fca..a88958c983c 100644 --- a/ui/src/lib/connectivity.ts +++ b/ui/src/lib/connectivity.ts @@ -25,6 +25,7 @@ import { createContext, createElement, useContext, useEffect, useSyncExternalStore, type ReactNode } from "react"; import { apiFetch } from "@/api/client"; import { isConnectivityError, isTransientError, parseRetryAfter } from "@/api/errors"; +import { intentionalAbortReason } from "./intentional-abort"; export type ConnectivityStatus = "online" | "reconnecting" | "offline"; @@ -304,7 +305,7 @@ export function createConnectivityStore(options: ConnectivityStoreOptions = {}): */ export async function probeServerHealth(): Promise { const controller = new AbortController(); - const timeout = setTimeout(() => controller.abort(), PROBE_TIMEOUT_MS); + const timeout = setTimeout(() => controller.abort(intentionalAbortReason()), PROBE_TIMEOUT_MS); try { const res = await apiFetch("/api/health", { credentials: "include",