@@ -12,6 +12,7 @@ import * as Option from "effect/Option";
1212import * as Ref from "effect/Ref" ;
1313import * as Stream from "effect/Stream" ;
1414import * as SubscriptionRef from "effect/SubscriptionRef" ;
15+ import { Atom , AtomRegistry } from "effect/reactivity" ;
1516
1617import * as ManagedRelay from "./managedRelay.ts" ;
1718import * as ClientCapabilities from "../platform/capabilities.ts" ;
@@ -20,6 +21,7 @@ import { ConnectionBlockedError, type NetworkStatus } from "../connection/model.
2021import * as ConnectionWakeups from "../connection/wakeups.ts" ;
2122import * as RelayEnvironmentDiscovery from "./discovery.ts" ;
2223import { NETWORK_BLOCKING_HINT } from "../errors/network.ts" ;
24+ import { createRelayEnvironmentDiscoveryAtoms } from "../state/relayDiscovery.ts" ;
2325
2426const environments = [
2527 {
@@ -59,6 +61,8 @@ function status(
5961const makeHarness = Effect . fn ( "RelayDiscoveryTest.makeHarness" ) ( function * ( ) {
6062 const networkStatus = yield * SubscriptionRef . make < NetworkStatus > ( "online" ) ;
6163 const listCalls = yield * Ref . make ( 0 ) ;
64+ const listedEnvironments =
65+ yield * Ref . make < ReadonlyArray < RelayClientEnvironmentRecord > > ( environments ) ;
6266 const listFailure = yield * Ref . make < ManagedRelay . ManagedRelayClientError | null > ( null ) ;
6367 const secondListCall = yield * Deferred . make < void > ( ) ;
6468 const clerkToken = yield * Ref . make < string | null > ( "clerk-token" ) ;
@@ -100,7 +104,7 @@ const makeHarness = Effect.fn("RelayDiscoveryTest.makeHarness")(function* () {
100104 if ( failure ) {
101105 return yield * failure ;
102106 }
103- return environments ;
107+ return yield * Ref . get ( listedEnvironments ) ;
104108 } ) ,
105109 getEnvironmentStatus : ( { environmentId } ) =>
106110 Ref . get ( statusRequests ) . pipe (
@@ -162,6 +166,7 @@ const makeHarness = Effect.fn("RelayDiscoveryTest.makeHarness")(function* () {
162166 return {
163167 layer,
164168 listCalls,
169+ listedEnvironments,
165170 listFailure,
166171 clerkToken,
167172 networkStatus,
@@ -176,6 +181,51 @@ const makeHarness = Effect.fn("RelayDiscoveryTest.makeHarness")(function* () {
176181} ) ;
177182
178183describe ( "RelayEnvironmentDiscovery" , ( ) => {
184+ it . effect ( "fetches a fresh list after removal while an older refresh is checking statuses" , ( ) =>
185+ Effect . scoped (
186+ Effect . gen ( function * ( ) {
187+ const harness = yield * makeHarness ( ) ;
188+ yield * Effect . gen ( function * ( ) {
189+ const discovery = yield * RelayEnvironmentDiscovery . RelayEnvironmentDiscovery ;
190+ const atoms = createRelayEnvironmentDiscoveryAtoms (
191+ Atom . runtime (
192+ Layer . succeed ( RelayEnvironmentDiscovery . RelayEnvironmentDiscovery , discovery ) ,
193+ ) ,
194+ ) ;
195+ const registry = AtomRegistry . make ( ) ;
196+ yield * Effect . addFinalizer ( ( ) => Effect . sync ( ( ) => registry . dispose ( ) ) ) ;
197+
198+ const refresh = atoms . refresh . run ( registry , undefined ) ;
199+ yield * SubscriptionRef . changes ( discovery . state ) . pipe (
200+ Stream . filter ( ( state ) => state . environments . size === environments . length ) ,
201+ Stream . runHead ,
202+ ) ;
203+ const coalescedRefresh = atoms . refresh . run ( registry , undefined ) ;
204+ yield * Ref . set ( harness . listedEnvironments , [ environments [ 1 ] ! ] ) ;
205+ const mutationRefresh = atoms . refreshAfterMutation . run ( registry , undefined ) ;
206+
207+ const requests = yield * Ref . get ( harness . statusRequests ) ;
208+ for ( const environment of environments ) {
209+ yield * Deferred . succeed (
210+ requests . get ( environment . environmentId ) ! ,
211+ status ( environment , "online" ) ,
212+ ) ;
213+ }
214+ const results = yield * Effect . promise ( ( ) =>
215+ Promise . all ( [ refresh , coalescedRefresh , mutationRefresh ] ) ,
216+ ) ;
217+ for ( const result of results ) {
218+ expect ( result . _tag ) . toBe ( "Success" ) ;
219+ }
220+ expect ( yield * Ref . get ( harness . listCalls ) ) . toBe ( 2 ) ;
221+ const complete = yield * SubscriptionRef . get ( discovery . state ) ;
222+ expect ( [ ...complete . environments . keys ( ) ] ) . toEqual ( [ environments [ 1 ] ! . environmentId ] ) ;
223+ expect ( complete . refreshing ) . toBe ( false ) ;
224+ } ) . pipe ( Effect . provide ( harness . layer ) ) ;
225+ } ) ,
226+ ) ,
227+ ) ;
228+
179229 it . effect ( "publishes each environment status as soon as that lookup completes" , ( ) =>
180230 Effect . gen ( function * ( ) {
181231 const harness = yield * makeHarness ( ) ;
0 commit comments