@atlaskit/collab-provider 9.0.0 → 9.1.0

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/collab-provider
 
+## 9.1.0
+
+### Minor Changes
+
+- [`2c0c19cc14b`](https://bitbucket.org/atlassian/atlassian-frontend/commits/2c0c19cc14b) - ESS-3609: add step commit status events for confl save indicator feature
+- [`470c3a7e8c6`](https://bitbucket.org/atlassian/atlassian-frontend/commits/470c3a7e8c6) - ESS-3644: allow max steps retry param to be passed thru collab provider to allow getFinalAcknowledgeState to catch up sooner on publish
+
+## 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

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

@@ -37,16 +37,19 @@ var DocumentService = /*#__PURE__*/function () {
    * @param analyticsHelper - Helper for analytics events
    * @param fetchCatchup - Function to fetch "catchup" data, data required to rebase current steps to the latest version.
    * @param providerEmitCallback - Callback for emitting events to listeners on the provider
-   * @param broadcastMetadata - Callback for broadcasting metadata changes to other clients
    * @param broadcast - Callback for broadcasting events to other clients
    * @param getUserId - Callback to fetch the current user's ID
    * @param onErrorHandled - Callback to handle
+   * @param metadataService
+   * @param failedStepsBeforeCatchupOnPublish - Control MAX_STEP_REJECTED_ERROR during page publishes.
    */
   function DocumentService(participantsService, analyticsHelper, fetchCatchup, providerEmitCallback, broadcast, getUserId, onErrorHandled, metadataService) {
     var _this = this;
+    var failedStepsBeforeCatchupOnPublish = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : _provider.MAX_STEP_REJECTED_ERROR;
     (0, _classCallCheck2.default)(this, DocumentService);
     // Fires analytics to editor when collab editor cannot sync up
     (0, _defineProperty2.default)(this, "stepRejectCounter", 0);
+    (0, _defineProperty2.default)(this, "aggressiveCatchup", false);
     /**
      * To prevent calling catchup to often, use lodash throttle to reduce the frequency
      */
@@ -85,7 +88,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;
@@ -280,34 +284,37 @@ var DocumentService = /*#__PURE__*/function () {
       return _regenerator.default.wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
-            _context3.prev = 0;
+            _this.aggressiveCatchup = true;
+            _context3.prev = 1;
             (0, _performance.startMeasure)(_performance.MEASURE_NAME.PUBLISH_PAGE, _this.analyticsHelper);
-            _context3.next = 4;
+            _context3.next = 5;
             return _this.commitUnconfirmedSteps();
-          case 4:
-            _context3.next = 6;
+          case 5:
+            _context3.next = 7;
             return _this.getCurrentState();
-          case 6:
+          case 7:
             currentState = _context3.sent;
             measure = (0, _performance.stopMeasure)(_performance.MEASURE_NAME.PUBLISH_PAGE, _this.analyticsHelper);
             (_this$analyticsHelper14 = _this.analyticsHelper) === null || _this$analyticsHelper14 === void 0 ? void 0 : _this$analyticsHelper14.sendActionEvent(_const.EVENT_ACTION.PUBLISH_PAGE, _const.EVENT_STATUS.SUCCESS, {
               latency: measure === null || measure === void 0 ? void 0 : measure.duration
             });
+            _this.aggressiveCatchup = false;
             return _context3.abrupt("return", currentState);
-          case 12:
-            _context3.prev = 12;
-            _context3.t0 = _context3["catch"](0);
+          case 14:
+            _context3.prev = 14;
+            _context3.t0 = _context3["catch"](1);
+            _this.aggressiveCatchup = false;
             _measure2 = (0, _performance.stopMeasure)(_performance.MEASURE_NAME.PUBLISH_PAGE, _this.analyticsHelper);
             (_this$analyticsHelper15 = _this.analyticsHelper) === null || _this$analyticsHelper15 === void 0 ? void 0 : _this$analyticsHelper15.sendActionEvent(_const.EVENT_ACTION.PUBLISH_PAGE, _const.EVENT_STATUS.FAILURE, {
               latency: _measure2 === null || _measure2 === void 0 ? void 0 : _measure2.duration
             });
             (_this$analyticsHelper16 = _this.analyticsHelper) === null || _this$analyticsHelper16 === void 0 ? void 0 : _this$analyticsHelper16.sendErrorEvent(_context3.t0, 'Error while returning ADF version of the final draft document');
             throw _context3.t0;
-          case 18:
+          case 21:
           case "end":
             return _context3.stop();
         }
-      }, _callee3, null, [[0, 12]]);
+      }, _callee3, null, [[1, 14]]);
     })));
     (0, _defineProperty2.default)(this, "updateDocument", function (_ref6) {
       var doc = _ref6.doc,
@@ -352,7 +359,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) {
@@ -408,10 +415,17 @@ var DocumentService = /*#__PURE__*/function () {
       }, _callee4, null, [[1, 23]]);
     })));
     (0, _defineProperty2.default)(this, "onStepRejectedError", function () {
+      var _this$analyticsHelper20;
       _this.stepRejectCounter++;
       logger("Steps rejected (tries=".concat(_this.stepRejectCounter, ")"));
-      if (_this.stepRejectCounter >= _provider.MAX_STEP_REJECTED_ERROR) {
+      (_this$analyticsHelper20 = _this.analyticsHelper) === null || _this$analyticsHelper20 === void 0 ? void 0 : _this$analyticsHelper20.sendActionEvent(_const.EVENT_ACTION.SEND_STEPS_RETRY, _const.EVENT_STATUS.INFO, {
+        count: _this.stepRejectCounter
+      });
+      var maxRetries = _this.aggressiveCatchup ? _this.failedStepsBeforeCatchupOnPublish : _provider.MAX_STEP_REJECTED_ERROR;
+      if (_this.stepRejectCounter >= maxRetries) {
+        var _this$analyticsHelper21;
         logger("The steps were rejected too many times (tries=".concat(_this.stepRejectCounter, ", limit=").concat(_provider.MAX_STEP_REJECTED_ERROR, "). Trying to catch-up."));
+        (_this$analyticsHelper21 = _this.analyticsHelper) === null || _this$analyticsHelper21 === void 0 ? void 0 : _this$analyticsHelper21.sendActionEvent(_const.EVENT_ACTION.CATCHUP_AFTER_MAX_SEND_STEPS_RETRY, _const.EVENT_STATUS.INFO);
         _this.throttledCatchup();
       } else {
         // If committing steps failed try again automatically in 1s
@@ -431,6 +445,7 @@ var DocumentService = /*#__PURE__*/function () {
     this.getUserId = getUserId;
     this.onErrorHandled = onErrorHandled;
     this.metadataService = metadataService;
+    this.failedStepsBeforeCatchupOnPublish = failedStepsBeforeCatchupOnPublish;
     this.stepQueue = new _stepQueueState.StepQueueState();
   }
   (0, _createClass2.default)(DocumentService, [{
@@ -482,9 +497,9 @@ var DocumentService = /*#__PURE__*/function () {
             }, 100);
           }
         } catch (error) {
-          var _this$analyticsHelper20;
+          var _this$analyticsHelper22;
           logger("Processing steps failed with error: ".concat(error, ". Triggering catch up call."));
-          (_this$analyticsHelper20 = this.analyticsHelper) === null || _this$analyticsHelper20 === void 0 ? void 0 : _this$analyticsHelper20.sendErrorEvent(error, 'Error while processing steps');
+          (_this$analyticsHelper22 = this.analyticsHelper) === null || _this$analyticsHelper22 === void 0 ? void 0 : _this$analyticsHelper22.sendErrorEvent(error, 'Error while processing steps');
           this.throttledCatchup();
         }
       }
@@ -549,7 +564,8 @@ var DocumentService = /*#__PURE__*/function () {
         version: version,
         onStepsAdded: this.onStepsAdded,
         onErrorHandled: this.onErrorHandled,
-        analyticsHelper: this.analyticsHelper
+        analyticsHelper: this.analyticsHelper,
+        emit: this.providerEmitCallback
       });
     }
   }]);

package/dist/cjs/helpers/const.js

@@ -16,12 +16,16 @@ 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["SEND_STEPS_RETRY"] = "sendStepsRetry";
+  EVENT_ACTION["CATCHUP_AFTER_MAX_SEND_STEPS_RETRY"] = "catchupAfterMaxSendStepsRetry";
+  EVENT_ACTION["DROPPED_STEPS"] = "droppedStepInCatchup";
   return EVENT_ACTION;
 }({});
 exports.EVENT_ACTION = EVENT_ACTION;
 var EVENT_STATUS = /*#__PURE__*/function (EVENT_STATUS) {
   EVENT_STATUS["SUCCESS"] = "SUCCESS";
   EVENT_STATUS["FAILURE"] = "FAILURE";
+  EVENT_STATUS["INFO"] = "INFO";
   return EVENT_STATUS;
 }({});
 exports.EVENT_STATUS = EVENT_STATUS;
@@ -32,7 +36,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/commit-step.js

@@ -23,7 +23,8 @@ var commitStep = function commitStep(_ref) {
     clientId = _ref.clientId,
     onStepsAdded = _ref.onStepsAdded,
     onErrorHandled = _ref.onErrorHandled,
-    analyticsHelper = _ref.analyticsHelper;
+    analyticsHelper = _ref.analyticsHelper,
+    emit = _ref.emit;
   var stepsWithClientAndUserId = steps.map(function (step) {
     return _objectSpread(_objectSpread({}, step.toJSON()), {}, {
       clientId: clientId,
@@ -31,6 +32,10 @@ var commitStep = function commitStep(_ref) {
     });
   });
   var start = new Date().getTime();
+  emit('commit-status', {
+    status: 'attempt',
+    version: version
+  });
   try {
     broadcast('steps:commit', {
       steps: stepsWithClientAndUserId,
@@ -50,6 +55,10 @@ var commitStep = function commitStep(_ref) {
             return stepWithClientAndUserId.stepType;
           })
         });
+        emit('commit-status', {
+          status: 'success',
+          version: response.version
+        });
       } else if (response.type === _types.AcknowledgementResponseTypes.ERROR) {
         onErrorHandled(response.error);
         analyticsHelper === null || analyticsHelper === void 0 ? void 0 : analyticsHelper.sendActionEvent(_const.EVENT_ACTION.ADD_STEPS, _const.EVENT_STATUS.FAILURE, {
@@ -60,14 +69,26 @@ var commitStep = function commitStep(_ref) {
           latency: latency
         });
         analyticsHelper === null || analyticsHelper === void 0 ? void 0 : analyticsHelper.sendErrorEvent(response.error, 'Error while adding steps - Acknowledgement Error');
+        emit('commit-status', {
+          status: 'failure',
+          version: version
+        });
       } else {
         analyticsHelper === null || analyticsHelper === void 0 ? void 0 : analyticsHelper.sendErrorEvent(
         // @ts-expect-error We didn't type the invalid type case
         new Error("Response type: ".concat((response === null || response === void 0 ? void 0 : response.type) || 'No response type')), 'Error while adding steps - Invalid Acknowledgement');
+        emit('commit-status', {
+          status: 'failure',
+          version: version
+        });
       }
     });
   } catch (error) {
     analyticsHelper === null || analyticsHelper === void 0 ? void 0 : analyticsHelper.sendErrorEvent(error, 'Error while adding steps - Broadcast threw exception');
+    emit('commit-status', {
+      status: 'failure',
+      version: version
+    });
   }
 };
 exports.commitStep = commitStep;

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,11 +225,11 @@ 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;
-    }, _this.onErrorHandled, _this.metadataService);
+    }, _this.onErrorHandled, _this.metadataService, _this.config.failedStepLimitBeforeCatchupOnPublish);
     _this.getStatePromise = new Promise(function (resolve) {
       _this.getStatePromiseResolve = resolve;
     });

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 = "9.0.0";
+var version = "9.1.0";
 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": "9.0.0",
+	"version": "9.1.0",
 	"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

@@ -24,14 +24,16 @@ export class DocumentService {
    * @param analyticsHelper - Helper for analytics events
    * @param fetchCatchup - Function to fetch "catchup" data, data required to rebase current steps to the latest version.
    * @param providerEmitCallback - Callback for emitting events to listeners on the provider
-   * @param broadcastMetadata - Callback for broadcasting metadata changes to other clients
    * @param broadcast - Callback for broadcasting events to other clients
    * @param getUserId - Callback to fetch the current user's ID
    * @param onErrorHandled - Callback to handle
+   * @param metadataService
+   * @param failedStepsBeforeCatchupOnPublish - Control MAX_STEP_REJECTED_ERROR during page publishes.
    */
-  constructor(participantsService, analyticsHelper, fetchCatchup, providerEmitCallback, broadcast, getUserId, onErrorHandled, metadataService) {
+  constructor(participantsService, analyticsHelper, fetchCatchup, providerEmitCallback, broadcast, getUserId, onErrorHandled, metadataService, failedStepsBeforeCatchupOnPublish = MAX_STEP_REJECTED_ERROR) {
     // Fires analytics to editor when collab editor cannot sync up
     _defineProperty(this, "stepRejectCounter", 0);
+    _defineProperty(this, "aggressiveCatchup", false);
     /**
      * To prevent calling catchup to often, use lodash throttle to reduce the frequency
      */
@@ -62,7 +64,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, {
@@ -235,6 +238,7 @@ export class DocumentService {
       }
     });
     _defineProperty(this, "getFinalAcknowledgedState", async () => {
+      this.aggressiveCatchup = true;
       try {
         var _this$analyticsHelper14;
         startMeasure(MEASURE_NAME.PUBLISH_PAGE, this.analyticsHelper);
@@ -244,9 +248,11 @@ export class DocumentService {
         (_this$analyticsHelper14 = this.analyticsHelper) === null || _this$analyticsHelper14 === void 0 ? void 0 : _this$analyticsHelper14.sendActionEvent(EVENT_ACTION.PUBLISH_PAGE, EVENT_STATUS.SUCCESS, {
           latency: measure === null || measure === void 0 ? void 0 : measure.duration
         });
+        this.aggressiveCatchup = false;
         return currentState;
       } catch (error) {
         var _this$analyticsHelper15, _this$analyticsHelper16;
+        this.aggressiveCatchup = false;
         const measure = stopMeasure(MEASURE_NAME.PUBLISH_PAGE, this.analyticsHelper);
         (_this$analyticsHelper15 = this.analyticsHelper) === null || _this$analyticsHelper15 === void 0 ? void 0 : _this$analyticsHelper15.sendActionEvent(EVENT_ACTION.PUBLISH_PAGE, EVENT_STATUS.FAILURE, {
           latency: measure === null || measure === void 0 ? void 0 : measure.duration
@@ -290,7 +296,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();
@@ -331,10 +337,17 @@ export class DocumentService {
       }
     });
     _defineProperty(this, "onStepRejectedError", () => {
+      var _this$analyticsHelper20;
       this.stepRejectCounter++;
       logger(`Steps rejected (tries=${this.stepRejectCounter})`);
-      if (this.stepRejectCounter >= MAX_STEP_REJECTED_ERROR) {
+      (_this$analyticsHelper20 = this.analyticsHelper) === null || _this$analyticsHelper20 === void 0 ? void 0 : _this$analyticsHelper20.sendActionEvent(EVENT_ACTION.SEND_STEPS_RETRY, EVENT_STATUS.INFO, {
+        count: this.stepRejectCounter
+      });
+      let maxRetries = this.aggressiveCatchup ? this.failedStepsBeforeCatchupOnPublish : MAX_STEP_REJECTED_ERROR;
+      if (this.stepRejectCounter >= maxRetries) {
+        var _this$analyticsHelper21;
         logger(`The steps were rejected too many times (tries=${this.stepRejectCounter}, limit=${MAX_STEP_REJECTED_ERROR}). Trying to catch-up.`);
+        (_this$analyticsHelper21 = this.analyticsHelper) === null || _this$analyticsHelper21 === void 0 ? void 0 : _this$analyticsHelper21.sendActionEvent(EVENT_ACTION.CATCHUP_AFTER_MAX_SEND_STEPS_RETRY, EVENT_STATUS.INFO);
         this.throttledCatchup();
       } else {
         // If committing steps failed try again automatically in 1s
@@ -352,6 +365,7 @@ export class DocumentService {
     this.getUserId = getUserId;
     this.onErrorHandled = onErrorHandled;
     this.metadataService = metadataService;
+    this.failedStepsBeforeCatchupOnPublish = failedStepsBeforeCatchupOnPublish;
     this.stepQueue = new StepQueueState();
   }
   processQueue() {
@@ -397,9 +411,9 @@ export class DocumentService {
           setTimeout(() => this.sendStepsFromCurrentState(), 100);
         }
       } catch (error) {
-        var _this$analyticsHelper20;
+        var _this$analyticsHelper22;
         logger(`Processing steps failed with error: ${error}. Triggering catch up call.`);
-        (_this$analyticsHelper20 = this.analyticsHelper) === null || _this$analyticsHelper20 === void 0 ? void 0 : _this$analyticsHelper20.sendErrorEvent(error, 'Error while processing steps');
+        (_this$analyticsHelper22 = this.analyticsHelper) === null || _this$analyticsHelper22 === void 0 ? void 0 : _this$analyticsHelper22.sendErrorEvent(error, 'Error while processing steps');
         this.throttledCatchup();
       }
     }
@@ -458,7 +472,8 @@ export class DocumentService {
       version,
       onStepsAdded: this.onStepsAdded,
       onErrorHandled: this.onErrorHandled,
-      analyticsHelper: this.analyticsHelper
+      analyticsHelper: this.analyticsHelper,
+      emit: this.providerEmitCallback
     });
   }
 }

package/dist/es2019/helpers/const.js

@@ -10,11 +10,15 @@ 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["SEND_STEPS_RETRY"] = "sendStepsRetry";
+  EVENT_ACTION["CATCHUP_AFTER_MAX_SEND_STEPS_RETRY"] = "catchupAfterMaxSendStepsRetry";
+  EVENT_ACTION["DROPPED_STEPS"] = "droppedStepInCatchup";
   return EVENT_ACTION;
 }({});
 export let EVENT_STATUS = /*#__PURE__*/function (EVENT_STATUS) {
   EVENT_STATUS["SUCCESS"] = "SUCCESS";
   EVENT_STATUS["FAILURE"] = "FAILURE";
+  EVENT_STATUS["INFO"] = "INFO";
   return EVENT_STATUS;
 }({});
 export let ADD_STEPS_TYPE = /*#__PURE__*/function (ADD_STEPS_TYPE) {
@@ -23,5 +27,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';