@jupyter/docprovider 2.0.0-alpha.4 → 2.0.0

package/lib/utils.d.ts

@@ -7,6 +7,5 @@ export declare enum RoomMessage {
     OVERWRITE = 1,
     FILE_CHANGED = 2,
     FILE_OVERWRITTEN = 3,
-    DOC_OVERWRITTEN = 4,
-    SESSION_TOKEN = 5
+    DOC_OVERWRITTEN = 4
 }

package/lib/utils.js

@@ -14,5 +14,4 @@ export var RoomMessage;
     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

@@ -42,7 +42,6 @@ export declare class WebSocketProvider implements IDocumentProvider {
     private _onSync;
     private _handleRoomMessage;
     private _handleFileChanged;
-    private _handleSessionToken;
     private _sendReloadMsg;
     private _sendOverwriteMsg;
     private _dialog;
@@ -51,7 +50,6 @@ export declare class WebSocketProvider implements IDocumentProvider {
     private _format;
     private _isDisposed;
     private _path;
-    private _session;
     private _ready;
     private _serverUrl;
     private _sharedModel;

package/lib/yprovider.js

@@ -7,7 +7,6 @@ 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';
@@ -25,9 +24,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,
@@ -46,7 +45,6 @@ export class WebSocketProvider {
         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,13 +88,10 @@ 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);
@@ -122,9 +117,6 @@ export class WebSocketProvider {
                     this._dialog = null;
                 }
                 break;
-            case RoomMessage.SESSION_TOKEN:
-                this._handleSessionToken(data);
-                break;
         }
     }
     _handleFileChanged(data) {
@@ -146,14 +138,6 @@ export class WebSocketProvider {
             }
         });
     }
-    _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();

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@jupyter/docprovider",
-  "version": "2.0.0-alpha.4",
+  "version": "2.0.0",
   "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",