@jupyter/docprovider 2.0.0-alpha.4 → 2.0.1

package/lib/utils.d.ts

@@ -1,12 +1,3 @@
 export declare enum MessageType {
-    ROOM = 124,
     CHAT = 125
 }
-export declare enum RoomMessage {
-    RELOAD = 0,
-    OVERWRITE = 1,
-    FILE_CHANGED = 2,
-    FILE_OVERWRITTEN = 3,
-    DOC_OVERWRITTEN = 4,
-    SESSION_TOKEN = 5
-}

package/lib/utils.js

@@ -4,15 +4,5 @@
 |----------------------------------------------------------------------------*/
 export var MessageType;
 (function (MessageType) {
-    MessageType[MessageType["ROOM"] = 124] = "ROOM";
     MessageType[MessageType["CHAT"] = 125] = "CHAT";
 })(MessageType || (MessageType = {}));
-export var RoomMessage;
-(function (RoomMessage) {
-    RoomMessage[RoomMessage["RELOAD"] = 0] = "RELOAD";
-    RoomMessage[RoomMessage["OVERWRITE"] = 1] = "OVERWRITE";
-    RoomMessage[RoomMessage["FILE_CHANGED"] = 2] = "FILE_CHANGED";
-    RoomMessage[RoomMessage["FILE_OVERWRITTEN"] = 3] = "FILE_OVERWRITTEN";
-    RoomMessage[RoomMessage["DOC_OVERWRITTEN"] = 4] = "DOC_OVERWRITTEN";
-    RoomMessage[RoomMessage["SESSION_TOKEN"] = 5] = "SESSION_TOKEN";
-})(RoomMessage || (RoomMessage = {}));

package/lib/yprovider.d.ts

@@ -40,18 +40,11 @@ export declare class WebSocketProvider implements IDocumentProvider {
     private _onUserChanged;
     private _onConnectionClosed;
     private _onSync;
-    private _handleRoomMessage;
-    private _handleFileChanged;
-    private _handleSessionToken;
-    private _sendReloadMsg;
-    private _sendOverwriteMsg;
-    private _dialog;
     private _awareness;
     private _contentType;
     private _format;
     private _isDisposed;
     private _path;
-    private _session;
     private _ready;
     private _serverUrl;
     private _sharedModel;

package/lib/yprovider.js

@@ -5,12 +5,8 @@
 import { showErrorMessage, Dialog } from '@jupyterlab/apputils';
 import { PromiseDelegate } from '@lumino/coreutils';
 import { Signal } from '@lumino/signaling';
-import * as decoding from 'lib0/decoding';
-import * as encoding from 'lib0/encoding';
-import * as url from 'lib0/url';
 import { WebsocketProvider as YWebsocketProvider } from 'y-websocket';
 import { requestDocSession } from './requests';
-import { MessageType, RoomMessage } from './utils';
 /**
  * A class to provide Yjs synchronization over WebSocket.
  *
@@ -25,9 +21,9 @@ export class WebSocketProvider {
      */
     constructor(options) {
         this._onConnectionClosed = (event) => {
-            if (event.code >= 4000 && event.code < 4005) {
-                console.error('Document provider closed:', event.code, event.reason);
-                showErrorMessage(this._trans.__('Document error'), event.reason, [
+            if (event.code === 1003) {
+                console.error('Document provider closed:', event.reason);
+                showErrorMessage(this._trans.__('Document session error'), event.reason, [
                     Dialog.okButton()
                 ]);
                 // Dispose shared model immediately. Better break the document model,
@@ -42,11 +38,9 @@ export class WebSocketProvider {
                 (_a = this._yWebsocketProvider) === null || _a === void 0 ? void 0 : _a.off('sync', this._onSync);
             }
         };
-        this._dialog = null;
         this._ready = new PromiseDelegate();
         this._isDisposed = false;
         this._path = options.path;
-        this._session = null;
         this._contentType = options.contentType;
         this._format = options.format;
         this._serverUrl = options.url;
@@ -90,84 +84,16 @@ export class WebSocketProvider {
         Signal.clearData(this);
     }
     async _connect() {
-        this._session = await requestDocSession(this._format, this._contentType, this._path);
-        const params = this._session.sessionId !== null
-            ? { sessionId: this._session.sessionId }
-            : undefined;
-        this._yWebsocketProvider = new YWebsocketProvider(this._serverUrl, `${this._session.format}:${this._session.type}:${this._session.fileId}`, this._sharedModel.ydoc, {
+        const session = await requestDocSession(this._format, this._contentType, this._path);
+        this._yWebsocketProvider = new YWebsocketProvider(this._serverUrl, `${session.format}:${session.type}:${session.fileId}`, this._sharedModel.ydoc, {
             disableBc: true,
-            params,
+            params: { sessionId: session.sessionId },
             awareness: this._awareness
         });
         this._yWebsocketProvider.on('sync', this._onSync);
         this._yWebsocketProvider.on('connection-close', this._onConnectionClosed);
-        this._yWebsocketProvider.messageHandlers[MessageType.ROOM] = (encoder, decoder, provider, emitSynced, messageType) => {
-            const msgType = decoding.readVarUint(decoder);
-            const data = decoding.readVarString(decoder);
-            this._handleRoomMessage(msgType, data);
-        };
     }
     _onUserChanged(user) {
         this._awareness.setLocalStateField('user', user.identity);
     }
-    _handleRoomMessage(type, data) {
-        switch (type) {
-            case RoomMessage.FILE_CHANGED:
-                this._handleFileChanged(data);
-                break;
-            case RoomMessage.DOC_OVERWRITTEN:
-            case RoomMessage.FILE_OVERWRITTEN:
-                if (this._dialog) {
-                    this._dialog.close();
-                    this._dialog = null;
-                }
-                break;
-            case RoomMessage.SESSION_TOKEN:
-                this._handleSessionToken(data);
-                break;
-        }
-    }
-    _handleFileChanged(data) {
-        this._dialog = new Dialog({
-            title: this._trans.__('File changed'),
-            body: this._trans.__('Do you want to overwrite the file or reload it?'),
-            buttons: [
-                Dialog.okButton({ label: 'Reload' }),
-                Dialog.warnButton({ label: 'Overwrite' })
-            ],
-            hasClose: false
-        });
-        this._dialog.launch().then(resp => {
-            if (resp.button.label === 'Reload') {
-                this._sendReloadMsg(data);
-            }
-            else if (resp.button.label === 'Overwrite') {
-                this._sendOverwriteMsg(data);
-            }
-        });
-    }
-    _handleSessionToken(data) {
-        if (this._yWebsocketProvider && this._session) {
-            const room = `${this._session.format}:${this._session.type}:${this._session.fileId}`;
-            const encodedParams = url.encodeQueryParams({ sessionId: data });
-            this._yWebsocketProvider.url =
-                this._serverUrl + '/' + room + '?' + encodedParams;
-        }
-    }
-    _sendReloadMsg(data) {
-        var _a;
-        const encoder = encoding.createEncoder();
-        encoding.writeVarUint(encoder, MessageType.ROOM);
-        encoding.writeVarUint(encoder, RoomMessage.RELOAD);
-        encoding.writeVarString(encoder, data);
-        (_a = this._yWebsocketProvider) === null || _a === void 0 ? void 0 : _a.ws.send(encoding.toUint8Array(encoder));
-    }
-    _sendOverwriteMsg(data) {
-        var _a;
-        const encoder = encoding.createEncoder();
-        encoding.writeVarUint(encoder, MessageType.ROOM);
-        encoding.writeVarUint(encoder, RoomMessage.OVERWRITE);
-        encoding.writeVarString(encoder, data);
-        (_a = this._yWebsocketProvider) === null || _a === void 0 ? void 0 : _a.ws.send(encoding.toUint8Array(encoder));
-    }
 }

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@jupyter/docprovider",
-  "version": "2.0.0-alpha.4",
+  "version": "2.0.1",
   "description": "JupyterLab - Document Provider",
-  "homepage": "https://github.com/jupyterlab/jupyter_collaboration",
+  "homepage": "https://github.com/jupyterlab/jupyter-collaboration",
   "bugs": {
-    "url": "https://github.com/jupyterlab/jupyter_collaboration/issues"
+    "url": "https://github.com/jupyterlab/jupyter-collaboration/issues"
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/jupyterlab/jupyter_collaboration.git"
+    "url": "https://github.com/jupyterlab/jupyter-collaboration.git"
   },
   "license": "BSD-3-Clause",
   "author": "Project Jupyter",