@@ -235,9 +235,11 @@ const makeHarness = Effect.fn("TestConnectionHarness.make")(function* (options?:
235235 entry : ConnectionCatalogEntry ,
236236 reportProgress : ( progress : ConnectionDriver . ConnectionDriverProgress ) => Effect . Effect < void > ,
237237 ) {
238- yield * reportProgress ( { stage : "preparing" } ) ;
239- return yield * ConnectionDriver . connectOverRoutes ( entry , checkRoute , ( route ) =>
240- connectRoute ( route . target , reportProgress ) ,
238+ return yield * ConnectionDriver . connectOverRoutes (
239+ entry ,
240+ checkRoute ,
241+ ( route ) => connectRoute ( route . target , reportProgress ) ,
242+ reportProgress ,
241243 ) ;
242244 } ) ;
243245
@@ -1818,32 +1820,51 @@ describe("EnvironmentSupervisor routes", () => {
18181820 } ) ,
18191821 ) ;
18201822
1821- it . effect ( "restarts on a network recovery while a fallback route has not opened" , ( ) =>
1822- Effect . gen ( function * ( ) {
1823- const fallbackOpening = yield * Deferred . make < void > ( ) ;
1824- const harness = yield * makeHarness ( {
1825- networkStatus : "unknown" ,
1826- checkRoute : ( ) => Effect . succeed ( "answered" ) ,
1827- prepare : ( _attempt , target ) => Effect . succeed ( preparedFor ( target ) ) ,
1828- opened : ( attempt ) =>
1829- attempt === 2
1830- ? Deferred . succeed ( fallbackOpening , undefined ) . pipe ( Effect . andThen ( Effect . never ) )
1831- : Effect . void ,
1832- ready : ( attempt ) => ( attempt === 1 ? Effect . fail ( transient ( ) ) : Effect . void ) ,
1833- } ) ;
1834- const supervisor = yield * EnvironmentSupervisor . make ( LAN_THEN_RELAY_ENTRY , {
1835- initiallyDesired : true ,
1836- } ) . pipe ( Effect . provide ( harness . dependencies ) ) ;
1823+ // The LAN route opens and then fails its snapshot, so the attempt moves on to relay.
1824+ it . effect . each ( [
1825+ { stall : "reachability check" , sessions : 2 } ,
1826+ { stall : "preparation" , sessions : 2 } ,
1827+ { stall : "opening" , sessions : 3 } ,
1828+ ] as const ) (
1829+ "restarts on a network recovery while a fallback route stalls in $stall" ,
1830+ ( { stall, sessions } ) =>
1831+ Effect . gen ( function * ( ) {
1832+ const stalled = yield * Deferred . make < void > ( ) ;
1833+ const stallHere = Deferred . succeed ( stalled , undefined ) . pipe ( Effect . andThen ( Effect . never ) ) ;
1834+ const harness = yield * makeHarness ( {
1835+ networkStatus : "unknown" ,
1836+ checkRoute : ( route ) =>
1837+ stall === "reachability check" && route . target . _tag === "RelayConnectionTarget"
1838+ ? Effect . never
1839+ : Effect . succeed ( "answered" ) ,
1840+ prepare : ( _attempt , target ) =>
1841+ stall === "preparation" && target . _tag === "RelayConnectionTarget"
1842+ ? stallHere
1843+ : Effect . succeed ( preparedFor ( target ) ) ,
1844+ opened : ( attempt ) => ( stall === "opening" && attempt === 2 ? stallHere : Effect . void ) ,
1845+ ready : ( attempt ) =>
1846+ attempt !== 1
1847+ ? Effect . void
1848+ : stall === "reachability check"
1849+ ? Deferred . succeed ( stalled , undefined ) . pipe (
1850+ Effect . andThen ( Effect . fail ( transient ( ) ) ) ,
1851+ )
1852+ : Effect . fail ( transient ( ) ) ,
1853+ } ) ;
1854+ const supervisor = yield * EnvironmentSupervisor . make ( LAN_THEN_RELAY_ENTRY , {
1855+ initiallyDesired : true ,
1856+ } ) . pipe ( Effect . provide ( harness . dependencies ) ) ;
18371857
1838- yield * Deferred . await ( fallbackOpening ) ;
1839- yield * harness . setNetworkStatus ( "online" ) ;
1840- yield * TestClock . adjust ( "0 millis" ) ;
1858+ yield * Deferred . await ( stalled ) ;
1859+ yield * TestClock . adjust ( "0 millis" ) ;
1860+ yield * harness . setNetworkStatus ( "online" ) ;
1861+ yield * TestClock . adjust ( "0 millis" ) ;
18411862
1842- expect ( yield * Ref . get ( harness . sessionCount ) ) . toBe ( 3 ) ;
1843- yield * awaitState ( supervisor . state , ( state ) => state . phase === "connected" ) ;
1844- const prepared = Option . getOrThrow ( yield * SubscriptionRef . get ( supervisor . prepared ) ) ;
1845- expect ( prepared . target . _tag ) . toBe ( "BearerConnectionTarget" ) ;
1846- } ) . pipe ( Effect . provide ( TestClock . layer ( ) ) ) ,
1863+ expect ( yield * Ref . get ( harness . sessionCount ) ) . toBe ( sessions ) ;
1864+ yield * awaitState ( supervisor . state , ( state ) => state . phase === "connected" ) ;
1865+ const prepared = Option . getOrThrow ( yield * SubscriptionRef . get ( supervisor . prepared ) ) ;
1866+ expect ( prepared . target . _tag ) . toBe ( "BearerConnectionTarget" ) ;
1867+ } ) . pipe ( Effect . provide ( TestClock . layer ( ) ) ) ,
18471868 ) ;
18481869
18491870 it . effect ( "tries every route when none answers the reachability check" , ( ) =>
0 commit comments