Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/clean-up-web-chat-streams.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"eve": patch
---

Generated Web Chat apps now include their new-session and resumable-session routes. Abandoned browser session streams also release their local workflow listeners instead of accumulating them across navigation.
10 changes: 10 additions & 0 deletions apps/docs/registry.json
Original file line number Diff line number Diff line change
Expand Up @@ -1491,6 +1491,16 @@
"type": "registry:file",
"target": "app/page.tsx"
},
{
"path": "registry/channel/web/app/s/[sessionId]/page.tsx",
"type": "registry:file",
"target": "app/s/[sessionId]/page.tsx"
},
{
"path": "registry/channel/web/app/s/page.tsx",
"type": "registry:file",
"target": "app/s/page.tsx"
},
{
"path": "registry/channel/web/components.json",
"type": "registry:file",
Expand Down
24 changes: 22 additions & 2 deletions packages/eve/src/public/channels/eve.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -344,13 +344,13 @@ function createEveStreamHandler(input: EveChannelInput) {
return {
getEventStream,
getStreamTailIndex,
async fetch(url: string) {
async fetch(url: string, init?: RequestInit) {
const args: RouteHandlerArgs = {
...createRouteArgs(),
attachSession: () => session,
params: { sessionId: "test-session-id" },
};
return (streamRoute as any).handler(new Request(url), args);
return (streamRoute as any).handler(new Request(url, init), args);
},
};
}
Expand Down Expand Up @@ -533,6 +533,26 @@ describe("eveChannel — stream cursor", () => {
expect(new TextDecoder().decode(firstChunk.value)).toBe("\n");
});

it("cancels the durable stream when the request aborts", async () => {
const handler = createEveStreamHandler({ auth: none() });
const cancelled = vi.fn();
handler.getEventStream.mockResolvedValueOnce(
new ReadableStream({
cancel: cancelled,
}),
);
const abort = new AbortController();

const response = await handler.fetch("https://eve.test/eve/v1/session/test-session-id/stream", {
signal: abort.signal,
});
const reader = response.body!.getReader();
await reader.read();
abort.abort();

await vi.waitFor(() => expect(cancelled).toHaveBeenCalledOnce());
});

it("forwards negative tail-relative start indices", async () => {
const handler = createEveStreamHandler({ auth: none() });

Expand Down
27 changes: 15 additions & 12 deletions packages/eve/src/public/channels/eve.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1068,7 +1068,7 @@ async function createSessionStreamResponse(request: Request, session: Session):
if (tailIndex !== undefined) {
headers.set(EVE_STREAM_TAIL_INDEX_HEADER, String(tailIndex));
}
return new Response(serializeAsNdjson(events), {
return new Response(serializeAsNdjson(events, request.signal), {
headers,
});
} catch {
Expand Down Expand Up @@ -1352,16 +1352,19 @@ function parseStartIndex(request: Request): number | undefined | Response {
return parsed;
}

function serializeAsNdjson(events: ReadableStream<unknown>): ReadableStream<Uint8Array> {
function serializeAsNdjson(
events: ReadableStream<unknown>,
signal: AbortSignal,
): ReadableStream<Uint8Array> {
const encoder = new TextEncoder();
return events.pipeThrough(
new TransformStream<unknown, Uint8Array>({
start(controller) {
controller.enqueue(encoder.encode("\n"));
},
transform(event, controller) {
controller.enqueue(encoder.encode(`${JSON.stringify(event)}\n`));
},
}),
);
const transform = new TransformStream<unknown, Uint8Array>({
start(controller) {
controller.enqueue(encoder.encode("\n"));
},
transform(event, controller) {
controller.enqueue(encoder.encode(`${JSON.stringify(event)}\n`));
},
});
void events.pipeTo(transform.writable, { signal }).catch(() => {});
return transform.readable;
}
6 changes: 6 additions & 0 deletions packages/eve/src/setup/scaffold/index.integration.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,12 @@ describe("ensureChannel", () => {
await expect(readFile(join(projectRoot, "app/page.tsx"), "utf8")).resolves.toContain(
"AgentChat",
);
await expect(readFile(join(projectRoot, "app/s/page.tsx"), "utf8")).resolves.toContain(
"<AgentChat sessionless />",
);
await expect(
readFile(join(projectRoot, "app/s/[sessionId]/page.tsx"), "utf8"),
).resolves.toContain("<AgentChat sessionId={sessionId} />");
await expect(
readFile(join(projectRoot, "agent/tools/randomize.ts"), "utf8"),
).rejects.toMatchObject({
Expand Down
Loading