11import { 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" ;
37import { EnvironmentId , type ServerConfig } from "@t3tools/contracts" ;
8+ import * as Effect from "effect/Effect" ;
49import * as Option from "effect/Option" ;
510import * 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
814import { APP_VERSION } from "~/branding" ;
15+ import { environmentCatalog } from "~/connection/catalog" ;
916import { appAtomRegistry } from "~/rpc/atomRegistry" ;
1017import { desktopUpdateStateAtom } from "~/state/desktopUpdate" ;
1118import { 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