Skip to content

Commit f01279f

Browse files
committed
fix(client-runtime): keep a resumed socket whose frame lands just before its replacement is ready
1 parent ff9cb58 commit f01279f

2 files changed

Lines changed: 48 additions & 1 deletion

File tree

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

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1049,6 +1049,45 @@ describe("EnvironmentSupervisor", () => {
10491049
}).pipe(Effect.provide(TestClock.layer())),
10501050
);
10511051

1052+
it.effect(
1053+
"keeps a long-resume socket whose frame lands just before the replacement is ready",
1054+
() =>
1055+
Effect.gen(function* () {
1056+
const frames = yield* Ref.make(0);
1057+
const replacementRequested = yield* Deferred.make<void>();
1058+
const ready = yield* Deferred.make<void>();
1059+
const harness = yield* makeHarness({
1060+
prepare: (_attempt, target) => Effect.succeed(preparedFor(target)),
1061+
initialConfig: () => Effect.succeed(PROBE_CAPABLE_CONFIG),
1062+
probe: (attempt) => (attempt === 1 ? Effect.never : Effect.void),
1063+
ready: (attempt) =>
1064+
attempt === 2
1065+
? Deferred.succeed(replacementRequested, undefined).pipe(
1066+
Effect.andThen(Deferred.await(ready)),
1067+
)
1068+
: Effect.void,
1069+
inboundFrames: Ref.get(frames),
1070+
checkHost: () => Effect.never,
1071+
});
1072+
const supervisor = yield* EnvironmentSupervisor.make(RELAY_ENTRY, {
1073+
initiallyDesired: true,
1074+
}).pipe(Effect.provide(harness.dependencies));
1075+
1076+
yield* awaitState(supervisor.state, (state) => state.phase === "connected");
1077+
yield* harness.wake("application-active-long");
1078+
yield* TestClock.adjust("500 millis");
1079+
expect(yield* Deferred.isDone(replacementRequested)).toBe(true);
1080+
// The frame lands between two frame checks, then the replacement becomes ready.
1081+
yield* Ref.update(frames, (count) => count + 1);
1082+
yield* Deferred.succeed(ready, undefined);
1083+
yield* TestClock.adjust("100 millis");
1084+
1085+
expect((yield* SubscriptionRef.get(supervisor.state)).generation).toBe(1);
1086+
expect(yield* Ref.get(harness.sessionCount)).toBe(2);
1087+
expect(yield* Ref.get(harness.releaseCount)).toBe(1);
1088+
}).pipe(Effect.provide(TestClock.layer())),
1089+
);
1090+
10521091
const makeDeadRemoteSocketHarness = Effect.fn("test.makeDeadRemoteSocketHarness")(function* (
10531092
replacementReady: (
10541093
requested: Deferred.Deferred<void>,

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -848,6 +848,7 @@ export const make = Effect.fn("EnvironmentSupervisor.make")(function* (
848848
const remoteRoute = routeKind !== undefined && !answersQuickly(routeKind);
849849
let replacementPlanned = false;
850850
let replacementDueAt: bigint | undefined;
851+
let framesAtReplacement = 0;
851852
const planReplacement = Effect.gen(function* () {
852853
if (replacementPlanned || !longResume || !remoteRoute) return;
853854
replacementPlanned = true;
@@ -910,11 +911,18 @@ export const make = Effect.fn("EnvironmentSupervisor.make")(function* (
910911
]);
911912
if (probeEvent._tag === "ReplacementDue") {
912913
replacementDueAt = undefined;
914+
framesAtReplacement = yield* lease.session.inboundFrames;
913915
yield* startReplacement(generation);
914916
continue;
915917
}
916918
if (probeEvent._tag === "ReplacementSettled") {
917-
if (Exit.isSuccess(probeEvent.exit) && Exit.isSuccess(probeEvent.exit.value)) {
919+
// The frame check polls, so a frame can land just before the replacement is ready.
920+
const framesArrived = (yield* lease.session.inboundFrames) !== framesAtReplacement;
921+
if (
922+
!framesArrived &&
923+
Exit.isSuccess(probeEvent.exit) &&
924+
Exit.isSuccess(probeEvent.exit.value)
925+
) {
918926
yield* stopProbe;
919927
handOffReplacement();
920928
return true;

0 commit comments

Comments
 (0)