@atlaskit/collab-provider 7.1.2 → 7.1.6

package/CHANGELOG.md

@@ -1,5 +1,37 @@
 # @atlaskit/collab-provider
 
+## 7.1.6
+
+### Patch Changes
+
+- [`5d5d6468ba9`](https://bitbucket.org/atlassian/atlassian-frontend/commits/5d5d6468ba9) - Remove url-parse from collab-provider
+
+  Url-parse can be replaced with the built-in URL constructor
+
+## 7.1.5
+
+### Patch Changes
+
+- [`f82fb6c48f7`](https://bitbucket.org/atlassian/atlassian-frontend/commits/f82fb6c48f7) - [ED-13911] Fix cycle dependencies
+- [`97412280671`](https://bitbucket.org/atlassian/atlassian-frontend/commits/97412280671) - [ED-13939] Add analytics event to track "can't syncup with collab service" error
+- [`88ada10af2c`](https://bitbucket.org/atlassian/atlassian-frontend/commits/88ada10af2c) - [ED-14097] Moved getFinalAcknowledgedState control to editor and made the API public
+- [`85648c038a4`](https://bitbucket.org/atlassian/atlassian-frontend/commits/85648c038a4) - ED-13939 Rename newCollabSyncUpError analytics event to newCollabSyncUpErrorNoSteps
+- [`e292f108d4b`](https://bitbucket.org/atlassian/atlassian-frontend/commits/e292f108d4b) - Ensure metadata is persisted when it is updated by another participant during an editing session
+- Updated dependencies
+
+## 7.1.4
+
+### Patch Changes
+
+- [`19d72473dfb`](https://bitbucket.org/atlassian/atlassian-frontend/commits/19d72473dfb) - ED-13912 refactor editor collab-provider and make sure that initializeChannel is only called once
+- Updated dependencies
+
+## 7.1.3
+
+### Patch Changes
+
+- [`c55c736ecea`](https://bitbucket.org/atlassian/atlassian-frontend/commits/c55c736ecea) - Patch VULN AFP-3486 AFP-3487 AFP-3488 AFP-3489
+
 ## 7.1.2
 
 ### Patch Changes

package/dist/cjs/analytics/index.js

@@ -11,9 +11,9 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 
 var _const = require("../helpers/const");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 var buildAnalyticsPayload = function buildAnalyticsPayload(subject, payload) {
   return {

package/dist/cjs/channel.js

@@ -37,9 +37,9 @@ var _performance = require("./analytics/performance");
 
 var _analytics = require("./analytics");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 

package/dist/cjs/provider/index.js

@@ -55,13 +55,15 @@ var _errorCodeMapper = require("../error-code-mapper");
 
 var _disconnectedReasonMapper = require("../disconnected-reason-mapper");
 
+var _excluded = ["type"];
+
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 var logger = (0, _utils.createLogger)('Provider', 'black');
 var PARTICIPANT_UPDATE_INTERVAL = 300 * 1000; // 300 seconds
@@ -75,6 +77,8 @@ var CATCHUP_THROTTLE = 1 * 1000; // 1 second
 exports.CATCHUP_THROTTLE = CATCHUP_THROTTLE;
 var OUT_OF_SYNC_PERIOD = 3 * 1000; // 3 seconds
 
+var noop = function noop() {};
+
 var MAX_STEP_REJECTED_ERROR = 15;
 exports.MAX_STEP_REJECTED_ERROR = MAX_STEP_REJECTED_ERROR;
 
@@ -115,6 +119,37 @@ var Provider = /*#__PURE__*/function (_Emitter) {
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "participants", new Map());
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "metadata", {});
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "stepRejectCounter", 0);
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "isChannelInitialized", false);
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "initializeChannel", function () {
+      _this.channel.on('connected', function (_ref2) {
+        var sid = _ref2.sid,
+            initialized = _ref2.initialized;
+        _this.sessionId = sid;
+
+        _this.emit('connected', {
+          sid: sid
+        }); // If already initialized, `connected` means reconnected
+
+
+        if (initialized && _this.disconnectedAt && // Offline longer than `OUT_OF_SYNC_PERIOD`
+        Date.now() - _this.disconnectedAt >= OUT_OF_SYNC_PERIOD) {
+          _this.throttledCatchup();
+        }
+
+        _this.disconnectedAt = undefined;
+      }).on('init', function (_ref3) {
+        var doc = _ref3.doc,
+            version = _ref3.version,
+            metadata = _ref3.metadata;
+
+        // Initial document and version
+        _this.updateDocumentWithMetadata({
+          doc: doc,
+          version: version,
+          metadata: metadata
+        });
+      }).on('steps:added', _this.onStepsAdded.bind((0, _assertThisInitialized2.default)(_this))).on('participant:telepointer', _this.onParticipantTelepointer.bind((0, _assertThisInitialized2.default)(_this))).on('presence:joined', _this.onPresenceJoined.bind((0, _assertThisInitialized2.default)(_this))).on('presence', _this.onPresence.bind((0, _assertThisInitialized2.default)(_this))).on('participant:left', _this.onParticipantLeft.bind((0, _assertThisInitialized2.default)(_this))).on('participant:updated', _this.onParticipantUpdated.bind((0, _assertThisInitialized2.default)(_this))).on('metadata:changed', _this.onMetadataChanged.bind((0, _assertThisInitialized2.default)(_this))).on('disconnect', _this.onDisconnected.bind((0, _assertThisInitialized2.default)(_this))).on('error', _this.onErrorHandled.bind((0, _assertThisInitialized2.default)(_this))).connect();
+    });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onStepsAdded", function (data) {
       logger("Received steps", {
         steps: data.steps,
@@ -142,8 +177,8 @@ var Provider = /*#__PURE__*/function (_Emitter) {
         _this.throttledCatchup();
       }
 
-      _this.updateParticipants([], data.steps.map(function (_ref2) {
-        var userId = _ref2.userId;
+      _this.updateParticipants([], data.steps.map(function (_ref4) {
+        var userId = _ref4.userId;
         return userId;
       }));
     });
@@ -156,11 +191,11 @@ var Provider = /*#__PURE__*/function (_Emitter) {
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "fitlerQueue", function (condition) {
       _this.queue = _this.queue.filter(condition);
     });
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "updateDocumentWithMetadata", function (_ref3) {
-      var doc = _ref3.doc,
-          version = _ref3.version,
-          metadata = _ref3.metadata,
-          reserveCursor = _ref3.reserveCursor;
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "updateDocumentWithMetadata", function (_ref5) {
+      var doc = _ref5.doc,
+          version = _ref5.version,
+          metadata = _ref5.metadata,
+          reserveCursor = _ref5.reserveCursor;
 
       _this.emit('init', _objectSpread({
         doc: doc,
@@ -282,14 +317,14 @@ var Provider = /*#__PURE__*/function (_Emitter) {
         return _this.sendPresence();
       }, SEND_PRESENCE_INTERVAL);
     });
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onPresenceJoined", function (_ref5) {
-      var sessionId = _ref5.sessionId;
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onPresenceJoined", function (_ref7) {
+      var sessionId = _ref7.sessionId;
       logger('Participant joined with session: ', sessionId); // This expose existing users to the newly joined user
 
       _this.sendPresence();
     });
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onPresence", function (_ref6) {
-      var userId = _ref6.userId;
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onPresence", function (_ref8) {
+      var userId = _ref8.userId;
       logger('onPresence userId: ', userId);
       _this.userId = userId;
 
@@ -299,11 +334,13 @@ var Provider = /*#__PURE__*/function (_Emitter) {
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onMetadataChanged", function (metadata) {
       if (metadata !== undefined && !(0, _isEqual.default)(_this.metadata, metadata)) {
+        _this.metadata = metadata;
+
         _this.emit('metadata:changed', metadata);
       }
     });
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onParticipantLeft", function (_ref7) {
-      var sessionId = _ref7.sessionId;
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onParticipantLeft", function (_ref9) {
+      var sessionId = _ref9.sessionId;
       logger("Participant left");
 
       _this.participants.delete(sessionId);
@@ -314,11 +351,11 @@ var Provider = /*#__PURE__*/function (_Emitter) {
         }]
       });
     });
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onParticipantUpdated", function (_ref8) {
-      var sessionId = _ref8.sessionId,
-          timestamp = _ref8.timestamp,
-          userId = _ref8.userId,
-          clientId = _ref8.clientId;
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onParticipantUpdated", function (_ref10) {
+      var sessionId = _ref10.sessionId,
+          timestamp = _ref10.timestamp,
+          userId = _ref10.userId,
+          clientId = _ref10.clientId;
 
       _this.updateParticipant({
         sessionId: sessionId,
@@ -327,12 +364,12 @@ var Provider = /*#__PURE__*/function (_Emitter) {
         clientId: clientId
       });
     });
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onParticipantTelepointer", function (_ref9) {
-      var sessionId = _ref9.sessionId,
-          timestamp = _ref9.timestamp,
-          selection = _ref9.selection,
-          userId = _ref9.userId,
-          clientId = _ref9.clientId;
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onParticipantTelepointer", function (_ref11) {
+      var sessionId = _ref11.sessionId,
+          timestamp = _ref11.timestamp,
+          selection = _ref11.selection,
+          userId = _ref11.userId,
+          clientId = _ref11.clientId;
 
       if (sessionId === _this.sessionId) {
         return;
@@ -360,14 +397,14 @@ var Provider = /*#__PURE__*/function (_Emitter) {
       });
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "updateParticipant", /*#__PURE__*/function () {
-      var _ref11 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(_ref10) {
+      var _ref13 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(_ref12) {
         var sessionId, timestamp, userId, clientId, getUser, _yield, _yield$name, name, _yield$email, email, _yield$avatar, avatar, isNewParticipant;
 
         return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
-                sessionId = _ref10.sessionId, timestamp = _ref10.timestamp, userId = _ref10.userId, clientId = _ref10.clientId;
+                sessionId = _ref12.sessionId, timestamp = _ref12.timestamp, userId = _ref12.userId, clientId = _ref12.clientId;
 
                 if (userId) {
                   _context2.next = 3;
@@ -420,7 +457,7 @@ var Provider = /*#__PURE__*/function (_Emitter) {
       }));
 
       return function (_x) {
-        return _ref11.apply(this, arguments);
+        return _ref13.apply(this, arguments);
       };
     }());
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "updateParticipants", function () {
@@ -480,8 +517,8 @@ var Provider = /*#__PURE__*/function (_Emitter) {
           return _disconnectedReasonMapper.DisconnectReason.UNKNOWN_DISCONNECT;
       }
     });
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onDisconnected", function (_ref12) {
-      var reason = _ref12.reason;
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onDisconnected", function (_ref14) {
+      var reason = _ref14.reason;
       _this.disconnectedAt = Date.now();
       var left = Array.from(_this.participants.values());
 
@@ -498,8 +535,74 @@ var Provider = /*#__PURE__*/function (_Emitter) {
         });
       }
     });
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "getFinalAcknowledgedState", /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
+      var _this$getUnconfirmedS, _this$metadata$title;
+
+      var maxAttemptsToSync, count, unconfirmedSteps, _this$getUnconfirmedS2, _unconfirmedSteps, _state, state;
+
+      return _regenerator.default.wrap(function _callee3$(_context3) {
+        while (1) {
+          switch (_context3.prev = _context3.next) {
+            case 0:
+              maxAttemptsToSync = _const.ACK_MAX_TRY;
+              count = 0;
+              unconfirmedSteps = (_this$getUnconfirmedS = _this.getUnconfirmedSteps()) === null || _this$getUnconfirmedS === void 0 ? void 0 : _this$getUnconfirmedS.steps;
+
+            case 3:
+              if (!(unconfirmedSteps && unconfirmedSteps.length)) {
+                _context3.next = 13;
+                break;
+              }
+
+              _this.sendStepsFromCurrentState();
+
+              _context3.next = 7;
+              return (0, _utils.sleep)(500);
+
+            case 7:
+              unconfirmedSteps = (_this$getUnconfirmedS2 = _this.getUnconfirmedSteps()) === null || _this$getUnconfirmedS2 === void 0 ? void 0 : _this$getUnconfirmedS2.steps;
+
+              if (!(count++ >= maxAttemptsToSync)) {
+                _context3.next = 11;
+                break;
+              }
+
+              if (_this.onSyncUpError) {
+                _state = _this.getState();
+
+                _this.onSyncUpError({
+                  lengthOfUnconfirmedSteps: (_unconfirmedSteps = unconfirmedSteps) === null || _unconfirmedSteps === void 0 ? void 0 : _unconfirmedSteps.length,
+                  tries: count,
+                  maxRetries: maxAttemptsToSync,
+                  clientId: _this.clientId,
+                  version: (0, _prosemirrorCollab.getVersion)(_state)
+                });
+              }
+
+              throw new Error("Can't syncup with Collab Service");
+
+            case 11:
+              _context3.next = 3;
+              break;
+
+            case 13:
+              state = _this.getState();
+              return _context3.abrupt("return", {
+                content: state.doc.toJSON(),
+                title: (_this$metadata$title = _this.metadata.title) === null || _this$metadata$title === void 0 ? void 0 : _this$metadata$title.toString(),
+                stepVersion: (0, _prosemirrorCollab.getVersion)(state)
+              });
+
+            case 15:
+            case "end":
+              return _context3.stop();
+          }
+        }
+      }, _callee3);
+    })));
     _this.config = config;
     _this.channel = new _channel.Channel(config);
+    _this.isChannelInitialized = false;
 
     if (config.analyticsClient) {
       _this.analyticsClient = config.analyticsClient;
@@ -507,50 +610,35 @@ var Provider = /*#__PURE__*/function (_Emitter) {
 
     return _this;
   }
-  /**
-   * Called by collab plugin in editor when it's ready to
-   * initialize a collab session.
-   */
-
 
   (0, _createClass2.default)(Provider, [{
     key: "initialize",
-    value: function initialize(optionsOrGetState) {
-      var _this2 = this;
-
-      this.getState = typeof optionsOrGetState === 'function' ? optionsOrGetState : optionsOrGetState.getState;
-      this.clientId = typeof optionsOrGetState === 'function' ? // Quick-hack to get clientID from native collab-plugin.
-      this.getState().plugins.find(function (p) {
+    value:
+    /**
+     * Called by collab plugin in editor when it's ready to
+     * initialize a collab session.
+     */
+    function initialize(getState) {
+      return this.setup({
+        getState: getState
+      });
+    }
+  }, {
+    key: "setup",
+    value: function setup(_ref16) {
+      var getState = _ref16.getState,
+          onSyncUpError = _ref16.onSyncUpError;
+      this.getState = getState;
+      this.onSyncUpError = onSyncUpError || noop;
+      this.clientId = getState().plugins.find(function (p) {
         return p.key === 'collab$';
-      }).spec.config.clientID : optionsOrGetState.clientId;
-      this.channel.on('connected', function (_ref13) {
-        var sid = _ref13.sid,
-            initialized = _ref13.initialized;
-        _this2.sessionId = sid;
-
-        _this2.emit('connected', {
-          sid: sid
-        }); // If already initialized, `connected` means reconnected
-
-
-        if (initialized && _this2.disconnectedAt && // Offline longer than `OUT_OF_SYNC_PERIOD`
-        Date.now() - _this2.disconnectedAt >= OUT_OF_SYNC_PERIOD) {
-          _this2.throttledCatchup();
-        }
+      }).spec.config.clientID;
 
-        _this2.disconnectedAt = undefined;
-      }).on('init', function (_ref14) {
-        var doc = _ref14.doc,
-            version = _ref14.version,
-            metadata = _ref14.metadata;
+      if (!this.isChannelInitialized) {
+        this.initializeChannel();
+        this.isChannelInitialized = true;
+      }
 
-        // Initial document and version
-        _this2.updateDocumentWithMetadata({
-          doc: doc,
-          version: version,
-          metadata: metadata
-        });
-      }).on('steps:added', this.onStepsAdded).on('participant:telepointer', this.onParticipantTelepointer).on('presence:joined', this.onPresenceJoined).on('presence', this.onPresence).on('participant:left', this.onParticipantLeft).on('participant:updated', this.onParticipantUpdated).on('metadata:changed', this.onMetadataChanged).on('disconnect', this.onDisconnected).on('error', this.onErrorHandled).connect();
       return this;
     }
     /**
@@ -642,15 +730,15 @@ var Provider = /*#__PURE__*/function (_Emitter) {
   }, {
     key: "processSteps",
     value: function processSteps(data) {
-      var _this3 = this;
+      var _this2 = this;
 
       var version = data.version,
           steps = data.steps;
       logger("Processing data. Version \"".concat(version, "\"."));
 
       if (steps && steps.length) {
-        var clientIds = steps.map(function (_ref15) {
-          var clientId = _ref15.clientId;
+        var clientIds = steps.map(function (_ref17) {
+          var clientId = _ref17.clientId;
           return clientId;
         });
         this.emit('data', {
@@ -665,7 +753,7 @@ var Provider = /*#__PURE__*/function (_Emitter) {
 
         if (clientIds.indexOf(this.clientId) === -1) {
           setTimeout(function () {
-            return _this3.sendStepsFromCurrentState();
+            return _this2.sendStepsFromCurrentState();
           }, 100);
         }
       }
@@ -682,7 +770,7 @@ var Provider = /*#__PURE__*/function (_Emitter) {
       }
 
       var type = data.type,
-          rest = (0, _objectWithoutProperties2.default)(data, ["type"]);
+          rest = (0, _objectWithoutProperties2.default)(data, _excluded);
       var userId = this.userId,
           sessionId = this.sessionId,
           clientId = this.clientId;
@@ -702,30 +790,30 @@ var Provider = /*#__PURE__*/function (_Emitter) {
   }, {
     key: "emitTelepointersFromSteps",
     value: function emitTelepointersFromSteps(steps) {
-      var _this4 = this;
+      var _this3 = this;
 
       steps.forEach(function (step) {
-        var _Array$from$filter = Array.from(_this4.participants.values()).filter(function (p) {
+        var _Array$from$filter = Array.from(_this3.participants.values()).filter(function (p) {
           return p.clientId === step.clientId;
         }),
             _Array$from$filter2 = (0, _slicedToArray2.default)(_Array$from$filter, 1),
             participant = _Array$from$filter2[0];
 
         if (participant) {
-          var _ref16 = step,
-              stepType = _ref16.stepType,
-              to = _ref16.to,
-              from = _ref16.from,
-              _ref16$slice = _ref16.slice,
-              slice = _ref16$slice === void 0 ? {
+          var _ref18 = step,
+              stepType = _ref18.stepType,
+              to = _ref18.to,
+              from = _ref18.from,
+              _ref18$slice = _ref18.slice,
+              slice = _ref18$slice === void 0 ? {
             content: []
-          } : _ref16$slice;
+          } : _ref18$slice;
 
           var _slice$content = (0, _slicedToArray2.default)(slice.content, 1),
               node = _slice$content[0];
 
           if (stepType === 'replace' && to === from && slice.content.length === 1 && node.type === 'text' && node.text.length === 1) {
-            _this4.emit('telepointer', {
+            _this3.emit('telepointer', {
               sessionId: participant.sessionId,
               selection: {
                 type: 'textSelection',
@@ -780,80 +868,13 @@ var Provider = /*#__PURE__*/function (_Emitter) {
       this.channel.sendMetadata(metadata);
       Object.assign(this.metadata, metadata);
     }
-    /**
-     * Get latest state.
-     *
-     * NOTE: Should this actually convert to ADF instead?
-     */
-
   }, {
-    key: "getFinalAcknowledgedState",
-    value: function () {
-      var _getFinalAcknowledgedState = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
-        var _this$getUnconfirmedS;
-
-        var state, count, unconfirmedSteps, _this$getUnconfirmedS2;
-
-        return _regenerator.default.wrap(function _callee3$(_context3) {
-          while (1) {
-            switch (_context3.prev = _context3.next) {
-              case 0:
-                state = this.getState();
-                count = 0;
-                unconfirmedSteps = this.getUnconfirmedSteps() && ((_this$getUnconfirmedS = this.getUnconfirmedSteps()) === null || _this$getUnconfirmedS === void 0 ? void 0 : _this$getUnconfirmedS.steps);
-
-              case 3:
-                if (!(unconfirmedSteps && unconfirmedSteps.length)) {
-                  _context3.next = 12;
-                  break;
-                }
-
-                this.sendStepsFromCurrentState();
-                _context3.next = 7;
-                return (0, _utils.sleep)(500);
-
-              case 7:
-                unconfirmedSteps = this.getUnconfirmedSteps() && ((_this$getUnconfirmedS2 = this.getUnconfirmedSteps()) === null || _this$getUnconfirmedS2 === void 0 ? void 0 : _this$getUnconfirmedS2.steps);
-
-                if (!(count++ >= _const.ACK_MAX_TRY)) {
-                  _context3.next = 10;
-                  break;
-                }
-
-                throw new Error("Can't syncup with Collab Service");
-
-              case 10:
-                _context3.next = 3;
-                break;
-
-              case 12:
-                return _context3.abrupt("return", {
-                  content: state.doc.toJSON(),
-                  title: this.metadata.title,
-                  stepVersion: (0, _prosemirrorCollab.getVersion)(state)
-                });
-
-              case 13:
-              case "end":
-                return _context3.stop();
-            }
-          }
-        }, _callee3, this);
-      }));
-
-      function getFinalAcknowledgedState() {
-        return _getFinalAcknowledgedState.apply(this, arguments);
-      }
-
-      return getFinalAcknowledgedState;
-    }()
+    key: "unsubscribeAll",
+    value:
     /**
      * Unsubscribe from all events emitted by this provider.
      */
-
-  }, {
-    key: "unsubscribeAll",
-    value: function unsubscribeAll() {
+    function unsubscribeAll() {
       (0, _get2.default)((0, _getPrototypeOf2.default)(Provider.prototype), "unsubscribeAll", this).call(this);
       this.channel.disconnect();
       return this;

package/dist/cjs/socket-io-provider.js

@@ -14,15 +14,13 @@ var _provider = require("./provider");
 
 var _socket = require("socket.io-client");
 
-var _urlParse2 = _interopRequireDefault(require("url-parse"));
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 function createSocketIOSocket(url, auth) {
-  var _urlParse = (0, _urlParse2.default)(url),
-      pathname = _urlParse.pathname;
+  var _URL = new URL(url),
+      pathname = _URL.pathname;
 
   return (0, _socket.io)(url, {
     withCredentials: true,

package/dist/cjs/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/collab-provider",
-	"version": "7.1.2",
+	"version": "7.1.6",
 	"sideEffects": false
 }