@jupyter/docprovider 4.1.0-beta.0 → 4.1.0

package/lib/ydrive.d.ts

@@ -52,6 +52,7 @@ export declare class RtcContentProvider extends RestContentProvider implements I
     get fileChanged(): ISignal<this, Contents.IChangedArgs>;
     private _onCreate;
     private _user;
+    private _saveCounter;
     private _trans;
     private _globalAwareness;
     private _providers;

package/lib/ydrive.js

@@ -2,17 +2,13 @@
 // Distributed under the terms of the Modified BSD License.
 import { PageConfig, URLExt } from '@jupyterlab/coreutils';
 import { RestContentProvider } from '@jupyterlab/services';
+import { PromiseDelegate } from '@lumino/coreutils';
 import { Signal } from '@lumino/signaling';
 import { WebSocketProvider } from './yprovider';
+import * as decoding from 'lib0/decoding';
 import * as encoding from 'lib0/encoding';
 const DISABLE_RTC = PageConfig.getOption('disableRTC') === 'true' ? true : false;
 const RAW_MESSAGE_TYPE = 2;
-const SAVE_MESSAGE = (() => {
-    const encoder = encoding.createEncoder();
-    encoding.writeVarUint(encoder, RAW_MESSAGE_TYPE);
-    encoding.writeVarString(encoder, 'save');
-    return encoding.toUint8Array(encoder);
-})();
 /**
  * The url for the default drive service.
  */
@@ -102,6 +98,7 @@ export class RtcContentProvider extends RestContentProvider {
                 console.error(`Failed to open websocket connection for ${options.path}.\n:${error}`);
             }
         };
+        this._saveCounter = 0;
         this._ydriveFileChanged = new Signal(this);
         this._user = options.user;
         this._trans = options.trans;
@@ -154,13 +151,63 @@ export class RtcContentProvider extends RestContentProvider {
      *   file is saved.
      */
     async save(localPath, options = {}) {
-        var _a, _b;
+        var _a;
         // Check that there is a provider - it won't e.g. if the document model is not collaborative.
         if (options.format && options.type) {
             const key = `${options.format}:${options.type}:${localPath}`;
             const provider = this._providers.get(key);
+            const saveId = ++this._saveCounter;
             if (provider) {
-                (_b = (_a = provider.wsProvider) === null || _a === void 0 ? void 0 : _a.ws) === null || _b === void 0 ? void 0 : _b.send(SAVE_MESSAGE);
+                const ws = (_a = provider.wsProvider) === null || _a === void 0 ? void 0 : _a.ws;
+                if (ws) {
+                    const delegate = new PromiseDelegate();
+                    const handler = (event) => {
+                        const data = new Uint8Array(event.data);
+                        const decoder = decoding.createDecoder(data);
+                        try {
+                            const messageType = decoding.readVarUint(decoder);
+                            if (messageType !== RAW_MESSAGE_TYPE) {
+                                return;
+                            }
+                        }
+                        catch (_a) {
+                            return;
+                        }
+                        const rawReply = decoding.readVarString(decoder);
+                        let reply = null;
+                        try {
+                            reply = JSON.parse(rawReply);
+                        }
+                        catch (e) {
+                            console.debug('The raw reply received was not a JSON reply');
+                        }
+                        if (reply &&
+                            reply['type'] === 'save' &&
+                            reply['responseTo'] === saveId) {
+                            if (reply.status === 'success') {
+                                delegate.resolve();
+                            }
+                            else if (reply.status === 'failed') {
+                                delegate.reject('Saving failed');
+                            }
+                            else if (reply.status === 'skipped') {
+                                delegate.reject('Saving already in progress');
+                            }
+                            else {
+                                delegate.reject('Unrecognised save reply status');
+                            }
+                        }
+                    };
+                    ws.addEventListener('message', handler);
+                    const encoder = encoding.createEncoder();
+                    encoding.writeVarUint(encoder, RAW_MESSAGE_TYPE);
+                    encoding.writeVarString(encoder, 'save');
+                    encoding.writeVarUint(encoder, saveId);
+                    const saveMessage = encoding.toUint8Array(encoder);
+                    ws.send(saveMessage);
+                    await delegate.promise;
+                    ws.removeEventListener('message', handler);
+                }
                 const fetchOptions = {
                     type: options.type,
                     format: options.format,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupyter/docprovider",
-  "version": "4.1.0-beta.0",
+  "version": "4.1.0",
   "description": "JupyterLab - Document Provider",
   "homepage": "https://github.com/jupyterlab/jupyter-collaboration",
   "bugs": {
@@ -41,7 +41,7 @@
     "watch": "tsc -b --watch"
   },
   "dependencies": {
-    "@jupyter/collaborative-drive": "^4.1.0-beta.0",
+    "@jupyter/collaborative-drive": "^4.1.0",
     "@jupyter/ydoc": "^2.1.3 || ^3.0.0",
     "@jupyterlab/apputils": "^4.4.0",
     "@jupyterlab/cells": "^4.4.0",