@jupyter/collaboration-extension 1.0.0-alpha.9 → 1.0.1

package/lib/collaboration.d.ts

@@ -3,7 +3,8 @@
  * @module collaboration-extension
  */
 import { JupyterFrontEndPlugin } from '@jupyterlab/application';
-import { IAwareness, IUserMenu } from '@jupyter/collaboration';
+import { IUserMenu } from '@jupyter/collaboration';
+import { IAwareness } from '@jupyter/docprovider';
 /**
  * Jupyter plugin providing the IUserMenu.
  */

package/lib/collaboration.js

@@ -7,6 +7,7 @@
 import { DOMUtils, IToolbarWidgetRegistry } from '@jupyterlab/apputils';
 import { EditorExtensionRegistry, IEditorExtensionRegistry } from '@jupyterlab/codemirror';
 import { CollaboratorsPanel, IGlobalAwareness, IUserMenu, remoteUserCursors, RendererUserMenu, UserInfoPanel, UserMenu } from '@jupyter/collaboration';
+import { WebSocketAwarenessProvider } from '@jupyter/docprovider';
 import { SidePanel, usersIcon } from '@jupyterlab/ui-components';
 import { MenuBar } from '@lumino/widgets';
 import { URLExt } from '@jupyterlab/coreutils';
@@ -15,7 +16,6 @@ import { IStateDB } from '@jupyterlab/statedb';
 import { ITranslator, nullTranslator } from '@jupyterlab/translation';
 import * as Y from 'yjs';
 import { Awareness } from 'y-protocols/awareness';
-import { WebsocketProvider } from 'y-websocket';
 /**
  * Jupyter plugin providing the IUserMenu.
  */
@@ -67,17 +67,12 @@ export const rtcGlobalAwarenessPlugin = {
         const awareness = new Awareness(ydoc);
         const server = ServerConnection.makeSettings();
         const url = URLExt.join(server.wsUrl, 'api/collaboration/room');
-        new WebsocketProvider(url, 'JupyterLab:globalAwareness', ydoc, {
-            awareness: awareness
+        new WebSocketAwarenessProvider({
+            url: url,
+            roomID: 'JupyterLab:globalAwareness',
+            awareness: awareness,
+            user: user
         });
-        const userChanged = () => {
-            awareness.setLocalStateField('user', user.identity);
-        };
-        if (user.isReady) {
-            userChanged();
-        }
-        user.ready.then(userChanged).catch(e => console.error(e));
-        user.userChanged.connect(userChanged);
         state.changed.connect(async () => {
             var _a, _b;
             const data = await state.toJSON();

package/lib/filebrowser.js

@@ -168,7 +168,7 @@ export const logger = {
                         showDialog({
                             title: trans.__('Warning'),
                             body: trans.__(`Two collaborative sessions are accessing the file %1 simultaneously.
-                \n'Opening a document with multiple views simultaneously is not supported. Please close one view; otherwise, you might lose some of your progress.`, emission.path),
+                \nOpening a document with multiple views simultaneously is not supported. Please close one view; otherwise, you might lose some of your progress.`, emission.path),
                             buttons: [Dialog.warnButton({ label: trans.__('Ok') })]
                         });
                     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupyter/collaboration-extension",
-  "version": "1.0.0-alpha.9",
+  "version": "1.0.1",
   "description": "JupyterLab - Real-Time Collaboration Extension",
   "keywords": [
     "jupyter",
@@ -53,8 +53,8 @@
     "watch:labextension": "jupyter labextension watch ."
   },
   "dependencies": {
-    "@jupyter/collaboration": "^1.0.0-alpha.9",
-    "@jupyter/docprovider": "^1.0.0-alpha.9",
+    "@jupyter/collaboration": "^1.0.1",
+    "@jupyter/docprovider": "^1.0.1",
     "@jupyterlab/application": "^4.0.0",
     "@jupyterlab/apputils": "^4.0.0",
     "@jupyterlab/codemirror": "^4.0.0",