@@ -2103,6 +2103,8 @@ it.effect("a running session renews its bound profile but refuses a replacement
21032103
21042104const makeRenewalBroker = Effect . gen ( function * ( ) {
21052105 const fs = yield * FileSystem . FileSystem ;
2106+ const requestStarted = yield * Deferred . make < void > ( ) ;
2107+ let listening = false ;
21062108 const oauthEntered = yield * Deferred . make < void > ( ) ;
21072109 const oauthRelease = yield * Deferred . make < void > ( ) ;
21082110 const commitEntered = yield * Deferred . make < void > ( ) ;
@@ -2178,6 +2180,7 @@ const makeRenewalBroker = Effect.gen(function* () {
21782180 const context = yield * Layer . buildWithScope ( CodexManagedTokenBroker . layer , scope ) ;
21792181 const broker = Context . get ( context , CodexManagedTokenBroker . CodexManagedTokenBroker ) ;
21802182 const endpoint = yield * broker . endpoint ;
2183+ listening = true ;
21812184 yield * Effect . addFinalizer ( ( ) =>
21822185 Deferred . succeed ( oauthRelease , undefined ) . pipe (
21832186 Effect . andThen ( Deferred . succeed ( commitRelease , undefined ) ) ,
@@ -2191,6 +2194,18 @@ const makeRenewalBroker = Effect.gen(function* () {
21912194 endpoint,
21922195 refreshTokens,
21932196 request : { version : 1 , instanceId, environmentId, profileKey } ,
2197+ requestStarted : Deferred . await ( requestStarted ) ,
2198+ holdSignIn : Effect . gen ( function * ( ) {
2199+ yield * auth . controller . start ( "owner" , Effect . void , undefined , undefined , "client" ) ;
2200+ const waiting = yield * auth . controller . subscribe ( "owner" ) . pipe (
2201+ Stream . filter ( ( state ) => state . phase === "waiting" ) ,
2202+ Stream . runHead ,
2203+ Effect . map ( Option . getOrThrow ) ,
2204+ ) ;
2205+ const cancel = auth . controller . cancel ( "owner" , waiting . flowId ! ) ;
2206+ yield * Effect . addFinalizer ( ( ) => cancel . pipe ( Effect . ignoreCause ) ) ;
2207+ return cancel ;
2208+ } ) ,
21942209 oauthEntered,
21952210 oauthRelease,
21962211 commitEntered,
@@ -2205,7 +2220,11 @@ const makeRenewalBroker = Effect.gen(function* () {
22052220 Effect . provideService ( FileSystem . FileSystem , fileSystem ) ,
22062221 Effect . provideService ( HttpClient . HttpClient , http ) ,
22072222 Effect . provideService ( ServerEnvironment . ServerEnvironmentIdentity , {
2208- getEnvironmentId : Effect . succeed ( environmentId ) ,
2223+ getEnvironmentId : Effect . gen ( function * ( ) {
2224+ // After listener setup, identity is resolved when an admitted job constructs auth.
2225+ if ( listening ) yield * Deferred . succeed ( requestStarted , undefined ) ;
2226+ return environmentId ;
2227+ } ) ,
22092228 } ) ,
22102229 ) ;
22112230} ) ;
@@ -2242,21 +2261,55 @@ const provideBroker = <A, E, R>(effect: Effect.Effect<A, E, R>) =>
22422261 ) ,
22432262 ) ;
22442263
2245- it . live . each ( [ "oauth-disconnect" , "commit-disconnect" , "commit-shutdown" ] as const ) (
2264+ it . effect ( "the broker retires a queued renewal while sign-in still holds the permit" , ( ) =>
2265+ provideBroker (
2266+ Effect . gen ( function * ( ) {
2267+ const h = yield * makeRenewalBroker ;
2268+ yield * h . holdSignIn . pipe ( Effect . asVoid ) ;
2269+ const client = yield * brokerClient ( h . endpoint , h . request ) ;
2270+ yield * h . requestStarted ;
2271+ const idle = yield * Deferred . make < void > ( ) ;
2272+ yield * h . broker . awaitIdle . pipe (
2273+ Effect . andThen ( Deferred . succeed ( idle , undefined ) ) ,
2274+ Effect . forkChild ,
2275+ ) ;
2276+
2277+ yield * TestClock . adjust ( 80_001 ) ;
2278+ assert . isTrue ( yield * Deferred . isDone ( idle ) , "The admitted renewal outlived its helper" ) ;
2279+ yield * Scope . close ( h . scope , Exit . void ) ;
2280+ assert . equal ( yield * Effect . promise ( ( ) => client . response ) , "" ) ;
2281+ const state = yield * h . auth . controller
2282+ . subscribe ( "owner" )
2283+ . pipe ( Stream . runHead , Effect . map ( Option . getOrThrow ) ) ;
2284+ assert . equal ( state . phase , "waiting" ) ;
2285+ assert . deepEqual ( h . refreshTokens , [ ] ) ;
2286+ } ) ,
2287+ ) ,
2288+ ) ;
2289+
2290+ it . effect . each ( [ "oauth-disconnect" , "commit-disconnect" , "commit-shutdown" ] as const ) (
22462291 "server-owned renewal persists rotated credentials after %s" ,
22472292 ( stage ) =>
22482293 provideBroker (
22492294 Effect . gen ( function * ( ) {
22502295 const h = yield * makeRenewalBroker ;
22512296 h . pause ( stage === "oauth-disconnect" ? "oauth" : "commit" ) ;
2297+ const releaseSignIn = stage === "oauth-disconnect" ? yield * h . holdSignIn : undefined ;
22522298 const client = yield * brokerClient ( h . endpoint , h . request ) ;
2299+ if ( releaseSignIn ) {
2300+ yield * h . requestStarted ;
2301+ yield * TestClock . adjust ( 70_000 ) ;
2302+ yield * releaseSignIn ;
2303+ }
22532304 yield * Deferred . await ( stage === "oauth-disconnect" ? h . oauthEntered : h . commitEntered ) ;
22542305 const closing =
22552306 stage === "commit-shutdown"
22562307 ? yield * Scope . close ( h . scope , Exit . void ) . pipe ( Effect . forkChild )
22572308 : undefined ;
22582309 if ( ! closing ) client . socket . destroy ( ) ;
22592310 yield * Effect . promise ( ( ) => client . response ) ;
2311+ // Cross the broker deadline while still inside the exchange's own 20-second budget.
2312+ if ( releaseSignIn ) yield * TestClock . adjust ( 10_001 ) ;
22602313 assert . equal ( Option . getOrThrow ( yield * h . auth . read ) . refreshToken , "single-use-refresh" ) ;
22612314 yield * Deferred . succeed ( h . oauthRelease , undefined ) ;
22622315 yield * Deferred . succeed ( h . commitRelease , undefined ) ;
0 commit comments