Skip to content

test(rivetkit): cover async websocket close db access #4938

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NathanFlurry merged 1 commit into from
May 5, 2026
+41 −16
Merged

test(rivetkit): cover async websocket close db access #4938

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
57 changes: 41 additions & 16 deletions rivetkit-typescript/packages/rivetkit/tests/driver/actor-sleep-db.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ import {
SLEEP_DB_TIMEOUT,
SLEEP_SCHEDULE_AFTER_ON_SLEEP_DELAY_MS,
} from "../../fixtures/driver-test-suite/sleep-db";
import {
RAW_WS_HANDLER_DELAY,
RAW_WS_HANDLER_SLEEP_TIMEOUT,
} from "../../fixtures/driver-test-suite/sleep";
import {
describeDriverMatrix,
SQLITE_DRIVER_MATRIX_OPTIONS,
Expand Down Expand Up @@ -252,8 +256,7 @@ describeDriverMatrix("Actor Sleep Db", (driverTestConfig) => {
);
});

// TODO(#4705): Root-cause sleep-shutdown disconnect ordering and re-enable this coverage.
test.skip("onDisconnect can write to c.db during sleep shutdown", async (c) => {
test("onDisconnect can write to c.db during sleep shutdown", async (c) => {
const { client } = await setupDriverTest(c, driverTestConfig);

// Create actor with a connection
Expand Down Expand Up @@ -294,12 +297,11 @@ describeDriverMatrix("Actor Sleep Db", (driverTestConfig) => {
expect(events).toContain("disconnect");
});

// TODO(#4705): Root-cause raw WebSocket close-handler DB access during sleep shutdown and re-enable this coverage.
test.skip("async websocket close handler can use c.db before sleep completes", async (c) => {
test("async websocket close handler can use c.db before sleep completes", async (c) => {
const { client } = await setupDriverTest(c, driverTestConfig);

const actor = client.sleepWithRawWsCloseDb.getOrCreate([
"raw-ws-close-db",
`raw-ws-close-db-${crypto.randomUUID()}`,
]);
const ws = await connectRawWebSocket(actor);

Expand All @@ -313,22 +315,33 @@ describeDriverMatrix("Actor Sleep Db", (driverTestConfig) => {
ws.close();
});

await waitForAction(actor.getStatus, (status) => {
expect(status.sleepCount).toBe(1);
expect(status.startCount).toBe(2);
});
await waitFor(
driverTestConfig,
RAW_WS_HANDLER_DELAY + RAW_WS_HANDLER_SLEEP_TIMEOUT + 1_000,
);

const entries = await actor.getLogEntries();
const events = entries.map((entry: LogEntry) => entry.event);
expect(events).toContain("close-start");
expect(events).toContain("close-finish");
expect(events).toContain("sleep");
expect(events).toContain("wake");
expect(events.indexOf("close-start")).toBeLessThan(
events.indexOf("close-finish"),
);
expect(events.indexOf("close-finish")).toBeLessThan(
events.indexOf("sleep"),
);
expect(events.indexOf("sleep")).toBeLessThan(
events.lastIndexOf("wake"),
);
}, 30_000);

// TODO(#4705): Root-cause addEventListener close-handler DB access during sleep shutdown and re-enable this coverage.
test.skip("async websocket addEventListener close handler can use c.db before sleep completes", async (c) => {
test("async websocket addEventListener close handler can use c.db before sleep completes", async (c) => {
const { client } = await setupDriverTest(c, driverTestConfig);

const actor = client.sleepWithRawWsCloseDbListener.getOrCreate([
"raw-ws-close-db-listener",
`raw-ws-close-db-listener-${crypto.randomUUID()}`,
]);
const ws = await connectRawWebSocket(actor);

Expand All @@ -342,14 +355,26 @@ describeDriverMatrix("Actor Sleep Db", (driverTestConfig) => {
ws.close();
});

await waitForAction(actor.getStatus, (status) => {
expect(status.sleepCount).toBe(1);
expect(status.startCount).toBe(2);
});
await waitFor(
driverTestConfig,
RAW_WS_HANDLER_DELAY + RAW_WS_HANDLER_SLEEP_TIMEOUT + 1_000,
);

const entries = await actor.getLogEntries();
const events = entries.map((entry: LogEntry) => entry.event);
expect(events).toContain("close-start");
expect(events).toContain("close-finish");
expect(events).toContain("sleep");
expect(events).toContain("wake");
expect(events.indexOf("close-start")).toBeLessThan(
events.indexOf("close-finish"),
);
expect(events.indexOf("close-finish")).toBeLessThan(
events.indexOf("sleep"),
);
expect(events.indexOf("sleep")).toBeLessThan(
events.lastIndexOf("wake"),
);
}, 30_000);

test("broadcast works in onSleep", async (c) => {
Expand Down
Loading