Skip to content

fix: shard Dispatcher DO per session instead of global singleton #83

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
rpurdel merged 5 commits into from
Apr 17, 2026
Merged

fix: shard Dispatcher DO per session instead of global singleton #83

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
87b75a5
fix: shard Dispatcher DO per session instead of global singleton
rpurdel Apr 17, 2026
5907dff
fix: use random UUID fallback for missing sessionId, soften locality …
rpurdel Apr 17, 2026
3929494
worker: pass sessionId as query param on dispatcher DO upgrade
rpurdel Apr 17, 2026
d3d243b
worker: rename dispatcher URL query param sessionId -> meetingId to d…
rpurdel Apr 17, 2026
a0f194c
worker: drop dispatcher URL session identifier (redacted by CF; DO re…
rpurdel Apr 17, 2026
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
7 changes: 4 additions & 3 deletions worker/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,10 +229,11 @@ async function handleWebSocketWithDispatcher(
containerWs.accept();

// Connect to Dispatcher DO via WebSocket (preferred - avoids subrequest limit)
// Each session gets its own DO instance for isolation.
let dispatcherWs: WebSocket | null = null;
if (env.DISPATCHER_DO) {
try {
const doId = env.DISPATCHER_DO.idFromName('global');
const doId = env.DISPATCHER_DO.idFromName(sessionId);
const stub = env.DISPATCHER_DO.get(doId);

const upgradeRequest = new Request('http://dispatcher/websocket', {
Expand Down Expand Up @@ -291,7 +292,7 @@ async function handleWebSocketWithDispatcher(
if (!env.DISPATCHER_DO || (sessionClosed && !allowDuringClose)) return null;

try {
const doId = env.DISPATCHER_DO.idFromName('global');
const doId = env.DISPATCHER_DO.idFromName(sessionId);
const stub = env.DISPATCHER_DO.get(doId);

const upgradeRequest = new Request('http://dispatcher/websocket', {
Expand Down Expand Up @@ -511,7 +512,7 @@ export default {
const useDispatcher = useDispatcherParam !== null
? useDispatcherParam === 'true'
: env.USE_DISPATCHER === 'true';
const sessionId = url.searchParams.get('sessionId') || 'unknown';
const sessionId = url.searchParams.get('sessionId') || crypto.randomUUID();

// Select which container instance to use based on routing strategy
const containerInstanceId = await selectContainerInstance(request, env);
Expand Down
Loading