Skip to content

Commit ecf9842

Browse files
committed
fix(history): make replaced work requests retryable
1 parent e61e8b9 commit ecf9842

2 files changed

Lines changed: 62 additions & 1 deletion

File tree

‎packages/client-runtime/src/state/threads-sync.test.ts‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -782,6 +782,65 @@ describe("EnvironmentThreads", () => {
782782
}),
783783
);
784784

785+
it.effect.each(["deferred", "complete"] as const)(
786+
"settles a replaced work request when the new snapshot is %s",
787+
(mode) =>
788+
Effect.gen(function* () {
789+
const anchor = {
790+
...command("anchor", "completed"),
791+
deferredWork: { cursor: "before", itemCount: 80, lastOrdinal: 80 },
792+
};
793+
const asked = yield* Deferred.make<void>();
794+
const release = yield* Deferred.make<void>();
795+
const harness = yield* makeHarness({
796+
cached: {
797+
...BASE_PROJECTION,
798+
turnItems: [anchor],
799+
visibleTurnItems: [localRow(anchor, 0)],
800+
},
801+
historyHttpClient: HttpClient.make((request) =>
802+
Effect.gen(function* () {
803+
yield* Deferred.succeed(asked, undefined);
804+
yield* Deferred.await(release);
805+
return HttpClientResponse.fromWeb(
806+
request,
807+
Response.json({
808+
snapshotSequence: 7,
809+
items: [],
810+
nextCursor: null,
811+
hasMoreHistory: false,
812+
}),
813+
);
814+
}),
815+
),
816+
});
817+
const loading = yield* harness.loadWork(anchor.id).pipe(Effect.forkChild);
818+
yield* Deferred.await(asked);
819+
const replacement =
820+
mode === "deferred"
821+
? { ...anchor, deferredWork: { ...anchor.deferredWork, cursor: "after" } }
822+
: command("anchor", "completed");
823+
yield* Queue.offer(
824+
harness.inputs,
825+
snapshot(
826+
{
827+
...BASE_PROJECTION,
828+
thread: { ...BASE_PROJECTION.thread, title: "Replacement" },
829+
turnItems: [replacement],
830+
visibleTurnItems: [localRow(replacement, 0)],
831+
},
832+
CACHED_SNAPSHOT_SEQUENCE + 1,
833+
),
834+
);
835+
yield* awaitThreadState(
836+
harness.observed,
837+
(value) => Option.getOrNull(value.data)?.thread.title === "Replacement",
838+
);
839+
yield* Deferred.succeed(release, undefined);
840+
expect((yield* Fiber.join(loading))._tag).toBe(mode === "deferred" ? "error" : "noop");
841+
}),
842+
);
843+
785844
it.effect("loads targeted messages without fetching unrelated deferred work", () =>
786845
Effect.gen(function* () {
787846
const anchor = {

‎packages/client-runtime/src/state/threads.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -788,10 +788,12 @@ export const makeEnvironmentThreadState = Effect.fn("EnvironmentThreadState.make
788788
})),
789789
),
790790
);
791-
if (workAnchorId !== undefined && result._tag === "loaded") {
791+
if (workAnchorId !== undefined && (result._tag === "loaded" || result._tag === "noop")) {
792792
const remaining = Option.getOrNull(
793793
(yield* SubscriptionRef.get(state)).data,
794794
)?.visibleTurnItems.find((row) => row.sourceItemId === workAnchorId)?.item.deferredWork;
795+
if (result._tag === "noop" && remaining !== undefined)
796+
return { _tag: "error", message: "Work history changed. Retry loading it." };
795797
if (remaining?.cursor === requestCursor)
796798
return { _tag: "error", message: "Work history did not advance." };
797799
if (remaining !== undefined) return yield* loadEarlier(undefined, workAnchorId);

0 commit comments

Comments
 (0)