@jupyter/docprovider 2.0.0-alpha.2 → 2.0.0-alpha.4

package/lib/utils.d.ts

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

package/lib/utils.js

@@ -14,4 +14,5 @@ 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,6 +42,7 @@ export declare class WebSocketProvider implements IDocumentProvider {
     private _onSync;
     private _handleRoomMessage;
     private _handleFileChanged;
+    private _handleSessionToken;
     private _sendReloadMsg;
     private _sendOverwriteMsg;
     private _dialog;
@@ -50,6 +51,7 @@ 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,6 +7,7 @@ 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';
@@ -24,7 +25,7 @@ export class WebSocketProvider {
      */
     constructor(options) {
         this._onConnectionClosed = (event) => {
-            if (event.code >= 1003 && event.code < 1006) {
+            if (event.code >= 4000 && event.code < 4005) {
                 console.error('Document provider closed:', event.code, event.reason);
                 showErrorMessage(this._trans.__('Document error'), event.reason, [
                     Dialog.okButton()
@@ -45,6 +46,7 @@ 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;
@@ -88,9 +90,11 @@ export class WebSocketProvider {
         Signal.clearData(this);
     }
     async _connect() {
-        const session = await requestDocSession(this._format, this._contentType, this._path);
-        const params = session.sessionId !== null ? { sessionId: session.sessionId } : undefined;
-        this._yWebsocketProvider = new YWebsocketProvider(this._serverUrl, `${session.format}:${session.type}:${session.fileId}`, this._sharedModel.ydoc, {
+        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, {
             disableBc: true,
             params,
             awareness: this._awareness
@@ -118,6 +122,9 @@ export class WebSocketProvider {
                     this._dialog = null;
                 }
                 break;
+            case RoomMessage.SESSION_TOKEN:
+                this._handleSessionToken(data);
+                break;
         }
     }
     _handleFileChanged(data) {
@@ -139,6 +146,14 @@ 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,6 +1,6 @@
 {
   "name": "@jupyter/docprovider",
-  "version": "2.0.0-alpha.2",
+  "version": "2.0.0-alpha.4",
   "description": "JupyterLab - Document Provider",
   "homepage": "https://github.com/jupyterlab/jupyter_collaboration",
   "bugs": {