Skip to content

Commit fa9d85f

Browse files
Bil0000shivamhwp
andauthored
fix(web): a server updated with the app reconnects as soon as it is ready (pingdotgg#35327)
Co-authored-by: shivam <[email protected]>
1 parent a044f0c commit fa9d85f

2 files changed

Lines changed: 48 additions & 3 deletions

File tree

‎apps/web/src/components/sidebar/updateEverythingRun.test.ts‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1+
import { AVAILABLE_CONNECTION_STATE } from "@t3tools/client-runtime/connection";
12
import { EnvironmentId, type ServerConfig } from "@t3tools/contracts";
2-
import { Atom } from "effect/reactivity";
3+
import { AsyncResult, Atom } from "effect/reactivity";
34
import { afterEach, describe, expect, it, vi } from "vite-plus/test";
45

6+
import { environmentCatalog } from "~/connection/catalog";
57
import { appAtomRegistry } from "~/rpc/atomRegistry";
68
import { serverEnvironment } from "~/state/server";
79
import type { ServerUpdateOutcome, ServerUpdateTarget } from "../ServerUpdateAction";
@@ -60,6 +62,28 @@ describe("startDesktopUpdateLaunchNotice", () => {
6062
}
6163
});
6264

65+
it("retries the connection to a restarting server instead of waiting out its backoff", async () => {
66+
const environmentId = EnvironmentId.make("backing-off-machine");
67+
using _connection = vi
68+
.spyOn(environmentCatalog, "stateAtom")
69+
.mockReturnValue(
70+
Atom.make(
71+
AsyncResult.success({ ...AVAILABLE_CONNECTION_STATE, phase: "backoff" as const }),
72+
) as unknown as ReturnType<typeof environmentCatalog.stateAtom>,
73+
);
74+
using retryNow = vi
75+
.spyOn(environmentCatalog.retryNow, "run")
76+
.mockResolvedValue(AsyncResult.success(undefined));
77+
const stop = relaunchWhileRestarting(environmentId);
78+
try {
79+
await vi.advanceTimersByTimeAsync(1_000);
80+
expect(retryNow).toHaveBeenCalledWith(appAtomRegistry, environmentId);
81+
} finally {
82+
await vi.advanceTimersByTimeAsync(32 * 60 * 1000);
83+
stop();
84+
}
85+
});
86+
6387
it("clears the restored state when the server never comes back", async () => {
6488
const environmentId = EnvironmentId.make("lost-machine");
6589
const stateAtom = serverEnvironment.updateStateAtom(environmentId);

‎apps/web/src/components/sidebar/updateEverythingRun.tsx‎

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,18 @@
11
import { useAtomValue } from "@effect/atom-react";
2-
import { serverUpdateStateAtom } from "@t3tools/client-runtime/state/server";
2+
import { AVAILABLE_CONNECTION_STATE } from "@t3tools/client-runtime/connection";
3+
import {
4+
nudgeReconnectDuringUpdateRestart,
5+
serverUpdateStateAtom,
6+
} from "@t3tools/client-runtime/state/server";
37
import { EnvironmentId, type ServerConfig } from "@t3tools/contracts";
8+
import * as Effect from "effect/Effect";
49
import * as Option from "effect/Option";
510
import * as Schema from "effect/Schema";
6-
import { AsyncResult, Atom } from "effect/reactivity";
11+
import * as Stream from "effect/Stream";
12+
import { AsyncResult, Atom, AtomRegistry } from "effect/reactivity";
713

814
import { APP_VERSION } from "~/branding";
15+
import { environmentCatalog } from "~/connection/catalog";
916
import { appAtomRegistry } from "~/rpc/atomRegistry";
1017
import { desktopUpdateStateAtom } from "~/state/desktopUpdate";
1118
import { serverEnvironment } from "~/state/server";
@@ -308,6 +315,7 @@ function followHandedOffServers(servers: ReadonlyArray<HandedOffServer>): void {
308315
if (settled) return;
309316
settled = true;
310317
clearTimeout(timer);
318+
stopReconnectNudge();
311319
queueMicrotask(() => unsubscribe());
312320
appAtomRegistry.set(stateAtom, { status: "idle" });
313321
releaseState();
@@ -329,6 +337,19 @@ function followHandedOffServers(servers: ReadonlyArray<HandedOffServer>): void {
329337
() => settle(`Not back after ${HANDOFF_TIMEOUT_MS / 60_000} minutes`),
330338
server.startedAt + HANDOFF_TIMEOUT_MS - Date.now(),
331339
);
340+
const stopReconnectNudge = Effect.runCallback(
341+
nudgeReconnectDuringUpdateRestart({
342+
stateChanges: AtomRegistry.toStream(
343+
appAtomRegistry,
344+
environmentCatalog.stateAtom(server.environmentId),
345+
).pipe(
346+
Stream.map((state) => AsyncResult.getOrElse(state, () => AVAILABLE_CONNECTION_STATE)),
347+
),
348+
retryNow: Effect.promise(() =>
349+
environmentCatalog.retryNow.run(appAtomRegistry, server.environmentId),
350+
).pipe(Effect.asVoid),
351+
}),
352+
);
332353
const unsubscribe = appAtomRegistry.subscribe(
333354
serverEnvironment.configValueAtom(server.environmentId),
334355
(config) => {

0 commit comments

Comments
 (0)