diff --git a/projects/jupyter-server-ydoc/jupyter_server_ydoc/rooms.py b/projects/jupyter-server-ydoc/jupyter_server_ydoc/rooms.py index e774e011..bfb5f76e 100644 --- a/projects/jupyter-server-ydoc/jupyter_server_ydoc/rooms.py +++ b/projects/jupyter-server-ydoc/jupyter_server_ydoc/rooms.py @@ -21,6 +21,8 @@ class DocumentRoom(YRoom): """A Y room for a possibly stored document (e.g. a notebook).""" + _background_tasks: set[asyncio.Task] + def __init__( self, room_id: str, @@ -48,6 +50,7 @@ def __init__( self._cleaner: asyncio.Task | None = None self._saving_document: asyncio.Task | None = None self._messages: dict[str, asyncio.Lock] = {} + self._background_tasks = set() # Listen for document changes self._document.observe(self._on_document_change) @@ -100,6 +103,10 @@ async def initialize(self) -> None: # try to apply Y updates from the YStore for this document read_from_source = True if self.ystore is not None: + async with self.ystore.start_lock: + if not self.ystore.started.is_set(): + self.create_task(self.ystore.start()) + await self.ystore.started.wait() try: await self.ystore.apply_updates(self.ydoc) self._emit( @@ -177,6 +184,11 @@ async def stop(self) -> None: self._document.unobserve() self._file.unobserve(self.room_id) + def create_task(self, aw): + task = asyncio.create_task(aw) + self._background_tasks.add(task) + task.add_done_callback(self._background_tasks.discard) + async def _broadcast_updates(self): # FIXME should be upstreamed try: diff --git a/projects/jupyter-server-ydoc/pyproject.toml b/projects/jupyter-server-ydoc/pyproject.toml index d96af6cf..bf63fadf 100644 --- a/projects/jupyter-server-ydoc/pyproject.toml +++ b/projects/jupyter-server-ydoc/pyproject.toml @@ -30,7 +30,7 @@ authors = [ dependencies = [ "jupyter_server>=2.4.0,<3.0.0", "jupyter_ydoc>=2.0.0,<3.0.0", - "pycrdt-websocket>=0.13.1,<0.14.0", + "pycrdt-websocket>=0.13.4,<0.14.0", "jupyter_events>=0.10.0", "jupyter_server_fileid>=0.7.0,<1", "jsonschema>=4.18.0"