Improves error handling when the file does not exist (#175)

* Improves error handling when the file does not exist

* Review

* Update jupyter_collaboration/rooms.py

Co-authored-by: Frédéric Collonval <[email protected]>

---------

Co-authored-by: Frédéric Collonval <[email protected]>

Author: hbcarlos

jupyter_collaboration/handlers.py

@@ -185,10 +185,22 @@ async def open(self, room_id):
             except Exception as e:
                 _, _, file_id = decode_file_path(self._room_id)
                 file = self._file_loaders[file_id]
-                self.log.error(f"Error initializing: {file.path}\n{e!r}", exc_info=e)
-                self.close(
-                    1003, f"Error initializing: {file.path}. You need to close the document."
-                )
+
+                # Close websocket and propagate error.
+                if isinstance(e, web.HTTPError):
+                    self.log.error(f"File {file.path} not found.\n{e!r}", exc_info=e)
+                    self.close(1004, f"File {file.path} not found.")
+                else:
+                    self.log.error(f"Error initializing: {file.path}\n{e!r}", exc_info=e)
+                    self.close(
+                        1003, f"Error initializing: {file.path}. You need to close the document."
+                    )
+
+                # Clean up the room and delete the file loader
+                if len(self.room.clients) == 0 or self.room.clients == [self]:
+                    self._message_queue.put_nowait(b"")
+                    self._cleanup_delay = 0
+                    await self._clean_room()
 
             self._emit(LogLevel.INFO, "initialize", "New client connected.")
 

jupyter_collaboration/rooms.py

@@ -203,13 +203,13 @@ def _emit(self, level: LogLevel, action: str | None = None, msg: str | None = No
 
         self._logger.emit(schema_id=JUPYTER_COLLABORATION_EVENTS_URI, data=data)
 
-    def _clean(self) -> None:
+    def stop(self) -> None:
         """
-        Cleans the rooms.
+        Stop the room.
 
         Cancels the save task and unsubscribes from the file.
         """
-        super()._clean()
+        super().stop()
         # TODO: Should we cancel or wait ?
         if self._saving_document:
             self._saving_document.cancel()

packages/docprovider/src/ydrive.ts

@@ -78,8 +78,14 @@ export class YDrive extends Drive implements ICollaborativeDrive {
       const provider = this._providers.get(key);
 
       if (provider) {
-        const model = super.get(localPath, { ...options, content: false });
-        await provider.ready;
+        // If the document does't exist, `super.get` will reject with an
+        // error and the provider will never be resolved.
+        // Use `Promise.all` to reject as soon as possible. The Context will
+        // show a dialog to the user.
+        const [model] = await Promise.all([
+          super.get(localPath, { ...options, content: false }),
+          provider.ready
+        ]);
         return model;
       }
     }