@atlaskit/collab-provider 8.9.1 → 9.0.1

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/collab-provider
 
+## 9.0.1
+
+### Patch Changes
+
+- [`6fe0ddc993e`](https://bitbucket.org/atlassian/atlassian-frontend/commits/6fe0ddc993e) - ESS-3624 bug fix for missing avatar in editing sessions
+- [`579326b4915`](https://bitbucket.org/atlassian/atlassian-frontend/commits/579326b4915) - ESS-2763 update get final editor state
+
+## 9.0.0
+
+### Major Changes
+
+- [`b7086232a7c`](https://bitbucket.org/atlassian/atlassian-frontend/commits/b7086232a7c) - ESS-3135: move collab provider types into @atlaskit/collab-provider
+
 ## 8.9.1
 
 ### Patch Changes

package/dist/cjs/channel.js

@@ -350,6 +350,12 @@ var Channel = /*#__PURE__*/function (_Emitter) {
       }
       _this.socket.emit('metadata', metadata);
     });
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "sendPresenceJoined", function () {
+      if (!_this.connected || !_this.socket) {
+        return;
+      }
+      _this.socket.emit('presence:joined');
+    });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onOnlineHandler", function () {
       // Force an immediate reconnect, the socket must first be closed to reset reconnection delay logic
       if (!_this.connected) {
@@ -566,14 +572,6 @@ var Channel = /*#__PURE__*/function (_Emitter) {
       // Fired upon a reconnection attempt error (from Socket.IO Manager)
       this.socket.io.on('reconnect_error', this.onReconnectError);
     }
-  }, {
-    key: "sendPresenceJoined",
-    value: function sendPresenceJoined() {
-      if (!this.connected || !this.socket) {
-        return;
-      }
-      this.socket.emit('presence:joined');
-    }
   }, {
     key: "disconnect",
     value: function disconnect() {

package/dist/cjs/document/catchup.js

@@ -8,6 +8,7 @@ exports.catchup = void 0;
 exports.rebaseSteps = rebaseSteps;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _const = require("../helpers/const");
 var _utils = require("../helpers/utils");
 var _prosemirrorTransform = require("prosemirror-transform");
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
@@ -42,7 +43,7 @@ function rebaseSteps(steps, mapping) {
 }
 var catchup = /*#__PURE__*/function () {
   var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(opt) {
-    var _yield$opt$fetchCatch, doc, serverStepMaps, serverVersion, metadata, currentPmVersion, unconfirmedSteps, _unconfirmedSteps, stepMaps, mapping, newUnconfirmedSteps;
+    var _yield$opt$fetchCatch, doc, serverStepMaps, serverVersion, metadata, currentPmVersion, unconfirmedSteps, _unconfirmedSteps, stepMaps, mapping, newUnconfirmedSteps, _opt$analyticsHelper;
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -120,6 +121,12 @@ var catchup = /*#__PURE__*/function () {
                 mapping = new _prosemirrorTransform.Mapping(stepMaps);
                 logger("".concat(_unconfirmedSteps.length, " unconfirmed steps before rebased: ").concat(JSON.stringify(_unconfirmedSteps)));
                 newUnconfirmedSteps = rebaseSteps(_unconfirmedSteps, mapping);
+                if ((newUnconfirmedSteps === null || newUnconfirmedSteps === void 0 ? void 0 : newUnconfirmedSteps.length) < _unconfirmedSteps.length) {
+                  // Log the dropped steps after rebase
+                  (_opt$analyticsHelper = opt.analyticsHelper) === null || _opt$analyticsHelper === void 0 ? void 0 : _opt$analyticsHelper.sendActionEvent(_const.EVENT_ACTION.DROPPED_STEPS, _const.EVENT_STATUS.SUCCESS, {
+                    numOfDroppedSteps: _unconfirmedSteps.length - (newUnconfirmedSteps === null || newUnconfirmedSteps === void 0 ? void 0 : newUnconfirmedSteps.length)
+                  });
+                }
                 logger("Re-aply ".concat(newUnconfirmedSteps.length, " mapped unconfirmed steps: ").concat(JSON.stringify(newUnconfirmedSteps)));
                 // Re-apply local steps
                 opt.applyLocalSteps(newUnconfirmedSteps);

package/dist/cjs/document/document-service.js

@@ -85,7 +85,8 @@ var DocumentService = /*#__PURE__*/function () {
               filterQueue: _this.stepQueue.filterQueue,
               applyLocalSteps: _this.applyLocalSteps,
               updateDocument: _this.updateDocument,
-              updateMetadata: _this.metadataService.updateMetadata
+              updateMetadata: _this.metadataService.updateMetadata,
+              analyticsHelper: _this.analyticsHelper
             });
           case 8:
             latency = new Date().getTime() - start;
@@ -352,7 +353,7 @@ var DocumentService = /*#__PURE__*/function () {
             }
             _this.sendStepsFromCurrentState();
             _context4.next = 12;
-            return (0, _utils.sleep)(1000);
+            return (0, _utils.sleep)(500);
           case 12:
             nextUnconfirmedSteps = _this.getUnconfirmedSteps();
             if (nextUnconfirmedSteps !== null && nextUnconfirmedSteps !== void 0 && nextUnconfirmedSteps.length) {

package/dist/cjs/helpers/const.js

@@ -16,6 +16,7 @@ var EVENT_ACTION = /*#__PURE__*/function (EVENT_ACTION) {
   EVENT_ACTION["PUBLISH_PAGE"] = "publishPage";
   EVENT_ACTION["GET_CURRENT_STATE"] = "getCurrentState";
   EVENT_ACTION["INVALIDATE_TOKEN"] = "invalidateToken";
+  EVENT_ACTION["DROPPED_STEPS"] = "droppedStepInCatchup";
   return EVENT_ACTION;
 }({});
 exports.EVENT_ACTION = EVENT_ACTION;
@@ -32,7 +33,7 @@ var ADD_STEPS_TYPE = /*#__PURE__*/function (ADD_STEPS_TYPE) {
   return ADD_STEPS_TYPE;
 }({});
 exports.ADD_STEPS_TYPE = ADD_STEPS_TYPE;
-var ACK_MAX_TRY = 30;
+var ACK_MAX_TRY = 60;
 exports.ACK_MAX_TRY = ACK_MAX_TRY;
 var CONFLUENCE = 'confluence';
 exports.CONFLUENCE = CONFLUENCE;

package/dist/cjs/participants/participants-service.js

@@ -38,6 +38,8 @@ var ParticipantsService = /*#__PURE__*/function () {
     var getUser = arguments.length > 3 ? arguments[3] : undefined;
     var channelBroadcast = arguments.length > 4 ? arguments[4] : undefined;
     var sendPresenceJoined = arguments.length > 5 ? arguments[5] : undefined;
+    var getPresenceData = arguments.length > 6 ? arguments[6] : undefined;
+    var setUserId = arguments.length > 7 ? arguments[7] : undefined;
     (0, _classCallCheck2.default)(this, ParticipantsService);
     /**
      * Carries out 3 things: 1) enriches the participant with user data, 2) updates the participantsState, 3) emits the presence event
@@ -234,12 +236,13 @@ var ParticipantsService = /*#__PURE__*/function () {
     (0, _defineProperty2.default)(this, "clearTimers", function () {
       clearTimeout(_this.participantUpdateTimeout);
     });
-    (0, _defineProperty2.default)(this, "sendPresence", function (payload) {
+    (0, _defineProperty2.default)(this, "sendPresence", function () {
       try {
         clearTimeout(_this.presenceUpdateTimeout);
-        _this.channelBroadcast('participant:updated', payload);
+        var _data = _this.getPresenceData();
+        _this.channelBroadcast('participant:updated', _data);
         _this.presenceUpdateTimeout = window.setTimeout(function () {
-          return _this.sendPresence(payload);
+          return _this.sendPresence();
         }, SEND_PRESENCE_INTERVAL);
       } catch (error) {
         var _this$analyticsHelper7;
@@ -258,7 +261,7 @@ var ParticipantsService = /*#__PURE__*/function () {
       try {
         logger('Participant joined with session: ', payload.sessionId);
         // This expose existing users to the newly joined user
-        _this.sendPresence(payload);
+        _this.sendPresence();
       } catch (error) {
         var _this$analyticsHelper8;
         // We don't want to throw errors for Presence features as they tend to self-restore
@@ -274,7 +277,8 @@ var ParticipantsService = /*#__PURE__*/function () {
     (0, _defineProperty2.default)(this, "onPresence", function (payload) {
       try {
         logger('onPresence userId: ', payload.userId);
-        _this.sendPresence(payload);
+        _this.setUserId(payload.userId);
+        _this.sendPresence();
         _this.sendPresenceJoined();
       } catch (error) {
         var _this$analyticsHelper9;
@@ -288,6 +292,8 @@ var ParticipantsService = /*#__PURE__*/function () {
     this.getUser = getUser;
     this.channelBroadcast = channelBroadcast;
     this.sendPresenceJoined = sendPresenceJoined;
+    this.getPresenceData = getPresenceData;
+    this.setUserId = setUserId;
   }
   (0, _createClass2.default)(ParticipantsService, [{
     key: "emitTelepointersFromSteps",

package/dist/cjs/provider/index.js

@@ -115,6 +115,16 @@ var Provider = /*#__PURE__*/function (_Emitter) {
         return _this.participantsService.onParticipantTelepointer(payload, _this.sessionId);
       }).on('presence:joined', _this.participantsService.onPresenceJoined).on('presence', _this.participantsService.onPresence).on('participant:left', _this.participantsService.onParticipantLeft).on('participant:updated', _this.participantsService.onParticipantUpdated).on('disconnect', _this.onDisconnected.bind((0, _assertThisInitialized2.default)(_this))).on('error', _this.onErrorHandled).on('status', _this.namespaceService.onNamespaceStatusChanged).connect(shouldInitialize);
     });
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "setUserId", function (id) {
+      _this.userId = id;
+    });
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "getPresenceData", function () {
+      return {
+        sessionId: _this.sessionId,
+        userId: _this.userId,
+        clientId: _this.clientId
+      };
+    });
     /**
      * @param {InternalError} error The error to handle
      */
@@ -183,17 +193,20 @@ var Provider = /*#__PURE__*/function (_Emitter) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             _context2.prev = 0;
-            return _context2.abrupt("return", _this.documentService.getFinalAcknowledgedState());
-          case 4:
-            _context2.prev = 4;
+            _context2.next = 3;
+            return _this.documentService.getFinalAcknowledgedState();
+          case 3:
+            return _context2.abrupt("return", _context2.sent);
+          case 6:
+            _context2.prev = 6;
             _context2.t0 = _context2["catch"](0);
             (_this$analyticsHelper4 = _this.analyticsHelper) === null || _this$analyticsHelper4 === void 0 ? void 0 : _this$analyticsHelper4.sendErrorEvent(_context2.t0, 'Error while returning ADF version of the final draft document');
             throw new _errorTypes.GetFinalAcknowledgedStateError('Error while returning the final acknowledged state of the draft document', _context2.t0);
-          case 8:
+          case 10:
           case "end":
             return _context2.stop();
         }
-      }, _callee2, null, [[0, 4]]);
+      }, _callee2, null, [[0, 6]]);
     })));
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "getUnconfirmedSteps", function () {
       return _this.documentService.getUnconfirmedSteps();
@@ -212,7 +225,7 @@ var Provider = /*#__PURE__*/function (_Emitter) {
     _this.initialDraft = _this.config.initialDraft;
     _this.isProviderInitialized = false;
     _this.isPreinitializing = false;
-    _this.participantsService = new _participantsService.ParticipantsService(_this.analyticsHelper, undefined, _this.emitCallback, _this.config.getUser, _this.channel.broadcast, _this.channel.sendPresenceJoined);
+    _this.participantsService = new _participantsService.ParticipantsService(_this.analyticsHelper, undefined, _this.emitCallback, _this.config.getUser, _this.channel.broadcast, _this.channel.sendPresenceJoined, _this.getPresenceData, _this.setUserId);
     _this.metadataService = new _metadataService.MetadataService(_this.emitCallback, _this.channel.sendMetadata);
     _this.documentService = new _documentService.DocumentService(_this.participantsService, _this.analyticsHelper, _this.channel.fetchCatchup, _this.emitCallback, _this.channel.broadcast, function () {
       return _this.userId;
@@ -332,7 +345,7 @@ var Provider = /*#__PURE__*/function (_Emitter) {
     /**
      * Send messages, such as telepointers, to NCS and other participants. Only used for telepointer data (text and node selections) in the editor and JWM. JWM does some weird serialisation stuff on the node selections.
      * Silently fails if an error occurs, since Presence isn't a critical functionality and self-restores over time.
-     * @param {CollabEventTelepointerData} data Data you want to send to NCS / the other participants
+     * @param {CollabTelepointerPayload} data Data you want to send to NCS / the other participants
      * @param {string} data.type Can only be 'telepointer' for now, we don't support anything else yet
      * @param {CollabSendableSelection} data.selection Object representing the selected element
      * @param {string} data.sessionId Identifier identifying the session

package/dist/cjs/types.js

@@ -4,10 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.AcknowledgementResponseTypes = void 0;
+// types from editor common
+// types from editor common end
 // Initial draft
-/**
- * @deprecated Use ProviderError type instead
- */
 // Channel
 /**
  * @description Incoming payload type from the `broadcast` route in NCS

package/dist/cjs/version-wrapper.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.version = exports.nextMajorVersion = exports.name = void 0;
 var name = "@atlaskit/collab-provider";
 exports.name = name;
-var version = "8.9.1";
+var version = "9.0.1";
 exports.version = version;
 var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');

package/dist/cjs/version.json

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

package/dist/es2019/channel.js

@@ -250,6 +250,12 @@ export class Channel extends Emitter {
       }
       this.socket.emit('metadata', metadata);
     });
+    _defineProperty(this, "sendPresenceJoined", () => {
+      if (!this.connected || !this.socket) {
+        return;
+      }
+      this.socket.emit('presence:joined');
+    });
     _defineProperty(this, "onOnlineHandler", () => {
       // Force an immediate reconnect, the socket must first be closed to reset reconnection delay logic
       if (!this.connected) {
@@ -433,12 +439,6 @@ export class Channel extends Emitter {
     // Fired upon a reconnection attempt error (from Socket.IO Manager)
     this.socket.io.on('reconnect_error', this.onReconnectError);
   }
-  sendPresenceJoined() {
-    if (!this.connected || !this.socket) {
-      return;
-    }
-    this.socket.emit('presence:joined');
-  }
   disconnect() {
     var _this$network;
     this.unsubscribeAll();

package/dist/es2019/document/catchup.js

@@ -1,3 +1,4 @@
+import { EVENT_ACTION, EVENT_STATUS } from '../helpers/const';
 import { createLogger } from '../helpers/utils';
 import { StepMap, Mapping } from 'prosemirror-transform';
 const logger = createLogger('Catchup', 'red');
@@ -93,6 +94,13 @@ export const catchup = async opt => {
         const mapping = new Mapping(stepMaps);
         logger(`${unconfirmedSteps.length} unconfirmed steps before rebased: ${JSON.stringify(unconfirmedSteps)}`);
         const newUnconfirmedSteps = rebaseSteps(unconfirmedSteps, mapping);
+        if ((newUnconfirmedSteps === null || newUnconfirmedSteps === void 0 ? void 0 : newUnconfirmedSteps.length) < unconfirmedSteps.length) {
+          var _opt$analyticsHelper;
+          // Log the dropped steps after rebase
+          (_opt$analyticsHelper = opt.analyticsHelper) === null || _opt$analyticsHelper === void 0 ? void 0 : _opt$analyticsHelper.sendActionEvent(EVENT_ACTION.DROPPED_STEPS, EVENT_STATUS.SUCCESS, {
+            numOfDroppedSteps: unconfirmedSteps.length - (newUnconfirmedSteps === null || newUnconfirmedSteps === void 0 ? void 0 : newUnconfirmedSteps.length)
+          });
+        }
         logger(`Re-aply ${newUnconfirmedSteps.length} mapped unconfirmed steps: ${JSON.stringify(newUnconfirmedSteps)}`);
         // Re-apply local steps
         opt.applyLocalSteps(newUnconfirmedSteps);

package/dist/es2019/document/document-service.js

@@ -62,7 +62,8 @@ export class DocumentService {
           filterQueue: this.stepQueue.filterQueue,
           applyLocalSteps: this.applyLocalSteps,
           updateDocument: this.updateDocument,
-          updateMetadata: this.metadataService.updateMetadata
+          updateMetadata: this.metadataService.updateMetadata,
+          analyticsHelper: this.analyticsHelper
         });
         const latency = new Date().getTime() - start;
         (_this$analyticsHelper = this.analyticsHelper) === null || _this$analyticsHelper === void 0 ? void 0 : _this$analyticsHelper.sendActionEvent(EVENT_ACTION.CATCHUP, EVENT_STATUS.SUCCESS, {
@@ -290,7 +291,7 @@ export class DocumentService {
           let isLastTrConfirmed = false;
           while (!isLastTrConfirmed) {
             this.sendStepsFromCurrentState();
-            await sleep(1000);
+            await sleep(500);
             const nextUnconfirmedSteps = this.getUnconfirmedSteps();
             if (nextUnconfirmedSteps !== null && nextUnconfirmedSteps !== void 0 && nextUnconfirmedSteps.length) {
               const nextUnconfirmedTrs = this.getUnconfirmedStepsOrigins();

package/dist/es2019/helpers/const.js

@@ -10,6 +10,7 @@ export let EVENT_ACTION = /*#__PURE__*/function (EVENT_ACTION) {
   EVENT_ACTION["PUBLISH_PAGE"] = "publishPage";
   EVENT_ACTION["GET_CURRENT_STATE"] = "getCurrentState";
   EVENT_ACTION["INVALIDATE_TOKEN"] = "invalidateToken";
+  EVENT_ACTION["DROPPED_STEPS"] = "droppedStepInCatchup";
   return EVENT_ACTION;
 }({});
 export let EVENT_STATUS = /*#__PURE__*/function (EVENT_STATUS) {
@@ -23,5 +24,5 @@ export let ADD_STEPS_TYPE = /*#__PURE__*/function (ADD_STEPS_TYPE) {
   ADD_STEPS_TYPE["ERROR"] = "ERROR";
   return ADD_STEPS_TYPE;
 }({});
-export const ACK_MAX_TRY = 30;
+export const ACK_MAX_TRY = 60;
 export const CONFLUENCE = 'confluence';

package/dist/es2019/participants/participants-service.js

@@ -18,7 +18,7 @@ const SEND_PRESENCE_INTERVAL = 150 * 1000; // 150 seconds
  * @param sendPresenceJoined Callback to Channel class
  */
 export class ParticipantsService {
-  constructor(analyticsHelper, participantsState = new ParticipantsState(), emit, getUser, channelBroadcast, sendPresenceJoined) {
+  constructor(analyticsHelper, participantsState = new ParticipantsState(), emit, getUser, channelBroadcast, sendPresenceJoined, getPresenceData, setUserId) {
     /**
      * Carries out 3 things: 1) enriches the participant with user data, 2) updates the participantsState, 3) emits the presence event
      * @param payload Payload from incoming socket event
@@ -187,11 +187,12 @@ export class ParticipantsService {
     _defineProperty(this, "clearTimers", () => {
       clearTimeout(this.participantUpdateTimeout);
     });
-    _defineProperty(this, "sendPresence", payload => {
+    _defineProperty(this, "sendPresence", () => {
       try {
         clearTimeout(this.presenceUpdateTimeout);
-        this.channelBroadcast('participant:updated', payload);
-        this.presenceUpdateTimeout = window.setTimeout(() => this.sendPresence(payload), SEND_PRESENCE_INTERVAL);
+        const data = this.getPresenceData();
+        this.channelBroadcast('participant:updated', data);
+        this.presenceUpdateTimeout = window.setTimeout(() => this.sendPresence(), SEND_PRESENCE_INTERVAL);
       } catch (error) {
         var _this$analyticsHelper7;
         // We don't want to throw errors for Presence features as they tend to self-restore
@@ -209,7 +210,7 @@ export class ParticipantsService {
       try {
         logger('Participant joined with session: ', payload.sessionId);
         // This expose existing users to the newly joined user
-        this.sendPresence(payload);
+        this.sendPresence();
       } catch (error) {
         var _this$analyticsHelper8;
         // We don't want to throw errors for Presence features as they tend to self-restore
@@ -225,7 +226,8 @@ export class ParticipantsService {
     _defineProperty(this, "onPresence", payload => {
       try {
         logger('onPresence userId: ', payload.userId);
-        this.sendPresence(payload);
+        this.setUserId(payload.userId);
+        this.sendPresence();
         this.sendPresenceJoined();
       } catch (error) {
         var _this$analyticsHelper9;
@@ -239,6 +241,8 @@ export class ParticipantsService {
     this.getUser = getUser;
     this.channelBroadcast = channelBroadcast;
     this.sendPresenceJoined = sendPresenceJoined;
+    this.getPresenceData = getPresenceData;
+    this.setUserId = setUserId;
   }
   /**
    * Called on receiving steps, emits each step's telepointer

package/dist/es2019/provider/index.js

@@ -91,6 +91,16 @@ export class Provider extends Emitter {
         this.isProviderInitialized = true;
       }).on('restore', this.documentService.onRestore).on('steps:added', this.documentService.onStepsAdded).on('metadata:changed', this.metadataService.onMetadataChanged).on('participant:telepointer', payload => this.participantsService.onParticipantTelepointer(payload, this.sessionId)).on('presence:joined', this.participantsService.onPresenceJoined).on('presence', this.participantsService.onPresence).on('participant:left', this.participantsService.onParticipantLeft).on('participant:updated', this.participantsService.onParticipantUpdated).on('disconnect', this.onDisconnected.bind(this)).on('error', this.onErrorHandled).on('status', this.namespaceService.onNamespaceStatusChanged).connect(shouldInitialize);
     });
+    _defineProperty(this, "setUserId", id => {
+      this.userId = id;
+    });
+    _defineProperty(this, "getPresenceData", () => {
+      return {
+        sessionId: this.sessionId,
+        userId: this.userId,
+        clientId: this.clientId
+      };
+    });
     /**
      * @param {InternalError} error The error to handle
      */
@@ -147,7 +157,7 @@ export class Provider extends Emitter {
      */
     _defineProperty(this, "getFinalAcknowledgedState", async () => {
       try {
-        return this.documentService.getFinalAcknowledgedState();
+        return await this.documentService.getFinalAcknowledgedState();
       } catch (error) {
         var _this$analyticsHelper4;
         (_this$analyticsHelper4 = this.analyticsHelper) === null || _this$analyticsHelper4 === void 0 ? void 0 : _this$analyticsHelper4.sendErrorEvent(error, 'Error while returning ADF version of the final draft document');
@@ -171,7 +181,7 @@ export class Provider extends Emitter {
     this.initialDraft = this.config.initialDraft;
     this.isProviderInitialized = false;
     this.isPreinitializing = false;
-    this.participantsService = new ParticipantsService(this.analyticsHelper, undefined, this.emitCallback, this.config.getUser, this.channel.broadcast, this.channel.sendPresenceJoined);
+    this.participantsService = new ParticipantsService(this.analyticsHelper, undefined, this.emitCallback, this.config.getUser, this.channel.broadcast, this.channel.sendPresenceJoined, this.getPresenceData, this.setUserId);
     this.metadataService = new MetadataService(this.emitCallback, this.channel.sendMetadata);
     this.documentService = new DocumentService(this.participantsService, this.analyticsHelper, this.channel.fetchCatchup, this.emitCallback, this.channel.broadcast, () => this.userId, this.onErrorHandled, this.metadataService);
     this.getStatePromise = new Promise(resolve => {
@@ -275,7 +285,7 @@ export class Provider extends Emitter {
   /**
    * Send messages, such as telepointers, to NCS and other participants. Only used for telepointer data (text and node selections) in the editor and JWM. JWM does some weird serialisation stuff on the node selections.
    * Silently fails if an error occurs, since Presence isn't a critical functionality and self-restores over time.
-   * @param {CollabEventTelepointerData} data Data you want to send to NCS / the other participants
+   * @param {CollabTelepointerPayload} data Data you want to send to NCS / the other participants
    * @param {string} data.type Can only be 'telepointer' for now, we don't support anything else yet
    * @param {CollabSendableSelection} data.selection Object representing the selected element
    * @param {string} data.sessionId Identifier identifying the session

package/dist/es2019/types.js

@@ -1,8 +1,8 @@
-// Initial draft
+// types from editor common
 
-/**
- * @deprecated Use ProviderError type instead
- */
+// types from editor common end
+
+// Initial draft
 
 // Channel
 

package/dist/es2019/version-wrapper.js

@@ -1,5 +1,5 @@
 export const name = "@atlaskit/collab-provider";
-export const version = "8.9.1";
+export const version = "9.0.1";
 export const nextMajorVersion = () => {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/es2019/version.json

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

package/dist/esm/channel.js

@@ -343,6 +343,12 @@ export var Channel = /*#__PURE__*/function (_Emitter) {
       }
       _this.socket.emit('metadata', metadata);
     });
+    _defineProperty(_assertThisInitialized(_this), "sendPresenceJoined", function () {
+      if (!_this.connected || !_this.socket) {
+        return;
+      }
+      _this.socket.emit('presence:joined');
+    });
     _defineProperty(_assertThisInitialized(_this), "onOnlineHandler", function () {
       // Force an immediate reconnect, the socket must first be closed to reset reconnection delay logic
       if (!_this.connected) {
@@ -559,14 +565,6 @@ export var Channel = /*#__PURE__*/function (_Emitter) {
       // Fired upon a reconnection attempt error (from Socket.IO Manager)
       this.socket.io.on('reconnect_error', this.onReconnectError);
     }
-  }, {
-    key: "sendPresenceJoined",
-    value: function sendPresenceJoined() {
-      if (!this.connected || !this.socket) {
-        return;
-      }
-      this.socket.emit('presence:joined');
-    }
   }, {
     key: "disconnect",
     value: function disconnect() {

package/dist/esm/document/catchup.js

@@ -3,6 +3,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+import { EVENT_ACTION, EVENT_STATUS } from '../helpers/const';
 import { createLogger } from '../helpers/utils';
 import { StepMap, Mapping } from 'prosemirror-transform';
 var logger = createLogger('Catchup', 'red');
@@ -34,7 +35,7 @@ export function rebaseSteps(steps, mapping) {
 }
 export var catchup = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(opt) {
-    var _yield$opt$fetchCatch, doc, serverStepMaps, serverVersion, metadata, currentPmVersion, unconfirmedSteps, _unconfirmedSteps, stepMaps, mapping, newUnconfirmedSteps;
+    var _yield$opt$fetchCatch, doc, serverStepMaps, serverVersion, metadata, currentPmVersion, unconfirmedSteps, _unconfirmedSteps, stepMaps, mapping, newUnconfirmedSteps, _opt$analyticsHelper;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -112,6 +113,12 @@ export var catchup = /*#__PURE__*/function () {
                 mapping = new Mapping(stepMaps);
                 logger("".concat(_unconfirmedSteps.length, " unconfirmed steps before rebased: ").concat(JSON.stringify(_unconfirmedSteps)));
                 newUnconfirmedSteps = rebaseSteps(_unconfirmedSteps, mapping);
+                if ((newUnconfirmedSteps === null || newUnconfirmedSteps === void 0 ? void 0 : newUnconfirmedSteps.length) < _unconfirmedSteps.length) {
+                  // Log the dropped steps after rebase
+                  (_opt$analyticsHelper = opt.analyticsHelper) === null || _opt$analyticsHelper === void 0 ? void 0 : _opt$analyticsHelper.sendActionEvent(EVENT_ACTION.DROPPED_STEPS, EVENT_STATUS.SUCCESS, {
+                    numOfDroppedSteps: _unconfirmedSteps.length - (newUnconfirmedSteps === null || newUnconfirmedSteps === void 0 ? void 0 : newUnconfirmedSteps.length)
+                  });
+                }
                 logger("Re-aply ".concat(newUnconfirmedSteps.length, " mapped unconfirmed steps: ").concat(JSON.stringify(newUnconfirmedSteps)));
                 // Re-apply local steps
                 opt.applyLocalSteps(newUnconfirmedSteps);

package/dist/esm/document/document-service.js

@@ -78,7 +78,8 @@ export var DocumentService = /*#__PURE__*/function () {
               filterQueue: _this.stepQueue.filterQueue,
               applyLocalSteps: _this.applyLocalSteps,
               updateDocument: _this.updateDocument,
-              updateMetadata: _this.metadataService.updateMetadata
+              updateMetadata: _this.metadataService.updateMetadata,
+              analyticsHelper: _this.analyticsHelper
             });
           case 8:
             latency = new Date().getTime() - start;
@@ -345,7 +346,7 @@ export var DocumentService = /*#__PURE__*/function () {
             }
             _this.sendStepsFromCurrentState();
             _context4.next = 12;
-            return sleep(1000);
+            return sleep(500);
           case 12:
             nextUnconfirmedSteps = _this.getUnconfirmedSteps();
             if (nextUnconfirmedSteps !== null && nextUnconfirmedSteps !== void 0 && nextUnconfirmedSteps.length) {

package/dist/esm/helpers/const.js

@@ -10,6 +10,7 @@ export var EVENT_ACTION = /*#__PURE__*/function (EVENT_ACTION) {
   EVENT_ACTION["PUBLISH_PAGE"] = "publishPage";
   EVENT_ACTION["GET_CURRENT_STATE"] = "getCurrentState";
   EVENT_ACTION["INVALIDATE_TOKEN"] = "invalidateToken";
+  EVENT_ACTION["DROPPED_STEPS"] = "droppedStepInCatchup";
   return EVENT_ACTION;
 }({});
 export var EVENT_STATUS = /*#__PURE__*/function (EVENT_STATUS) {
@@ -23,5 +24,5 @@ export var ADD_STEPS_TYPE = /*#__PURE__*/function (ADD_STEPS_TYPE) {
   ADD_STEPS_TYPE["ERROR"] = "ERROR";
   return ADD_STEPS_TYPE;
 }({});
-export var ACK_MAX_TRY = 30;
+export var ACK_MAX_TRY = 60;
 export var CONFLUENCE = 'confluence';

package/dist/esm/participants/participants-service.js

@@ -31,6 +31,8 @@ export var ParticipantsService = /*#__PURE__*/function () {
     var getUser = arguments.length > 3 ? arguments[3] : undefined;
     var channelBroadcast = arguments.length > 4 ? arguments[4] : undefined;
     var sendPresenceJoined = arguments.length > 5 ? arguments[5] : undefined;
+    var getPresenceData = arguments.length > 6 ? arguments[6] : undefined;
+    var setUserId = arguments.length > 7 ? arguments[7] : undefined;
     _classCallCheck(this, ParticipantsService);
     /**
      * Carries out 3 things: 1) enriches the participant with user data, 2) updates the participantsState, 3) emits the presence event
@@ -227,12 +229,13 @@ export var ParticipantsService = /*#__PURE__*/function () {
     _defineProperty(this, "clearTimers", function () {
       clearTimeout(_this.participantUpdateTimeout);
     });
-    _defineProperty(this, "sendPresence", function (payload) {
+    _defineProperty(this, "sendPresence", function () {
       try {
         clearTimeout(_this.presenceUpdateTimeout);
-        _this.channelBroadcast('participant:updated', payload);
+        var _data = _this.getPresenceData();
+        _this.channelBroadcast('participant:updated', _data);
         _this.presenceUpdateTimeout = window.setTimeout(function () {
-          return _this.sendPresence(payload);
+          return _this.sendPresence();
         }, SEND_PRESENCE_INTERVAL);
       } catch (error) {
         var _this$analyticsHelper7;
@@ -251,7 +254,7 @@ export var ParticipantsService = /*#__PURE__*/function () {
       try {
         logger('Participant joined with session: ', payload.sessionId);
         // This expose existing users to the newly joined user
-        _this.sendPresence(payload);
+        _this.sendPresence();
       } catch (error) {
         var _this$analyticsHelper8;
         // We don't want to throw errors for Presence features as they tend to self-restore
@@ -267,7 +270,8 @@ export var ParticipantsService = /*#__PURE__*/function () {
     _defineProperty(this, "onPresence", function (payload) {
       try {
         logger('onPresence userId: ', payload.userId);
-        _this.sendPresence(payload);
+        _this.setUserId(payload.userId);
+        _this.sendPresence();
         _this.sendPresenceJoined();
       } catch (error) {
         var _this$analyticsHelper9;
@@ -281,6 +285,8 @@ export var ParticipantsService = /*#__PURE__*/function () {
     this.getUser = getUser;
     this.channelBroadcast = channelBroadcast;
     this.sendPresenceJoined = sendPresenceJoined;
+    this.getPresenceData = getPresenceData;
+    this.setUserId = setUserId;
   }
   _createClass(ParticipantsService, [{
     key: "emitTelepointersFromSteps",