@atlaskit/collab-provider 10.10.0 → 10.10.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/collab-provider
 
+## 10.10.2
+
+### Patch Changes
+
+- Updated dependencies
+
+## 10.10.1
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 10.10.0
 
 ### Minor Changes

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

@@ -375,11 +375,7 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
                 reserveCursor: true
               });
               _this.metadataService.updateMetadata(metadata);
-              if (!(0, _platformFeatureFlags.fg)('restore_localstep_fallback_reconcile')) {
-                _context3.next = 27;
-                break;
-              }
-              _context3.prev = 14;
+              _context3.prev = 13;
               (_this$analyticsHelper13 = _this.analyticsHelper) === null || _this$analyticsHelper13 === void 0 || _this$analyticsHelper13.sendActionEvent(_const.EVENT_ACTION.REINITIALISE_DOCUMENT, _const.EVENT_STATUS.INFO, {
                 numUnconfirmedSteps: unconfirmedSteps === null || unconfirmedSteps === void 0 ? void 0 : unconfirmedSteps.length,
                 obfuscatedSteps: obfuscatedSteps,
@@ -392,35 +388,16 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
               if (unconfirmedSteps !== null && unconfirmedSteps !== void 0 && unconfirmedSteps.length) {
                 _this.applyLocalSteps(unconfirmedSteps);
               }
-              _context3.next = 25;
+              _context3.next = 24;
               break;
-            case 19:
-              _context3.prev = 19;
-              _context3.t0 = _context3["catch"](14);
+            case 18:
+              _context3.prev = 18;
+              _context3.t0 = _context3["catch"](13);
               (_this$analyticsHelper14 = _this.analyticsHelper) === null || _this$analyticsHelper14 === void 0 || _this$analyticsHelper14.sendErrorEvent(_context3.t0, "Error while onRestore with applyLocalSteps. Will fallback to fetchReconcile");
               useReconcile = true;
-              _context3.next = 25;
+              _context3.next = 24;
               return _this.fetchReconcile(JSON.stringify(currentState.content), 'fe-restore');
-            case 25:
-              _context3.next = 33;
-              break;
-            case 27:
-              if (!(useReconcile && currentState)) {
-                _context3.next = 32;
-                break;
-              }
-              _context3.next = 30;
-              return _this.fetchReconcile(JSON.stringify(currentState.content), 'fe-restore');
-            case 30:
-              _context3.next = 33;
-              break;
-            case 32:
-              if (unconfirmedSteps !== null && unconfirmedSteps !== void 0 && unconfirmedSteps.length) {
-                // we don't want to use reconcile for restore triggered by catchup client out of sync (when targetClientId is provided)
-                // as this results in all changes made while the client was out of sync being lost
-                _this.applyLocalSteps(unconfirmedSteps);
-              }
-            case 33:
+            case 24:
               (_this$analyticsHelper15 = _this.analyticsHelper) === null || _this$analyticsHelper15 === void 0 || _this$analyticsHelper15.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),
@@ -429,10 +406,10 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
                 targetClientId: targetClientId,
                 triggeredByCatchup: !!targetClientId
               });
-              _context3.next = 41;
+              _context3.next = 32;
               break;
-            case 36:
-              _context3.prev = 36;
+            case 27:
+              _context3.prev = 27;
               _context3.t1 = _context3["catch"](10);
               (_this$analyticsHelper16 = _this.analyticsHelper) === null || _this$analyticsHelper16 === void 0 || _this$analyticsHelper16.sendActionEvent(_const.EVENT_ACTION.REINITIALISE_DOCUMENT, _const.EVENT_STATUS.FAILURE, {
                 numUnconfirmedSteps: unconfirmedSteps === null || unconfirmedSteps === void 0 ? void 0 : unconfirmedSteps.length,
@@ -450,11 +427,11 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
                   code: _internalErrors.INTERNAL_ERROR_CODE.DOCUMENT_RESTORE_ERROR
                 }
               });
-            case 41:
+            case 32:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, null, [[10, 36], [14, 19]]);
+        }, _callee3, null, [[10, 27], [13, 18]]);
       }));
       return function (_x3) {
         return _ref7.apply(this, arguments);
@@ -640,8 +617,8 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
                 _context5.next = 22;
                 break;
               }
-              // forcePublish = true, this is because commitUnconfirmedSteps is only called when the Editor publishes a document
-              _this.sendStepsFromCurrentState(undefined, reason);
+              // this makes all commitUnconfirmedSteps skip the waiting time, which means draft-sync is sped up too.
+              _this.sendStepsFromCurrentState(undefined, 'publish');
               _context5.next = 13;
               return (0, _utils.sleep)(500);
             case 13:

package/dist/cjs/document/getConflictChanges.js

@@ -58,12 +58,17 @@ var getConflicts = function getConflicts(_ref) {
       // Partial overlap with the end
       localChange.fromA >= remoteChange.fromA && localChange.fromA < remoteChange.toA && localChange.toA > remoteChange.toA ||
       // Partial overlap with the start
-      localChange.fromA < remoteChange.fromA && localChange.toA > remoteChange.fromA && localChange.toA <= remoteChange.toA) {
+      localChange.fromA < remoteChange.fromA && localChange.toA > remoteChange.fromA && localChange.toA <= remoteChange.toA ||
+      // One of the edges match
+      localChange.fromA === remoteChange.toA || remoteChange.fromA === localChange.toA) {
+        var remoteSlice = remoteDoc.slice(remoteChange.fromB, remoteChange.toB);
+        var isDeletion = remoteSlice.size === 0;
         conflictingChanges.push({
           from: Math.min(localChange.fromA, remoteChange.fromA),
           to: Math.max(localChange.toA, remoteChange.toA),
-          local: localDoc.slice(localChange.fromB, localChange.toB, true),
-          remote: remoteDoc.slice(remoteChange.fromB, remoteChange.toB)
+          // We only want to capture the exact slice deleted (without parents) so we can display and insert as expected
+          local: localDoc.slice(localChange.fromB, localChange.toB, !isDeletion),
+          remote: remoteSlice
         });
       }
     });
@@ -156,6 +161,9 @@ function getConflictChanges(_ref3) {
   var isConflictChange = function isConflictChange(value) {
     return Boolean(value);
   };
+
+  // Prevent duplicate ranges occuring
+  var seenInsertions = new Set();
   return {
     inserted: conflictingChanges.filter(function (i) {
       return i.remote.size !== 0;
@@ -164,7 +172,14 @@ function getConflictChanges(_ref3) {
         from: mapping.map(i.from, -1),
         to: mapping.map(i.to)
       });
-    }).filter(isConflictChange),
+    }).filter(function (i) {
+      var identifier = "".concat(i.from, "-").concat(i.to);
+      if (seenInsertions.has(identifier)) {
+        return false;
+      }
+      seenInsertions.add(identifier);
+      return isConflictChange(i);
+    }),
     deleted: conflictingChanges.filter(function (d) {
       return d.remote.size === 0;
     }).map(function (d) {

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

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.readyToCommit = exports.commitStepQueue = exports.RESET_READYTOCOMMIT_INTERVAL_MS = void 0;
+exports.readyToCommit = exports.lastBroadcastRequestAcked = exports.commitStepQueue = exports.RESET_READYTOCOMMIT_INTERVAL_MS = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _countBy = _interopRequireDefault(require("lodash/countBy"));
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
@@ -16,6 +16,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) { (0, _defineProperty2.default)(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; }
 var logger = (0, _utils.createLogger)('commit-step', 'black');
 var readyToCommit = exports.readyToCommit = true;
+var lastBroadcastRequestAcked = exports.lastBroadcastRequestAcked = true;
 var RESET_READYTOCOMMIT_INTERVAL_MS = exports.RESET_READYTOCOMMIT_INTERVAL_MS = 5000;
 var commitStepQueue = exports.commitStepQueue = function commitStepQueue(_ref) {
   var broadcast = _ref.broadcast,
@@ -31,14 +32,27 @@ var commitStepQueue = exports.commitStepQueue = function commitStepQueue(_ref) {
     hasRecovered = _ref.hasRecovered,
     collabMode = _ref.collabMode,
     reason = _ref.reason;
+  // 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
+  if (reason === 'publish' && lastBroadcastRequestAcked) {
+    if ((0, _platformFeatureFlags.fg)('skip_collab_provider_delay_on_publish')) {
+      clearTimeout(commitWaitTimer);
+      exports.readyToCommit = readyToCommit = true;
+    } // no-op if fg is turned off
+  }
   if (!readyToCommit) {
     logger('Not ready to commit, skip');
     return;
   }
   // Block other sending request, before ACK
   exports.readyToCommit = readyToCommit = false;
-  var timer = setTimeout(function () {
+  exports.lastBroadcastRequestAcked = lastBroadcastRequestAcked = false;
+
+  // this timer is a fallback for if an ACK from BE is lost - stop the queue from getting indefinitely locked
+  var fallbackTimer = setTimeout(function () {
     exports.readyToCommit = readyToCommit = true;
+    exports.lastBroadcastRequestAcked = lastBroadcastRequestAcked = true;
     logger('reset readyToCommit by timer');
   }, RESET_READYTOCOMMIT_INTERVAL_MS);
   var stepsWithClientAndUserId = steps.map(function (step) {
@@ -58,7 +72,6 @@ var commitStepQueue = exports.commitStepQueue = function commitStepQueue(_ref) {
   // - is setup for last write wins,
   // - and is just a boolean -- so no real risk of data loss.
   if (__livePage && (0, _platformFeatureFlags.fg)('platform.editor.live-pages-expand-divergence')) {
-    // @atlaskit/platform-feature-flags
     stepsWithClientAndUserId = stepsWithClientAndUserId.map(function (step) {
       if (isExpandChangeStep(step)) {
         // The title is also updated via this step, which we do want to send to the server.
@@ -94,66 +107,35 @@ var commitStepQueue = exports.commitStepQueue = function commitStepQueue(_ref) {
       version: version,
       userId: userId
     }, function (response) {
+      exports.lastBroadcastRequestAcked = lastBroadcastRequestAcked = true;
       var latency = new Date().getTime() - start;
-      if (timer) {
-        clearTimeout(timer);
-        if ((0, _platformFeatureFlags.fg)('make_collab_provider_ack_delay_agnostic')) {
-          if (latency < 680) {
-            // this most closely replicates the BE ack delay behaviour. 500ms hardcoded + 180ms network delay (tested on hello)
-            // more context: https://hello.atlassian.net/wiki/spaces/CEPS/pages/5020556010/Spike+Moving+BE+delay+to+the+FE
-            // to be switched over to backpressure delay sent from the BE in https://hello.jira.atlassian.cloud/browse/CEPS-1030
-            setTimeout(function () {
-              exports.readyToCommit = readyToCommit = true;
-              logger('reset readyToCommit');
-            }, 680 - latency);
-          } else {
-            exports.readyToCommit = readyToCommit = true;
-            logger('reset readyToCommit');
-          }
-        } else {
-          if (latency < 400) {
-            setTimeout(function () {
-              exports.readyToCommit = readyToCommit = true;
-              logger('reset readyToCommit');
-            }, 100);
-          } else {
-            exports.readyToCommit = readyToCommit = true;
-            logger('reset readyToCommit');
-          }
-        }
-      }
+      // this most closely replicates the BE ack delay behaviour. 500ms hardcoded + 180ms network delay (tested on hello)
+      // more context: https://hello.atlassian.net/wiki/spaces/CEPS/pages/5020556010/Spike+Moving+BE+delay+to+the+FE
+      // to be switched over to backpressure delay sent from the BE in https://hello.jira.atlassian.cloud/browse/CEPS-1030
+      var delay = latency < 680 ? 680 - latency : 1;
+      if (response.delay) {
+        delay = response.delay;
+      } // if backpressure delay is sent, overwrite it
+
+      clearTimeout(fallbackTimer); // clear the fallback timer, ack was successfully sent/recieved
+      commitWaitTimer = setTimeout(function () {
+        // unlock the queue after waiting for delay
+        exports.readyToCommit = readyToCommit = true;
+        logger('reset readyToCommit');
+      }, delay);
       if (response.type === _types.AcknowledgementResponseTypes.SUCCESS) {
         onStepsAdded({
           steps: stepsWithClientAndUserId,
           version: response.version
         });
-        // Sample only 10% of add steps events to avoid overwhelming the analytics
-        if (Math.random() < 0.1) {
-          analyticsHelper === null || analyticsHelper === void 0 || analyticsHelper.sendActionEvent(_const.EVENT_ACTION.ADD_STEPS, _const.EVENT_STATUS.SUCCESS_10x_SAMPLED, {
-            type: _const.ADD_STEPS_TYPE.ACCEPTED,
-            latency: latency,
-            stepType: (0, _countBy.default)(stepsWithClientAndUserId,
-            // Ignored via go/ees005
-            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-            function (stepWithClientAndUserId) {
-              return stepWithClientAndUserId.stepType;
-            })
-          });
-        }
+        sendSuccessAnalytics(latency, stepsWithClientAndUserId, analyticsHelper);
         emit('commit-status', {
           status: 'success',
           version: response.version
         });
       } else if (response.type === _types.AcknowledgementResponseTypes.ERROR) {
         onErrorHandled(response.error);
-        analyticsHelper === null || analyticsHelper === void 0 || analyticsHelper.sendActionEvent(_const.EVENT_ACTION.ADD_STEPS, _const.EVENT_STATUS.FAILURE, {
-          // 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
-          type: response.error.data.code === _ncsErrors.NCS_ERROR_CODE.HEAD_VERSION_UPDATE_FAILED || response.error.data.code === _ncsErrors.NCS_ERROR_CODE.VERSION_NUMBER_ALREADY_EXISTS ? _const.ADD_STEPS_TYPE.REJECTED : _const.ADD_STEPS_TYPE.ERROR,
-          latency: latency
-        });
-        analyticsHelper === null || analyticsHelper === void 0 || analyticsHelper.sendErrorEvent(response.error, 'Error while adding steps - Acknowledgement Error');
+        sendFailureAnalytics(response, latency, analyticsHelper);
         emit('commit-status', {
           status: 'failure',
           version: version
@@ -169,10 +151,8 @@ var commitStepQueue = exports.commitStepQueue = function commitStepQueue(_ref) {
       }
     });
   } catch (error) {
-    // if the broadcast failed due to not yet being connected, then set readyToCommit to true so that we don't get stuck in the timeout if the connection is slow to succeed
-    if (error.name === 'NotConnectedError') {
-      exports.readyToCommit = readyToCommit = true;
-    }
+    // 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;
     analyticsHelper === null || analyticsHelper === void 0 || analyticsHelper.sendErrorEvent(error, 'Error while adding steps - Broadcast threw exception');
     emit('commit-status', {
       status: 'failure',
@@ -187,4 +167,29 @@ function isExpandChangeStep(step) {
     return true;
   }
   return false;
+}
+function sendSuccessAnalytics(latency, stepsWithClientAndUserId, analyticsHelper) {
+  // Sample only 10% of add steps events to avoid overwhelming the analytics
+  if (Math.random() < 0.1) {
+    analyticsHelper === null || analyticsHelper === void 0 || analyticsHelper.sendActionEvent(_const.EVENT_ACTION.ADD_STEPS, _const.EVENT_STATUS.SUCCESS_10x_SAMPLED, {
+      type: _const.ADD_STEPS_TYPE.ACCEPTED,
+      latency: latency,
+      stepType: (0, _countBy.default)(stepsWithClientAndUserId,
+      // Ignored via go/ees005
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      function (stepWithClientAndUserId) {
+        return stepWithClientAndUserId.stepType;
+      })
+    });
+  }
+}
+function sendFailureAnalytics(response, latency, analyticsHelper) {
+  analyticsHelper === null || analyticsHelper === void 0 || analyticsHelper.sendActionEvent(_const.EVENT_ACTION.ADD_STEPS, _const.EVENT_STATUS.FAILURE, {
+    // 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
+    type: response.error.data.code === _ncsErrors.NCS_ERROR_CODE.HEAD_VERSION_UPDATE_FAILED || response.error.data.code === _ncsErrors.NCS_ERROR_CODE.VERSION_NUMBER_ALREADY_EXISTS ? _const.ADD_STEPS_TYPE.REJECTED : _const.ADD_STEPS_TYPE.ERROR,
+    latency: latency
+  });
+  analyticsHelper === null || analyticsHelper === void 0 || analyticsHelper.sendErrorEvent(response.error, 'Error while adding steps - Acknowledgement Error');
 }

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

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

@@ -339,36 +339,25 @@ export class DocumentService {
           reserveCursor: true
         });
         this.metadataService.updateMetadata(metadata);
-        if (fg('restore_localstep_fallback_reconcile')) {
-          try {
-            var _this$analyticsHelper13;
-            (_this$analyticsHelper13 = this.analyticsHelper) === null || _this$analyticsHelper13 === void 0 ? void 0 : _this$analyticsHelper13.sendActionEvent(EVENT_ACTION.REINITIALISE_DOCUMENT, EVENT_STATUS.INFO, {
-              numUnconfirmedSteps: unconfirmedSteps === null || unconfirmedSteps === void 0 ? void 0 : unconfirmedSteps.length,
-              obfuscatedSteps,
-              obfuscatedDoc,
-              hasTitle: !!(metadata !== null && metadata !== void 0 && metadata.title),
-              clientId: this.clientId,
-              targetClientId,
-              triggeredByCatchup: !!targetClientId
-            });
-            if (unconfirmedSteps !== null && unconfirmedSteps !== void 0 && unconfirmedSteps.length) {
-              this.applyLocalSteps(unconfirmedSteps);
-            }
-          } catch (applyLocalStepsError) {
-            var _this$analyticsHelper14;
-            (_this$analyticsHelper14 = this.analyticsHelper) === null || _this$analyticsHelper14 === void 0 ? void 0 : _this$analyticsHelper14.sendErrorEvent(applyLocalStepsError, `Error while onRestore with applyLocalSteps. Will fallback to fetchReconcile`);
-            useReconcile = true;
-            await this.fetchReconcile(JSON.stringify(currentState.content), 'fe-restore');
-          }
-        } else {
-          // If there are unconfirmed steps, attempt to reconcile our current state with with recovered document
-          if (useReconcile && currentState) {
-            await this.fetchReconcile(JSON.stringify(currentState.content), 'fe-restore');
-          } else if (unconfirmedSteps !== null && unconfirmedSteps !== void 0 && unconfirmedSteps.length) {
-            // we don't want to use reconcile for restore triggered by catchup client out of sync (when targetClientId is provided)
-            // as this results in all changes made while the client was out of sync being lost
+        try {
+          var _this$analyticsHelper13;
+          (_this$analyticsHelper13 = this.analyticsHelper) === null || _this$analyticsHelper13 === void 0 ? void 0 : _this$analyticsHelper13.sendActionEvent(EVENT_ACTION.REINITIALISE_DOCUMENT, EVENT_STATUS.INFO, {
+            numUnconfirmedSteps: unconfirmedSteps === null || unconfirmedSteps === void 0 ? void 0 : unconfirmedSteps.length,
+            obfuscatedSteps,
+            obfuscatedDoc,
+            hasTitle: !!(metadata !== null && metadata !== void 0 && metadata.title),
+            clientId: this.clientId,
+            targetClientId,
+            triggeredByCatchup: !!targetClientId
+          });
+          if (unconfirmedSteps !== null && unconfirmedSteps !== void 0 && unconfirmedSteps.length) {
             this.applyLocalSteps(unconfirmedSteps);
           }
+        } catch (applyLocalStepsError) {
+          var _this$analyticsHelper14;
+          (_this$analyticsHelper14 = this.analyticsHelper) === null || _this$analyticsHelper14 === void 0 ? void 0 : _this$analyticsHelper14.sendErrorEvent(applyLocalStepsError, `Error while onRestore with applyLocalSteps. Will fallback to fetchReconcile`);
+          useReconcile = true;
+          await this.fetchReconcile(JSON.stringify(currentState.content), 'fe-restore');
         }
         (_this$analyticsHelper15 = this.analyticsHelper) === null || _this$analyticsHelper15 === void 0 ? void 0 : _this$analyticsHelper15.sendActionEvent(EVENT_ACTION.REINITIALISE_DOCUMENT, EVENT_STATUS.SUCCESS, {
           numUnconfirmedSteps: unconfirmedSteps === null || unconfirmedSteps === void 0 ? void 0 : unconfirmedSteps.length,
@@ -543,8 +532,8 @@ export class DocumentService {
             (_this$analyticsHelper24 = this.analyticsHelper) === null || _this$analyticsHelper24 === void 0 ? void 0 : _this$analyticsHelper24.sendErrorEvent(new Error('Editor state is undefined'), 'commitUnconfirmedSteps called without state');
           }
           while (!isLastTrConfirmed) {
-            // forcePublish = true, this is because commitUnconfirmedSteps is only called when the Editor publishes a document
-            this.sendStepsFromCurrentState(undefined, reason);
+            // this makes all commitUnconfirmedSteps skip the waiting time, which means draft-sync is sped up too.
+            this.sendStepsFromCurrentState(undefined, 'publish');
             await sleep(500);
             const nextUnconfirmedSteps = this.getUnconfirmedSteps();
             if (nextUnconfirmedSteps !== null && nextUnconfirmedSteps !== void 0 && nextUnconfirmedSteps.length) {

package/dist/es2019/document/getConflictChanges.js

@@ -49,12 +49,17 @@ const getConflicts = ({
       // Partial overlap with the end
       localChange.fromA >= remoteChange.fromA && localChange.fromA < remoteChange.toA && localChange.toA > remoteChange.toA ||
       // Partial overlap with the start
-      localChange.fromA < remoteChange.fromA && localChange.toA > remoteChange.fromA && localChange.toA <= remoteChange.toA) {
+      localChange.fromA < remoteChange.fromA && localChange.toA > remoteChange.fromA && localChange.toA <= remoteChange.toA ||
+      // One of the edges match
+      localChange.fromA === remoteChange.toA || remoteChange.fromA === localChange.toA) {
+        const remoteSlice = remoteDoc.slice(remoteChange.fromB, remoteChange.toB);
+        const isDeletion = remoteSlice.size === 0;
         conflictingChanges.push({
           from: Math.min(localChange.fromA, remoteChange.fromA),
           to: Math.max(localChange.toA, remoteChange.toA),
-          local: localDoc.slice(localChange.fromB, localChange.toB, true),
-          remote: remoteDoc.slice(remoteChange.fromB, remoteChange.toB)
+          // We only want to capture the exact slice deleted (without parents) so we can display and insert as expected
+          local: localDoc.slice(localChange.fromB, localChange.toB, !isDeletion),
+          remote: remoteSlice
         });
       }
     });
@@ -146,12 +151,22 @@ export function getConflictChanges({
     remoteChanges
   });
   const isConflictChange = value => Boolean(value);
+
+  // Prevent duplicate ranges occuring
+  const seenInsertions = new Set();
   return {
     inserted: conflictingChanges.filter(i => i.remote.size !== 0).map(i => ({
       ...i,
       from: mapping.map(i.from, -1),
       to: mapping.map(i.to)
-    })).filter(isConflictChange),
+    })).filter(i => {
+      const identifier = `${i.from}-${i.to}`;
+      if (seenInsertions.has(identifier)) {
+        return false;
+      }
+      seenInsertions.add(identifier);
+      return isConflictChange(i);
+    }),
     deleted: conflictingChanges.filter(d => d.remote.size === 0).map(d => ({
       ...d,
       from: mapping.map(d.from),

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

@@ -6,6 +6,7 @@ import { NCS_ERROR_CODE } from '../errors/ncs-errors';
 import { createLogger } from '../helpers/utils';
 const logger = createLogger('commit-step', 'black');
 export let readyToCommit = true;
+export let lastBroadcastRequestAcked = true;
 export const RESET_READYTOCOMMIT_INTERVAL_MS = 5000;
 export const commitStepQueue = ({
   broadcast,
@@ -22,14 +23,27 @@ export const commitStepQueue = ({
   collabMode,
   reason
 }) => {
+  // this timer is for waiting to send the next batch in between acks from the BE
+  let commitWaitTimer;
+  // if publishing and not waiting for an ACK, then clear the commit timer and proceed, skipping the timer
+  if (reason === 'publish' && lastBroadcastRequestAcked) {
+    if (fg('skip_collab_provider_delay_on_publish')) {
+      clearTimeout(commitWaitTimer);
+      readyToCommit = true;
+    } // no-op if fg is turned off
+  }
   if (!readyToCommit) {
     logger('Not ready to commit, skip');
     return;
   }
   // Block other sending request, before ACK
   readyToCommit = false;
-  const timer = setTimeout(() => {
+  lastBroadcastRequestAcked = false;
+
+  // this timer is a fallback for if an ACK from BE is lost - stop the queue from getting indefinitely locked
+  const fallbackTimer = setTimeout(() => {
     readyToCommit = true;
+    lastBroadcastRequestAcked = true;
     logger('reset readyToCommit by timer');
   }, RESET_READYTOCOMMIT_INTERVAL_MS);
   let stepsWithClientAndUserId = steps.map(step => ({
@@ -48,7 +62,6 @@ export const commitStepQueue = ({
   // - is setup for last write wins,
   // - and is just a boolean -- so no real risk of data loss.
   if (__livePage && fg('platform.editor.live-pages-expand-divergence')) {
-    // @atlaskit/platform-feature-flags
     stepsWithClientAndUserId = stepsWithClientAndUserId.map(step => {
       if (isExpandChangeStep(step)) {
         // The title is also updated via this step, which we do want to send to the server.
@@ -86,64 +99,35 @@ export const commitStepQueue = ({
       version,
       userId
     }, response => {
+      lastBroadcastRequestAcked = true;
       const latency = new Date().getTime() - start;
-      if (timer) {
-        clearTimeout(timer);
-        if (fg('make_collab_provider_ack_delay_agnostic')) {
-          if (latency < 680) {
-            // this most closely replicates the BE ack delay behaviour. 500ms hardcoded + 180ms network delay (tested on hello)
-            // more context: https://hello.atlassian.net/wiki/spaces/CEPS/pages/5020556010/Spike+Moving+BE+delay+to+the+FE
-            // to be switched over to backpressure delay sent from the BE in https://hello.jira.atlassian.cloud/browse/CEPS-1030
-            setTimeout(() => {
-              readyToCommit = true;
-              logger('reset readyToCommit');
-            }, 680 - latency);
-          } else {
-            readyToCommit = true;
-            logger('reset readyToCommit');
-          }
-        } else {
-          if (latency < 400) {
-            setTimeout(() => {
-              readyToCommit = true;
-              logger('reset readyToCommit');
-            }, 100);
-          } else {
-            readyToCommit = true;
-            logger('reset readyToCommit');
-          }
-        }
-      }
+      // this most closely replicates the BE ack delay behaviour. 500ms hardcoded + 180ms network delay (tested on hello)
+      // more context: https://hello.atlassian.net/wiki/spaces/CEPS/pages/5020556010/Spike+Moving+BE+delay+to+the+FE
+      // to be switched over to backpressure delay sent from the BE in https://hello.jira.atlassian.cloud/browse/CEPS-1030
+      let delay = latency < 680 ? 680 - latency : 1;
+      if (response.delay) {
+        delay = response.delay;
+      } // if backpressure delay is sent, overwrite it
+
+      clearTimeout(fallbackTimer); // clear the fallback timer, ack was successfully sent/recieved
+      commitWaitTimer = setTimeout(() => {
+        // unlock the queue after waiting for delay
+        readyToCommit = true;
+        logger('reset readyToCommit');
+      }, delay);
       if (response.type === AcknowledgementResponseTypes.SUCCESS) {
         onStepsAdded({
           steps: stepsWithClientAndUserId,
           version: response.version
         });
-        // Sample only 10% of add steps events to avoid overwhelming the analytics
-        if (Math.random() < 0.1) {
-          analyticsHelper === null || analyticsHelper === void 0 ? void 0 : analyticsHelper.sendActionEvent(EVENT_ACTION.ADD_STEPS, EVENT_STATUS.SUCCESS_10x_SAMPLED, {
-            type: ADD_STEPS_TYPE.ACCEPTED,
-            latency,
-            stepType: countBy(stepsWithClientAndUserId,
-            // Ignored via go/ees005
-            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-            stepWithClientAndUserId => stepWithClientAndUserId.stepType)
-          });
-        }
+        sendSuccessAnalytics(latency, stepsWithClientAndUserId, analyticsHelper);
         emit('commit-status', {
           status: 'success',
           version: response.version
         });
       } else if (response.type === AcknowledgementResponseTypes.ERROR) {
         onErrorHandled(response.error);
-        analyticsHelper === null || analyticsHelper === void 0 ? void 0 : analyticsHelper.sendActionEvent(EVENT_ACTION.ADD_STEPS, EVENT_STATUS.FAILURE, {
-          // 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
-          type: response.error.data.code === NCS_ERROR_CODE.HEAD_VERSION_UPDATE_FAILED || response.error.data.code === NCS_ERROR_CODE.VERSION_NUMBER_ALREADY_EXISTS ? ADD_STEPS_TYPE.REJECTED : ADD_STEPS_TYPE.ERROR,
-          latency
-        });
-        analyticsHelper === null || analyticsHelper === void 0 ? void 0 : analyticsHelper.sendErrorEvent(response.error, 'Error while adding steps - Acknowledgement Error');
+        sendFailureAnalytics(response, latency, analyticsHelper);
         emit('commit-status', {
           status: 'failure',
           version
@@ -159,10 +143,8 @@ export const commitStepQueue = ({
       }
     });
   } catch (error) {
-    // if the broadcast failed due to not yet being connected, then set readyToCommit to true so that we don't get stuck in the timeout if the connection is slow to succeed
-    if (error.name === 'NotConnectedError') {
-      readyToCommit = true;
-    }
+    // if the broadcast failed for any reason, we shouldn't keep the queue locked as the BE has not recieved any message
+    readyToCommit = true;
     analyticsHelper === null || analyticsHelper === void 0 ? void 0 : analyticsHelper.sendErrorEvent(error, 'Error while adding steps - Broadcast threw exception');
     emit('commit-status', {
       status: 'failure',
@@ -177,4 +159,27 @@ function isExpandChangeStep(step) {
     return true;
   }
   return false;
+}
+function sendSuccessAnalytics(latency, stepsWithClientAndUserId, analyticsHelper) {
+  // Sample only 10% of add steps events to avoid overwhelming the analytics
+  if (Math.random() < 0.1) {
+    analyticsHelper === null || analyticsHelper === void 0 ? void 0 : analyticsHelper.sendActionEvent(EVENT_ACTION.ADD_STEPS, EVENT_STATUS.SUCCESS_10x_SAMPLED, {
+      type: ADD_STEPS_TYPE.ACCEPTED,
+      latency,
+      stepType: countBy(stepsWithClientAndUserId,
+      // Ignored via go/ees005
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      stepWithClientAndUserId => stepWithClientAndUserId.stepType)
+    });
+  }
+}
+function sendFailureAnalytics(response, latency, analyticsHelper) {
+  analyticsHelper === null || analyticsHelper === void 0 ? void 0 : analyticsHelper.sendActionEvent(EVENT_ACTION.ADD_STEPS, EVENT_STATUS.FAILURE, {
+    // 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
+    type: response.error.data.code === NCS_ERROR_CODE.HEAD_VERSION_UPDATE_FAILED || response.error.data.code === NCS_ERROR_CODE.VERSION_NUMBER_ALREADY_EXISTS ? ADD_STEPS_TYPE.REJECTED : ADD_STEPS_TYPE.ERROR,
+    latency
+  });
+  analyticsHelper === null || analyticsHelper === void 0 ? void 0 : analyticsHelper.sendErrorEvent(response.error, 'Error while adding steps - Acknowledgement Error');
 }

package/dist/es2019/version-wrapper.js

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

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

@@ -368,11 +368,7 @@ export var DocumentService = /*#__PURE__*/function () {
                 reserveCursor: true
               });
               _this.metadataService.updateMetadata(metadata);
-              if (!fg('restore_localstep_fallback_reconcile')) {
-                _context3.next = 27;
-                break;
-              }
-              _context3.prev = 14;
+              _context3.prev = 13;
               (_this$analyticsHelper13 = _this.analyticsHelper) === null || _this$analyticsHelper13 === void 0 || _this$analyticsHelper13.sendActionEvent(EVENT_ACTION.REINITIALISE_DOCUMENT, EVENT_STATUS.INFO, {
                 numUnconfirmedSteps: unconfirmedSteps === null || unconfirmedSteps === void 0 ? void 0 : unconfirmedSteps.length,
                 obfuscatedSteps: obfuscatedSteps,
@@ -385,35 +381,16 @@ export var DocumentService = /*#__PURE__*/function () {
               if (unconfirmedSteps !== null && unconfirmedSteps !== void 0 && unconfirmedSteps.length) {
                 _this.applyLocalSteps(unconfirmedSteps);
               }
-              _context3.next = 25;
+              _context3.next = 24;
               break;
-            case 19:
-              _context3.prev = 19;
-              _context3.t0 = _context3["catch"](14);
+            case 18:
+              _context3.prev = 18;
+              _context3.t0 = _context3["catch"](13);
               (_this$analyticsHelper14 = _this.analyticsHelper) === null || _this$analyticsHelper14 === void 0 || _this$analyticsHelper14.sendErrorEvent(_context3.t0, "Error while onRestore with applyLocalSteps. Will fallback to fetchReconcile");
               useReconcile = true;
-              _context3.next = 25;
+              _context3.next = 24;
               return _this.fetchReconcile(JSON.stringify(currentState.content), 'fe-restore');
-            case 25:
-              _context3.next = 33;
-              break;
-            case 27:
-              if (!(useReconcile && currentState)) {
-                _context3.next = 32;
-                break;
-              }
-              _context3.next = 30;
-              return _this.fetchReconcile(JSON.stringify(currentState.content), 'fe-restore');
-            case 30:
-              _context3.next = 33;
-              break;
-            case 32:
-              if (unconfirmedSteps !== null && unconfirmedSteps !== void 0 && unconfirmedSteps.length) {
-                // we don't want to use reconcile for restore triggered by catchup client out of sync (when targetClientId is provided)
-                // as this results in all changes made while the client was out of sync being lost
-                _this.applyLocalSteps(unconfirmedSteps);
-              }
-            case 33:
+            case 24:
               (_this$analyticsHelper15 = _this.analyticsHelper) === null || _this$analyticsHelper15 === void 0 || _this$analyticsHelper15.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),
@@ -422,10 +399,10 @@ export var DocumentService = /*#__PURE__*/function () {
                 targetClientId: targetClientId,
                 triggeredByCatchup: !!targetClientId
               });
-              _context3.next = 41;
+              _context3.next = 32;
               break;
-            case 36:
-              _context3.prev = 36;
+            case 27:
+              _context3.prev = 27;
               _context3.t1 = _context3["catch"](10);
               (_this$analyticsHelper16 = _this.analyticsHelper) === null || _this$analyticsHelper16 === void 0 || _this$analyticsHelper16.sendActionEvent(EVENT_ACTION.REINITIALISE_DOCUMENT, EVENT_STATUS.FAILURE, {
                 numUnconfirmedSteps: unconfirmedSteps === null || unconfirmedSteps === void 0 ? void 0 : unconfirmedSteps.length,
@@ -443,11 +420,11 @@ export var DocumentService = /*#__PURE__*/function () {
                   code: INTERNAL_ERROR_CODE.DOCUMENT_RESTORE_ERROR
                 }
               });
-            case 41:
+            case 32:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, null, [[10, 36], [14, 19]]);
+        }, _callee3, null, [[10, 27], [13, 18]]);
       }));
       return function (_x3) {
         return _ref7.apply(this, arguments);
@@ -633,8 +610,8 @@ export var DocumentService = /*#__PURE__*/function () {
                 _context5.next = 22;
                 break;
               }
-              // forcePublish = true, this is because commitUnconfirmedSteps is only called when the Editor publishes a document
-              _this.sendStepsFromCurrentState(undefined, reason);
+              // this makes all commitUnconfirmedSteps skip the waiting time, which means draft-sync is sped up too.
+              _this.sendStepsFromCurrentState(undefined, 'publish');
               _context5.next = 13;
               return sleep(500);
             case 13:

package/dist/esm/document/getConflictChanges.js

@@ -51,12 +51,17 @@ var getConflicts = function getConflicts(_ref) {
       // Partial overlap with the end
       localChange.fromA >= remoteChange.fromA && localChange.fromA < remoteChange.toA && localChange.toA > remoteChange.toA ||
       // Partial overlap with the start
-      localChange.fromA < remoteChange.fromA && localChange.toA > remoteChange.fromA && localChange.toA <= remoteChange.toA) {
+      localChange.fromA < remoteChange.fromA && localChange.toA > remoteChange.fromA && localChange.toA <= remoteChange.toA ||
+      // One of the edges match
+      localChange.fromA === remoteChange.toA || remoteChange.fromA === localChange.toA) {
+        var remoteSlice = remoteDoc.slice(remoteChange.fromB, remoteChange.toB);
+        var isDeletion = remoteSlice.size === 0;
         conflictingChanges.push({
           from: Math.min(localChange.fromA, remoteChange.fromA),
           to: Math.max(localChange.toA, remoteChange.toA),
-          local: localDoc.slice(localChange.fromB, localChange.toB, true),
-          remote: remoteDoc.slice(remoteChange.fromB, remoteChange.toB)
+          // We only want to capture the exact slice deleted (without parents) so we can display and insert as expected
+          local: localDoc.slice(localChange.fromB, localChange.toB, !isDeletion),
+          remote: remoteSlice
         });
       }
     });
@@ -149,6 +154,9 @@ export function getConflictChanges(_ref3) {
   var isConflictChange = function isConflictChange(value) {
     return Boolean(value);
   };
+
+  // Prevent duplicate ranges occuring
+  var seenInsertions = new Set();
   return {
     inserted: conflictingChanges.filter(function (i) {
       return i.remote.size !== 0;
@@ -157,7 +165,14 @@ export function getConflictChanges(_ref3) {
         from: mapping.map(i.from, -1),
         to: mapping.map(i.to)
       });
-    }).filter(isConflictChange),
+    }).filter(function (i) {
+      var identifier = "".concat(i.from, "-").concat(i.to);
+      if (seenInsertions.has(identifier)) {
+        return false;
+      }
+      seenInsertions.add(identifier);
+      return isConflictChange(i);
+    }),
     deleted: conflictingChanges.filter(function (d) {
       return d.remote.size === 0;
     }).map(function (d) {

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

@@ -9,6 +9,7 @@ import { NCS_ERROR_CODE } from '../errors/ncs-errors';
 import { createLogger } from '../helpers/utils';
 var logger = createLogger('commit-step', 'black');
 export var readyToCommit = true;
+export var lastBroadcastRequestAcked = true;
 export var RESET_READYTOCOMMIT_INTERVAL_MS = 5000;
 export var commitStepQueue = function commitStepQueue(_ref) {
   var broadcast = _ref.broadcast,
@@ -24,14 +25,27 @@ export var commitStepQueue = function commitStepQueue(_ref) {
     hasRecovered = _ref.hasRecovered,
     collabMode = _ref.collabMode,
     reason = _ref.reason;
+  // 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
+  if (reason === 'publish' && lastBroadcastRequestAcked) {
+    if (fg('skip_collab_provider_delay_on_publish')) {
+      clearTimeout(commitWaitTimer);
+      readyToCommit = true;
+    } // no-op if fg is turned off
+  }
   if (!readyToCommit) {
     logger('Not ready to commit, skip');
     return;
   }
   // Block other sending request, before ACK
   readyToCommit = false;
-  var timer = setTimeout(function () {
+  lastBroadcastRequestAcked = false;
+
+  // this timer is a fallback for if an ACK from BE is lost - stop the queue from getting indefinitely locked
+  var fallbackTimer = setTimeout(function () {
     readyToCommit = true;
+    lastBroadcastRequestAcked = true;
     logger('reset readyToCommit by timer');
   }, RESET_READYTOCOMMIT_INTERVAL_MS);
   var stepsWithClientAndUserId = steps.map(function (step) {
@@ -51,7 +65,6 @@ export var commitStepQueue = function commitStepQueue(_ref) {
   // - is setup for last write wins,
   // - and is just a boolean -- so no real risk of data loss.
   if (__livePage && fg('platform.editor.live-pages-expand-divergence')) {
-    // @atlaskit/platform-feature-flags
     stepsWithClientAndUserId = stepsWithClientAndUserId.map(function (step) {
       if (isExpandChangeStep(step)) {
         // The title is also updated via this step, which we do want to send to the server.
@@ -87,66 +100,35 @@ export var commitStepQueue = function commitStepQueue(_ref) {
       version: version,
       userId: userId
     }, function (response) {
+      lastBroadcastRequestAcked = true;
       var latency = new Date().getTime() - start;
-      if (timer) {
-        clearTimeout(timer);
-        if (fg('make_collab_provider_ack_delay_agnostic')) {
-          if (latency < 680) {
-            // this most closely replicates the BE ack delay behaviour. 500ms hardcoded + 180ms network delay (tested on hello)
-            // more context: https://hello.atlassian.net/wiki/spaces/CEPS/pages/5020556010/Spike+Moving+BE+delay+to+the+FE
-            // to be switched over to backpressure delay sent from the BE in https://hello.jira.atlassian.cloud/browse/CEPS-1030
-            setTimeout(function () {
-              readyToCommit = true;
-              logger('reset readyToCommit');
-            }, 680 - latency);
-          } else {
-            readyToCommit = true;
-            logger('reset readyToCommit');
-          }
-        } else {
-          if (latency < 400) {
-            setTimeout(function () {
-              readyToCommit = true;
-              logger('reset readyToCommit');
-            }, 100);
-          } else {
-            readyToCommit = true;
-            logger('reset readyToCommit');
-          }
-        }
-      }
+      // this most closely replicates the BE ack delay behaviour. 500ms hardcoded + 180ms network delay (tested on hello)
+      // more context: https://hello.atlassian.net/wiki/spaces/CEPS/pages/5020556010/Spike+Moving+BE+delay+to+the+FE
+      // to be switched over to backpressure delay sent from the BE in https://hello.jira.atlassian.cloud/browse/CEPS-1030
+      var delay = latency < 680 ? 680 - latency : 1;
+      if (response.delay) {
+        delay = response.delay;
+      } // if backpressure delay is sent, overwrite it
+
+      clearTimeout(fallbackTimer); // clear the fallback timer, ack was successfully sent/recieved
+      commitWaitTimer = setTimeout(function () {
+        // unlock the queue after waiting for delay
+        readyToCommit = true;
+        logger('reset readyToCommit');
+      }, delay);
       if (response.type === AcknowledgementResponseTypes.SUCCESS) {
         onStepsAdded({
           steps: stepsWithClientAndUserId,
           version: response.version
         });
-        // Sample only 10% of add steps events to avoid overwhelming the analytics
-        if (Math.random() < 0.1) {
-          analyticsHelper === null || analyticsHelper === void 0 || analyticsHelper.sendActionEvent(EVENT_ACTION.ADD_STEPS, EVENT_STATUS.SUCCESS_10x_SAMPLED, {
-            type: ADD_STEPS_TYPE.ACCEPTED,
-            latency: latency,
-            stepType: countBy(stepsWithClientAndUserId,
-            // Ignored via go/ees005
-            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-            function (stepWithClientAndUserId) {
-              return stepWithClientAndUserId.stepType;
-            })
-          });
-        }
+        sendSuccessAnalytics(latency, stepsWithClientAndUserId, analyticsHelper);
         emit('commit-status', {
           status: 'success',
           version: response.version
         });
       } else if (response.type === AcknowledgementResponseTypes.ERROR) {
         onErrorHandled(response.error);
-        analyticsHelper === null || analyticsHelper === void 0 || analyticsHelper.sendActionEvent(EVENT_ACTION.ADD_STEPS, EVENT_STATUS.FAILURE, {
-          // 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
-          type: response.error.data.code === NCS_ERROR_CODE.HEAD_VERSION_UPDATE_FAILED || response.error.data.code === NCS_ERROR_CODE.VERSION_NUMBER_ALREADY_EXISTS ? ADD_STEPS_TYPE.REJECTED : ADD_STEPS_TYPE.ERROR,
-          latency: latency
-        });
-        analyticsHelper === null || analyticsHelper === void 0 || analyticsHelper.sendErrorEvent(response.error, 'Error while adding steps - Acknowledgement Error');
+        sendFailureAnalytics(response, latency, analyticsHelper);
         emit('commit-status', {
           status: 'failure',
           version: version
@@ -162,10 +144,8 @@ export var commitStepQueue = function commitStepQueue(_ref) {
       }
     });
   } catch (error) {
-    // if the broadcast failed due to not yet being connected, then set readyToCommit to true so that we don't get stuck in the timeout if the connection is slow to succeed
-    if (error.name === 'NotConnectedError') {
-      readyToCommit = true;
-    }
+    // if the broadcast failed for any reason, we shouldn't keep the queue locked as the BE has not recieved any message
+    readyToCommit = true;
     analyticsHelper === null || analyticsHelper === void 0 || analyticsHelper.sendErrorEvent(error, 'Error while adding steps - Broadcast threw exception');
     emit('commit-status', {
       status: 'failure',
@@ -180,4 +160,29 @@ function isExpandChangeStep(step) {
     return true;
   }
   return false;
+}
+function sendSuccessAnalytics(latency, stepsWithClientAndUserId, analyticsHelper) {
+  // Sample only 10% of add steps events to avoid overwhelming the analytics
+  if (Math.random() < 0.1) {
+    analyticsHelper === null || analyticsHelper === void 0 || analyticsHelper.sendActionEvent(EVENT_ACTION.ADD_STEPS, EVENT_STATUS.SUCCESS_10x_SAMPLED, {
+      type: ADD_STEPS_TYPE.ACCEPTED,
+      latency: latency,
+      stepType: countBy(stepsWithClientAndUserId,
+      // Ignored via go/ees005
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      function (stepWithClientAndUserId) {
+        return stepWithClientAndUserId.stepType;
+      })
+    });
+  }
+}
+function sendFailureAnalytics(response, latency, analyticsHelper) {
+  analyticsHelper === null || analyticsHelper === void 0 || analyticsHelper.sendActionEvent(EVENT_ACTION.ADD_STEPS, EVENT_STATUS.FAILURE, {
+    // 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
+    type: response.error.data.code === NCS_ERROR_CODE.HEAD_VERSION_UPDATE_FAILED || response.error.data.code === NCS_ERROR_CODE.VERSION_NUMBER_ALREADY_EXISTS ? ADD_STEPS_TYPE.REJECTED : ADD_STEPS_TYPE.ERROR,
+    latency: latency
+  });
+  analyticsHelper === null || analyticsHelper === void 0 || analyticsHelper.sendErrorEvent(response.error, 'Error while adding steps - Acknowledgement Error');
 }

package/dist/esm/version-wrapper.js

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

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

@@ -5,6 +5,7 @@ import type AnalyticsHelper from '../analytics/analytics-helper';
 import type { InternalError } from '../errors/internal-errors';
 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, }: {
     broadcast: <K extends keyof ChannelEvent>(type: K, data: Omit<ChannelEvent[K], 'timestamp'>, callback?: Function) => void;

package/dist/types/types.d.ts

@@ -151,10 +151,12 @@ export type AcknowledgementPayload = AcknowledgementSuccessPayload | Acknowledge
 export type AddStepAcknowledgementSuccessPayload = {
     type: AcknowledgementResponseTypes.SUCCESS;
     version: number;
+    delay?: number;
 };
 export type AcknowledgementErrorPayload = {
     type: AcknowledgementResponseTypes.ERROR;
     error: InternalError;
+    delay?: number;
 };
 export type AddStepAcknowledgementPayload = AddStepAcknowledgementSuccessPayload | AcknowledgementErrorPayload;
 export type StepsPayload = {

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

@@ -5,6 +5,7 @@ import type AnalyticsHelper from '../analytics/analytics-helper';
 import type { InternalError } from '../errors/internal-errors';
 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, }: {
     broadcast: <K extends keyof ChannelEvent>(type: K, data: Omit<ChannelEvent[K], 'timestamp'>, callback?: Function) => void;

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

@@ -151,10 +151,12 @@ export type AcknowledgementPayload = AcknowledgementSuccessPayload | Acknowledge
 export type AddStepAcknowledgementSuccessPayload = {
     type: AcknowledgementResponseTypes.SUCCESS;
     version: number;
+    delay?: number;
 };
 export type AcknowledgementErrorPayload = {
     type: AcknowledgementResponseTypes.ERROR;
     error: InternalError;
+    delay?: number;
 };
 export type AddStepAcknowledgementPayload = AddStepAcknowledgementSuccessPayload | AcknowledgementErrorPayload;
 export type StepsPayload = {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/collab-provider",
-	"version": "10.10.0",
+	"version": "10.10.2",
 	"description": "A provider for collaborative editing.",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -35,12 +35,12 @@
 		"@atlaskit/adf-utils": "^19.19.0",
 		"@atlaskit/analytics-gas-types": "^5.1.0",
 		"@atlaskit/analytics-listeners": "^9.0.0",
-		"@atlaskit/editor-common": "^102.10.0",
+		"@atlaskit/editor-common": "^102.13.0",
 		"@atlaskit/editor-json-transformer": "^8.24.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
-		"@atlaskit/feature-gate-js-client": "^4.26.0",
+		"@atlaskit/feature-gate-js-client": "^5.0.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/prosemirror-collab": "^0.15.0",
+		"@atlaskit/prosemirror-collab": "^0.16.0",
 		"@atlaskit/react-ufo": "^3.4.0",
 		"@atlaskit/ufo": "^0.4.0",
 		"@atlaskit/util-service-support": "^6.3.0",
@@ -80,9 +80,6 @@
 		"platform_editor_merge_unconfirmed_steps": {
 			"type": "boolean"
 		},
-		"restore_localstep_fallback_reconcile": {
-			"type": "boolean"
-		},
 		"tag_unconfirmed_steps_after_recovery": {
 			"type": "boolean"
 		},
@@ -95,7 +92,7 @@
 		"log_obfuscated_steps_for_view_only": {
 			"type": "boolean"
 		},
-		"make_collab_provider_ack_delay_agnostic": {
+		"skip_collab_provider_delay_on_publish": {
 			"type": "boolean"
 		}
 	}