@@ -39,8 +39,15 @@ import {
3939
4040const RETRY_BASE_DELAY_MS = 1_000 ;
4141const RETRY_MAX_DELAY_MS = 300_000 ;
42+ // Per-route budget to resolve credentials and create the session, which ends
43+ // when the driver reports the synchronizing stage. Each route that gets that
44+ // far adds its own budget for the socket to open (bounded at 15 seconds by the
45+ // RPC session) and the server to deliver the first config snapshot. A cold
46+ // server with a large database can take longer than 15 seconds to answer, and
47+ // that is not a reason to drop a working connection.
4248const CONNECTION_ESTABLISHMENT_TIMEOUT = "15 seconds" ;
4349const establishmentTimeout = Duration . fromInputUnsafe ( CONNECTION_ESTABLISHMENT_TIMEOUT ) ;
50+ const synchronizationTimeout = Duration . fromInputUnsafe ( "75 seconds" ) ;
4451const CONNECTION_PROBE_TIMEOUT = "15 seconds" ;
4552// Mobile resumes, explicit retries, and offline events want a fast answer:
4653// the user is waiting, or the network may be gone.
@@ -428,9 +435,13 @@ export const make = Effect.fn("EnvironmentSupervisor.make")(function* (
428435 attempt : number ,
429436 generation : number ,
430437 lastFailure : ConnectionAttemptError | null ,
438+ synchronizedRoutes : Ref . Ref < number > ,
431439 ) {
432440 return yield * driver . connect ( yield * attemptEntry , ( progress ) =>
433- reportProgress ( attempt , generation , lastFailure , progress ) ,
441+ ( progress . stage === "synchronizing"
442+ ? Ref . update ( synchronizedRoutes , ( count ) => count + 1 )
443+ : Effect . void
444+ ) . pipe ( Effect . andThen ( reportProgress ( attempt , generation , lastFailure , progress ) ) ) ,
434445 ) ;
435446 } ) ;
436447
@@ -481,16 +492,17 @@ export const make = Effect.fn("EnvironmentSupervisor.make")(function* (
481492 generation : number ,
482493 lastFailure : ConnectionAttemptError | null ,
483494 pendingRetry : Option . Option < PendingRetryTrace > ,
495+ synchronizedRoutes : Ref . Ref < number > ,
484496 ) {
485497 if ( usesRelay ) {
486498 return yield * traceRelayEstablishment (
487- establishConnection ( attempt , generation , lastFailure ) ,
499+ establishConnection ( attempt , generation , lastFailure , synchronizedRoutes ) ,
488500 attempt ,
489501 generation ,
490502 pendingRetry ,
491503 ) ;
492504 }
493- return yield * establishConnection ( attempt , generation , lastFailure ) . pipe (
505+ return yield * establishConnection ( attempt , generation , lastFailure , synchronizedRoutes ) . pipe (
494506 Effect . map ( ( lease ) => ( {
495507 attemptSpan : Option . none < Tracer . Span > ( ) ,
496508 lease,
@@ -684,9 +696,16 @@ export const make = Effect.fn("EnvironmentSupervisor.make")(function* (
684696 ) {
685697 const switchingTo = yield * Ref . get ( preferredRouteId ) ;
686698 yield * SubscriptionRef . set ( prepared , Option . none ( ) ) ;
699+ const synchronizedRoutes = yield * Ref . make ( 0 ) ;
687700 const establishment = yield * Effect . raceAllFirst ( [
688701 exitUnlessInterrupted (
689- establishTracedConnection ( attempt , generation , lastFailure , pendingRetry ) ,
702+ establishTracedConnection (
703+ attempt ,
704+ generation ,
705+ lastFailure ,
706+ pendingRetry ,
707+ synchronizedRoutes ,
708+ ) ,
690709 ) . pipe (
691710 Effect . map ( ( exit ) : EstablishmentEvent => ( {
692711 _tag : "Completed" ,
@@ -699,10 +718,24 @@ export const make = Effect.fn("EnvironmentSupervisor.make")(function* (
699718 resetRetry,
700719 } ) ) ,
701720 ) ,
702- // Each route may use the full setup time before the next is tried.
703- Effect . sleep (
704- Duration . times ( establishmentTimeout , connectionRoutes ( yield * Ref . get ( currentEntry ) ) . length ) ,
705- ) . pipe ( Effect . as < EstablishmentEvent > ( { _tag : "TimedOut" } ) ) ,
721+ // Each route may use the full setup time before the next is tried, and
722+ // each route that reaches synchronizing adds its own snapshot budget, so
723+ // a route that fails late does not eat the next route's time.
724+ Effect . gen ( function * ( ) {
725+ const routeCount = connectionRoutes ( yield * Ref . get ( currentEntry ) ) . length ;
726+ const startedAt = yield * Clock . monotonicTimeNanos ;
727+ const setup = Duration . toNanosUnsafe ( Duration . times ( establishmentTimeout , routeCount ) ) ;
728+ while ( true ) {
729+ const synchronized = BigInt ( yield * Ref . get ( synchronizedRoutes ) ) ;
730+ const deadline =
731+ startedAt + setup + synchronized * Duration . toNanosUnsafe ( synchronizationTimeout ) ;
732+ const remaining = deadline - ( yield * Clock . monotonicTimeNanos ) ;
733+ if ( remaining <= 0n ) {
734+ return { _tag : "TimedOut" } as const satisfies EstablishmentEvent ;
735+ }
736+ yield * Effect . sleep ( Duration . nanos ( remaining ) ) ;
737+ }
738+ } ) ,
706739 ] ) ;
707740
708741 if ( establishment . _tag === "Interrupted" ) {
0 commit comments