@@ -987,7 +987,7 @@ describe("EnvironmentRegistry", () => {
987987 yield * Deferred . await ( relayChecked ) ;
988988
989989 const entries = yield * SubscriptionRef . get ( registry . entries ) ;
990- expect ( entries . get ( RELAY_TARGET . environmentId ) ) . toMatchObject ( { enabled : false } ) ;
990+ expect ( entries . get ( RELAY_TARGET . environmentId ) ?. unsupportedReason ) . toBeDefined ( ) ;
991991 expect ( entries . get ( TARGET . environmentId ) ) . toMatchObject ( { enabled : true } ) ;
992992 expect ( entries . get ( TARGET . environmentId ) ?. unsupportedReason ) . toBeUndefined ( ) ;
993993 expect ( ( yield * registry . state ( TARGET . environmentId ) ) . phase ) . toBe ( "connected" ) ;
@@ -996,7 +996,7 @@ describe("EnvironmentRegistry", () => {
996996 ) ;
997997
998998 it . effect . each ( [ false , true ] ) (
999- "discovery keeps unsupported environments off (learned route: %s)" ,
999+ "a switched-off environment stays off after compatibility clears (learned route: %s)" ,
10001000 ( learned ) =>
10011001 Effect . gen ( function * ( ) {
10021002 const environmentId = BEARER_TARGET . environmentId ;
@@ -1030,6 +1030,9 @@ describe("EnvironmentRegistry", () => {
10301030 expect ( ( yield * SubscriptionRef . get ( registry . entries ) ) . get ( environmentId ) ?. enabled ) . toBe (
10311031 false ,
10321032 ) ;
1033+ expect ( yield * registry . state ( environmentId ) ) . toMatchObject ( { desired : false } ) ;
1034+ expect ( yield * Ref . get ( harness . storedDisabled ) ) . toEqual ( new Set ( [ environmentId ] ) ) ;
1035+ expect ( yield * Ref . get ( harness . sessions ) ) . toHaveLength ( 0 ) ;
10331036 yield * registry . setEnabled ( environmentId , true ) ;
10341037 yield * awaitConnectionState (
10351038 registry ,
@@ -1040,28 +1043,68 @@ describe("EnvironmentRegistry", () => {
10401043 } ) ,
10411044 ) ;
10421045
1043- it . effect ( "a socket preflight rejection persists the connection as switched off " , ( ) =>
1046+ it . effect ( "protocol rejection preserves enablement through recovery and relaunch " , ( ) =>
10441047 Effect . gen ( function * ( ) {
10451048 const error = new ConnectionBlockedError ( {
10461049 reason : "unsupported" ,
10471050 detail : "Use a compatible client." ,
10481051 } ) ;
1049- const harness = yield * makeHarness ( [ RELAY_TARGET ] , [ ] , [ ] , { prepareError : error } ) ;
1052+ const rejection = yield * Ref . make < ConnectionBlockedError | undefined > ( error ) ;
1053+ const harness = yield * makeHarness ( [ RELAY_TARGET ] , [ ] , [ ] , {
1054+ beforePrepareRoute : ( ) => Ref . get ( rejection ) ,
1055+ } ) ;
10501056 yield * Effect . gen ( function * ( ) {
10511057 const registry = yield * EnvironmentRegistry . EnvironmentRegistry ;
10521058 yield * registry . start ;
10531059 yield * SubscriptionRef . changes ( registry . entries ) . pipe (
1054- Stream . filter ( ( entries ) => entries . get ( RELAY_TARGET . environmentId ) ?. enabled === false ) ,
1060+ Stream . filter (
1061+ ( entries ) => entries . get ( RELAY_TARGET . environmentId ) ?. unsupportedReason !== undefined ,
1062+ ) ,
10551063 Stream . take ( 1 ) ,
10561064 Stream . runDrain ,
10571065 ) ;
1058- expect ( ( yield * Ref . get ( harness . storedDisabled ) ) . has ( RELAY_TARGET . environmentId ) ) . toBe ( true ) ;
1066+ expect ( yield * Ref . get ( harness . storedDisabled ) ) . toEqual ( new Set ( ) ) ;
10591067 expect (
1060- ( yield * SubscriptionRef . get ( registry . entries ) ) . get ( RELAY_TARGET . environmentId )
1061- ?. unsupportedReason ,
1062- ) . toBe ( error . message ) ;
1068+ ( yield * SubscriptionRef . get ( registry . entries ) ) . get ( RELAY_TARGET . environmentId ) ,
1069+ ) . toMatchObject ( { enabled : true , unsupportedReason : error . message } ) ;
1070+ yield * awaitConnectionState (
1071+ registry ,
1072+ RELAY_TARGET . environmentId ,
1073+ ( state ) => ! state . desired && state . phase === "available" ,
1074+ ) ;
10631075 expect ( yield * Ref . get ( harness . sessions ) ) . toHaveLength ( 0 ) ;
1064- } ) . pipe ( Effect . provide ( harness . layer ) ) ;
1076+
1077+ yield * Ref . set ( rejection , undefined ) ;
1078+ yield * registry . setCompatibility ( RELAY_TARGET . environmentId , null ) ;
1079+ yield * awaitConnectionState (
1080+ registry ,
1081+ RELAY_TARGET . environmentId ,
1082+ ( state ) => state . phase === "connected" ,
1083+ ) ;
1084+ expect ( yield * Ref . get ( harness . sessions ) ) . toHaveLength ( 1 ) ;
1085+ yield * registry . setCompatibility ( RELAY_TARGET . environmentId , error ) ;
1086+ yield * awaitConnectionState (
1087+ registry ,
1088+ RELAY_TARGET . environmentId ,
1089+ ( state ) => ! state . desired && state . phase === "available" ,
1090+ ) ;
1091+ expect ( yield * Ref . get ( harness . releasedSessions ) ) . toBe ( 1 ) ;
1092+ } ) . pipe ( Effect . provide ( harness . layer ) , Effect . scoped ) ;
1093+
1094+ yield * Effect . gen ( function * ( ) {
1095+ const registry = yield * EnvironmentRegistry . EnvironmentRegistry ;
1096+ const entry = ( yield * SubscriptionRef . get ( registry . entries ) ) . get (
1097+ RELAY_TARGET . environmentId ,
1098+ ) ;
1099+ expect ( entry ?. enabled ) . toBe ( true ) ;
1100+ expect ( entry ?. unsupportedReason ) . toBeUndefined ( ) ;
1101+ yield * registry . start ;
1102+ yield * awaitConnectionState (
1103+ registry ,
1104+ RELAY_TARGET . environmentId ,
1105+ ( state ) => state . phase === "connected" ,
1106+ ) ;
1107+ } ) . pipe ( Effect . provide ( harness . layer ) , Effect . scoped ) ;
10651108 } ) ,
10661109 ) ;
10671110
@@ -1100,16 +1143,16 @@ describe("EnvironmentRegistry", () => {
11001143 yield * Effect . gen ( function * ( ) {
11011144 const registry = yield * EnvironmentRegistry . EnvironmentRegistry ;
11021145 yield * registry . start ;
1103- const awaitDisabled = SubscriptionRef . changes ( registry . entries ) . pipe (
1104- Stream . filter ( ( entries ) => entries . get ( environmentId ) ?. enabled === false ) ,
1146+ const awaitUnsupported = SubscriptionRef . changes ( registry . entries ) . pipe (
1147+ Stream . filter ( ( entries ) => entries . get ( environmentId ) ?. unsupportedReason !== undefined ) ,
11051148 Stream . take ( 1 ) ,
11061149 Stream . runDrain ,
11071150 ) ;
1108- yield * awaitDisabled ;
1109- expect ( ( yield * Ref . get ( harness . storedDisabled ) ) . has ( environmentId ) ) . toBe ( true ) ;
1151+ yield * awaitUnsupported ;
1152+ expect ( ( yield * Ref . get ( harness . storedDisabled ) ) . has ( environmentId ) ) . toBe ( false ) ;
11101153 expect ( ( yield * SubscriptionRef . get ( registry . entries ) ) . get ( environmentId ) ) . toMatchObject ( {
11111154 target : relayFirst ? relay : BEARER_TARGET ,
1112- enabled : false ,
1155+ enabled : true ,
11131156 unsupportedReason : error . message ,
11141157 serverUpdateRequired : true ,
11151158 } ) ;
@@ -1132,13 +1175,13 @@ describe("EnvironmentRegistry", () => {
11321175 ) ;
11331176 expect ( yield * Ref . get ( harness . sessions ) ) . toHaveLength ( 1 ) ;
11341177 } else {
1135- yield * awaitDisabled ;
1178+ yield * awaitUnsupported ;
11361179 expect ( ( yield * SubscriptionRef . get ( registry . entries ) ) . get ( environmentId ) ) . toMatchObject ( {
1137- enabled : false ,
1180+ enabled : true ,
11381181 unsupportedReason : error . message ,
11391182 serverUpdateRequired : true ,
11401183 } ) ;
1141- expect ( ( yield * Ref . get ( harness . storedDisabled ) ) . has ( environmentId ) ) . toBe ( true ) ;
1184+ expect ( ( yield * Ref . get ( harness . storedDisabled ) ) . has ( environmentId ) ) . toBe ( false ) ;
11421185 expect ( yield * Ref . get ( harness . sessions ) ) . toHaveLength ( 0 ) ;
11431186 }
11441187 expect ( yield * Ref . get ( attempts ) ) . toBe ( 2 ) ;
@@ -1808,7 +1851,16 @@ describe("EnvironmentRegistry", () => {
18081851 yield * registry . reconcilePlatform ( [ registration ] ) ;
18091852 expect (
18101853 ( yield * SubscriptionRef . get ( registry . entries ) ) . get ( TARGET . environmentId ) ,
1811- ) . toMatchObject ( { enabled : false , unsupportedReason : error . message } ) ;
1854+ ) . toMatchObject ( { enabled : true , unsupportedReason : error . message } ) ;
1855+ yield * registry . registerPlatform (
1856+ new PrimaryConnectionRegistration ( {
1857+ target : new PrimaryConnectionTarget ( { ...TARGET , label : "Renamed" } ) ,
1858+ } ) ,
1859+ ) ;
1860+ expect ( yield * registry . state ( TARGET . environmentId ) ) . toMatchObject ( {
1861+ desired : false ,
1862+ phase : "available" ,
1863+ } ) ;
18121864 expect ( yield * Ref . get ( harness . sessions ) ) . toHaveLength ( 1 ) ;
18131865 yield * registry . registerPlatform (
18141866 new PrimaryConnectionRegistration ( {
0 commit comments