@atlaskit/collab-provider 9.22.7 → 9.22.8

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @atlaskit/collab-provider
 
+## 9.22.8
+
+### Patch Changes
+
+- [#71421](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/71421) [`27695a18c13c`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/27695a18c13c) - Update the recovery process to use reconcile instead of applying local steps
+- Updated dependencies
+
 ## 9.22.7
 
 ### Patch Changes

package/dist/cjs/channel.js

@@ -230,7 +230,7 @@ var Channel = exports.Channel = /*#__PURE__*/function (_Emitter) {
             metadata: metadata
           });
         } else {
-          // Page is been just restored, need to fix all the participants as well.
+          // Page has just been restored, need to fix all the participants as well.
           var _doc = data.doc,
             _version = data.version,
             _userId = data.userId,

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

@@ -48,6 +48,7 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
   function DocumentService(participantsService, analyticsHelper, fetchCatchup, fetchReconcile, providerEmitCallback, broadcast, getUserId, onErrorHandled, metadataService) {
     var _this = this;
     var enableErrorOnFailedDocumentApply = arguments.length > 9 && arguments[9] !== undefined ? arguments[9] : false;
+    var reconcileOnRecovery = arguments.length > 10 && arguments[10] !== undefined ? arguments[10] : false;
     (0, _classCallCheck2.default)(this, DocumentService);
     // Fires analytics to editor when collab editor cannot sync up
     (0, _defineProperty2.default)(this, "stepRejectCounter", 0);
@@ -238,81 +239,115 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
       }
     });
     // Triggered when page recovery has emitted an 'init' event on a page client is currently connected to.
-    (0, _defineProperty2.default)(this, "onRestore", function (_ref4) {
-      var doc = _ref4.doc,
-        version = _ref4.version,
-        metadata = _ref4.metadata;
-      // Preserve the unconfirmed steps to prevent data loss.
-      var unconfirmedSteps = _this.getUnconfirmedSteps();
-      try {
-        var _this$analyticsHelper11;
-        // Reset the editor,
-        //  - Replace the document, keep in sync with the server
-        //  - Replace the version number, so editor is in sync with NCS server and can commit new changes.
-        //  - Replace the metadata
-        //  - Reserve the cursor position, in case a cursor jump.
+    (0, _defineProperty2.default)(this, "onRestore", /*#__PURE__*/function () {
+      var _ref5 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(_ref4) {
+        var doc, version, metadata, unconfirmedSteps, currentState, _this$analyticsHelper11, _this$analyticsHelper12, _this$analyticsHelper13;
+        return _regenerator.default.wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
+            case 0:
+              doc = _ref4.doc, version = _ref4.version, metadata = _ref4.metadata;
+              // We preserve these as they will be lost apon this.updateDocument. This is because we are using document recovery.
+              // We can then reconcile the document with the preserved state.
+              unconfirmedSteps = _this.getUnconfirmedSteps();
+              if (!_this.reconcileOnRecovery) {
+                _context3.next = 6;
+                break;
+              }
+              _context3.next = 5;
+              return _this.getCurrentState();
+            case 5:
+              currentState = _context3.sent;
+            case 6:
+              _context3.prev = 6;
+              // Reset the editor,
+              //  - Replace the document, keep in sync with the server
+              //  - Replace the version number, so editor is in sync with NCS server and can commit new changes.
+              //  - Replace the metadata
+              //  - Reserve the cursor position, in case a cursor jump.
 
-        _this.updateDocument({
-          doc: doc,
-          version: version,
-          metadata: metadata,
-          reserveCursor: true
-        });
-        _this.metadataService.updateMetadata(metadata);
+              _this.updateDocument({
+                doc: doc,
+                version: version,
+                metadata: metadata,
+                reserveCursor: true
+              });
+              _this.metadataService.updateMetadata(metadata);
 
-        // Re-apply the unconfirmed steps, not 100% of them can be applied, if document is changed significantly.
-        if (unconfirmedSteps !== null && unconfirmedSteps !== void 0 && unconfirmedSteps.length) {
-          _this.applyLocalSteps(unconfirmedSteps);
-        }
-        (_this$analyticsHelper11 = _this.analyticsHelper) === null || _this$analyticsHelper11 === void 0 || _this$analyticsHelper11.sendActionEvent(_const.EVENT_ACTION.REINITIALISE_DOCUMENT, _const.EVENT_STATUS.SUCCESS, {
-          numUnconfirmedSteps: unconfirmedSteps === null || unconfirmedSteps === void 0 ? void 0 : unconfirmedSteps.length,
-          hasTitle: !!(metadata !== null && metadata !== void 0 && metadata.title)
-        });
-      } catch (restoreError) {
-        var _this$analyticsHelper12, _this$analyticsHelper13;
-        (_this$analyticsHelper12 = _this.analyticsHelper) === null || _this$analyticsHelper12 === void 0 || _this$analyticsHelper12.sendActionEvent(_const.EVENT_ACTION.REINITIALISE_DOCUMENT, _const.EVENT_STATUS.FAILURE, {
-          numUnconfirmedSteps: unconfirmedSteps === null || unconfirmedSteps === void 0 ? void 0 : unconfirmedSteps.length
-        });
-        (_this$analyticsHelper13 = _this.analyticsHelper) === null || _this$analyticsHelper13 === void 0 || _this$analyticsHelper13.sendErrorEvent(restoreError, 'Error while reinitialising document');
-        _this.onErrorHandled({
-          message: 'Caught error while trying to recover the document',
-          data: {
-            status: 500,
-            // Meaningless, remove when we review error structure
-            code: _internalErrors.INTERNAL_ERROR_CODE.DOCUMENT_RESTORE_ERROR
+              // If there are unconfirmed steps, attempt to reconcile our current state with with recovered document
+              if (!(unconfirmedSteps !== null && unconfirmedSteps !== void 0 && unconfirmedSteps.length && _this.reconcileOnRecovery && currentState)) {
+                _context3.next = 14;
+                break;
+              }
+              _context3.next = 12;
+              return _this.fetchReconcile(JSON.stringify(currentState.content));
+            case 12:
+              _context3.next = 15;
+              break;
+            case 14:
+              if (unconfirmedSteps !== null && unconfirmedSteps !== void 0 && unconfirmedSteps.length) {
+                _this.applyLocalSteps(unconfirmedSteps);
+              }
+            case 15:
+              (_this$analyticsHelper11 = _this.analyticsHelper) === null || _this$analyticsHelper11 === void 0 || _this$analyticsHelper11.sendActionEvent(_const.EVENT_ACTION.REINITIALISE_DOCUMENT, _const.EVENT_STATUS.SUCCESS, {
+                numUnconfirmedSteps: unconfirmedSteps === null || unconfirmedSteps === void 0 ? void 0 : unconfirmedSteps.length,
+                hasTitle: !!(metadata !== null && metadata !== void 0 && metadata.title)
+              });
+              _context3.next = 23;
+              break;
+            case 18:
+              _context3.prev = 18;
+              _context3.t0 = _context3["catch"](6);
+              (_this$analyticsHelper12 = _this.analyticsHelper) === null || _this$analyticsHelper12 === void 0 || _this$analyticsHelper12.sendActionEvent(_const.EVENT_ACTION.REINITIALISE_DOCUMENT, _const.EVENT_STATUS.FAILURE, {
+                numUnconfirmedSteps: unconfirmedSteps === null || unconfirmedSteps === void 0 ? void 0 : unconfirmedSteps.length
+              });
+              (_this$analyticsHelper13 = _this.analyticsHelper) === null || _this$analyticsHelper13 === void 0 || _this$analyticsHelper13.sendErrorEvent(_context3.t0, 'Error while reinitialising document');
+              _this.onErrorHandled({
+                message: 'Caught error while trying to recover the document',
+                data: {
+                  status: 500,
+                  // Meaningless, remove when we review error structure
+                  code: _internalErrors.INTERNAL_ERROR_CODE.DOCUMENT_RESTORE_ERROR
+                }
+              });
+            case 23:
+            case "end":
+              return _context3.stop();
           }
-        });
-      }
-    });
-    (0, _defineProperty2.default)(this, "getFinalAcknowledgedState", /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
+        }, _callee3, null, [[6, 18]]);
+      }));
+      return function (_x) {
+        return _ref5.apply(this, arguments);
+      };
+    }());
+    (0, _defineProperty2.default)(this, "getFinalAcknowledgedState", /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
       var _this$analyticsHelper14, finalAcknowledgedState, currentState, reconcileResponse, measure, _this$analyticsHelper15, _this$analyticsHelper16, _measure2;
-      return _regenerator.default.wrap(function _callee3$(_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
+      return _regenerator.default.wrap(function _callee4$(_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
           case 0:
             _this.aggressiveCatchup = true;
-            _context3.prev = 1;
+            _context4.prev = 1;
             (0, _performance.startMeasure)(_performance.MEASURE_NAME.PUBLISH_PAGE, _this.analyticsHelper);
-            _context3.prev = 3;
-            _context3.next = 6;
+            _context4.prev = 3;
+            _context4.next = 6;
             return _this.commitUnconfirmedSteps();
           case 6:
-            _context3.next = 8;
+            _context4.next = 8;
             return _this.getCurrentState();
           case 8:
-            finalAcknowledgedState = _context3.sent;
-            _context3.next = 20;
+            finalAcknowledgedState = _context4.sent;
+            _context4.next = 20;
             break;
           case 11:
-            _context3.prev = 11;
-            _context3.t0 = _context3["catch"](3);
-            _context3.next = 15;
+            _context4.prev = 11;
+            _context4.t0 = _context4["catch"](3);
+            _context4.next = 15;
             return _this.getCurrentState();
           case 15:
-            currentState = _context3.sent;
-            _context3.next = 18;
+            currentState = _context4.sent;
+            _context4.next = 18;
             return _this.fetchReconcile(JSON.stringify(currentState.content));
           case 18:
-            reconcileResponse = _context3.sent;
+            reconcileResponse = _context4.sent;
             finalAcknowledgedState = {
               content: JSON.parse(reconcileResponse.document),
               title: currentState.title,
@@ -324,28 +359,28 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
               latency: measure === null || measure === void 0 ? void 0 : measure.duration
             });
             _this.aggressiveCatchup = false;
-            return _context3.abrupt("return", finalAcknowledgedState);
+            return _context4.abrupt("return", finalAcknowledgedState);
           case 26:
-            _context3.prev = 26;
-            _context3.t1 = _context3["catch"](1);
+            _context4.prev = 26;
+            _context4.t1 = _context4["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 || _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 || _this$analyticsHelper16.sendErrorEvent(_context3.t1, 'Error while returning ADF version of the final draft document');
-            throw _context3.t1;
+            (_this$analyticsHelper16 = _this.analyticsHelper) === null || _this$analyticsHelper16 === void 0 || _this$analyticsHelper16.sendErrorEvent(_context4.t1, 'Error while returning ADF version of the final draft document');
+            throw _context4.t1;
           case 33:
           case "end":
-            return _context3.stop();
+            return _context4.stop();
         }
-      }, _callee3, null, [[1, 26], [3, 11]]);
+      }, _callee4, null, [[1, 26], [3, 11]]);
     })));
-    (0, _defineProperty2.default)(this, "updateDocument", function (_ref6) {
-      var doc = _ref6.doc,
-        version = _ref6.version,
-        metadata = _ref6.metadata,
-        reserveCursor = _ref6.reserveCursor;
+    (0, _defineProperty2.default)(this, "updateDocument", function (_ref7) {
+      var doc = _ref7.doc,
+        version = _ref7.version,
+        metadata = _ref7.metadata,
+        reserveCursor = _ref7.reserveCursor;
       _this.providerEmitCallback('init', _objectSpread({
         doc: doc,
         version: version,
@@ -421,15 +456,15 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
      * Commit the unconfirmed local steps to the back-end service
      * @throws {Error} Couldn't sync the steps after retrying 30 times
      */
-    (0, _defineProperty2.default)(this, "commitUnconfirmedSteps", /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
+    (0, _defineProperty2.default)(this, "commitUnconfirmedSteps", /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5() {
       var unconfirmedSteps, _this$getState6, _this$analyticsHelper21, count, unconfirmedTrs, lastTr, isLastTrConfirmed, _this$analyticsHelper20, nextUnconfirmedSteps, nextUnconfirmedTrs, _this$getUnconfirmedS, state, unconfirmedStepsInfoUGCRemoved, _error2, measure, _this$analyticsHelper22, _this$analyticsHelper23, _measure3;
-      return _regenerator.default.wrap(function _callee4$(_context4) {
-        while (1) switch (_context4.prev = _context4.next) {
+      return _regenerator.default.wrap(function _callee5$(_context5) {
+        while (1) switch (_context5.prev = _context5.next) {
           case 0:
             unconfirmedSteps = _this.getUnconfirmedSteps();
-            _context4.prev = 1;
+            _context5.prev = 1;
             if (!(unconfirmedSteps !== null && unconfirmedSteps !== void 0 && unconfirmedSteps.length)) {
-              _context4.next = 24;
+              _context5.next = 24;
               break;
             }
             (0, _performance.startMeasure)(_performance.MEASURE_NAME.COMMIT_UNCONFIRMED_STEPS, _this.analyticsHelper);
@@ -445,11 +480,11 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
             }
           case 9:
             if (isLastTrConfirmed) {
-              _context4.next = 22;
+              _context5.next = 22;
               break;
             }
             _this.sendStepsFromCurrentState();
-            _context4.next = 13;
+            _context5.next = 13;
             return (0, _utils.sleep)(500);
           case 13:
             nextUnconfirmedSteps = _this.getUnconfirmedSteps();
@@ -462,7 +497,7 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
               isLastTrConfirmed = true;
             }
             if (!(!isLastTrConfirmed && count++ >= _const.ACK_MAX_TRY)) {
-              _context4.next = 20;
+              _context5.next = 20;
               break;
             }
             if (_this.onSyncUpError) {
@@ -483,7 +518,7 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
             });
             throw _error2;
           case 20:
-            _context4.next = 9;
+            _context5.next = 9;
             break;
           case 22:
             measure = (0, _performance.stopMeasure)(_performance.MEASURE_NAME.COMMIT_UNCONFIRMED_STEPS, _this.analyticsHelper);
@@ -493,23 +528,23 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
               numUnconfirmedSteps: unconfirmedSteps === null || unconfirmedSteps === void 0 ? void 0 : unconfirmedSteps.length
             });
           case 24:
-            _context4.next = 32;
+            _context5.next = 32;
             break;
           case 26:
-            _context4.prev = 26;
-            _context4.t0 = _context4["catch"](1);
+            _context5.prev = 26;
+            _context5.t0 = _context5["catch"](1);
             _measure3 = (0, _performance.stopMeasure)(_performance.MEASURE_NAME.COMMIT_UNCONFIRMED_STEPS, _this.analyticsHelper);
             (_this$analyticsHelper22 = _this.analyticsHelper) === null || _this$analyticsHelper22 === void 0 || _this$analyticsHelper22.sendActionEvent(_const.EVENT_ACTION.COMMIT_UNCONFIRMED_STEPS, _const.EVENT_STATUS.FAILURE, {
               latency: _measure3 === null || _measure3 === void 0 ? void 0 : _measure3.duration,
               numUnconfirmedSteps: unconfirmedSteps === null || unconfirmedSteps === void 0 ? void 0 : unconfirmedSteps.length
             });
-            (_this$analyticsHelper23 = _this.analyticsHelper) === null || _this$analyticsHelper23 === void 0 || _this$analyticsHelper23.sendErrorEvent(_context4.t0, 'Error while committing unconfirmed steps');
-            throw _context4.t0;
+            (_this$analyticsHelper23 = _this.analyticsHelper) === null || _this$analyticsHelper23 === void 0 || _this$analyticsHelper23.sendErrorEvent(_context5.t0, 'Error while committing unconfirmed steps');
+            throw _context5.t0;
           case 32:
           case "end":
-            return _context4.stop();
+            return _context5.stop();
         }
-      }, _callee4, null, [[1, 26]]);
+      }, _callee5, null, [[1, 26]]);
     })));
     (0, _defineProperty2.default)(this, "onStepRejectedError", function () {
       var _this$analyticsHelper24;
@@ -544,6 +579,7 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
     this.onErrorHandled = onErrorHandled;
     this.metadataService = metadataService;
     this.enableErrorOnFailedDocumentApply = enableErrorOnFailedDocumentApply;
+    this.reconcileOnRecovery = reconcileOnRecovery;
     this.stepQueue = new _stepQueueState.StepQueueState();
   }
   (0, _createClass2.default)(DocumentService, [{
@@ -575,8 +611,8 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
       logger("Processing data. Version \"".concat(version, "\"."));
       if (steps !== null && steps !== void 0 && steps.length) {
         try {
-          var clientIds = steps.map(function (_ref8) {
-            var clientId = _ref8.clientId;
+          var clientIds = steps.map(function (_ref9) {
+            var clientId = _ref9.clientId;
             return clientId;
           });
           this.providerEmitCallback('data', {
@@ -604,10 +640,10 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
     }
   }, {
     key: "setup",
-    value: function setup(_ref9) {
-      var getState = _ref9.getState,
-        onSyncUpError = _ref9.onSyncUpError,
-        clientId = _ref9.clientId;
+    value: function setup(_ref10) {
+      var getState = _ref10.getState,
+        onSyncUpError = _ref10.onSyncUpError,
+        clientId = _ref10.clientId;
       this.getState = getState;
       this.onSyncUpError = onSyncUpError || noop;
       this.clientId = clientId;

package/dist/cjs/feature-flags/index.js

@@ -9,7 +9,8 @@ exports.getProductSpecificFeatureFlags = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var defaultNCSFeatureFlags = {
   testFF: false,
-  blockViewOnly: false
+  blockViewOnly: false,
+  reconcileOnRecovery: false
 };
 
 /**
@@ -18,7 +19,8 @@ var defaultNCSFeatureFlags = {
 var productKeys = {
   confluence: {
     testFF: 'confluence.frontend.collab.provider.testFF',
-    blockViewOnly: 'confluence.frontend.ncs.block-view-only'
+    blockViewOnly: 'confluence.frontend.ncs.block-view-only',
+    reconcileOnRecovery: 'confluence.frontend.ncs.reconcile-on-recovery'
   }
 };
 var filterFeatureFlagNames = function filterFeatureFlagNames(flags) {

package/dist/cjs/provider/index.js

@@ -265,9 +265,10 @@ var Provider = exports.Provider = /*#__PURE__*/function (_Emitter) {
     _this.isProviderInitialized = false;
     _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);
+    var reconcileOnRecovery = (0, _featureFlags.getCollabProviderFeatureFlag)('reconcileOnRecovery', _this.config.featureFlags);
     _this.documentService = new _documentService.DocumentService(_this.participantsService, _this.analyticsHelper, _this.channel.fetchCatchup, _this.channel.fetchReconcile, _this.emitCallback, _this.channel.broadcast, function () {
       return _this.userId;
-    }, _this.onErrorHandled, _this.metadataService, _this.config.enableErrorOnFailedDocumentApply);
+    }, _this.onErrorHandled, _this.metadataService, _this.config.enableErrorOnFailedDocumentApply, reconcileOnRecovery);
     _this.namespaceService = new _namespaceService.NamespaceService();
     _this.api = new _api.Api(config, _this.documentService, _this.channel);
     _this.sendStepsTimer = setInterval(function () {

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 = "9.22.7";
+var version = exports.version = "9.22.8";
 var nextMajorVersion = exports.nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/es2019/channel.js

@@ -161,7 +161,7 @@ export class Channel extends Emitter {
             metadata
           });
         } else {
-          // Page is been just restored, need to fix all the participants as well.
+          // Page has just been restored, need to fix all the participants as well.
           const {
             doc,
             version,

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

@@ -32,7 +32,7 @@ export class DocumentService {
    * @param metadataService
    * @param enableErrorOnFailedDocumentApply - Enable failed document update exceptions.
    */
-  constructor(participantsService, analyticsHelper, fetchCatchup, fetchReconcile, providerEmitCallback, broadcast, getUserId, onErrorHandled, metadataService, enableErrorOnFailedDocumentApply = false) {
+  constructor(participantsService, analyticsHelper, fetchCatchup, fetchReconcile, providerEmitCallback, broadcast, getUserId, onErrorHandled, metadataService, enableErrorOnFailedDocumentApply = false, reconcileOnRecovery = false) {
     // Fires analytics to editor when collab editor cannot sync up
     _defineProperty(this, "stepRejectCounter", 0);
     _defineProperty(this, "aggressiveCatchup", false);
@@ -196,13 +196,18 @@ export class DocumentService {
       }
     });
     // Triggered when page recovery has emitted an 'init' event on a page client is currently connected to.
-    _defineProperty(this, "onRestore", ({
+    _defineProperty(this, "onRestore", async ({
       doc,
       version,
       metadata
     }) => {
-      // Preserve the unconfirmed steps to prevent data loss.
+      // We preserve these as they will be lost apon this.updateDocument. This is because we are using document recovery.
+      // We can then reconcile the document with the preserved state.
       const unconfirmedSteps = this.getUnconfirmedSteps();
+      let currentState;
+      if (this.reconcileOnRecovery) {
+        currentState = await this.getCurrentState();
+      }
       try {
         var _this$analyticsHelper11;
         // Reset the editor,
@@ -219,8 +224,10 @@ export class DocumentService {
         });
         this.metadataService.updateMetadata(metadata);
 
-        // Re-apply the unconfirmed steps, not 100% of them can be applied, if document is changed significantly.
-        if (unconfirmedSteps !== null && unconfirmedSteps !== void 0 && unconfirmedSteps.length) {
+        // If there are unconfirmed steps, attempt to reconcile our current state with with recovered document
+        if (unconfirmedSteps !== null && unconfirmedSteps !== void 0 && unconfirmedSteps.length && this.reconcileOnRecovery && currentState) {
+          await this.fetchReconcile(JSON.stringify(currentState.content));
+        } else if (unconfirmedSteps !== null && unconfirmedSteps !== void 0 && unconfirmedSteps.length) {
           this.applyLocalSteps(unconfirmedSteps);
         }
         (_this$analyticsHelper11 = this.analyticsHelper) === null || _this$analyticsHelper11 === void 0 ? void 0 : _this$analyticsHelper11.sendActionEvent(EVENT_ACTION.REINITIALISE_DOCUMENT, EVENT_STATUS.SUCCESS, {
@@ -455,6 +462,7 @@ export class DocumentService {
     this.onErrorHandled = onErrorHandled;
     this.metadataService = metadataService;
     this.enableErrorOnFailedDocumentApply = enableErrorOnFailedDocumentApply;
+    this.reconcileOnRecovery = reconcileOnRecovery;
     this.stepQueue = new StepQueueState();
   }
   processQueue() {

package/dist/es2019/feature-flags/index.js

@@ -1,6 +1,7 @@
 const defaultNCSFeatureFlags = {
   testFF: false,
-  blockViewOnly: false
+  blockViewOnly: false,
+  reconcileOnRecovery: false
 };
 
 /**
@@ -9,7 +10,8 @@ const defaultNCSFeatureFlags = {
 const productKeys = {
   confluence: {
     testFF: 'confluence.frontend.collab.provider.testFF',
-    blockViewOnly: 'confluence.frontend.ncs.block-view-only'
+    blockViewOnly: 'confluence.frontend.ncs.block-view-only',
+    reconcileOnRecovery: 'confluence.frontend.ncs.reconcile-on-recovery'
   }
 };
 const filterFeatureFlagNames = flags => {

package/dist/es2019/provider/index.js

@@ -220,7 +220,8 @@ export class Provider extends Emitter {
     this.isProviderInitialized = false;
     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.channel.fetchReconcile, this.emitCallback, this.channel.broadcast, () => this.userId, this.onErrorHandled, this.metadataService, this.config.enableErrorOnFailedDocumentApply);
+    const reconcileOnRecovery = getCollabProviderFeatureFlag('reconcileOnRecovery', this.config.featureFlags);
+    this.documentService = new DocumentService(this.participantsService, this.analyticsHelper, this.channel.fetchCatchup, this.channel.fetchReconcile, this.emitCallback, this.channel.broadcast, () => this.userId, this.onErrorHandled, this.metadataService, this.config.enableErrorOnFailedDocumentApply, reconcileOnRecovery);
     this.namespaceService = new NamespaceService();
     this.api = new Api(config, this.documentService, this.channel);
     this.sendStepsTimer = setInterval(() => {

package/dist/es2019/version-wrapper.js

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

package/dist/esm/channel.js

@@ -223,7 +223,7 @@ export var Channel = /*#__PURE__*/function (_Emitter) {
             metadata: metadata
           });
         } else {
-          // Page is been just restored, need to fix all the participants as well.
+          // Page has just been restored, need to fix all the participants as well.
           var _doc = data.doc,
             _version = data.version,
             _userId = data.userId,

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

@@ -41,6 +41,7 @@ export var DocumentService = /*#__PURE__*/function () {
   function DocumentService(participantsService, analyticsHelper, fetchCatchup, fetchReconcile, providerEmitCallback, broadcast, getUserId, onErrorHandled, metadataService) {
     var _this = this;
     var enableErrorOnFailedDocumentApply = arguments.length > 9 && arguments[9] !== undefined ? arguments[9] : false;
+    var reconcileOnRecovery = arguments.length > 10 && arguments[10] !== undefined ? arguments[10] : false;
     _classCallCheck(this, DocumentService);
     // Fires analytics to editor when collab editor cannot sync up
     _defineProperty(this, "stepRejectCounter", 0);
@@ -231,81 +232,115 @@ export var DocumentService = /*#__PURE__*/function () {
       }
     });
     // Triggered when page recovery has emitted an 'init' event on a page client is currently connected to.
-    _defineProperty(this, "onRestore", function (_ref4) {
-      var doc = _ref4.doc,
-        version = _ref4.version,
-        metadata = _ref4.metadata;
-      // Preserve the unconfirmed steps to prevent data loss.
-      var unconfirmedSteps = _this.getUnconfirmedSteps();
-      try {
-        var _this$analyticsHelper11;
-        // Reset the editor,
-        //  - Replace the document, keep in sync with the server
-        //  - Replace the version number, so editor is in sync with NCS server and can commit new changes.
-        //  - Replace the metadata
-        //  - Reserve the cursor position, in case a cursor jump.
+    _defineProperty(this, "onRestore", /*#__PURE__*/function () {
+      var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(_ref4) {
+        var doc, version, metadata, unconfirmedSteps, currentState, _this$analyticsHelper11, _this$analyticsHelper12, _this$analyticsHelper13;
+        return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
+            case 0:
+              doc = _ref4.doc, version = _ref4.version, metadata = _ref4.metadata;
+              // We preserve these as they will be lost apon this.updateDocument. This is because we are using document recovery.
+              // We can then reconcile the document with the preserved state.
+              unconfirmedSteps = _this.getUnconfirmedSteps();
+              if (!_this.reconcileOnRecovery) {
+                _context3.next = 6;
+                break;
+              }
+              _context3.next = 5;
+              return _this.getCurrentState();
+            case 5:
+              currentState = _context3.sent;
+            case 6:
+              _context3.prev = 6;
+              // Reset the editor,
+              //  - Replace the document, keep in sync with the server
+              //  - Replace the version number, so editor is in sync with NCS server and can commit new changes.
+              //  - Replace the metadata
+              //  - Reserve the cursor position, in case a cursor jump.
 
-        _this.updateDocument({
-          doc: doc,
-          version: version,
-          metadata: metadata,
-          reserveCursor: true
-        });
-        _this.metadataService.updateMetadata(metadata);
+              _this.updateDocument({
+                doc: doc,
+                version: version,
+                metadata: metadata,
+                reserveCursor: true
+              });
+              _this.metadataService.updateMetadata(metadata);
 
-        // Re-apply the unconfirmed steps, not 100% of them can be applied, if document is changed significantly.
-        if (unconfirmedSteps !== null && unconfirmedSteps !== void 0 && unconfirmedSteps.length) {
-          _this.applyLocalSteps(unconfirmedSteps);
-        }
-        (_this$analyticsHelper11 = _this.analyticsHelper) === null || _this$analyticsHelper11 === void 0 || _this$analyticsHelper11.sendActionEvent(EVENT_ACTION.REINITIALISE_DOCUMENT, EVENT_STATUS.SUCCESS, {
-          numUnconfirmedSteps: unconfirmedSteps === null || unconfirmedSteps === void 0 ? void 0 : unconfirmedSteps.length,
-          hasTitle: !!(metadata !== null && metadata !== void 0 && metadata.title)
-        });
-      } catch (restoreError) {
-        var _this$analyticsHelper12, _this$analyticsHelper13;
-        (_this$analyticsHelper12 = _this.analyticsHelper) === null || _this$analyticsHelper12 === void 0 || _this$analyticsHelper12.sendActionEvent(EVENT_ACTION.REINITIALISE_DOCUMENT, EVENT_STATUS.FAILURE, {
-          numUnconfirmedSteps: unconfirmedSteps === null || unconfirmedSteps === void 0 ? void 0 : unconfirmedSteps.length
-        });
-        (_this$analyticsHelper13 = _this.analyticsHelper) === null || _this$analyticsHelper13 === void 0 || _this$analyticsHelper13.sendErrorEvent(restoreError, 'Error while reinitialising document');
-        _this.onErrorHandled({
-          message: 'Caught error while trying to recover the document',
-          data: {
-            status: 500,
-            // Meaningless, remove when we review error structure
-            code: INTERNAL_ERROR_CODE.DOCUMENT_RESTORE_ERROR
+              // If there are unconfirmed steps, attempt to reconcile our current state with with recovered document
+              if (!(unconfirmedSteps !== null && unconfirmedSteps !== void 0 && unconfirmedSteps.length && _this.reconcileOnRecovery && currentState)) {
+                _context3.next = 14;
+                break;
+              }
+              _context3.next = 12;
+              return _this.fetchReconcile(JSON.stringify(currentState.content));
+            case 12:
+              _context3.next = 15;
+              break;
+            case 14:
+              if (unconfirmedSteps !== null && unconfirmedSteps !== void 0 && unconfirmedSteps.length) {
+                _this.applyLocalSteps(unconfirmedSteps);
+              }
+            case 15:
+              (_this$analyticsHelper11 = _this.analyticsHelper) === null || _this$analyticsHelper11 === void 0 || _this$analyticsHelper11.sendActionEvent(EVENT_ACTION.REINITIALISE_DOCUMENT, EVENT_STATUS.SUCCESS, {
+                numUnconfirmedSteps: unconfirmedSteps === null || unconfirmedSteps === void 0 ? void 0 : unconfirmedSteps.length,
+                hasTitle: !!(metadata !== null && metadata !== void 0 && metadata.title)
+              });
+              _context3.next = 23;
+              break;
+            case 18:
+              _context3.prev = 18;
+              _context3.t0 = _context3["catch"](6);
+              (_this$analyticsHelper12 = _this.analyticsHelper) === null || _this$analyticsHelper12 === void 0 || _this$analyticsHelper12.sendActionEvent(EVENT_ACTION.REINITIALISE_DOCUMENT, EVENT_STATUS.FAILURE, {
+                numUnconfirmedSteps: unconfirmedSteps === null || unconfirmedSteps === void 0 ? void 0 : unconfirmedSteps.length
+              });
+              (_this$analyticsHelper13 = _this.analyticsHelper) === null || _this$analyticsHelper13 === void 0 || _this$analyticsHelper13.sendErrorEvent(_context3.t0, 'Error while reinitialising document');
+              _this.onErrorHandled({
+                message: 'Caught error while trying to recover the document',
+                data: {
+                  status: 500,
+                  // Meaningless, remove when we review error structure
+                  code: INTERNAL_ERROR_CODE.DOCUMENT_RESTORE_ERROR
+                }
+              });
+            case 23:
+            case "end":
+              return _context3.stop();
           }
-        });
-      }
-    });
-    _defineProperty(this, "getFinalAcknowledgedState", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
+        }, _callee3, null, [[6, 18]]);
+      }));
+      return function (_x) {
+        return _ref5.apply(this, arguments);
+      };
+    }());
+    _defineProperty(this, "getFinalAcknowledgedState", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
       var _this$analyticsHelper14, finalAcknowledgedState, currentState, reconcileResponse, measure, _this$analyticsHelper15, _this$analyticsHelper16, _measure2;
-      return _regeneratorRuntime.wrap(function _callee3$(_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
+      return _regeneratorRuntime.wrap(function _callee4$(_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
           case 0:
             _this.aggressiveCatchup = true;
-            _context3.prev = 1;
+            _context4.prev = 1;
             startMeasure(MEASURE_NAME.PUBLISH_PAGE, _this.analyticsHelper);
-            _context3.prev = 3;
-            _context3.next = 6;
+            _context4.prev = 3;
+            _context4.next = 6;
             return _this.commitUnconfirmedSteps();
           case 6:
-            _context3.next = 8;
+            _context4.next = 8;
             return _this.getCurrentState();
           case 8:
-            finalAcknowledgedState = _context3.sent;
-            _context3.next = 20;
+            finalAcknowledgedState = _context4.sent;
+            _context4.next = 20;
             break;
           case 11:
-            _context3.prev = 11;
-            _context3.t0 = _context3["catch"](3);
-            _context3.next = 15;
+            _context4.prev = 11;
+            _context4.t0 = _context4["catch"](3);
+            _context4.next = 15;
             return _this.getCurrentState();
           case 15:
-            currentState = _context3.sent;
-            _context3.next = 18;
+            currentState = _context4.sent;
+            _context4.next = 18;
             return _this.fetchReconcile(JSON.stringify(currentState.content));
           case 18:
-            reconcileResponse = _context3.sent;
+            reconcileResponse = _context4.sent;
             finalAcknowledgedState = {
               content: JSON.parse(reconcileResponse.document),
               title: currentState.title,
@@ -317,28 +352,28 @@ export var DocumentService = /*#__PURE__*/function () {
               latency: measure === null || measure === void 0 ? void 0 : measure.duration
             });
             _this.aggressiveCatchup = false;
-            return _context3.abrupt("return", finalAcknowledgedState);
+            return _context4.abrupt("return", finalAcknowledgedState);
           case 26:
-            _context3.prev = 26;
-            _context3.t1 = _context3["catch"](1);
+            _context4.prev = 26;
+            _context4.t1 = _context4["catch"](1);
             _this.aggressiveCatchup = false;
             _measure2 = stopMeasure(MEASURE_NAME.PUBLISH_PAGE, _this.analyticsHelper);
             (_this$analyticsHelper15 = _this.analyticsHelper) === null || _this$analyticsHelper15 === void 0 || _this$analyticsHelper15.sendActionEvent(EVENT_ACTION.PUBLISH_PAGE, EVENT_STATUS.FAILURE, {
               latency: _measure2 === null || _measure2 === void 0 ? void 0 : _measure2.duration
             });
-            (_this$analyticsHelper16 = _this.analyticsHelper) === null || _this$analyticsHelper16 === void 0 || _this$analyticsHelper16.sendErrorEvent(_context3.t1, 'Error while returning ADF version of the final draft document');
-            throw _context3.t1;
+            (_this$analyticsHelper16 = _this.analyticsHelper) === null || _this$analyticsHelper16 === void 0 || _this$analyticsHelper16.sendErrorEvent(_context4.t1, 'Error while returning ADF version of the final draft document');
+            throw _context4.t1;
           case 33:
           case "end":
-            return _context3.stop();
+            return _context4.stop();
         }
-      }, _callee3, null, [[1, 26], [3, 11]]);
+      }, _callee4, null, [[1, 26], [3, 11]]);
     })));
-    _defineProperty(this, "updateDocument", function (_ref6) {
-      var doc = _ref6.doc,
-        version = _ref6.version,
-        metadata = _ref6.metadata,
-        reserveCursor = _ref6.reserveCursor;
+    _defineProperty(this, "updateDocument", function (_ref7) {
+      var doc = _ref7.doc,
+        version = _ref7.version,
+        metadata = _ref7.metadata,
+        reserveCursor = _ref7.reserveCursor;
       _this.providerEmitCallback('init', _objectSpread({
         doc: doc,
         version: version,
@@ -414,15 +449,15 @@ export var DocumentService = /*#__PURE__*/function () {
      * Commit the unconfirmed local steps to the back-end service
      * @throws {Error} Couldn't sync the steps after retrying 30 times
      */
-    _defineProperty(this, "commitUnconfirmedSteps", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
+    _defineProperty(this, "commitUnconfirmedSteps", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
       var unconfirmedSteps, _this$getState6, _this$analyticsHelper21, count, unconfirmedTrs, lastTr, isLastTrConfirmed, _this$analyticsHelper20, nextUnconfirmedSteps, nextUnconfirmedTrs, _this$getUnconfirmedS, state, unconfirmedStepsInfoUGCRemoved, _error2, measure, _this$analyticsHelper22, _this$analyticsHelper23, _measure3;
-      return _regeneratorRuntime.wrap(function _callee4$(_context4) {
-        while (1) switch (_context4.prev = _context4.next) {
+      return _regeneratorRuntime.wrap(function _callee5$(_context5) {
+        while (1) switch (_context5.prev = _context5.next) {
           case 0:
             unconfirmedSteps = _this.getUnconfirmedSteps();
-            _context4.prev = 1;
+            _context5.prev = 1;
             if (!(unconfirmedSteps !== null && unconfirmedSteps !== void 0 && unconfirmedSteps.length)) {
-              _context4.next = 24;
+              _context5.next = 24;
               break;
             }
             startMeasure(MEASURE_NAME.COMMIT_UNCONFIRMED_STEPS, _this.analyticsHelper);
@@ -438,11 +473,11 @@ export var DocumentService = /*#__PURE__*/function () {
             }
           case 9:
             if (isLastTrConfirmed) {
-              _context4.next = 22;
+              _context5.next = 22;
               break;
             }
             _this.sendStepsFromCurrentState();
-            _context4.next = 13;
+            _context5.next = 13;
             return sleep(500);
           case 13:
             nextUnconfirmedSteps = _this.getUnconfirmedSteps();
@@ -455,7 +490,7 @@ export var DocumentService = /*#__PURE__*/function () {
               isLastTrConfirmed = true;
             }
             if (!(!isLastTrConfirmed && count++ >= ACK_MAX_TRY)) {
-              _context4.next = 20;
+              _context5.next = 20;
               break;
             }
             if (_this.onSyncUpError) {
@@ -476,7 +511,7 @@ export var DocumentService = /*#__PURE__*/function () {
             });
             throw _error2;
           case 20:
-            _context4.next = 9;
+            _context5.next = 9;
             break;
           case 22:
             measure = stopMeasure(MEASURE_NAME.COMMIT_UNCONFIRMED_STEPS, _this.analyticsHelper);
@@ -486,23 +521,23 @@ export var DocumentService = /*#__PURE__*/function () {
               numUnconfirmedSteps: unconfirmedSteps === null || unconfirmedSteps === void 0 ? void 0 : unconfirmedSteps.length
             });
           case 24:
-            _context4.next = 32;
+            _context5.next = 32;
             break;
           case 26:
-            _context4.prev = 26;
-            _context4.t0 = _context4["catch"](1);
+            _context5.prev = 26;
+            _context5.t0 = _context5["catch"](1);
             _measure3 = stopMeasure(MEASURE_NAME.COMMIT_UNCONFIRMED_STEPS, _this.analyticsHelper);
             (_this$analyticsHelper22 = _this.analyticsHelper) === null || _this$analyticsHelper22 === void 0 || _this$analyticsHelper22.sendActionEvent(EVENT_ACTION.COMMIT_UNCONFIRMED_STEPS, EVENT_STATUS.FAILURE, {
               latency: _measure3 === null || _measure3 === void 0 ? void 0 : _measure3.duration,
               numUnconfirmedSteps: unconfirmedSteps === null || unconfirmedSteps === void 0 ? void 0 : unconfirmedSteps.length
             });
-            (_this$analyticsHelper23 = _this.analyticsHelper) === null || _this$analyticsHelper23 === void 0 || _this$analyticsHelper23.sendErrorEvent(_context4.t0, 'Error while committing unconfirmed steps');
-            throw _context4.t0;
+            (_this$analyticsHelper23 = _this.analyticsHelper) === null || _this$analyticsHelper23 === void 0 || _this$analyticsHelper23.sendErrorEvent(_context5.t0, 'Error while committing unconfirmed steps');
+            throw _context5.t0;
           case 32:
           case "end":
-            return _context4.stop();
+            return _context5.stop();
         }
-      }, _callee4, null, [[1, 26]]);
+      }, _callee5, null, [[1, 26]]);
     })));
     _defineProperty(this, "onStepRejectedError", function () {
       var _this$analyticsHelper24;
@@ -537,6 +572,7 @@ export var DocumentService = /*#__PURE__*/function () {
     this.onErrorHandled = onErrorHandled;
     this.metadataService = metadataService;
     this.enableErrorOnFailedDocumentApply = enableErrorOnFailedDocumentApply;
+    this.reconcileOnRecovery = reconcileOnRecovery;
     this.stepQueue = new StepQueueState();
   }
   _createClass(DocumentService, [{
@@ -568,8 +604,8 @@ export var DocumentService = /*#__PURE__*/function () {
       logger("Processing data. Version \"".concat(version, "\"."));
       if (steps !== null && steps !== void 0 && steps.length) {
         try {
-          var clientIds = steps.map(function (_ref8) {
-            var clientId = _ref8.clientId;
+          var clientIds = steps.map(function (_ref9) {
+            var clientId = _ref9.clientId;
             return clientId;
           });
           this.providerEmitCallback('data', {
@@ -597,10 +633,10 @@ export var DocumentService = /*#__PURE__*/function () {
     }
   }, {
     key: "setup",
-    value: function setup(_ref9) {
-      var getState = _ref9.getState,
-        onSyncUpError = _ref9.onSyncUpError,
-        clientId = _ref9.clientId;
+    value: function setup(_ref10) {
+      var getState = _ref10.getState,
+        onSyncUpError = _ref10.onSyncUpError,
+        clientId = _ref10.clientId;
       this.getState = getState;
       this.onSyncUpError = onSyncUpError || noop;
       this.clientId = clientId;

package/dist/esm/feature-flags/index.js

@@ -1,7 +1,8 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 var defaultNCSFeatureFlags = {
   testFF: false,
-  blockViewOnly: false
+  blockViewOnly: false,
+  reconcileOnRecovery: false
 };
 
 /**
@@ -10,7 +11,8 @@ var defaultNCSFeatureFlags = {
 var productKeys = {
   confluence: {
     testFF: 'confluence.frontend.collab.provider.testFF',
-    blockViewOnly: 'confluence.frontend.ncs.block-view-only'
+    blockViewOnly: 'confluence.frontend.ncs.block-view-only',
+    reconcileOnRecovery: 'confluence.frontend.ncs.reconcile-on-recovery'
   }
 };
 var filterFeatureFlagNames = function filterFeatureFlagNames(flags) {

package/dist/esm/provider/index.js

@@ -258,9 +258,10 @@ export var Provider = /*#__PURE__*/function (_Emitter) {
     _this.isProviderInitialized = false;
     _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);
+    var reconcileOnRecovery = getCollabProviderFeatureFlag('reconcileOnRecovery', _this.config.featureFlags);
     _this.documentService = new DocumentService(_this.participantsService, _this.analyticsHelper, _this.channel.fetchCatchup, _this.channel.fetchReconcile, _this.emitCallback, _this.channel.broadcast, function () {
       return _this.userId;
-    }, _this.onErrorHandled, _this.metadataService, _this.config.enableErrorOnFailedDocumentApply);
+    }, _this.onErrorHandled, _this.metadataService, _this.config.enableErrorOnFailedDocumentApply, reconcileOnRecovery);
     _this.namespaceService = new NamespaceService();
     _this.api = new Api(config, _this.documentService, _this.channel);
     _this.sendStepsTimer = setInterval(function () {

package/dist/esm/version-wrapper.js

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

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

@@ -19,6 +19,7 @@ export declare class DocumentService {
     private onErrorHandled;
     private metadataService;
     private enableErrorOnFailedDocumentApply;
+    private reconcileOnRecovery;
     private getState;
     private onSyncUpError?;
     private stepQueue;
@@ -39,7 +40,7 @@ export declare class DocumentService {
      * @param metadataService
      * @param enableErrorOnFailedDocumentApply - Enable failed document update exceptions.
      */
-    constructor(participantsService: ParticipantsService, analyticsHelper: AnalyticsHelper | undefined, fetchCatchup: (fromVersion: number, clientId: number | string | undefined) => Promise<CatchupResponse>, fetchReconcile: (currentStateDoc: string) => Promise<ReconcileResponse>, providerEmitCallback: (evt: keyof CollabEvents, data: any) => void, broadcast: <K extends keyof ChannelEvent>(type: K, data: Omit<ChannelEvent[K], 'timestamp'>, callback?: Function) => void, getUserId: () => string | undefined, onErrorHandled: (error: InternalError) => void, metadataService: MetadataService, enableErrorOnFailedDocumentApply?: boolean);
+    constructor(participantsService: ParticipantsService, analyticsHelper: AnalyticsHelper | undefined, fetchCatchup: (fromVersion: number, clientId: number | string | undefined) => Promise<CatchupResponse>, fetchReconcile: (currentStateDoc: string) => Promise<ReconcileResponse>, providerEmitCallback: (evt: keyof CollabEvents, data: any) => void, broadcast: <K extends keyof ChannelEvent>(type: K, data: Omit<ChannelEvent[K], 'timestamp'>, callback?: Function) => void, getUserId: () => string | undefined, onErrorHandled: (error: InternalError) => void, metadataService: MetadataService, enableErrorOnFailedDocumentApply?: boolean, reconcileOnRecovery?: boolean);
     /**
      * To prevent calling catchup to often, use lodash throttle to reduce the frequency
      */
@@ -61,7 +62,7 @@ export declare class DocumentService {
      * Called when we receive steps from the service
      */
     onStepsAdded: (data: StepsPayload) => void;
-    onRestore: ({ doc, version, metadata }: CollabInitPayload) => void;
+    onRestore: ({ doc, version, metadata }: CollabInitPayload) => Promise<void>;
     getFinalAcknowledgedState: () => Promise<ResolvedEditorState>;
     updateDocument: ({ doc, version, metadata, reserveCursor, }: CollabInitPayload) => void;
     private updateDocumentAnalytics;

package/dist/types/feature-flags/types.d.ts

@@ -1,6 +1,7 @@
 export interface NCSFeatureFlags {
     testFF?: boolean;
     blockViewOnly?: boolean;
+    reconcileOnRecovery?: boolean;
 }
 export interface WithNCSFeatureFlags {
     featureFlags?: NCSFeatureFlags;

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

@@ -19,6 +19,7 @@ export declare class DocumentService {
     private onErrorHandled;
     private metadataService;
     private enableErrorOnFailedDocumentApply;
+    private reconcileOnRecovery;
     private getState;
     private onSyncUpError?;
     private stepQueue;
@@ -39,7 +40,7 @@ export declare class DocumentService {
      * @param metadataService
      * @param enableErrorOnFailedDocumentApply - Enable failed document update exceptions.
      */
-    constructor(participantsService: ParticipantsService, analyticsHelper: AnalyticsHelper | undefined, fetchCatchup: (fromVersion: number, clientId: number | string | undefined) => Promise<CatchupResponse>, fetchReconcile: (currentStateDoc: string) => Promise<ReconcileResponse>, providerEmitCallback: (evt: keyof CollabEvents, data: any) => void, broadcast: <K extends keyof ChannelEvent>(type: K, data: Omit<ChannelEvent[K], 'timestamp'>, callback?: Function) => void, getUserId: () => string | undefined, onErrorHandled: (error: InternalError) => void, metadataService: MetadataService, enableErrorOnFailedDocumentApply?: boolean);
+    constructor(participantsService: ParticipantsService, analyticsHelper: AnalyticsHelper | undefined, fetchCatchup: (fromVersion: number, clientId: number | string | undefined) => Promise<CatchupResponse>, fetchReconcile: (currentStateDoc: string) => Promise<ReconcileResponse>, providerEmitCallback: (evt: keyof CollabEvents, data: any) => void, broadcast: <K extends keyof ChannelEvent>(type: K, data: Omit<ChannelEvent[K], 'timestamp'>, callback?: Function) => void, getUserId: () => string | undefined, onErrorHandled: (error: InternalError) => void, metadataService: MetadataService, enableErrorOnFailedDocumentApply?: boolean, reconcileOnRecovery?: boolean);
     /**
      * To prevent calling catchup to often, use lodash throttle to reduce the frequency
      */
@@ -61,7 +62,7 @@ export declare class DocumentService {
      * Called when we receive steps from the service
      */
     onStepsAdded: (data: StepsPayload) => void;
-    onRestore: ({ doc, version, metadata }: CollabInitPayload) => void;
+    onRestore: ({ doc, version, metadata }: CollabInitPayload) => Promise<void>;
     getFinalAcknowledgedState: () => Promise<ResolvedEditorState>;
     updateDocument: ({ doc, version, metadata, reserveCursor, }: CollabInitPayload) => void;
     private updateDocumentAnalytics;

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

@@ -1,6 +1,7 @@
 export interface NCSFeatureFlags {
     testFF?: boolean;
     blockViewOnly?: boolean;
+    reconcileOnRecovery?: boolean;
 }
 export interface WithNCSFeatureFlags {
     featureFlags?: NCSFeatureFlags;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/collab-provider",
-  "version": "9.22.7",
+  "version": "9.22.8",
   "description": "A provider for collaborative editing.",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -36,7 +36,7 @@
   "dependencies": {
     "@atlaskit/analytics-gas-types": "^5.1.0",
     "@atlaskit/analytics-listeners": "^8.9.0",
-    "@atlaskit/editor-common": "^77.3.0",
+    "@atlaskit/editor-common": "^77.5.0",
     "@atlaskit/editor-json-transformer": "^8.10.0",
     "@atlaskit/editor-prosemirror": "3.0.0",
     "@atlaskit/prosemirror-collab": "^0.2.0",