Skip to content

Commit 4b92848

Browse files
committed
fix(client-runtime): learn direct routes from the replacement session after a token handoff
1 parent b18efca commit 4b92848

2 files changed

Lines changed: 42 additions & 0 deletions

File tree

‎packages/client-runtime/src/connection/supervisor.test.ts‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1581,6 +1581,44 @@ describe("EnvironmentSupervisor", () => {
15811581
}).pipe(Effect.provide(TestClock.layer())),
15821582
);
15831583

1584+
it.effect("learns routes from the replacement session after a token handoff", () =>
1585+
Effect.gen(function* () {
1586+
const learnCalls = yield* Ref.make(0);
1587+
const harness = yield* makeHarness({
1588+
prepare: (attempt) =>
1589+
Effect.succeed({
1590+
...PREPARED_CONNECTION,
1591+
target: RELAY_TARGET,
1592+
httpAuthorization: {
1593+
_tag: "Dpop",
1594+
accessToken: `access-token-${attempt}`,
1595+
expiresAtEpochMs: 3_600_000 * attempt,
1596+
},
1597+
}),
1598+
initialConfig: () =>
1599+
Effect.succeed({ directEndpoints: [] } as Pick<
1600+
ServerConfig,
1601+
"directEndpoints"
1602+
> as ServerConfig),
1603+
});
1604+
const supervisor = yield* EnvironmentSupervisor.make(RELAY_ENTRY, {
1605+
initiallyDesired: true,
1606+
learnRoutes: () =>
1607+
Ref.update(learnCalls, (count) => count + 1).pipe(Effect.as(Option.none())),
1608+
}).pipe(Effect.provide(harness.dependencies));
1609+
1610+
yield* awaitState(supervisor.state, (state) => state.phase === "connected");
1611+
const first = Option.getOrThrow(yield* SubscriptionRef.get(supervisor.session));
1612+
yield* TestClock.adjust("1 minute");
1613+
expect(yield* Ref.get(learnCalls)).toBe(1);
1614+
1615+
yield* TestClock.adjust("58 minutes");
1616+
yield* awaitNewSession(supervisor.session, first);
1617+
yield* TestClock.adjust("1 second");
1618+
expect(yield* Ref.get(learnCalls)).toBe(2);
1619+
}).pipe(Effect.provide(TestClock.layer())),
1620+
);
1621+
15841622
it.effect("keeps the session while a failed replacement retries before expiry", () =>
15851623
Effect.gen(function* () {
15861624
const harness = yield* makeHarness({

‎packages/client-runtime/src/connection/supervisor.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -851,6 +851,10 @@ export const make = Effect.fn("EnvironmentSupervisor.make")(function* (
851851
yield* SubscriptionRef.set(prepared, Option.some(replacement.lease.prepared));
852852
yield* SubscriptionRef.set(session, Option.some(replacement.lease.session));
853853
yield* Ref.set(probeUnanswered, false);
854+
// The replacement session reports its own direct endpoints, as a reconnect would.
855+
if (options?.learnRoutes !== undefined) {
856+
yield* learnRoutesFrom(options.learnRoutes, replacement.lease).pipe(Effect.forkScoped);
857+
}
854858
// Requests already running on the previous socket finish on it; the
855859
// server closes it at expiry, within the refresh skew.
856860
yield* Scope.close(activeScope, Exit.void).pipe(

0 commit comments

Comments
 (0)