@seafile/sdoc-editor 2.0.159 → 2.0.161

package/dist/extension/plugins/list/plugin/insert-fragment-list.js

@@ -153,7 +153,7 @@ var insertFragmentList = exports.insertFragmentList = function insertFragmentLis
         mode: 'lowest'
       });
       if (!liEntry) {
-        var nodes = isListRoot(fragment) ? [(0, _core.generateDefaultText)()].concat((0, _toConsumableArray2["default"])(fragment)) : fragment;
+        var nodes = isListRoot(fragment[0]) ? [(0, _core.generateDefaultText)()].concat((0, _toConsumableArray2["default"])(fragment)) : fragment;
         return _insertFragment(nodes);
       }
       _slate.Transforms.insertFragment(editor, [(0, _core.generateDefaultText)()]); // need ' '

package/dist/socket/socket-client.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
+var _regenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/regenerator"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/asyncToGenerator"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/createClass"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/classCallCheck"));
@@ -12,9 +14,42 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/es
 var _socket = _interopRequireDefault(require("socket.io-client"));
 var _debug = require("../utils/debug");
 var _socketManager = _interopRequireDefault(require("./socket-manager"));
-var SocketClient = /*#__PURE__*/(0, _createClass2["default"])(function SocketClient(config) {
+var SocketClient = /*#__PURE__*/(0, _createClass2["default"])(function SocketClient(_config) {
   var _this = this;
   (0, _classCallCheck2["default"])(this, SocketClient);
+  (0, _defineProperty2["default"])(this, "setupEventHandlers", function () {
+    _this.socket.on('connect', _this.onConnected);
+    _this.socket.on('disconnect', _this.onDisconnected);
+    _this.socket.on('connect_error', _this.onConnectError);
+    _this.socket.on('join-room', _this.onJoinRoom);
+    _this.socket.on('leave-room', _this.onLeaveRoom);
+    _this.socket.on('user-updated', _this.onUserUpdated);
+    _this.socket.on('reload-image', _this.onReloadImage);
+    _this.socket.on('update-document', _this.onReceiveRemoteOperations);
+
+    // doc replaced
+    _this.socket.on('doc-replaced', _this.receiveDocumentReplaced);
+    _this.socket.on('doc-replaced-error', _this.receiveDocumentReplacedError);
+
+    // doc published
+    _this.socket.on('doc-published', _this.receivePublishDocument);
+    _this.socket.on('doc-published-error', _this.receivePublishDocumentError);
+
+    // doc removed
+    _this.socket.on('doc-removed', _this.receiveRemoveDocument);
+    _this.socket.on('doc-removed-error', _this.receiveRemoveDocumentError);
+    _this.socket.on('update-cursor', _this.receiveCursorLocation);
+
+    // notification
+    _this.socket.on('new-notification', _this.receiveNewNotification);
+
+    // participant
+    _this.socket.on('participant-added', _this.receiveParticipantAdded);
+    _this.socket.on('participant-removed', _this.receiveParticipantRemoved);
+    _this.socket.io.on('reconnect', _this.onReconnect);
+    _this.socket.io.on('reconnect_attempt', _this.onReconnectAttempt);
+    _this.socket.io.on('reconnect_error', _this.onReconnectError);
+  });
   (0, _defineProperty2["default"])(this, "getParams", function () {
     var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     var _this$config = _this.config,
@@ -37,7 +72,7 @@ var SocketClient = /*#__PURE__*/(0, _createClass2["default"])(function SocketCli
           // The reconnect of socketManager needs to be triggered after entering the room again
           socketManager.onReconnect(result);
         }
-        socketManager.dispatchConnectState('onConnected', result);
+        socketManager.dispatchConnectState('connect', result);
         return;
       }
 
@@ -67,22 +102,62 @@ var SocketClient = /*#__PURE__*/(0, _createClass2["default"])(function SocketCli
       var time = new Date().toLocaleString();
       (0, _debug.clientDebug)('Current time is: %s', time);
       (0, _debug.clientDebug)('Disconnected due to ping timeout, trying to reconnect...');
-      _this.socket.connect(function (err) {
-        if (err) {
-          (0, _debug.clientDebug)('error, %o', err);
-        }
-      });
+      setTimeout(function () {
+        _this.safeReconnect();
+      }, 1000);
       return;
     }
     (0, _debug.clientDebug)('disconnect message: %s', data);
     var socketManager = _socketManager["default"].getInstance();
     socketManager.dispatchConnectState('disconnect');
   });
-  (0, _defineProperty2["default"])(this, "onConnectError", function (e) {
-    (0, _debug.clientDebug)('connect_error. %o', e.message);
+  (0, _defineProperty2["default"])(this, "onConnectError", function (error) {
+    (0, _debug.clientDebug)('connect_error. %s', error.message);
+    (0, _debug.clientDebug)('connect_error. %s', error.type);
+    (0, _debug.clientDebug)('connect_error. %O', error.context);
+    if (error.message.includes('timeout')) {
+      setTimeout(function () {
+        _this.safeReconnect();
+      }, 1000);
+    }
     var socketManager = _socketManager["default"].getInstance();
     socketManager.dispatchConnectState('connect_error');
   });
+  (0, _defineProperty2["default"])(this, "safeReconnect", /*#__PURE__*/(0, _asyncToGenerator2["default"])(/*#__PURE__*/(0, _regenerator2["default"])().m(function _callee() {
+    var config, _t;
+    return (0, _regenerator2["default"])().w(function (_context) {
+      while (1) switch (_context.p = _context.n) {
+        case 0:
+          _context.p = 0;
+          _this.socket.disconnect();
+          _this.socket = null;
+          _context.n = 1;
+          return new Promise(function (resolve) {
+            return setTimeout(resolve, 1000);
+          });
+        case 1:
+          config = _this.config;
+          _this.socket = (0, _socket["default"])(config.sdocServer, {
+            reconnection: true,
+            auth: {
+              token: config.accessToken
+            },
+            query: {
+              'sdoc_uuid': config.docUuid
+            }
+          });
+          _this.setupEventHandlers();
+          _context.n = 3;
+          break;
+        case 2:
+          _context.p = 2;
+          _t = _context.v;
+          console.error('Reconnection failed:', _t);
+        case 3:
+          return _context.a(2);
+      }
+    }, _callee, null, [[0, 2]]);
+  })));
   (0, _defineProperty2["default"])(this, "sendOperations", function (operations, version, selection, callback) {
     (0, _debug.clientDebug)('send operations: %O', operations);
     _this.socket.emit('update-document', _this.getParams({
@@ -203,47 +278,17 @@ var SocketClient = /*#__PURE__*/(0, _createClass2["default"])(function SocketCli
     var socketManager = _socketManager["default"].getInstance();
     socketManager.receiveParticipantRemoved(email);
   });
-  this.config = config;
+  this.config = _config;
   this.isReconnect = false;
-  this.socket = (0, _socket["default"])(config.sdocServer, {
+  this.socket = (0, _socket["default"])(_config.sdocServer, {
     reconnection: true,
     auth: {
-      token: config.accessToken
+      token: _config.accessToken
     },
     query: {
-      'sdoc_uuid': config.docUuid
+      'sdoc_uuid': _config.docUuid
     }
   });
-  this.socket.on('connect', this.onConnected);
-  this.socket.on('disconnect', this.onDisconnected);
-  this.socket.on('connect_error', this.onConnectError);
-  this.socket.on('join-room', this.onJoinRoom);
-  this.socket.on('leave-room', this.onLeaveRoom);
-  this.socket.on('user-updated', this.onUserUpdated);
-  this.socket.on('reload-image', this.onReloadImage);
-  this.socket.on('update-document', this.onReceiveRemoteOperations);
-
-  // doc replaced
-  this.socket.on('doc-replaced', this.receiveDocumentReplaced);
-  this.socket.on('doc-replaced-error', this.receiveDocumentReplacedError);
-
-  // doc published
-  this.socket.on('doc-published', this.receivePublishDocument);
-  this.socket.on('doc-published-error', this.receivePublishDocumentError);
-
-  // doc removed
-  this.socket.on('doc-removed', this.receiveRemoveDocument);
-  this.socket.on('doc-removed-error', this.receiveRemoveDocumentError);
-  this.socket.on('update-cursor', this.receiveCursorLocation);
-
-  // notification
-  this.socket.on('new-notification', this.receiveNewNotification);
-
-  // participant
-  this.socket.on('participant-added', this.receiveParticipantAdded);
-  this.socket.on('participant-removed', this.receiveParticipantRemoved);
-  this.socket.io.on('reconnect', this.onReconnect);
-  this.socket.io.on('reconnect_attempt', this.onReconnectAttempt);
-  this.socket.io.on('reconnect_error', this.onReconnectError);
+  this.setupEventHandlers();
 });
 var _default = exports["default"] = SocketClient;

package/dist/socket/socket-manager.js

@@ -335,6 +335,10 @@ var SocketManager = /*#__PURE__*/(0, _createClass2["default"])(function SocketMa
       (0, _debug.stateDebug)("State Changed: ".concat(_this.state, " -> ").concat(STATE.DISCONNECT));
       _this.state = STATE.DISCONNECT;
     }
+    if (type === 'connect' && _this.state === STATE.DISCONNECT) {
+      (0, _debug.stateDebug)("State Changed: ".concat(_this.state, " -> ").concat(STATE.IDLE));
+      _this.state = STATE.IDLE;
+    }
     _this.eventBus.dispatch(type, message);
   });
   (0, _defineProperty2["default"])(this, "closeSocketConnect", function () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/sdoc-editor",
-  "version": "2.0.159",
+  "version": "2.0.161",
   "main": "dist/index.js",
   "scripts": {
     "test": "jest",
@@ -71,5 +71,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a845c5a44f523fc5d2609ace65cfea2ebfefbbb2"
+  "gitHead": "575324484ce755f3ac5ef6ac424d70103a4cc795"
 }