@seafile/sdoc-editor 0.1.116 → 0.1.117

package/dist/basic-sdk/socket/socket-manager.js

@@ -29,13 +29,16 @@ var SocketManager = /*#__PURE__*/_createClass(function SocketManager(editor, doc
       _this.isSending = false;
       return;
     }
+    if (_this._sendingOperations || _this.disconnect) return;
     _this.dispatchConnectState('is-saving');
     var version = _this.document.version;
     var operations = _this.pendingOperationList.shift();
     var selection = _this.editor.selection;
+    _this._sendingOperations = operations;
     _this.socketClient.sendOperations(operations, version, selection, _this.sendOperationsCallback);
   };
   this.sendOperationsCallback = function (result) {
+    _this._sendingOperations = null;
     if (result && result.success) {
       var serverVersion = result.version;
       _this.document['version'] = serverVersion;
@@ -55,6 +58,8 @@ var SocketManager = /*#__PURE__*/_createClass(function SocketManager(editor, doc
     } else if (error_type === 'document_content_load_failed') {
       // After a short-term reconnection, the content of the document fails to load
       _this.dispatchConnectState(error_type);
+    } else if (error_type === 'Internal_server_error') {
+      _this.dispatchConnectState(error_type);
     } else if (error_type === 'operation_exec_error') {
       _this.editor.isRemote = true;
       revertOperationList(_this.editor, [operations]);
@@ -76,15 +81,11 @@ var SocketManager = /*#__PURE__*/_createClass(function SocketManager(editor, doc
       });
     }
     if (_this.isExecRemoteOperations) return;
+
+    // update execute remote operations flag
     _this.isExecRemoteOperations = true;
     _this.editor.isRemote = true;
     _this.execRemoteOperations();
-
-    // reset control flag
-    Promise.resolve().then(function (_) {
-      _this.isExecRemoteOperations = false;
-      _this.editor.isRemote = false;
-    });
   };
   this.execRemoteOperations = function () {
     if (_this.remoteOperationsList.length > 0) {
@@ -123,11 +124,14 @@ var SocketManager = /*#__PURE__*/_createClass(function SocketManager(editor, doc
         // Re-execute undone operations after isRemote is set to false
         // Need resend this operations to server
         Promise.resolve().then(function (_) {
-          debug('Editor isRemote is false: %s', _this.editor.isRemote);
-          debug('Re-execute pending operations, %O', _this.revertOperationList);
+          // reset execute remote operations flag
+          _this.isExecRemoteOperations = false;
+          _this.editor.isRemote = false;
 
           // 3. Execute pending operations
           // 3.1 Re-execute operations
+          debug('Editor isRemote is false: %s', _this.editor.isRemote);
+          debug('Re-execute pending operations, %O', _this.revertOperationList);
           reExecRevertOperationList(_this.editor, _this.revertOperationList);
 
           // 3.2 Clear revert operationList
@@ -168,15 +172,11 @@ var SocketManager = /*#__PURE__*/_createClass(function SocketManager(editor, doc
     // sync operations
     // content is [{version, operations}, {version, operations}, ...]
     _this.remoteOperationsList = content;
+
+    // update execute remote operations flag
     _this.isExecRemoteOperations = true;
     _this.editor.isRemote = true;
     _this.execRemoteOperations();
-
-    // reset control flag
-    Promise.resolve().then(function (_) {
-      _this.isExecRemoteOperations = false;
-      _this.editor.isRemote = false;
-    });
   };
   this.sendCursorLocation = function (location) {
     _this.socketClient.sendCursorLocation(location);
@@ -193,6 +193,21 @@ var SocketManager = /*#__PURE__*/_createClass(function SocketManager(editor, doc
       deleteCursor(_this.editor, message);
       _this.editor.onCursor && _this.editor.onCursor(_this.editor.cursors);
     }
+    if (type === 'disconnect') {
+      if (_this._sendingOperations) {
+        _this.pendingOperationList.unshift(_this._sendingOperations.slice());
+        _this._sendingOperations = null;
+      }
+      _this.isSending = false;
+      _this.disconnect = true;
+
+      // Update saved state
+      var lastSavedAt = new Date().getTime();
+      _this.dispatchConnectState('saved', lastSavedAt);
+    }
+    if (type === 'reconnect') {
+      _this.disconnect = false;
+    }
     _this.eventBus.dispatch(type, message);
   };
   this.closeSocketConnect = function () {

package/dist/components/tip-message/index.js

@@ -39,6 +39,14 @@ var TipMessage = /*#__PURE__*/function (_React$Component) {
         duration: null
       });
     };
+    _this.onOperationsSaveError = function () {
+      var t = _this.props.t;
+      var message = t('Operations_save_error_tip');
+      toaster.danger(message, {
+        hasCloseButton: false,
+        duration: null
+      });
+    };
     _this.onDisconnect = function () {
       var _this$props = _this.props,
         t = _this$props.t,
@@ -138,6 +146,7 @@ var TipMessage = /*#__PURE__*/function (_React$Component) {
       this.unsubscribeOpExecError = eventBus.subscribe('operation_exec_error', this.onOperationExecuteError);
       this.unsubscribePendingOpExceedLimit = eventBus.subscribe('pending_operations_exceed_limit', this.onPendingOpExceedLimit);
       this.unsubscribeDocumentLoadError = eventBus.subscribe('document_content_load_failed', this.onDocumentLoadError);
+      this.unsubscribeOperationsSaveError = eventBus.subscribe('Internal_server_error', this.onOperationsSaveError);
     }
   }, {
     key: "componentWillUnmount",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/sdoc-editor",
-  "version": "0.1.116",
+  "version": "0.1.117",
   "private": false,
   "description": "This is a sdoc editor",
   "main": "dist/index.js",

package/public/locales/en/sdoc-editor.json

@@ -349,5 +349,6 @@
   "Icon_and_text_Link": "Icon and text Link",
   "Card": "Card",
   "Select_sdoc_document": "Select sdoc document",
-  "Local_file": "Local file"
+  "Local_file": "Local file",
+  "Operations_save_error_tip": "Operation execution failed, internal server error, please refresh the page"
 }

package/public/locales/zh-CN/sdoc-editor.json

@@ -351,5 +351,6 @@
   "Icon_and_text_Link": "图标+文字链",
   "Card": "卡片",
   "Select_sdoc_document": "选择sdoc文档",
-  "Local_file": "本地文件"
+  "Local_file": "本地文件",
+  "Operations_save_error_tip": "操作执行失败，服务器内部错误，请刷新页面"
 }