Skip to content

Commit eac66d8

Browse files
committed
fix(server): synchronize stale thread resumes after buffered events
1 parent d7ddba7 commit eac66d8

2 files changed

Lines changed: 19 additions & 14 deletions

File tree

‎apps/server/src/server.test.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6077,7 +6077,7 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
60776077
}).pipe(Effect.provide(NodeHttpServer.layerTest)),
60786078
);
60796079

6080-
it.effect("subscribeThread replaces a stale cursor with a fresh snapshot", () =>
6080+
it.effect("subscribeThread buffers live events before synchronizing a stale cursor", () =>
60816081
Effect.gen(function* () {
60826082
const snapshotSequence = 5_000;
60836083
const thread = makeDefaultOrchestrationReadModel().threads[0]!;
@@ -6147,11 +6147,11 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
61476147
assert.equal(result[0].snapshot.snapshotSequence, snapshotSequence);
61486148
assert.equal(result[0].snapshot.thread.id, defaultThreadId);
61496149
}
6150-
assert.deepEqual(result[1], { kind: "synchronized" });
6151-
assert.equal(result[2]?.kind, "event");
6152-
if (result[2]?.kind === "event") {
6153-
assert.equal(result[2].event.sequence, snapshotSequence + 1);
6150+
assert.equal(result[1]?.kind, "event");
6151+
if (result[1]?.kind === "event") {
6152+
assert.equal(result[1].event.sequence, snapshotSequence + 1);
61546153
}
6154+
assert.deepEqual(result[2], { kind: "synchronized" });
61556155
}).pipe(Effect.provide(NodeHttpServer.layerTest), TestClock.withLive),
61566156
);
61576157

‎apps/server/src/ws.ts‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1335,17 +1335,22 @@ const makeWsRpcLayer = (
13351335
});
13361336
}
13371337

1338-
const replacementSnapshot =
1338+
const afterReplacementSnapshot =
13391339
input.requestCompletionMarker === true
1340-
? Stream.make(
1341-
{ kind: "snapshot" as const, snapshot: snapshot.value },
1342-
{ kind: "synchronized" as const },
1340+
? Stream.concat(
1341+
Stream.fromEffect(
1342+
Queue.offer(liveBuffer, { kind: "synchronized" as const }),
1343+
).pipe(Stream.drain),
1344+
bufferedLiveStream,
13431345
)
1344-
: Stream.make({
1345-
kind: "snapshot" as const,
1346-
snapshot: snapshot.value,
1347-
});
1348-
return Stream.concat(replacementSnapshot, bufferedLiveStream);
1346+
: bufferedLiveStream;
1347+
return Stream.concat(
1348+
Stream.make({
1349+
kind: "snapshot" as const,
1350+
snapshot: snapshot.value,
1351+
}),
1352+
afterReplacementSnapshot,
1353+
);
13491354
}
13501355

13511356
const catchUpStream = orchestrationEngine

0 commit comments

Comments
 (0)