@atlaskit/collab-provider 10.10.2 → 10.11.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/collab-provider
 
+## 10.11.0
+
+### Minor Changes
+
+- [#130166](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/130166)
+  [`1d522a3c3f04a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/1d522a3c3f04a) -
+  handle corrupt step validation errors and tag first steps from client
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 10.10.2
 
 ### Patch Changes

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

@@ -66,6 +66,7 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
     (0, _defineProperty2.default)(this, "aggressiveCatchup", false);
     (0, _defineProperty2.default)(this, "catchUpOutofSync", false);
     (0, _defineProperty2.default)(this, "hasRecovered", false);
+    (0, _defineProperty2.default)(this, "numberOfStepCommitsSent", 0);
     /**
      * To prevent calling catchup to often, use lodash throttle to reduce the frequency
      * @param reason - optional reason to attach.
@@ -77,6 +78,14 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
       // TODO: ED-26957 - why shouldn't this be leading?
       trailing: true
     }));
+    /**
+     * Updates the number of commits sent since connect/reconnect
+     * This is used to track the number of commits sent to the server.
+     * currently we are validating the first steps from a user after connect/reconnect - CEPS-710
+     */
+    (0, _defineProperty2.default)(this, "setNumberOfCommitsSent", function (steps) {
+      _this.numberOfStepCommitsSent = steps;
+    });
     /**
      * Called when:
      *   * session established(offline -> online)
@@ -114,7 +123,7 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
                 analyticsHelper: _this.analyticsHelper,
                 clientId: _this.clientId,
                 onStepsAdded: _this.onStepsAdded,
-                catchUpOutofSync: _this.catchUpOutofSync,
+                catchUpOutofSync: reason === _const.CatchupEventReason.CORRUPT_STEP ? true : _this.catchUpOutofSync,
                 reason: reason,
                 onCatchupComplete: function onCatchupComplete(steps) {
                   // We want to capture the number of steps made while offline vs. online
@@ -971,7 +980,9 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
         __livePage: this.options.__livePage,
         hasRecovered: this.hasRecovered,
         collabMode: this.participantsService.getCollabMode(),
-        reason: reason
+        reason: reason,
+        numberOfStepCommitsSent: this.numberOfStepCommitsSent,
+        setNumberOfCommitsSent: this.setNumberOfCommitsSent
       });
     }
   }]);

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

@@ -17,6 +17,7 @@ var NullDocumentService = exports.NullDocumentService = /*#__PURE__*/function ()
       return _this;
     });
     (0, _defineProperty2.default)(this, "onErrorHandled", function () {});
+    (0, _defineProperty2.default)(this, "setNumberOfCommitsSent", function () {});
   }
   return (0, _createClass2.default)(NullDocumentService, [{
     key: "updateDocument",

package/dist/cjs/errors/ncs-errors.js

@@ -24,6 +24,7 @@ var NCS_ERROR_CODE = exports.NCS_ERROR_CODE = /*#__PURE__*/function (NCS_ERROR_C
   NCS_ERROR_CODE["INVALID_CLOUD_ID"] = "INVALID_CLOUD_ID";
   NCS_ERROR_CODE["RATE_LIMIT_ERROR"] = "RATE_LIMIT_ERROR";
   NCS_ERROR_CODE["PROSEMIRROR_SCHEMA_VALIDATION_ERROR"] = "PROSEMIRROR_SCHEMA_VALIDATION_ERROR";
+  NCS_ERROR_CODE["CORRUPT_STEP_FAILED_TO_SAVE"] = "CORRUPT_STEP_FAILED_TO_SAVE";
   return NCS_ERROR_CODE;
 }({}); // TODO: ED-26957 - Import emitted error codes from NCS
 // NCS Errors

package/dist/cjs/helpers/const.js

@@ -51,5 +51,6 @@ var CatchupEventReason = exports.CatchupEventReason = /*#__PURE__*/function (Cat
   CatchupEventReason["STEPS_REJECTED"] = "onStepsRejected";
   CatchupEventReason["PROCESS_STEPS"] = "processSteps";
   CatchupEventReason["RECONNECTED"] = "reconnected";
+  CatchupEventReason["CORRUPT_STEP"] = "corruptStep";
   return CatchupEventReason;
 }({});

package/dist/cjs/provider/commit-step.js

@@ -8,6 +8,7 @@ exports.readyToCommit = exports.lastBroadcastRequestAcked = exports.commitStepQu
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _countBy = _interopRequireDefault(require("lodash/countBy"));
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _featureGateJsClient = _interopRequireDefault(require("@atlaskit/feature-gate-js-client"));
 var _const = require("../helpers/const");
 var _types = require("../types");
 var _ncsErrors = require("../errors/ncs-errors");
@@ -31,7 +32,9 @@ var commitStepQueue = exports.commitStepQueue = function commitStepQueue(_ref) {
     __livePage = _ref.__livePage,
     hasRecovered = _ref.hasRecovered,
     collabMode = _ref.collabMode,
-    reason = _ref.reason;
+    reason = _ref.reason,
+    numberOfStepCommitsSent = _ref.numberOfStepCommitsSent,
+    setNumberOfCommitsSent = _ref.setNumberOfCommitsSent;
   // this timer is for waiting to send the next batch in between acks from the BE
   var commitWaitTimer;
   // if publishing and not waiting for an ACK, then clear the commit timer and proceed, skipping the timer
@@ -101,11 +104,17 @@ var commitStepQueue = exports.commitStepQueue = function commitStepQueue(_ref) {
     version: version
   });
   try {
+    var _FeatureGates$getExpe;
+    var n = (_FeatureGates$getExpe = _featureGateJsClient.default.getExperimentValue('validate-first-n-steps-experiment', 'steps', 0)) !== null && _FeatureGates$getExpe !== void 0 ? _FeatureGates$getExpe : 0;
+    var isExperimentEnabled = n > 0;
+    // skip validation if FG is on and we have already sent n steps, or if FG is off
+    var skipValidation = isExperimentEnabled ? numberOfStepCommitsSent >= n : true;
     broadcast('steps:commit', {
       collabMode: collabMode,
       steps: stepsWithClientAndUserId,
       version: version,
-      userId: userId
+      userId: userId,
+      skipValidation: skipValidation
     }, function (response) {
       exports.lastBroadcastRequestAcked = lastBroadcastRequestAcked = true;
       var latency = new Date().getTime() - start;
@@ -150,6 +159,9 @@ var commitStepQueue = exports.commitStepQueue = function commitStepQueue(_ref) {
         });
       }
     });
+    if (isExperimentEnabled && numberOfStepCommitsSent < n) {
+      setNumberOfCommitsSent(numberOfStepCommitsSent + 1);
+    }
   } catch (error) {
     // if the broadcast failed for any reason, we shouldn't keep the queue locked as the BE has not recieved any message
     exports.readyToCommit = readyToCommit = true;

package/dist/cjs/provider/index.js

@@ -117,6 +117,7 @@ var Provider = exports.Provider = /*#__PURE__*/function (_Emitter) {
           initial: !initialized
         });
         var unconfirmedStepsLength = (_this$documentService = _this.documentService.getUnconfirmedSteps()) === null || _this$documentService === void 0 ? void 0 : _this$documentService.length;
+        _this.documentService.setNumberOfCommitsSent(0);
 
         // if buffering is enabled and the provider is initialized before connection,
         // send any unconfirmed steps
@@ -213,12 +214,14 @@ var Provider = exports.Provider = /*#__PURE__*/function (_Emitter) {
      * @param {InternalError} error The error to handle
      */
     (0, _defineProperty2.default)(_this, "onErrorHandled", function (error) {
-      var _error$data, _error$data2;
+      var _error$data, _error$data2, _error$data3;
       // User tried committing steps but they were rejected because:
       // HEAD_VERSION_UPDATE_FAILED: the collab service's latest stored step tail version didn't correspond to the head version of the first step submitted
       // VERSION_NUMBER_ALREADY_EXISTS: while storing the steps there was a conflict meaning someone else wrote steps into the database more quickly
       if (((_error$data = error.data) === null || _error$data === void 0 ? void 0 : _error$data.code) === _ncsErrors.NCS_ERROR_CODE.HEAD_VERSION_UPDATE_FAILED || ((_error$data2 = error.data) === null || _error$data2 === void 0 ? void 0 : _error$data2.code) === _ncsErrors.NCS_ERROR_CODE.VERSION_NUMBER_ALREADY_EXISTS) {
         _this.documentService.onStepRejectedError();
+      } else if (((_error$data3 = error.data) === null || _error$data3 === void 0 ? void 0 : _error$data3.code) === _ncsErrors.NCS_ERROR_CODE.CORRUPT_STEP_FAILED_TO_SAVE) {
+        _this.documentService.throttledCatchupv2(_const.CatchupEventReason.CORRUPT_STEP);
       } else {
         var _this$analyticsHelper2;
         (_this$analyticsHelper2 = _this.analyticsHelper) === null || _this$analyticsHelper2 === void 0 || _this$analyticsHelper2.sendErrorEvent(error, 'Error handled');

package/dist/cjs/version-wrapper.js

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

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

@@ -48,6 +48,7 @@ export class DocumentService {
     _defineProperty(this, "aggressiveCatchup", false);
     _defineProperty(this, "catchUpOutofSync", false);
     _defineProperty(this, "hasRecovered", false);
+    _defineProperty(this, "numberOfStepCommitsSent", 0);
     /**
      * To prevent calling catchup to often, use lodash throttle to reduce the frequency
      * @param reason - optional reason to attach.
@@ -57,6 +58,14 @@ export class DocumentService {
       // TODO: ED-26957 - why shouldn't this be leading?
       trailing: true
     }));
+    /**
+     * Updates the number of commits sent since connect/reconnect
+     * This is used to track the number of commits sent to the server.
+     * currently we are validating the first steps from a user after connect/reconnect - CEPS-710
+     */
+    _defineProperty(this, "setNumberOfCommitsSent", steps => {
+      this.numberOfStepCommitsSent = steps;
+    });
     /**
      * Called when:
      *   * session established(offline -> online)
@@ -107,7 +116,7 @@ export class DocumentService {
           analyticsHelper: this.analyticsHelper,
           clientId: this.clientId,
           onStepsAdded: this.onStepsAdded,
-          catchUpOutofSync: this.catchUpOutofSync,
+          catchUpOutofSync: reason === CatchupEventReason.CORRUPT_STEP ? true : this.catchUpOutofSync,
           reason,
           onCatchupComplete: steps => {
             // We want to capture the number of steps made while offline vs. online
@@ -845,7 +854,9 @@ export class DocumentService {
       __livePage: this.options.__livePage,
       hasRecovered: this.hasRecovered,
       collabMode: this.participantsService.getCollabMode(),
-      reason
+      reason,
+      numberOfStepCommitsSent: this.numberOfStepCommitsSent,
+      setNumberOfCommitsSent: this.setNumberOfCommitsSent
     });
   }
 }

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

@@ -6,6 +6,7 @@ export class NullDocumentService {
       return this;
     });
     _defineProperty(this, "onErrorHandled", () => {});
+    _defineProperty(this, "setNumberOfCommitsSent", () => {});
   }
   updateDocument() {}
   onRestore() {}

package/dist/es2019/errors/ncs-errors.js

@@ -18,6 +18,7 @@ export let NCS_ERROR_CODE = /*#__PURE__*/function (NCS_ERROR_CODE) {
   NCS_ERROR_CODE["INVALID_CLOUD_ID"] = "INVALID_CLOUD_ID";
   NCS_ERROR_CODE["RATE_LIMIT_ERROR"] = "RATE_LIMIT_ERROR";
   NCS_ERROR_CODE["PROSEMIRROR_SCHEMA_VALIDATION_ERROR"] = "PROSEMIRROR_SCHEMA_VALIDATION_ERROR";
+  NCS_ERROR_CODE["CORRUPT_STEP_FAILED_TO_SAVE"] = "CORRUPT_STEP_FAILED_TO_SAVE";
   return NCS_ERROR_CODE;
 }({});
 

package/dist/es2019/helpers/const.js

@@ -45,5 +45,6 @@ export let CatchupEventReason = /*#__PURE__*/function (CatchupEventReason) {
   CatchupEventReason["STEPS_REJECTED"] = "onStepsRejected";
   CatchupEventReason["PROCESS_STEPS"] = "processSteps";
   CatchupEventReason["RECONNECTED"] = "reconnected";
+  CatchupEventReason["CORRUPT_STEP"] = "corruptStep";
   return CatchupEventReason;
 }({});

package/dist/es2019/provider/commit-step.js

@@ -1,5 +1,6 @@
 import countBy from 'lodash/countBy';
 import { fg } from '@atlaskit/platform-feature-flags';
+import FeatureGates from '@atlaskit/feature-gate-js-client';
 import { ADD_STEPS_TYPE, EVENT_ACTION, EVENT_STATUS } from '../helpers/const';
 import { AcknowledgementResponseTypes } from '../types';
 import { NCS_ERROR_CODE } from '../errors/ncs-errors';
@@ -21,7 +22,9 @@ export const commitStepQueue = ({
   __livePage,
   hasRecovered,
   collabMode,
-  reason
+  reason,
+  numberOfStepCommitsSent,
+  setNumberOfCommitsSent
 }) => {
   // this timer is for waiting to send the next batch in between acks from the BE
   let commitWaitTimer;
@@ -93,11 +96,17 @@ export const commitStepQueue = ({
     version
   });
   try {
+    var _FeatureGates$getExpe;
+    const n = (_FeatureGates$getExpe = FeatureGates.getExperimentValue('validate-first-n-steps-experiment', 'steps', 0)) !== null && _FeatureGates$getExpe !== void 0 ? _FeatureGates$getExpe : 0;
+    const isExperimentEnabled = n > 0;
+    // skip validation if FG is on and we have already sent n steps, or if FG is off
+    const skipValidation = isExperimentEnabled ? numberOfStepCommitsSent >= n : true;
     broadcast('steps:commit', {
       collabMode,
       steps: stepsWithClientAndUserId,
       version,
-      userId
+      userId,
+      skipValidation
     }, response => {
       lastBroadcastRequestAcked = true;
       const latency = new Date().getTime() - start;
@@ -142,6 +151,9 @@ export const commitStepQueue = ({
         });
       }
     });
+    if (isExperimentEnabled && numberOfStepCommitsSent < n) {
+      setNumberOfCommitsSent(numberOfStepCommitsSent + 1);
+    }
   } catch (error) {
     // if the broadcast failed for any reason, we shouldn't keep the queue locked as the BE has not recieved any message
     readyToCommit = true;

package/dist/es2019/provider/index.js

@@ -95,6 +95,7 @@ export class Provider extends Emitter {
           initial: !initialized
         });
         const unconfirmedStepsLength = (_this$documentService = this.documentService.getUnconfirmedSteps()) === null || _this$documentService === void 0 ? void 0 : _this$documentService.length;
+        this.documentService.setNumberOfCommitsSent(0);
 
         // if buffering is enabled and the provider is initialized before connection,
         // send any unconfirmed steps
@@ -175,12 +176,14 @@ export class Provider extends Emitter {
      * @param {InternalError} error The error to handle
      */
     _defineProperty(this, "onErrorHandled", error => {
-      var _error$data, _error$data2;
+      var _error$data, _error$data2, _error$data3;
       // User tried committing steps but they were rejected because:
       // HEAD_VERSION_UPDATE_FAILED: the collab service's latest stored step tail version didn't correspond to the head version of the first step submitted
       // VERSION_NUMBER_ALREADY_EXISTS: while storing the steps there was a conflict meaning someone else wrote steps into the database more quickly
       if (((_error$data = error.data) === null || _error$data === void 0 ? void 0 : _error$data.code) === NCS_ERROR_CODE.HEAD_VERSION_UPDATE_FAILED || ((_error$data2 = error.data) === null || _error$data2 === void 0 ? void 0 : _error$data2.code) === NCS_ERROR_CODE.VERSION_NUMBER_ALREADY_EXISTS) {
         this.documentService.onStepRejectedError();
+      } else if (((_error$data3 = error.data) === null || _error$data3 === void 0 ? void 0 : _error$data3.code) === NCS_ERROR_CODE.CORRUPT_STEP_FAILED_TO_SAVE) {
+        this.documentService.throttledCatchupv2(CatchupEventReason.CORRUPT_STEP);
       } else {
         var _this$analyticsHelper2;
         (_this$analyticsHelper2 = this.analyticsHelper) === null || _this$analyticsHelper2 === void 0 ? void 0 : _this$analyticsHelper2.sendErrorEvent(error, 'Error handled');

package/dist/es2019/version-wrapper.js

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

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

@@ -59,6 +59,7 @@ export var DocumentService = /*#__PURE__*/function () {
     _defineProperty(this, "aggressiveCatchup", false);
     _defineProperty(this, "catchUpOutofSync", false);
     _defineProperty(this, "hasRecovered", false);
+    _defineProperty(this, "numberOfStepCommitsSent", 0);
     /**
      * To prevent calling catchup to often, use lodash throttle to reduce the frequency
      * @param reason - optional reason to attach.
@@ -70,6 +71,14 @@ export var DocumentService = /*#__PURE__*/function () {
       // TODO: ED-26957 - why shouldn't this be leading?
       trailing: true
     }));
+    /**
+     * Updates the number of commits sent since connect/reconnect
+     * This is used to track the number of commits sent to the server.
+     * currently we are validating the first steps from a user after connect/reconnect - CEPS-710
+     */
+    _defineProperty(this, "setNumberOfCommitsSent", function (steps) {
+      _this.numberOfStepCommitsSent = steps;
+    });
     /**
      * Called when:
      *   * session established(offline -> online)
@@ -107,7 +116,7 @@ export var DocumentService = /*#__PURE__*/function () {
                 analyticsHelper: _this.analyticsHelper,
                 clientId: _this.clientId,
                 onStepsAdded: _this.onStepsAdded,
-                catchUpOutofSync: _this.catchUpOutofSync,
+                catchUpOutofSync: reason === CatchupEventReason.CORRUPT_STEP ? true : _this.catchUpOutofSync,
                 reason: reason,
                 onCatchupComplete: function onCatchupComplete(steps) {
                   // We want to capture the number of steps made while offline vs. online
@@ -964,7 +973,9 @@ export var DocumentService = /*#__PURE__*/function () {
         __livePage: this.options.__livePage,
         hasRecovered: this.hasRecovered,
         collabMode: this.participantsService.getCollabMode(),
-        reason: reason
+        reason: reason,
+        numberOfStepCommitsSent: this.numberOfStepCommitsSent,
+        setNumberOfCommitsSent: this.setNumberOfCommitsSent
       });
     }
   }]);

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

@@ -10,6 +10,7 @@ export var NullDocumentService = /*#__PURE__*/function () {
       return _this;
     });
     _defineProperty(this, "onErrorHandled", function () {});
+    _defineProperty(this, "setNumberOfCommitsSent", function () {});
   }
   return _createClass(NullDocumentService, [{
     key: "updateDocument",

package/dist/esm/errors/ncs-errors.js

@@ -18,6 +18,7 @@ export var NCS_ERROR_CODE = /*#__PURE__*/function (NCS_ERROR_CODE) {
   NCS_ERROR_CODE["INVALID_CLOUD_ID"] = "INVALID_CLOUD_ID";
   NCS_ERROR_CODE["RATE_LIMIT_ERROR"] = "RATE_LIMIT_ERROR";
   NCS_ERROR_CODE["PROSEMIRROR_SCHEMA_VALIDATION_ERROR"] = "PROSEMIRROR_SCHEMA_VALIDATION_ERROR";
+  NCS_ERROR_CODE["CORRUPT_STEP_FAILED_TO_SAVE"] = "CORRUPT_STEP_FAILED_TO_SAVE";
   return NCS_ERROR_CODE;
 }({});
 

package/dist/esm/helpers/const.js

@@ -45,5 +45,6 @@ export var CatchupEventReason = /*#__PURE__*/function (CatchupEventReason) {
   CatchupEventReason["STEPS_REJECTED"] = "onStepsRejected";
   CatchupEventReason["PROCESS_STEPS"] = "processSteps";
   CatchupEventReason["RECONNECTED"] = "reconnected";
+  CatchupEventReason["CORRUPT_STEP"] = "corruptStep";
   return CatchupEventReason;
 }({});

package/dist/esm/provider/commit-step.js

@@ -3,6 +3,7 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import countBy from 'lodash/countBy';
 import { fg } from '@atlaskit/platform-feature-flags';
+import FeatureGates from '@atlaskit/feature-gate-js-client';
 import { ADD_STEPS_TYPE, EVENT_ACTION, EVENT_STATUS } from '../helpers/const';
 import { AcknowledgementResponseTypes } from '../types';
 import { NCS_ERROR_CODE } from '../errors/ncs-errors';
@@ -24,7 +25,9 @@ export var commitStepQueue = function commitStepQueue(_ref) {
     __livePage = _ref.__livePage,
     hasRecovered = _ref.hasRecovered,
     collabMode = _ref.collabMode,
-    reason = _ref.reason;
+    reason = _ref.reason,
+    numberOfStepCommitsSent = _ref.numberOfStepCommitsSent,
+    setNumberOfCommitsSent = _ref.setNumberOfCommitsSent;
   // this timer is for waiting to send the next batch in between acks from the BE
   var commitWaitTimer;
   // if publishing and not waiting for an ACK, then clear the commit timer and proceed, skipping the timer
@@ -94,11 +97,17 @@ export var commitStepQueue = function commitStepQueue(_ref) {
     version: version
   });
   try {
+    var _FeatureGates$getExpe;
+    var n = (_FeatureGates$getExpe = FeatureGates.getExperimentValue('validate-first-n-steps-experiment', 'steps', 0)) !== null && _FeatureGates$getExpe !== void 0 ? _FeatureGates$getExpe : 0;
+    var isExperimentEnabled = n > 0;
+    // skip validation if FG is on and we have already sent n steps, or if FG is off
+    var skipValidation = isExperimentEnabled ? numberOfStepCommitsSent >= n : true;
     broadcast('steps:commit', {
       collabMode: collabMode,
       steps: stepsWithClientAndUserId,
       version: version,
-      userId: userId
+      userId: userId,
+      skipValidation: skipValidation
     }, function (response) {
       lastBroadcastRequestAcked = true;
       var latency = new Date().getTime() - start;
@@ -143,6 +152,9 @@ export var commitStepQueue = function commitStepQueue(_ref) {
         });
       }
     });
+    if (isExperimentEnabled && numberOfStepCommitsSent < n) {
+      setNumberOfCommitsSent(numberOfStepCommitsSent + 1);
+    }
   } catch (error) {
     // if the broadcast failed for any reason, we shouldn't keep the queue locked as the BE has not recieved any message
     readyToCommit = true;

package/dist/esm/provider/index.js

@@ -110,6 +110,7 @@ export var Provider = /*#__PURE__*/function (_Emitter) {
           initial: !initialized
         });
         var unconfirmedStepsLength = (_this$documentService = _this.documentService.getUnconfirmedSteps()) === null || _this$documentService === void 0 ? void 0 : _this$documentService.length;
+        _this.documentService.setNumberOfCommitsSent(0);
 
         // if buffering is enabled and the provider is initialized before connection,
         // send any unconfirmed steps
@@ -206,12 +207,14 @@ export var Provider = /*#__PURE__*/function (_Emitter) {
      * @param {InternalError} error The error to handle
      */
     _defineProperty(_this, "onErrorHandled", function (error) {
-      var _error$data, _error$data2;
+      var _error$data, _error$data2, _error$data3;
       // User tried committing steps but they were rejected because:
       // HEAD_VERSION_UPDATE_FAILED: the collab service's latest stored step tail version didn't correspond to the head version of the first step submitted
       // VERSION_NUMBER_ALREADY_EXISTS: while storing the steps there was a conflict meaning someone else wrote steps into the database more quickly
       if (((_error$data = error.data) === null || _error$data === void 0 ? void 0 : _error$data.code) === NCS_ERROR_CODE.HEAD_VERSION_UPDATE_FAILED || ((_error$data2 = error.data) === null || _error$data2 === void 0 ? void 0 : _error$data2.code) === NCS_ERROR_CODE.VERSION_NUMBER_ALREADY_EXISTS) {
         _this.documentService.onStepRejectedError();
+      } else if (((_error$data3 = error.data) === null || _error$data3 === void 0 ? void 0 : _error$data3.code) === NCS_ERROR_CODE.CORRUPT_STEP_FAILED_TO_SAVE) {
+        _this.documentService.throttledCatchupv2(CatchupEventReason.CORRUPT_STEP);
       } else {
         var _this$analyticsHelper2;
         (_this$analyticsHelper2 = _this.analyticsHelper) === null || _this$analyticsHelper2 === void 0 || _this$analyticsHelper2.sendErrorEvent(error, 'Error handled');

package/dist/esm/version-wrapper.js

@@ -1,5 +1,5 @@
 export var name = "@atlaskit/collab-provider";
-export var version = "10.10.2";
+export var version = "10.11.0";
 export var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/types/document/document-service.d.ts

@@ -31,6 +31,7 @@ export declare class DocumentService implements DocumentServiceInterface {
     private aggressiveCatchup;
     private catchUpOutofSync;
     private hasRecovered;
+    private numberOfStepCommitsSent;
     private clientId?;
     onErrorHandled: (error: InternalError) => void;
     /**
@@ -56,6 +57,12 @@ export declare class DocumentService implements DocumentServiceInterface {
      * @param reason - optional reason to attach.
      */
     throttledCatchupv2: import("lodash").DebouncedFunc<(reason?: CatchupEventReason, reconnectionMetadata?: ReconnectionMetadata) => Promise<void>>;
+    /**
+     * Updates the number of commits sent since connect/reconnect
+     * This is used to track the number of commits sent to the server.
+     * currently we are validating the first steps from a user after connect/reconnect - CEPS-710
+     */
+    setNumberOfCommitsSent: (steps: number) => void;
     /**
      * Called when:
      *   * session established(offline -> online)

package/dist/types/document/null-document-service.d.ts

@@ -16,4 +16,5 @@ export declare class NullDocumentService implements DocumentServiceInterface {
     getUnconfirmedSteps(): undefined;
     getCurrentPmVersion(): number;
     onErrorHandled: () => void;
+    setNumberOfCommitsSent: () => void;
 }

package/dist/types/errors/ncs-errors.d.ts

@@ -16,7 +16,8 @@ export declare enum NCS_ERROR_CODE {
     INVALID_DOCUMENT_ARI = "INVALID_DOCUMENT_ARI",
     INVALID_CLOUD_ID = "INVALID_CLOUD_ID",
     RATE_LIMIT_ERROR = "RATE_LIMIT_ERROR",
-    PROSEMIRROR_SCHEMA_VALIDATION_ERROR = "PROSEMIRROR_SCHEMA_VALIDATION_ERROR"
+    PROSEMIRROR_SCHEMA_VALIDATION_ERROR = "PROSEMIRROR_SCHEMA_VALIDATION_ERROR",
+    CORRUPT_STEP_FAILED_TO_SAVE = "CORRUPT_STEP_FAILED_TO_SAVE"
 }
 type HeadVersionUpdateFailedError = {
     message: string;
@@ -163,6 +164,14 @@ type InvalidCloudIdError = {
         status: number;
     };
 };
+type CorruptStepFailedToApplyError = {
+    message: string;
+    data: {
+        code: NCS_ERROR_CODE.CORRUPT_STEP_FAILED_TO_SAVE;
+        meta: string;
+        status: number;
+    };
+};
 /**
  * The client is trying to send too many messages or messages that are too large. This not expected to be a standard
  * operating condition and should only ever indicate a frontend bug.
@@ -180,5 +189,5 @@ export type RateLimitError = {
         status: 500;
     };
 };
-export type NCSErrors = HeadVersionUpdateFailedError | VersionAlreadyPresentInDynamoError | InsufficientEditingPermissionError | ForbiddenUserTokenError | NCSDocumentNotFoundError | FailedToLoadInitDataError | ErrorMappingError | InvalidNamespaceDefinedError | SocketNamespaceNotFoundError | TenantInstanceMaintenanceError | NamespaceLockedError | EmptyBroadcastError | DynamoError | InvalidActivationIdError | InvalidDocumentAriError | InvalidCloudIdError | RateLimitError | ProsemirrorSchemaValidationError;
+export type NCSErrors = HeadVersionUpdateFailedError | VersionAlreadyPresentInDynamoError | InsufficientEditingPermissionError | ForbiddenUserTokenError | NCSDocumentNotFoundError | FailedToLoadInitDataError | ErrorMappingError | InvalidNamespaceDefinedError | SocketNamespaceNotFoundError | TenantInstanceMaintenanceError | NamespaceLockedError | EmptyBroadcastError | DynamoError | InvalidActivationIdError | InvalidDocumentAriError | InvalidCloudIdError | RateLimitError | ProsemirrorSchemaValidationError | CorruptStepFailedToApplyError;
 export {};

package/dist/types/helpers/const.d.ts

@@ -303,6 +303,7 @@ export declare enum CatchupEventReason {
     STEPS_ADDED = "onStepsAdded",
     STEPS_REJECTED = "onStepsRejected",
     PROCESS_STEPS = "processSteps",
-    RECONNECTED = "reconnected"
+    RECONNECTED = "reconnected",
+    CORRUPT_STEP = "corruptStep"
 }
 export {};

package/dist/types/provider/commit-step.d.ts

@@ -7,7 +7,7 @@ import type { GetResolvedEditorStateReason } from '@atlaskit/editor-common/types
 export declare let readyToCommit: boolean;
 export declare let lastBroadcastRequestAcked: boolean;
 export declare const RESET_READYTOCOMMIT_INTERVAL_MS = 5000;
-export declare const commitStepQueue: ({ broadcast, steps, version, userId, clientId, onStepsAdded, onErrorHandled, analyticsHelper, emit, __livePage, hasRecovered, collabMode, reason, }: {
+export declare const commitStepQueue: ({ broadcast, steps, version, userId, clientId, onStepsAdded, onErrorHandled, analyticsHelper, emit, __livePage, hasRecovered, collabMode, reason, numberOfStepCommitsSent, setNumberOfCommitsSent, }: {
     broadcast: <K extends keyof ChannelEvent>(type: K, data: Omit<ChannelEvent[K], 'timestamp'>, callback?: Function) => void;
     steps: readonly ProseMirrorStep[];
     version: number;
@@ -21,4 +21,6 @@ export declare const commitStepQueue: ({ broadcast, steps, version, userId, clie
     hasRecovered: boolean;
     collabMode: string;
     reason?: GetResolvedEditorStateReason | undefined;
+    numberOfStepCommitsSent: number;
+    setNumberOfCommitsSent: (steps: number) => void;
 }) => void;

package/dist/types/types.d.ts

@@ -185,6 +185,7 @@ export type ChannelEvent = {
         userId: string;
         collabMode: string;
         forcePublish?: boolean;
+        skipValidation: boolean;
     };
     'steps:added': StepsPayload;
     'metadata:changed': Metadata;

package/dist/types-ts4.5/document/document-service.d.ts

@@ -31,6 +31,7 @@ export declare class DocumentService implements DocumentServiceInterface {
     private aggressiveCatchup;
     private catchUpOutofSync;
     private hasRecovered;
+    private numberOfStepCommitsSent;
     private clientId?;
     onErrorHandled: (error: InternalError) => void;
     /**
@@ -56,6 +57,12 @@ export declare class DocumentService implements DocumentServiceInterface {
      * @param reason - optional reason to attach.
      */
     throttledCatchupv2: import("lodash").DebouncedFunc<(reason?: CatchupEventReason, reconnectionMetadata?: ReconnectionMetadata) => Promise<void>>;
+    /**
+     * Updates the number of commits sent since connect/reconnect
+     * This is used to track the number of commits sent to the server.
+     * currently we are validating the first steps from a user after connect/reconnect - CEPS-710
+     */
+    setNumberOfCommitsSent: (steps: number) => void;
     /**
      * Called when:
      *   * session established(offline -> online)

package/dist/types-ts4.5/document/null-document-service.d.ts

@@ -16,4 +16,5 @@ export declare class NullDocumentService implements DocumentServiceInterface {
     getUnconfirmedSteps(): undefined;
     getCurrentPmVersion(): number;
     onErrorHandled: () => void;
+    setNumberOfCommitsSent: () => void;
 }

package/dist/types-ts4.5/errors/ncs-errors.d.ts

@@ -16,7 +16,8 @@ export declare enum NCS_ERROR_CODE {
     INVALID_DOCUMENT_ARI = "INVALID_DOCUMENT_ARI",
     INVALID_CLOUD_ID = "INVALID_CLOUD_ID",
     RATE_LIMIT_ERROR = "RATE_LIMIT_ERROR",
-    PROSEMIRROR_SCHEMA_VALIDATION_ERROR = "PROSEMIRROR_SCHEMA_VALIDATION_ERROR"
+    PROSEMIRROR_SCHEMA_VALIDATION_ERROR = "PROSEMIRROR_SCHEMA_VALIDATION_ERROR",
+    CORRUPT_STEP_FAILED_TO_SAVE = "CORRUPT_STEP_FAILED_TO_SAVE"
 }
 type HeadVersionUpdateFailedError = {
     message: string;
@@ -163,6 +164,14 @@ type InvalidCloudIdError = {
         status: number;
     };
 };
+type CorruptStepFailedToApplyError = {
+    message: string;
+    data: {
+        code: NCS_ERROR_CODE.CORRUPT_STEP_FAILED_TO_SAVE;
+        meta: string;
+        status: number;
+    };
+};
 /**
  * The client is trying to send too many messages or messages that are too large. This not expected to be a standard
  * operating condition and should only ever indicate a frontend bug.
@@ -180,5 +189,5 @@ export type RateLimitError = {
         status: 500;
     };
 };
-export type NCSErrors = HeadVersionUpdateFailedError | VersionAlreadyPresentInDynamoError | InsufficientEditingPermissionError | ForbiddenUserTokenError | NCSDocumentNotFoundError | FailedToLoadInitDataError | ErrorMappingError | InvalidNamespaceDefinedError | SocketNamespaceNotFoundError | TenantInstanceMaintenanceError | NamespaceLockedError | EmptyBroadcastError | DynamoError | InvalidActivationIdError | InvalidDocumentAriError | InvalidCloudIdError | RateLimitError | ProsemirrorSchemaValidationError;
+export type NCSErrors = HeadVersionUpdateFailedError | VersionAlreadyPresentInDynamoError | InsufficientEditingPermissionError | ForbiddenUserTokenError | NCSDocumentNotFoundError | FailedToLoadInitDataError | ErrorMappingError | InvalidNamespaceDefinedError | SocketNamespaceNotFoundError | TenantInstanceMaintenanceError | NamespaceLockedError | EmptyBroadcastError | DynamoError | InvalidActivationIdError | InvalidDocumentAriError | InvalidCloudIdError | RateLimitError | ProsemirrorSchemaValidationError | CorruptStepFailedToApplyError;
 export {};

package/dist/types-ts4.5/helpers/const.d.ts

@@ -303,6 +303,7 @@ export declare enum CatchupEventReason {
     STEPS_ADDED = "onStepsAdded",
     STEPS_REJECTED = "onStepsRejected",
     PROCESS_STEPS = "processSteps",
-    RECONNECTED = "reconnected"
+    RECONNECTED = "reconnected",
+    CORRUPT_STEP = "corruptStep"
 }
 export {};

package/dist/types-ts4.5/provider/commit-step.d.ts

@@ -7,7 +7,7 @@ import type { GetResolvedEditorStateReason } from '@atlaskit/editor-common/types
 export declare let readyToCommit: boolean;
 export declare let lastBroadcastRequestAcked: boolean;
 export declare const RESET_READYTOCOMMIT_INTERVAL_MS = 5000;
-export declare const commitStepQueue: ({ broadcast, steps, version, userId, clientId, onStepsAdded, onErrorHandled, analyticsHelper, emit, __livePage, hasRecovered, collabMode, reason, }: {
+export declare const commitStepQueue: ({ broadcast, steps, version, userId, clientId, onStepsAdded, onErrorHandled, analyticsHelper, emit, __livePage, hasRecovered, collabMode, reason, numberOfStepCommitsSent, setNumberOfCommitsSent, }: {
     broadcast: <K extends keyof ChannelEvent>(type: K, data: Omit<ChannelEvent[K], 'timestamp'>, callback?: Function) => void;
     steps: readonly ProseMirrorStep[];
     version: number;
@@ -21,4 +21,6 @@ export declare const commitStepQueue: ({ broadcast, steps, version, userId, clie
     hasRecovered: boolean;
     collabMode: string;
     reason?: GetResolvedEditorStateReason | undefined;
+    numberOfStepCommitsSent: number;
+    setNumberOfCommitsSent: (steps: number) => void;
 }) => void;

package/dist/types-ts4.5/types.d.ts

@@ -185,6 +185,7 @@ export type ChannelEvent = {
         userId: string;
         collabMode: string;
         forcePublish?: boolean;
+        skipValidation: boolean;
     };
     'steps:added': StepsPayload;
     'metadata:changed': Metadata;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/collab-provider",
-	"version": "10.10.2",
+	"version": "10.11.0",
 	"description": "A provider for collaborative editing.",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"