Skip to content

Fix race condition in MultisynqRoot session creation #1

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix race condition in MultisynqRoot session creation #1

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
45 changes: 25 additions & 20 deletions bindings/src/components/MultisynqRoot.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import { useEffect, useState, useRef, useCallback } from 'react'
import { MultisynqSession, App } from '@multisynq/client'
import { MultisynqReactView } from '../MultisynqReactView'
import { setSyncedCallback } from '../MultisynqReactView'
import { MultisynqContext } from './MultisynqContext'
import { App, MultisynqSession } from '@multisynq/client'
import { useCallback, useEffect, useRef, useState } from 'react'
import { createMultisynqSession, MultisynqReactSessionParameters } from '../createMultisynqSession'
import { MultisynqReactView, setSyncedCallback } from '../MultisynqReactView'
import { ReactModel } from '../ReactModel'
import { MultisynqContext } from './MultisynqContext'

export interface ReactSessionParameters<M extends ReactModel> extends Omit<MultisynqReactSessionParameters<M>, 'name'> {
name?: string
Expand Down Expand Up @@ -39,11 +38,11 @@ export function MultisynqRoot<M extends ReactModel>({
const [multisynqSession, setMultisynqSession] = useState<MultisynqSession<MultisynqReactView<M>> | null>(null)
const [multisynqView, setMultisynqView] = useState<MultisynqReactView<M> | null>(null)
const [currentSessionParams, setCurrentSessionParams] = useState<SessionParamsState<M>>(() => {
if(!deferSession) {
if(!sessionParams.name) {
if (!deferSession) {
if (!sessionParams.name) {
sessionParams.name = App.randomSession()
}
if(!sessionParams.password) {
if (!sessionParams.password) {
sessionParams.password = App.randomPassword()
}
}
Expand Down Expand Up @@ -122,20 +121,30 @@ export function MultisynqRoot<M extends ReactModel>({
join: true,
}

if(!newParams.name) {
if (!newParams.name) {
newParams.name = App.randomSession()
}
if(!newParams.password) {
if (!newParams.password) {
newParams.password = App.randomPassword()
}

// eslint-disable-next-line @typescript-eslint/no-unused-vars
const { join, ...args } = newParams

createMultisynqSession(args).then((newSession) => {
nextSessionRef.current = newSession
setCurrentSessionParams(newParams)
})
try {
const newSession = await createMultisynqSession(args)
// Verify if the next session is null, if so, set the new session to the next session
// and update the current session params
if (nextSessionRef.current === null) {
nextSessionRef.current = newSession
setCurrentSessionParams(newParams)
} else {
// Another session was created in the meantime
newSession.leave()
}
} catch (error) {
console.error('Failed to create session:', error)
}
},
[setCurrentSessionParams, currentSessionParams]
)
Expand All @@ -152,13 +161,9 @@ export function MultisynqRoot<M extends ReactModel>({
view: multisynqView,
model: multisynqView?.model || null,
setSession,
leaveSession
leaveSession,
}
return (
<MultisynqContext.Provider value={contextValue}>
{children}
</MultisynqContext.Provider>
)
return <MultisynqContext.Provider value={contextValue}>{children}</MultisynqContext.Provider>
}
return null
}