Support only one provider per document for now

Author: davidbrochart

packages/collaboration-extension/src/collaboration.ts

@@ -256,7 +256,8 @@ function addMenuItem(
     execute: () => {
       menu.title.label = label;
       if (command == 'suggesting') {
-        context.model.sharedModel.getProvider('root').fork();
+        const provider = context.model.sharedModel.provider;
+        provider.fork().then(forkId => {provider.connectFork(forkId);});
       }
     }
   });

packages/docprovider/src/ydrive.ts

@@ -147,7 +147,7 @@ export class YDrive extends Drive implements ICollaborativeDrive {
       const key = `${options.format}:${options.contentType}:${options.path}`;
       this._providers.set(key, provider);
 
-      sharedModel.setProvider('root', provider);
+      sharedModel.provider = provider;
       sharedModel.disposed.connect(() => {
         const provider = this._providers.get(key);
         if (provider) {

packages/docprovider/src/yprovider.ts

@@ -81,7 +81,7 @@ export class WebSocketProvider implements IDocumentProvider {
     Signal.clearData(this);
   }
 
-  async fork(): Promise<void> {
+  async fork(): Promise<string> {
     const session = await requestDocSession(
       this._format,
       this._contentType,
@@ -90,59 +90,41 @@ export class WebSocketProvider implements IDocumentProvider {
 
     const response = await requestDocFork(`${session.format}:${session.type}:${session.fileId}`);
     const forkId = response.roomId;
-
-    this._sharedModel.forkId = forkId;
-
-    // the fork has to be advertised before the ydoc is connected to the forked room
-    // so that it targets the root room
+    this._sharedModel.roomId = forkId;
     this._sharedModel.addFork(forkId);
 
+    return forkId;
+  }
+
+  connectFork(forkId: string) {
+    this._sharedModel.roomId = forkId;
     this._yWebsocketProvider?.disconnect();
     this._yWebsocketProvider = new YWebsocketProvider(
       this._serverUrl,
       forkId,
       this._sharedModel.ydoc,
       {
         disableBc: true,
-        params: { sessionId: session.sessionId },
+        params: { sessionId: this._sessionId },
         awareness: this._awareness
       }
     );
   }
 
-  connectFork(forkId: string, sharedModel: YDocument<DocumentChange>): IDocumentProvider {
-    sharedModel.forkId = forkId;
-
-    return new WebSocketProvider({
-      sessionId: this._sessionId,
-      url: this._serverUrl,
-      path: forkId,
-      format: '',
-      contentType: '',
-      model: sharedModel,
-      user: this._user,
-      translator: this._trans
-    });
-  }
-
   private async _connect(): Promise<void> {
-    var roomId: string;
-    if (this._sharedModel.forkId === 'root') {
+    if (this._sharedModel.roomId === '') {
       const session = await requestDocSession(
         this._format,
         this._contentType,
         this._path
       );
-      roomId = `${session.format}:${session.type}:${session.fileId}`;
+      this._sharedModel.roomId = `${session.format}:${session.type}:${session.fileId}`;
       this._sessionId = session.sessionId;
     }
-    else {
-      roomId = this._path;
-    }
 
     this._yWebsocketProvider = new YWebsocketProvider(
       this._serverUrl,
-      roomId,
+      this._sharedModel.roomId,
       this._sharedModel.ydoc,
       {
         disableBc: true,

yarn.lock

@@ -2133,15 +2133,15 @@ __metadata:
 
 "@jupyter/ydoc@file:.yalc/@jupyter/ydoc::locator=%40jupyter%2Freal-time-collaboration%40workspace%3A.":
   version: 2.0.1
-  resolution: "@jupyter/ydoc@file:.yalc/@jupyter/ydoc#.yalc/@jupyter/ydoc::hash=c66726&locator=%40jupyter%2Freal-time-collaboration%40workspace%3A."
+  resolution: "@jupyter/ydoc@file:.yalc/@jupyter/ydoc#.yalc/@jupyter/ydoc::hash=d13236&locator=%40jupyter%2Freal-time-collaboration%40workspace%3A."
   dependencies:
     "@jupyterlab/nbformat": ^3.0.0 || ^4.0.0-alpha.21 || ^4.0.0
     "@lumino/coreutils": ^1.11.0 || ^2.0.0
     "@lumino/disposable": ^1.10.0 || ^2.0.0
     "@lumino/signaling": ^1.10.0 || ^2.0.0
     y-protocols: ^1.0.5
     yjs: ^13.5.40
-  checksum: f5cac20b6b88fb9ced006923ad7164bb53fcc7565b66bc4bd454bcf72595ed3f0689c479166caabff57bd5a5f73534ce3af08623123a30870e39382c74374d61
+  checksum: 4b906adf8d1eb9461463456f39be7225281d8f9f59213af58dad3d1383f2436760f7a6a60b6d87795e95662c6ff4323c41069644cf6833b2ad2d1310aa9a46fd
   languageName: node
   linkType: hard