@atlaskit/collab-provider 9.8.0 → 9.9.1

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

@@ -1,6 +1,7 @@
 const defaultNCSFeatureFlags = {
   testFF: false,
-  socketMessageMetricsFF: false
+  socketMessageMetricsFF: false,
+  enableFallbackToReconcile: false
 };
 
 /**
@@ -8,8 +9,9 @@ const defaultNCSFeatureFlags = {
  */
 const productKeys = {
   confluence: {
-    testFF: 'confluence.fe.collab.provider.testFF',
-    socketMessageMetricsFF: 'confluence.fe.collab.provider.socketMessageMetricsFF'
+    testFF: 'confluence.frontend.collab.provider.testFF',
+    socketMessageMetricsFF: 'confluence.frontend.collab.provider.socketMessageMetricsFF',
+    enableFallbackToReconcile: 'confluence.frontend.collab.provider.enable-fallback-to-reconcile'
   }
 };
 const filterFeatureFlagNames = flags => {

package/dist/es2019/provider/index.js

@@ -241,7 +241,7 @@ export class Provider extends Emitter {
     this.isPreinitializing = 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.emitCallback, this.channel.broadcast, () => this.userId, this.onErrorHandled, this.metadataService, this.config.failedStepLimitBeforeCatchupOnPublish, this.config.enableErrorOnFailedDocumentApply);
+    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.failedStepLimitBeforeCatchupOnPublish, this.config.enableErrorOnFailedDocumentApply, this.config.featureFlags);
     this.onSetupPromise = new Promise(resolve => {
       this.resolveOnSetupPromise = resolve;
     });

package/dist/es2019/version-wrapper.js

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

package/dist/es2019/version.json

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

package/dist/esm/channel.js

@@ -325,6 +325,112 @@ export var Channel = /*#__PURE__*/function (_Emitter) {
         return _ref.apply(this, arguments);
       };
     }());
+    _defineProperty(_assertThisInitialized(_this), "fetchReconcile", /*#__PURE__*/function () {
+      var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(currentStateDoc) {
+        var _ref4, _this$token2, reqBody, reconcileResponse, _this$analyticsHelper7;
+        return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              _context2.prev = 0;
+              reqBody = JSON.stringify({
+                doc: currentStateDoc,
+                productId: 'ccollab',
+                reason: 'UNKNOWN' // different reason here?
+              });
+              _context2.t0 = utils;
+              _context2.t1 = _this.config;
+              _context2.t2 = "document/".concat(encodeURIComponent(_this.config.documentAri), "/reconcile");
+              _context2.t3 = _objectSpread;
+              _context2.t4 = _objectSpread;
+              _context2.t5 = {};
+              if (!_this.config.permissionTokenRefresh) {
+                _context2.next = 29;
+                break;
+              }
+              if (!((_this$token2 = _this.token) !== null && _this$token2 !== void 0)) {
+                _context2.next = 13;
+                break;
+              }
+              _context2.t8 = _this$token2;
+              _context2.next = 16;
+              break;
+            case 13:
+              _context2.next = 15;
+              return _this.config.permissionTokenRefresh().then(function (token) {
+                if (token) {
+                  _this.setToken(token);
+                }
+                return token;
+              });
+            case 15:
+              _context2.t8 = _context2.sent;
+            case 16:
+              _context2.t9 = _ref4 = _context2.t8;
+              _context2.t7 = _context2.t9 !== null;
+              if (!_context2.t7) {
+                _context2.next = 20;
+                break;
+              }
+              _context2.t7 = _ref4 !== void 0;
+            case 20:
+              if (!_context2.t7) {
+                _context2.next = 24;
+                break;
+              }
+              _context2.t10 = _ref4;
+              _context2.next = 25;
+              break;
+            case 24:
+              _context2.t10 = undefined;
+            case 25:
+              _context2.t11 = _context2.t10;
+              _context2.t6 = {
+                'x-token': _context2.t11
+              };
+              _context2.next = 30;
+              break;
+            case 29:
+              _context2.t6 = {};
+            case 30:
+              _context2.t12 = _context2.t6;
+              _context2.t13 = (0, _context2.t4)(_context2.t5, _context2.t12);
+              _context2.t14 = {};
+              _context2.t15 = {
+                'x-product': getProduct(_this.config.productInfo),
+                'x-subproduct': getSubProduct(_this.config.productInfo),
+                'Content-Type': 'application/json'
+              };
+              _context2.t16 = (0, _context2.t3)(_context2.t13, _context2.t14, _context2.t15);
+              _context2.t17 = reqBody;
+              _context2.t18 = {
+                headers: _context2.t16,
+                method: 'POST',
+                body: _context2.t17
+              };
+              _context2.t19 = {
+                path: _context2.t2,
+                requestInit: _context2.t18
+              };
+              _context2.next = 40;
+              return _context2.t0.requestService.call(_context2.t0, _context2.t1, _context2.t19);
+            case 40:
+              reconcileResponse = _context2.sent;
+              return _context2.abrupt("return", reconcileResponse);
+            case 44:
+              _context2.prev = 44;
+              _context2.t20 = _context2["catch"](0);
+              (_this$analyticsHelper7 = _this.analyticsHelper) === null || _this$analyticsHelper7 === void 0 ? void 0 : _this$analyticsHelper7.sendErrorEvent(_context2.t20, 'Error while fetching reconciled document');
+              throw _context2.t20;
+            case 48:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2, null, [[0, 44]]);
+      }));
+      return function (_x2) {
+        return _ref3.apply(this, arguments);
+      };
+    }());
     /**
      * Send message to the back-end service over the channel. Timestamp will be added server side.
      * @throws {NotInitializedError} Channel not initialized
@@ -409,10 +515,10 @@ export var Channel = /*#__PURE__*/function (_Emitter) {
       var auth;
       if (permissionTokenRefresh) {
         auth = /*#__PURE__*/function () {
-          var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(cb) {
+          var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(cb) {
             var authData, token, _data, _data$meta, authenticationError;
-            return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-              while (1) switch (_context2.prev = _context2.next) {
+            return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+              while (1) switch (_context3.prev = _context3.next) {
                 case 0:
                   // Rebuild authData to ensure values are current
                   authData = {
@@ -422,19 +528,19 @@ export var Channel = /*#__PURE__*/function (_Emitter) {
                     need404: _this2.config.need404
                   }; // use the cached token if caching in enabled and token valid
                   if (!(cacheToken && _this2.token)) {
-                    _context2.next = 6;
+                    _context3.next = 6;
                     break;
                   }
                   authData.token = _this2.token;
                   cb(authData);
-                  _context2.next = 18;
+                  _context3.next = 18;
                   break;
                 case 6:
-                  _context2.prev = 6;
-                  _context2.next = 9;
+                  _context3.prev = 6;
+                  _context3.next = 9;
                   return permissionTokenRefresh();
                 case 9:
-                  token = _context2.sent;
+                  token = _context3.sent;
                   if (token) {
                     // save token locally
                     _this2.setToken(token);
@@ -444,11 +550,11 @@ export var Channel = /*#__PURE__*/function (_Emitter) {
                     authData.token = undefined;
                   }
                   cb(authData);
-                  _context2.next = 18;
+                  _context3.next = 18;
                   break;
                 case 14:
-                  _context2.prev = 14;
-                  _context2.t0 = _context2["catch"](6);
+                  _context3.prev = 14;
+                  _context3.t0 = _context3["catch"](6);
                   // Pass the error back to the consumers so they can deal with exceptional cases themselves (eg. no permissions because the page was deleted)
                   authenticationError = {
                     message: 'Insufficient editing permissions',
@@ -456,8 +562,8 @@ export var Channel = /*#__PURE__*/function (_Emitter) {
                       status: 403,
                       code: INTERNAL_ERROR_CODE.TOKEN_PERMISSION_ERROR,
                       meta: {
-                        originalError: _context2.t0,
-                        reason: _context2.t0 === null || _context2.t0 === void 0 ? void 0 : (_data = _context2.t0.data) === null || _data === void 0 ? void 0 : (_data$meta = _data.meta) === null || _data$meta === void 0 ? void 0 : _data$meta.reason // Should always be 'RESOURCE_DELETED' Temporary, until Confluence Cloud removes their hack
+                        originalError: _context3.t0,
+                        reason: _context3.t0 === null || _context3.t0 === void 0 ? void 0 : (_data = _context3.t0.data) === null || _data === void 0 ? void 0 : (_data$meta = _data.meta) === null || _data$meta === void 0 ? void 0 : _data$meta.reason // Should always be 'RESOURCE_DELETED' Temporary, until Confluence Cloud removes their hack
                         // https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/browse/next/packages/native-collab/src/fetchCollabPermissionToken.ts#37
                       }
                     }
@@ -466,12 +572,12 @@ export var Channel = /*#__PURE__*/function (_Emitter) {
                   _this2.emit('error', authenticationError);
                 case 18:
                 case "end":
-                  return _context2.stop();
+                  return _context3.stop();
               }
-            }, _callee2, null, [[6, 14]]);
+            }, _callee3, null, [[6, 14]]);
           }));
-          return function auth(_x2) {
-            return _ref3.apply(this, arguments);
+          return function auth(_x3) {
+            return _ref5.apply(this, arguments);
           };
         }();
       } else {
@@ -495,9 +601,9 @@ export var Channel = /*#__PURE__*/function (_Emitter) {
       this.socket.on('steps:added', function (data) {
         _this2.emit('steps:added', data);
       });
-      this.socket.on('participant:telepointer', function (_ref4) {
-        var timestamp = _ref4.timestamp,
-          data = _ref4.data;
+      this.socket.on('participant:telepointer', function (_ref6) {
+        var timestamp = _ref6.timestamp,
+          data = _ref6.data;
         // data is TelepointerPayload without timestamp
         _this2.emit('participant:telepointer', _objectSpread({
           timestamp: timestamp
@@ -512,11 +618,11 @@ export var Channel = /*#__PURE__*/function (_Emitter) {
       this.socket.on('participant:left', function (data) {
         _this2.emit('participant:left', data);
       });
-      this.socket.on('participant:updated', function (_ref5) {
-        var sessionId = _ref5.sessionId,
-          timestamp = _ref5.timestamp,
-          data = _ref5.data,
-          clientId = _ref5.clientId;
+      this.socket.on('participant:updated', function (_ref7) {
+        var sessionId = _ref7.sessionId,
+          timestamp = _ref7.timestamp,
+          data = _ref7.data,
+          clientId = _ref7.clientId;
         _this2.emit('participant:updated', _objectSpread({
           sessionId: sessionId,
           timestamp: timestamp,
@@ -532,10 +638,10 @@ export var Channel = /*#__PURE__*/function (_Emitter) {
         _this2.emit('status', data);
       });
       this.socket.on('disconnect', /*#__PURE__*/function () {
-        var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(reason) {
+        var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(reason) {
           var _this2$analyticsHelpe, reconnectionError;
-          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:
                 if (getCollabProviderFeatureFlag('socketMessageMetricsFF', _this2.config.featureFlags) && _this2.socketMessageMetrics) {
                   _this2.socketMessageMetrics.closeSocketMessageMetrics();
@@ -563,12 +669,12 @@ export var Channel = /*#__PURE__*/function (_Emitter) {
                 }
               case 5:
               case "end":
-                return _context3.stop();
+                return _context4.stop();
             }
-          }, _callee3);
+          }, _callee4);
         }));
-        return function (_x3) {
-          return _ref6.apply(this, arguments);
+        return function (_x4) {
+          return _ref8.apply(this, arguments);
         };
       }());
 
@@ -658,8 +764,8 @@ export var Channel = /*#__PURE__*/function (_Emitter) {
                 this.emit('error', rateLimitError);
                 throw new Error();
               } else if (rateLimitType === this.RATE_LIMIT_TYPE_SOFT) {
-                var _this$analyticsHelper7;
-                (_this$analyticsHelper7 = this.analyticsHelper) === null || _this$analyticsHelper7 === void 0 ? void 0 : _this$analyticsHelper7.sendErrorEvent(rateLimitError, 'Rate limited');
+                var _this$analyticsHelper8;
+                (_this$analyticsHelper8 = this.analyticsHelper) === null || _this$analyticsHelper8 === void 0 ? void 0 : _this$analyticsHelper8.sendErrorEvent(rateLimitError, 'Rate limited');
               }
             }
           }

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

@@ -15,6 +15,7 @@ import { JSONTransformer } from '@atlaskit/editor-json-transformer';
 import { MAX_STEP_REJECTED_ERROR } from '../provider';
 import { catchup } from './catchup';
 import { StepQueueState } from './step-queue-state';
+import { getCollabProviderFeatureFlag } from '../feature-flags';
 import { CantSyncUpError, INTERNAL_ERROR_CODE, UpdateDocumentError } from '../errors/error-types';
 var CATCHUP_THROTTLE = 1 * 1000; // 1 second
 
@@ -29,6 +30,7 @@ export var DocumentService = /*#__PURE__*/function () {
    * and to emit their telepointers from steps they add
    * @param analyticsHelper - Helper for analytics events
    * @param fetchCatchup - Function to fetch "catchup" data, data required to rebase current steps to the latest version.
+   * @param fetchReconcile - Function to call "reconcile" from NCS backend
    * @param providerEmitCallback - Callback for emitting events to listeners on the provider
    * @param broadcast - Callback for broadcasting events to other clients
    * @param getUserId - Callback to fetch the current user's ID
@@ -36,11 +38,13 @@ export var DocumentService = /*#__PURE__*/function () {
    * @param metadataService
    * @param failedStepsBeforeCatchupOnPublish - Control MAX_STEP_REJECTED_ERROR during page publishes.
    * @param enableErrorOnFailedDocumentApply - Enable failed document update exceptions.
+   * @param featureFlags - Feature flag config
    */
-  function DocumentService(participantsService, analyticsHelper, fetchCatchup, providerEmitCallback, broadcast, getUserId, onErrorHandled, metadataService) {
+  function DocumentService(participantsService, analyticsHelper, fetchCatchup, fetchReconcile, providerEmitCallback, broadcast, getUserId, onErrorHandled, metadataService) {
     var _this = this;
-    var failedStepsBeforeCatchupOnPublish = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : MAX_STEP_REJECTED_ERROR;
-    var enableErrorOnFailedDocumentApply = arguments.length > 9 && arguments[9] !== undefined ? arguments[9] : false;
+    var failedStepsBeforeCatchupOnPublish = arguments.length > 9 && arguments[9] !== undefined ? arguments[9] : MAX_STEP_REJECTED_ERROR;
+    var enableErrorOnFailedDocumentApply = arguments.length > 10 && arguments[10] !== undefined ? arguments[10] : false;
+    var featureFlags = arguments.length > 11 ? arguments[11] : undefined;
     _classCallCheck(this, DocumentService);
     // Fires analytics to editor when collab editor cannot sync up
     _defineProperty(this, "stepRejectCounter", 0);
@@ -276,41 +280,76 @@ export var DocumentService = /*#__PURE__*/function () {
       }
     });
     _defineProperty(this, "getFinalAcknowledgedState", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
-      var _this$analyticsHelper14, currentState, measure, _this$analyticsHelper15, _this$analyticsHelper16, _measure2;
+      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) {
           case 0:
             _this.aggressiveCatchup = true;
             _context3.prev = 1;
             startMeasure(MEASURE_NAME.PUBLISH_PAGE, _this.analyticsHelper);
-            _context3.next = 5;
-            return _this.commitUnconfirmedSteps();
-          case 5:
+            if (!getCollabProviderFeatureFlag('enableFallbackToReconcile', _this.featureFlags)) {
+              _context3.next = 23;
+              break;
+            }
+            _context3.prev = 4;
             _context3.next = 7;
-            return _this.getCurrentState();
+            return _this.commitUnconfirmedSteps();
           case 7:
+            _context3.next = 9;
+            return _this.getCurrentState();
+          case 9:
+            finalAcknowledgedState = _context3.sent;
+            _context3.next = 21;
+            break;
+          case 12:
+            _context3.prev = 12;
+            _context3.t0 = _context3["catch"](4);
+            _context3.next = 16;
+            return _this.getCurrentState();
+          case 16:
             currentState = _context3.sent;
+            _context3.next = 19;
+            return _this.fetchReconcile(JSON.stringify(currentState.content));
+          case 19:
+            reconcileResponse = _context3.sent;
+            finalAcknowledgedState = {
+              content: JSON.parse(reconcileResponse.document),
+              title: currentState.title,
+              stepVersion: reconcileResponse.version
+            };
+          case 21:
+            _context3.next = 28;
+            break;
+          case 23:
+            _context3.next = 25;
+            return _this.commitUnconfirmedSteps();
+          case 25:
+            _context3.next = 27;
+            return _this.getCurrentState();
+          case 27:
+            finalAcknowledgedState = _context3.sent;
+          case 28:
             measure = stopMeasure(MEASURE_NAME.PUBLISH_PAGE, _this.analyticsHelper);
             (_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 _context3.abrupt("return", currentState);
-          case 14:
-            _context3.prev = 14;
-            _context3.t0 = _context3["catch"](1);
+            return _context3.abrupt("return", finalAcknowledgedState);
+          case 34:
+            _context3.prev = 34;
+            _context3.t1 = _context3["catch"](1);
             _this.aggressiveCatchup = false;
             _measure2 = 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: _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 21:
+            (_this$analyticsHelper16 = _this.analyticsHelper) === null || _this$analyticsHelper16 === void 0 ? void 0 : _this$analyticsHelper16.sendErrorEvent(_context3.t1, 'Error while returning ADF version of the final draft document');
+            throw _context3.t1;
+          case 41:
           case "end":
             return _context3.stop();
         }
-      }, _callee3, null, [[1, 14]]);
+      }, _callee3, null, [[1, 34], [4, 12]]);
     })));
     _defineProperty(this, "updateDocument", function (_ref6) {
       var doc = _ref6.doc,
@@ -488,6 +527,7 @@ export var DocumentService = /*#__PURE__*/function () {
     this.participantsService = participantsService;
     this.analyticsHelper = analyticsHelper;
     this.fetchCatchup = fetchCatchup;
+    this.fetchReconcile = fetchReconcile;
     this.providerEmitCallback = providerEmitCallback;
     this.broadcast = broadcast;
     this.getUserId = getUserId;
@@ -495,6 +535,7 @@ export var DocumentService = /*#__PURE__*/function () {
     this.metadataService = metadataService;
     this.failedStepsBeforeCatchupOnPublish = failedStepsBeforeCatchupOnPublish;
     this.enableErrorOnFailedDocumentApply = enableErrorOnFailedDocumentApply;
+    this.featureFlags = featureFlags;
     this.stepQueue = new StepQueueState();
   }
   _createClass(DocumentService, [{

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

@@ -3,9 +3,10 @@ describe('Feature flags', function () {
   it('getProductSpecificFeatureFlags', function () {
     var result = getProductSpecificFeatureFlags({
       testFF: true,
-      socketMessageMetricsFF: true
+      socketMessageMetricsFF: true,
+      enableFallbackToReconcile: true
     }, 'confluence');
-    expect(result).toEqual(['confluence.fe.collab.provider.testFF', 'confluence.fe.collab.provider.socketMessageMetricsFF']);
+    expect(result).toEqual(['confluence.frontend.collab.provider.testFF', 'confluence.frontend.collab.provider.socketMessageMetricsFF', 'confluence.frontend.collab.provider.enable-fallback-to-reconcile']);
   });
   it('getCollabProviderFeatureFlag return true', function () {
     var result = getCollabProviderFeatureFlag('testFF', {

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

@@ -1,7 +1,8 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 var defaultNCSFeatureFlags = {
   testFF: false,
-  socketMessageMetricsFF: false
+  socketMessageMetricsFF: false,
+  enableFallbackToReconcile: false
 };
 
 /**
@@ -9,8 +10,9 @@ var defaultNCSFeatureFlags = {
  */
 var productKeys = {
   confluence: {
-    testFF: 'confluence.fe.collab.provider.testFF',
-    socketMessageMetricsFF: 'confluence.fe.collab.provider.socketMessageMetricsFF'
+    testFF: 'confluence.frontend.collab.provider.testFF',
+    socketMessageMetricsFF: 'confluence.frontend.collab.provider.socketMessageMetricsFF',
+    enableFallbackToReconcile: 'confluence.frontend.collab.provider.enable-fallback-to-reconcile'
   }
 };
 var filterFeatureFlagNames = function filterFeatureFlagNames(flags) {

package/dist/esm/provider/index.js

@@ -279,9 +279,9 @@ export var Provider = /*#__PURE__*/function (_Emitter) {
     _this.isPreinitializing = 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.emitCallback, _this.channel.broadcast, function () {
+    _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.failedStepLimitBeforeCatchupOnPublish, _this.config.enableErrorOnFailedDocumentApply);
+    }, _this.onErrorHandled, _this.metadataService, _this.config.failedStepLimitBeforeCatchupOnPublish, _this.config.enableErrorOnFailedDocumentApply, _this.config.featureFlags);
     _this.onSetupPromise = new Promise(function (resolve) {
       _this.resolveOnSetupPromise = resolve;
     });

package/dist/esm/version-wrapper.js

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

package/dist/esm/version.json

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

package/dist/types/channel.d.ts

@@ -1,5 +1,5 @@
 import { Emitter } from './emitter';
-import type { Config, ChannelEvent, CatchupResponse } from './types';
+import type { Config, ChannelEvent, CatchupResponse, ReconcileResponse } from './types';
 import type { Socket } from 'socket.io-client';
 import AnalyticsHelper from './analytics/analytics-helper';
 import type { Metadata } from '@atlaskit/editor-common/collab';
@@ -41,6 +41,7 @@ export declare class Channel extends Emitter<ChannelEvent> {
     private onConnect;
     private onReceiveData;
     fetchCatchup: (fromVersion: number) => Promise<CatchupResponse>;
+    fetchReconcile: (currentStateDoc: string) => Promise<ReconcileResponse>;
     /**
      * Send message to the back-end service over the channel. Timestamp will be added server side.
      * @throws {NotInitializedError} Channel not initialized

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

@@ -1,6 +1,6 @@
 /// <reference types="lodash" />
 import AnalyticsHelper from '../analytics/analytics-helper';
-import { CatchupResponse, ChannelEvent, StepsPayload } from '../types';
+import { CatchupResponse, ReconcileResponse, ChannelEvent, StepsPayload } from '../types';
 import type { SyncUpErrorFunction, ResolvedEditorState } from '@atlaskit/editor-common/collab';
 import type { Step as ProseMirrorStep } from '@atlaskit/editor-prosemirror/transform';
 import type { MetadataService } from '../metadata/metadata-service';
@@ -12,6 +12,7 @@ export declare class DocumentService {
     private participantsService;
     private analyticsHelper;
     private fetchCatchup;
+    private fetchReconcile;
     private providerEmitCallback;
     private broadcast;
     private getUserId;
@@ -19,6 +20,7 @@ export declare class DocumentService {
     private metadataService;
     private failedStepsBeforeCatchupOnPublish;
     private enableErrorOnFailedDocumentApply;
+    private featureFlags;
     private getState;
     private onSyncUpError?;
     private stepQueue;
@@ -31,6 +33,7 @@ export declare class DocumentService {
      * and to emit their telepointers from steps they add
      * @param analyticsHelper - Helper for analytics events
      * @param fetchCatchup - Function to fetch "catchup" data, data required to rebase current steps to the latest version.
+     * @param fetchReconcile - Function to call "reconcile" from NCS backend
      * @param providerEmitCallback - Callback for emitting events to listeners on the provider
      * @param broadcast - Callback for broadcasting events to other clients
      * @param getUserId - Callback to fetch the current user's ID
@@ -38,8 +41,11 @@ export declare class DocumentService {
      * @param metadataService
      * @param failedStepsBeforeCatchupOnPublish - Control MAX_STEP_REJECTED_ERROR during page publishes.
      * @param enableErrorOnFailedDocumentApply - Enable failed document update exceptions.
+     * @param featureFlags - Feature flag config
      */
-    constructor(participantsService: ParticipantsService, analyticsHelper: AnalyticsHelper | undefined, fetchCatchup: (fromVersion: number) => Promise<CatchupResponse>, 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, failedStepsBeforeCatchupOnPublish?: number, enableErrorOnFailedDocumentApply?: boolean);
+    constructor(participantsService: ParticipantsService, analyticsHelper: AnalyticsHelper | undefined, fetchCatchup: (fromVersion: number) => 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, failedStepsBeforeCatchupOnPublish: number, enableErrorOnFailedDocumentApply: boolean, featureFlags: {
+        [key: string]: boolean;
+    } | undefined);
     /**
      * To prevent calling catchup to often, use lodash throttle to reduce the frequency
      */

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

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

package/dist/types/types.d.ts

@@ -179,6 +179,12 @@ export interface CatchupResponse {
     stepMaps?: any[];
     metadata?: Metadata;
 }
+export interface ReconcileResponse {
+    document: string;
+    version: number;
+    ari?: string;
+    metadata?: Metadata;
+}
 export interface CatchupOptions {
     getCurrentPmVersion: () => number;
     fetchCatchup: (fromVersion: number) => Promise<CatchupResponse>;

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

@@ -1,5 +1,5 @@
 import { Emitter } from './emitter';
-import type { Config, ChannelEvent, CatchupResponse } from './types';
+import type { Config, ChannelEvent, CatchupResponse, ReconcileResponse } from './types';
 import type { Socket } from 'socket.io-client';
 import AnalyticsHelper from './analytics/analytics-helper';
 import type { Metadata } from '@atlaskit/editor-common/collab';
@@ -41,6 +41,7 @@ export declare class Channel extends Emitter<ChannelEvent> {
     private onConnect;
     private onReceiveData;
     fetchCatchup: (fromVersion: number) => Promise<CatchupResponse>;
+    fetchReconcile: (currentStateDoc: string) => Promise<ReconcileResponse>;
     /**
      * Send message to the back-end service over the channel. Timestamp will be added server side.
      * @throws {NotInitializedError} Channel not initialized