@seafile/sdoc-editor 0.1.119 → 0.1.120

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

@@ -65,30 +65,29 @@ var SocketManager = /*#__PURE__*/_createClass(function SocketManager(editor, doc
 
     // Operations are execute failure
     var error_type = result.error_type;
-    if (error_type === 'version_behind_server') {
-      // Put the failed operation into the pending list and re-execute it
-      _this.pendingOperationList.unshift(_toConsumableArray(_this._sendingOperations));
-      _this.state = STATE.CONFLICT;
-      var lose_operations = result.lose_operations;
-      _this.resolveConflicting(lose_operations);
-    } 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);
-
-      // reset sending control
-      _this.state = STATE.NEED_RELOAD;
-      _this._sendingOperations = null;
-    } else if (error_type === 'Internal_server_error') {
+    if (error_type === 'load_document_content_error' || error_type === 'save_operations_to_database_error') {
+      // load_document_content_error: After a short-term reconnection, the content of the document fails to load
+      // save_operation_to_database_error: Save operation to database error
       _this.dispatchConnectState(error_type);
 
       // reset sending control
       _this.state = STATE.NEED_RELOAD;
       _this._sendingOperations = null;
-    } else if (error_type === 'operation_exec_error') {
+    } else if (error_type === 'version_behind_server') {
+      // Put the failed operation into the pending list and re-execute it
+      _this.pendingOperationList.unshift(_toConsumableArray(_this._sendingOperations));
+      _this.state = STATE.CONFLICT;
+      var lose_operations = result.lose_operations;
+      _this.resolveConflicting(lose_operations);
+    } else if (error_type === 'execute_client_operations_error') {
       _this.editor.isRemote = true;
       var dupSendingOperations = _toConsumableArray(_this._sendingOperations);
       revertOperationList(_this.editor, [dupSendingOperations]);
 
+      // Update the save time after revert
+      var _lastSavedAt = new Date().getTime();
+      _this.dispatchConnectState('saved', _lastSavedAt);
+
       // Set isRemote to false must be in Promise.resolve function, make sure the modification of isRemote is later than the onChange event
       Promise.resolve().then(function (_) {
         _this.editor.isRemote = false;
@@ -112,7 +111,13 @@ var SocketManager = /*#__PURE__*/_createClass(function SocketManager(editor, doc
       var operations = params.operations;
       // Update content & version
       debug('execute remote operations: %O', operations);
-      syncRemoteOperations(_this.editor, operations);
+      try {
+        syncRemoteOperations(_this.editor, operations);
+      } catch (error) {
+        _this.state = STATE.CONFLICT;
+        _this.dispatchConnectState('sync_server_operations_error');
+        return;
+      }
 
       // Update document
       _this.document.version = serverVersion;
@@ -197,7 +202,13 @@ var SocketManager = /*#__PURE__*/_createClass(function SocketManager(editor, doc
         serverVersion = operationParams.version;
       // 2.1 Update content & version
       debug('execute lose operations: %O', operations);
-      syncRemoteOperations(_this.editor, operations);
+      try {
+        syncRemoteOperations(_this.editor, operations);
+      } catch (error) {
+        _this.state = STATE.CONFLICT;
+        _this.dispatchConnectState('sync_server_operations_error');
+        return;
+      }
 
       // 2.2 Update document
       _this.document.version = serverVersion;

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

@@ -18,35 +18,34 @@ var TipMessage = /*#__PURE__*/function (_React$Component) {
     _this.onOperationExecuteError = function () {
       var t = _this.props.t;
       var message = t('Failed_to_execute_operation_on_server');
-      toaster.danger(message, {
-        hasCloseButton: true,
-        duration: null
-      });
-    };
-    _this.onPendingOpExceedLimit = function () {
-      var t = _this.props.t;
-      toaster.closeAll();
-      var message = t('Pending_operations_exceed_limit');
       toaster.warning(message, {
-        duration: 5
+        hasCloseButton: true
       });
     };
-    _this.onDocumentLoadError = function () {
+    _this.onSyncServerOperationError = function () {
       var t = _this.props.t;
-      var message = t('Document_content_load_failed');
+      var message = t('Failed_to_sync_with_server_operations');
       toaster.danger(message, {
-        hasCloseButton: true,
+        hasCloseButton: false,
         duration: null
       });
     };
-    _this.onOperationsSaveError = function () {
+    _this.onInternalServerExecError = function () {
       var t = _this.props.t;
-      var message = t('Operations_save_error_tip');
+      var message = t('Internal_server_exec_operations_error');
       toaster.danger(message, {
         hasCloseButton: false,
         duration: null
       });
     };
+    _this.onPendingOpExceedLimit = function () {
+      var t = _this.props.t;
+      toaster.closeAll();
+      var message = t('Pending_operations_exceed_limit');
+      toaster.warning(message, {
+        duration: 5
+      });
+    };
     _this.onDisconnect = function () {
       var _this$props = _this.props,
         t = _this$props.t,
@@ -142,18 +141,28 @@ var TipMessage = /*#__PURE__*/function (_React$Component) {
       this.unsubscribeReconnectErrorEvent = eventBus.subscribe('reconnect_error', this.onReconnectError);
       this.unsubscribeReconnectEvent = eventBus.subscribe('reconnect', this.onReconnect);
 
-      // op execute error
-      this.unsubscribeOpExecError = eventBus.subscribe('operation_exec_error', this.onOperationExecuteError);
+      // server return error
+      this.unsubscribeOpExecError = eventBus.subscribe('execute_client_operations_error', this.onOperationExecuteError);
+      this.unsubscribeSyncServerOpError = eventBus.subscribe('sync_server_operations_error', this.onSyncServerOperationError);
+      this.unsubscribeDocumentLoadError = eventBus.subscribe('load_document_content_error', this.onInternalServerExecError);
+      this.unsubscribeOperationsSaveError = eventBus.subscribe('save_operations_to_database_error', this.onInternalServerExecError);
+
+      // local error
       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",
     value: function componentWillUnmount() {
       this.unsubscribeSavingEvent();
       this.unsubscribeSavedEvent();
+      this.unsubscribeDisconnectEvent();
+      this.unsubscribeReconnectErrorEvent();
+      this.unsubscribeReconnectEvent();
+      this.unsubscribeOpExecError();
+      this.unsubscribeSyncServerOpError();
+      this.unsubscribePendingOpExceedLimit();
       this.unsubscribeDocumentLoadError();
+      this.unsubscribeOperationsSaveError();
       clearTimeout(this.saveTimer);
     }
   }]);

package/package.json

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

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

@@ -273,7 +273,7 @@
   "Revision": "Revision",
   "Error": "Error",
   "Start_revise": "Start revise",
-  "Failed_to_execute_operation_on_server": "Failed to execute operation on server",
+  "Failed_to_execute_operation_on_server": "Failed to execute operation on server, the current operation has been withdrawn",
   "Start_revise_tip": "Create a temporary document and modify on it, merge it back after reviewing changes",
   "Load_doc_content_error": "Load doc content error",
   "Sdoc_format_invalid": "The content of the document does not conform to the sdoc specification",
@@ -341,7 +341,6 @@
   "Font": "Font",
   "All_fonts": "All fonts",
   "Default_font": "Default font",
-  "Document_content_load_failed": "Document content failed to load, please refresh the page to try again",
   "Pending_operations_exceed_limit": "There are multiple operations not synced to the server. Please check your network.",
   "Recently_saved": "Recently saved",
   "Sdoc_document" : "Sdoc document",
@@ -350,5 +349,6 @@
   "Card": "Card",
   "Select_sdoc_document": "Select sdoc document",
   "Local_file": "Local file",
-  "Operations_save_error_tip": "Operation execution failed, internal server error, please refresh the page"
+  "Internal_server_exec_operations_error": "An exception occurred on the server, please refresh the page and try again",
+  "Failed_to_sync_with_server_operations": "Synchronization with the server failed, please refresh the page"
 }

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

@@ -273,7 +273,7 @@
   "Revision": "修订稿",
   "Error": "错误",
   "Start_revise": "开始修订",
-  "Failed_to_execute_operation_on_server": "无法在服务器上执行操作",
+  "Failed_to_execute_operation_on_server": "无法在服务器上执行操作，当前操作已经撤回",
   "Start_revise_tip": "创建一个临时文档并对其进行修订，检查更改后将其合并回来",
   "Load_doc_content_error": "加载文档内容错误",
   "Sdoc_format_invalid": "文档内容不符合 sdoc 规范",
@@ -343,7 +343,6 @@
   "Font": "字体",
   "All_fonts": "所有字体",
   "Default_font": "默认字体",
-  "Document_content_load_failed": "文档内容加载失败, 请刷新页面重新访问",
   "Pending_operations_exceed_limit": "有多个操作未同步到服务器。请检查你的网络。",
   "Recently_saved": "最近保存",
   "Sdoc_document" : "sdoc 文档",
@@ -352,5 +351,6 @@
   "Card": "卡片",
   "Select_sdoc_document": "选择sdoc文档",
   "Local_file": "本地文件",
-  "Operations_save_error_tip": "操作执行失败，服务器内部错误，请刷新页面"
+  "Internal_server_exec_operations_error": "在服务器执行操作异常，请刷新页面后重试",
+  "Failed_to_sync_with_server_operations": "与服务器同步操作失败，请刷新页面"
 }