Skip to content

Reassociate sid and token when connecting websocket #5794

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
adhami3310 merged 3 commits into from
Sep 17, 2025
Merged

Reassociate sid and token when connecting websocket #5794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
07e03ef
Reassociate sid and token when connecting websocket
masenf Sep 16, 2025
82d80cd
Do not queue websocket events until the websocket is connected
masenf Sep 17, 2025
80655b9
fully drain the queue on socket connect event
masenf Sep 17, 2025
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
12 changes: 8 additions & 4 deletions reflex/.templates/web/utils/state.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,8 +478,8 @@ export const queueEvents = async (
* @param params The params object from React Router
*/
export const processEvent = async (socket, navigate, params) => {
// Only proceed if the socket is up and no event in the queue uses state, otherwise we throw the event into the void
if (!socket && isStateful()) {
// Only proceed if the socket is up or no event in the queue uses state, otherwise we throw the event into the void
if (isStateful() && !(socket && socket.connected)) {
return;
}

Expand Down Expand Up @@ -576,11 +576,15 @@ export const connect = async (
};

// Once the socket is open, hydrate the page.
socket.current.on("connect", () => {
socket.current.on("connect", async () => {
setConnectErrors([]);
window.addEventListener("pagehide", pagehideHandler);
window.addEventListener("beforeunload", disconnectTrigger);
window.addEventListener("unload", disconnectTrigger);
// Drain any initial events from the queue.
while (event_queue.length > 0 && !event_processing) {
await processEvent(socket.current, navigate, () => params.current);
}
});

socket.current.on("connect_error", (error) => {
Expand Down Expand Up @@ -893,7 +897,7 @@ export const useEventLoop = (
// Main event loop.
useEffect(() => {
// Skip if the backend is disabled
if (isBackendDisabled()) {
if (isBackendDisabled() || !socket.current || !socket.current.connected) {
return;
}
(async () => {
Expand Down
7 changes: 7 additions & 0 deletions reflex/app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2189,3 +2189,10 @@ async def link_token_to_sid(self, sid: str, token: str):
if new_token:
# Duplicate detected, emit new token to client
await self.emit("new_token", new_token, to=sid)

# Update client state to apply new sid/token for running background tasks.
async with self.app.modify_state(
_substate_key(new_token or token, self.app.state_manager.state)
) as state:
state.router_data[constants.RouteVar.SESSION_ID] = sid
state.router = RouterData.from_router_data(state.router_data)
Loading