@atlaskit/collab-provider 11.1.1 → 11.2.1

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @atlaskit/collab-provider
 
+## 11.2.1
+
+### Patch Changes
+
+- [`bc0db0b86820f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/bc0db0b86820f) -
+  cleanup unused skipValidation experiment code
+- Updated dependencies
+
+## 11.2.0
+
+### Minor Changes
+
+- [#197573](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/197573)
+  [`2853bc7075415`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/2853bc7075415) -
+  Clean up platform_editor_connection_auto_disconnect_delay experiment feature gate
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 11.1.1
 
 ### Patch Changes

package/dist/cjs/channel.js

@@ -25,7 +25,6 @@ var _network = _interopRequireDefault(require("./connectivity/network"));
 var _internalErrors = require("./errors/internal-errors");
 var _ncsErrors = require("./errors/ncs-errors");
 var _customErrors = require("./errors/custom-errors");
-var _featureGateJsClient = _interopRequireDefault(require("@atlaskit/feature-gate-js-client"));
 var _bindEventListener = require("bind-event-listener");
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
@@ -884,14 +883,13 @@ var Channel = exports.Channel = /*#__PURE__*/function (_Emitter) {
     key: "addVisiblityListener",
     value:
     /**
-     * Adds an event listener for visibilitychange events to handle auto-disconnection if tab is in background
+     * Adds an event listener for visibilitychange events to automatically close the socket
+     * connection  if tab is in background for longer than disconnectDelay
      */
     function addVisiblityListener() {
-      var _FeatureGates$getExpe,
-        _this3 = this;
-      var disconnectDelay = (_FeatureGates$getExpe = _featureGateJsClient.default.getExperimentValue('platform_editor_connection_auto_disconnect_delay', 'delay', -1)) !== null && _FeatureGates$getExpe !== void 0 ? _FeatureGates$getExpe : -1;
-      var isAutoDisconnectEnabled = disconnectDelay >= 0;
-      if (isAutoDisconnectEnabled && this.config.isPresenceOnly) {
+      var _this3 = this;
+      var disconnectDelay = 60;
+      if (this.config.isPresenceOnly) {
         this.unbindVisibilityListener = (0, _bindEventListener.bind)(document, {
           type: 'visibilitychange',
           listener: function listener() {

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

@@ -21,7 +21,6 @@ var _const = require("../helpers/const");
 var _performance = require("../analytics/performance");
 var _internalErrors = require("../errors/internal-errors");
 var _utils = require("../helpers/utils");
-var _participantsService = require("../participants/participants-service");
 var _provider = require("../provider");
 var _commitStep = require("../provider/commit-step");
 var _customErrors = require("../errors/custom-errors");
@@ -78,7 +77,6 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
     (0, _defineProperty2.default)(this, "aggressiveCatchup", false);
     (0, _defineProperty2.default)(this, "catchUpOutofSync", false);
     (0, _defineProperty2.default)(this, "hasRecovered", false);
-    (0, _defineProperty2.default)(this, "numberOfStepCommitsSent", 0);
     (0, _defineProperty2.default)(this, "timeoutExceeded", false);
     /**
      * To prevent calling catchup to often, use lodash throttle to reduce the frequency
@@ -91,16 +89,6 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
       // TODO: ED-26957 - why shouldn't this be leading?
       trailing: true
     }));
-    /**
-     * Updates the number of commits sent since connect/reconnect
-     * This is used to track the number of commits sent to the server.
-     * currently we are validating the first steps from a user after connect/reconnect - CEPS-710
-     * @param steps
-     * @example
-     */
-    (0, _defineProperty2.default)(this, "setNumberOfCommitsSent", function (steps) {
-      _this.numberOfStepCommitsSent = steps;
-    });
     /**
      * Called when:
      *   * session established(offline -> online)
@@ -140,7 +128,7 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
                 analyticsHelper: _this.analyticsHelper,
                 clientId: _this.clientId,
                 onStepsAdded: _this.onStepsAdded,
-                catchUpOutofSync: reason === _const.CatchupEventReason.CORRUPT_STEP ? true : _this.catchUpOutofSync,
+                catchUpOutofSync: _this.catchUpOutofSync,
                 reason: reason,
                 sessionId: sessionId,
                 onCatchupComplete: function onCatchupComplete(steps) {
@@ -1026,12 +1014,12 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
     ) {
       var _this3 = this;
       var offlineEditingEnabled = (0, _experiments.editorExperiment)('platform_editor_offline_editing_web', true);
-      var singlePlayerStepMergingEnabled = (0, _expValEquals.expValEquals)('platform_editor_enable_single_player_step_merging', 'isEnabled', true);
+      var onlineStepMergingEnabled = (0, _expValEquals.expValEquals)('platform_editor_enable_single_player_step_merging', 'isEnabled', true);
 
       // Don't send any steps before we're ready.
-      if (offlineEditingEnabled || singlePlayerStepMergingEnabled) {
-        var enableStepsMergingForSinglePlayer = singlePlayerStepMergingEnabled && !this.commitStepService.getReadyToCommitStatus() && this.participantsService.getCollabMode() === _participantsService.SINGLE_COLLAB_MODE;
-        if (!this.getConnected() || enableStepsMergingForSinglePlayer) {
+      if (offlineEditingEnabled || onlineStepMergingEnabled) {
+        var enableOnlineStepMerging = onlineStepMergingEnabled && !this.commitStepService.getReadyToCommitStatus();
+        if (!this.getConnected() || enableOnlineStepMerging) {
           return;
         }
       }
@@ -1040,7 +1028,7 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
       if (!unconfirmedStepsData) {
         return;
       }
-      if (offlineEditingEnabled || singlePlayerStepMergingEnabled) {
+      if (offlineEditingEnabled || onlineStepMergingEnabled) {
         this.lockStepOrigins(unconfirmedStepsData.origins);
       }
       var unconfirmedSteps = unconfirmedStepsData.steps;
@@ -1124,8 +1112,6 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
         hasRecovered: this.hasRecovered,
         collabMode: this.participantsService.getCollabMode(),
         reason: reason,
-        numberOfStepCommitsSent: this.numberOfStepCommitsSent,
-        setNumberOfCommitsSent: this.setNumberOfCommitsSent,
         lockSteps: this.lockSteps
       });
     }

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

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

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

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

package/dist/cjs/helpers/const.js

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

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

@@ -9,7 +9,6 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _countBy = _interopRequireDefault(require("lodash/countBy"));
-var _featureGateJsClient = _interopRequireDefault(require("@atlaskit/feature-gate-js-client"));
 var _const = require("../helpers/const");
 var _types = require("../types");
 var _ncsErrors = require("../errors/ncs-errors");
@@ -50,8 +49,6 @@ var CommitStepService = exports.CommitStepService = /*#__PURE__*/function () {
         hasRecovered = _ref.hasRecovered,
         collabMode = _ref.collabMode,
         reason = _ref.reason,
-        numberOfStepCommitsSent = _ref.numberOfStepCommitsSent,
-        setNumberOfCommitsSent = _ref.setNumberOfCommitsSent,
         lockSteps = _ref.lockSteps;
       // this timer is for waiting to send the next batch in between acks from the BE
       var commitWaitTimer;
@@ -124,17 +121,11 @@ var CommitStepService = exports.CommitStepService = /*#__PURE__*/function () {
         version: version
       });
       try {
-        var _FeatureGates$getExpe;
-        var n = (_FeatureGates$getExpe = _featureGateJsClient.default.getExperimentValue('platform_editor_step_validation_on_connect', 'steps', 0)) !== null && _FeatureGates$getExpe !== void 0 ? _FeatureGates$getExpe : 0;
-        var isExperimentEnabled = n > 0;
-        // skip validation if FG is on and we have already sent n steps, or if FG is off
-        var skipValidation = isExperimentEnabled ? numberOfStepCommitsSent >= n : true;
         this.broadcast('steps:commit', {
           collabMode: collabMode,
           steps: stepsWithClientAndUserId,
           version: version,
-          userId: userId,
-          skipValidation: skipValidation
+          userId: userId
         }, function (response) {
           _this.lastBroadcastRequestAcked = true;
           var latency = new Date().getTime() - start;
@@ -185,9 +176,6 @@ var CommitStepService = exports.CommitStepService = /*#__PURE__*/function () {
             console.error(ADD_STEPS_ACKNOWLEDGEMENT_ERROR_MSG);
           }
         });
-        if (isExperimentEnabled && numberOfStepCommitsSent < n) {
-          setNumberOfCommitsSent(numberOfStepCommitsSent + 1);
-        }
       } catch (error) {
         var _this$analyticsHelper2;
         // if the broadcast failed for any reason, we shouldn't keep the queue locked as the BE has not recieved any message

package/dist/cjs/provider/index.js

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

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

package/dist/es2019/channel.js

@@ -11,7 +11,6 @@ import Network from './connectivity/network';
 import { INTERNAL_ERROR_CODE } from './errors/internal-errors';
 import { NCS_ERROR_CODE } from './errors/ncs-errors';
 import { NotConnectedError, NotInitializedError } from './errors/custom-errors';
-import FeatureGates from '@atlaskit/feature-gate-js-client';
 import { bind } from 'bind-event-listener';
 const logger = createLogger('Channel', 'green');
 export class Channel extends Emitter {
@@ -621,13 +620,12 @@ export class Channel extends Emitter {
     return stepLimit > 0 && this.stepCounter > stepLimit || stepSizeLimit > 0 && this.stepSizeCounter > stepSizeLimit || maxStepSizeLimit > 0 && this.maxStepSize > maxStepSizeLimit;
   }
   /**
-   * Adds an event listener for visibilitychange events to handle auto-disconnection if tab is in background
+   * Adds an event listener for visibilitychange events to automatically close the socket
+   * connection  if tab is in background for longer than disconnectDelay
    */
   addVisiblityListener() {
-    var _FeatureGates$getExpe;
-    const disconnectDelay = (_FeatureGates$getExpe = FeatureGates.getExperimentValue('platform_editor_connection_auto_disconnect_delay', 'delay', -1)) !== null && _FeatureGates$getExpe !== void 0 ? _FeatureGates$getExpe : -1;
-    const isAutoDisconnectEnabled = disconnectDelay >= 0;
-    if (isAutoDisconnectEnabled && this.config.isPresenceOnly) {
+    const disconnectDelay = 60;
+    if (this.config.isPresenceOnly) {
       this.unbindVisibilityListener = bind(document, {
         type: 'visibilitychange',
         listener: () => {

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

@@ -10,7 +10,6 @@ import { ACK_MAX_TRY, EVENT_ACTION, EVENT_STATUS, CatchupEventReason } from '../
 import { MEASURE_NAME, startMeasure, stopMeasure } from '../analytics/performance';
 import { INTERNAL_ERROR_CODE } from '../errors/internal-errors';
 import { createLogger, getDocAdfWithObfuscationFromJSON, getObfuscatedSteps, getStepUGCFreeDetails, sleep } from '../helpers/utils';
-import { SINGLE_COLLAB_MODE } from '../participants/participants-service';
 import { MAX_STEP_REJECTED_ERROR, MAX_STEP_REJECTED_ERROR_AGGRESSIVE } from '../provider';
 import { CommitStepService } from '../provider/commit-step';
 import { CantSyncUpError, UpdateDocumentError } from '../errors/custom-errors';
@@ -60,7 +59,6 @@ export class DocumentService {
     _defineProperty(this, "aggressiveCatchup", false);
     _defineProperty(this, "catchUpOutofSync", false);
     _defineProperty(this, "hasRecovered", false);
-    _defineProperty(this, "numberOfStepCommitsSent", 0);
     _defineProperty(this, "timeoutExceeded", false);
     /**
      * To prevent calling catchup to often, use lodash throttle to reduce the frequency
@@ -71,16 +69,6 @@ export class DocumentService {
       // TODO: ED-26957 - why shouldn't this be leading?
       trailing: true
     }));
-    /**
-     * Updates the number of commits sent since connect/reconnect
-     * This is used to track the number of commits sent to the server.
-     * currently we are validating the first steps from a user after connect/reconnect - CEPS-710
-     * @param steps
-     * @example
-     */
-    _defineProperty(this, "setNumberOfCommitsSent", steps => {
-      this.numberOfStepCommitsSent = steps;
-    });
     /**
      * Called when:
      *   * session established(offline -> online)
@@ -133,7 +121,7 @@ export class DocumentService {
           analyticsHelper: this.analyticsHelper,
           clientId: this.clientId,
           onStepsAdded: this.onStepsAdded,
-          catchUpOutofSync: reason === CatchupEventReason.CORRUPT_STEP ? true : this.catchUpOutofSync,
+          catchUpOutofSync: this.catchUpOutofSync,
           reason,
           sessionId,
           onCatchupComplete: steps => {
@@ -892,12 +880,12 @@ export class DocumentService {
   send(tr, _oldState, newState, sendAnalyticsEvent, reason // only used for publish and draft-sync events - when called through getFinalAcknowledgedState
   ) {
     const offlineEditingEnabled = editorExperiment('platform_editor_offline_editing_web', true);
-    const singlePlayerStepMergingEnabled = expValEquals('platform_editor_enable_single_player_step_merging', 'isEnabled', true);
+    const onlineStepMergingEnabled = expValEquals('platform_editor_enable_single_player_step_merging', 'isEnabled', true);
 
     // Don't send any steps before we're ready.
-    if (offlineEditingEnabled || singlePlayerStepMergingEnabled) {
-      const enableStepsMergingForSinglePlayer = singlePlayerStepMergingEnabled && !this.commitStepService.getReadyToCommitStatus() && this.participantsService.getCollabMode() === SINGLE_COLLAB_MODE;
-      if (!this.getConnected() || enableStepsMergingForSinglePlayer) {
+    if (offlineEditingEnabled || onlineStepMergingEnabled) {
+      const enableOnlineStepMerging = onlineStepMergingEnabled && !this.commitStepService.getReadyToCommitStatus();
+      if (!this.getConnected() || enableOnlineStepMerging) {
         return;
       }
     }
@@ -906,7 +894,7 @@ export class DocumentService {
     if (!unconfirmedStepsData) {
       return;
     }
-    if (offlineEditingEnabled || singlePlayerStepMergingEnabled) {
+    if (offlineEditingEnabled || onlineStepMergingEnabled) {
       this.lockStepOrigins(unconfirmedStepsData.origins);
     }
     const unconfirmedSteps = unconfirmedStepsData.steps;
@@ -990,8 +978,6 @@ export class DocumentService {
       hasRecovered: this.hasRecovered,
       collabMode: this.participantsService.getCollabMode(),
       reason,
-      numberOfStepCommitsSent: this.numberOfStepCommitsSent,
-      setNumberOfCommitsSent: this.setNumberOfCommitsSent,
       lockSteps: this.lockSteps
     });
   }

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

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

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

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

package/dist/es2019/helpers/const.js

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

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

@@ -1,5 +1,4 @@
 import countBy from 'lodash/countBy';
-import FeatureGates from '@atlaskit/feature-gate-js-client';
 import { ADD_STEPS_TYPE, EVENT_ACTION, EVENT_STATUS } from '../helpers/const';
 import { AcknowledgementResponseTypes } from '../types';
 import { NCS_ERROR_CODE } from '../errors/ncs-errors';
@@ -34,8 +33,6 @@ export class CommitStepService {
     hasRecovered,
     collabMode,
     reason,
-    numberOfStepCommitsSent,
-    setNumberOfCommitsSent,
     lockSteps
   }) {
     // this timer is for waiting to send the next batch in between acks from the BE
@@ -110,17 +107,11 @@ export class CommitStepService {
       version
     });
     try {
-      var _FeatureGates$getExpe;
-      const n = (_FeatureGates$getExpe = FeatureGates.getExperimentValue('platform_editor_step_validation_on_connect', 'steps', 0)) !== null && _FeatureGates$getExpe !== void 0 ? _FeatureGates$getExpe : 0;
-      const isExperimentEnabled = n > 0;
-      // skip validation if FG is on and we have already sent n steps, or if FG is off
-      const skipValidation = isExperimentEnabled ? numberOfStepCommitsSent >= n : true;
       this.broadcast('steps:commit', {
         collabMode,
         steps: stepsWithClientAndUserId,
         version,
-        userId,
-        skipValidation
+        userId
       }, response => {
         this.lastBroadcastRequestAcked = true;
         const latency = new Date().getTime() - start;
@@ -171,9 +162,6 @@ export class CommitStepService {
           console.error(ADD_STEPS_ACKNOWLEDGEMENT_ERROR_MSG);
         }
       });
-      if (isExperimentEnabled && numberOfStepCommitsSent < n) {
-        setNumberOfCommitsSent(numberOfStepCommitsSent + 1);
-      }
     } catch (error) {
       var _this$analyticsHelper2;
       // if the broadcast failed for any reason, we shouldn't keep the queue locked as the BE has not recieved any message

package/dist/es2019/provider/index.js

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

package/dist/es2019/version-wrapper.js

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

package/dist/esm/channel.js

@@ -25,7 +25,6 @@ import Network from './connectivity/network';
 import { INTERNAL_ERROR_CODE } from './errors/internal-errors';
 import { NCS_ERROR_CODE } from './errors/ncs-errors';
 import { NotConnectedError, NotInitializedError } from './errors/custom-errors';
-import FeatureGates from '@atlaskit/feature-gate-js-client';
 import { bind } from 'bind-event-listener';
 var logger = createLogger('Channel', 'green');
 export var Channel = /*#__PURE__*/function (_Emitter) {
@@ -877,14 +876,13 @@ export var Channel = /*#__PURE__*/function (_Emitter) {
     key: "addVisiblityListener",
     value:
     /**
-     * Adds an event listener for visibilitychange events to handle auto-disconnection if tab is in background
+     * Adds an event listener for visibilitychange events to automatically close the socket
+     * connection  if tab is in background for longer than disconnectDelay
      */
     function addVisiblityListener() {
-      var _FeatureGates$getExpe,
-        _this3 = this;
-      var disconnectDelay = (_FeatureGates$getExpe = FeatureGates.getExperimentValue('platform_editor_connection_auto_disconnect_delay', 'delay', -1)) !== null && _FeatureGates$getExpe !== void 0 ? _FeatureGates$getExpe : -1;
-      var isAutoDisconnectEnabled = disconnectDelay >= 0;
-      if (isAutoDisconnectEnabled && this.config.isPresenceOnly) {
+      var _this3 = this;
+      var disconnectDelay = 60;
+      if (this.config.isPresenceOnly) {
         this.unbindVisibilityListener = bind(document, {
           type: 'visibilitychange',
           listener: function listener() {

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

@@ -16,7 +16,6 @@ import { ACK_MAX_TRY, EVENT_ACTION, EVENT_STATUS, CatchupEventReason } from '../
 import { MEASURE_NAME, startMeasure, stopMeasure } from '../analytics/performance';
 import { INTERNAL_ERROR_CODE } from '../errors/internal-errors';
 import { createLogger, getDocAdfWithObfuscationFromJSON, getObfuscatedSteps, getStepUGCFreeDetails, sleep } from '../helpers/utils';
-import { SINGLE_COLLAB_MODE } from '../participants/participants-service';
 import { MAX_STEP_REJECTED_ERROR, MAX_STEP_REJECTED_ERROR_AGGRESSIVE } from '../provider';
 import { CommitStepService } from '../provider/commit-step';
 import { CantSyncUpError, UpdateDocumentError } from '../errors/custom-errors';
@@ -71,7 +70,6 @@ export var DocumentService = /*#__PURE__*/function () {
     _defineProperty(this, "aggressiveCatchup", false);
     _defineProperty(this, "catchUpOutofSync", false);
     _defineProperty(this, "hasRecovered", false);
-    _defineProperty(this, "numberOfStepCommitsSent", 0);
     _defineProperty(this, "timeoutExceeded", false);
     /**
      * To prevent calling catchup to often, use lodash throttle to reduce the frequency
@@ -84,16 +82,6 @@ export var DocumentService = /*#__PURE__*/function () {
       // TODO: ED-26957 - why shouldn't this be leading?
       trailing: true
     }));
-    /**
-     * Updates the number of commits sent since connect/reconnect
-     * This is used to track the number of commits sent to the server.
-     * currently we are validating the first steps from a user after connect/reconnect - CEPS-710
-     * @param steps
-     * @example
-     */
-    _defineProperty(this, "setNumberOfCommitsSent", function (steps) {
-      _this.numberOfStepCommitsSent = steps;
-    });
     /**
      * Called when:
      *   * session established(offline -> online)
@@ -133,7 +121,7 @@ export var DocumentService = /*#__PURE__*/function () {
                 analyticsHelper: _this.analyticsHelper,
                 clientId: _this.clientId,
                 onStepsAdded: _this.onStepsAdded,
-                catchUpOutofSync: reason === CatchupEventReason.CORRUPT_STEP ? true : _this.catchUpOutofSync,
+                catchUpOutofSync: _this.catchUpOutofSync,
                 reason: reason,
                 sessionId: sessionId,
                 onCatchupComplete: function onCatchupComplete(steps) {
@@ -1019,12 +1007,12 @@ export var DocumentService = /*#__PURE__*/function () {
     ) {
       var _this3 = this;
       var offlineEditingEnabled = editorExperiment('platform_editor_offline_editing_web', true);
-      var singlePlayerStepMergingEnabled = expValEquals('platform_editor_enable_single_player_step_merging', 'isEnabled', true);
+      var onlineStepMergingEnabled = expValEquals('platform_editor_enable_single_player_step_merging', 'isEnabled', true);
 
       // Don't send any steps before we're ready.
-      if (offlineEditingEnabled || singlePlayerStepMergingEnabled) {
-        var enableStepsMergingForSinglePlayer = singlePlayerStepMergingEnabled && !this.commitStepService.getReadyToCommitStatus() && this.participantsService.getCollabMode() === SINGLE_COLLAB_MODE;
-        if (!this.getConnected() || enableStepsMergingForSinglePlayer) {
+      if (offlineEditingEnabled || onlineStepMergingEnabled) {
+        var enableOnlineStepMerging = onlineStepMergingEnabled && !this.commitStepService.getReadyToCommitStatus();
+        if (!this.getConnected() || enableOnlineStepMerging) {
           return;
         }
       }
@@ -1033,7 +1021,7 @@ export var DocumentService = /*#__PURE__*/function () {
       if (!unconfirmedStepsData) {
         return;
       }
-      if (offlineEditingEnabled || singlePlayerStepMergingEnabled) {
+      if (offlineEditingEnabled || onlineStepMergingEnabled) {
         this.lockStepOrigins(unconfirmedStepsData.origins);
       }
       var unconfirmedSteps = unconfirmedStepsData.steps;
@@ -1117,8 +1105,6 @@ export var DocumentService = /*#__PURE__*/function () {
         hasRecovered: this.hasRecovered,
         collabMode: this.participantsService.getCollabMode(),
         reason: reason,
-        numberOfStepCommitsSent: this.numberOfStepCommitsSent,
-        setNumberOfCommitsSent: this.setNumberOfCommitsSent,
         lockSteps: this.lockSteps
       });
     }

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

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

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

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

package/dist/esm/helpers/const.js

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

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

@@ -4,7 +4,6 @@ import _createClass from "@babel/runtime/helpers/createClass";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import countBy from 'lodash/countBy';
-import FeatureGates from '@atlaskit/feature-gate-js-client';
 import { ADD_STEPS_TYPE, EVENT_ACTION, EVENT_STATUS } from '../helpers/const';
 import { AcknowledgementResponseTypes } from '../types';
 import { NCS_ERROR_CODE } from '../errors/ncs-errors';
@@ -43,8 +42,6 @@ export var CommitStepService = /*#__PURE__*/function () {
         hasRecovered = _ref.hasRecovered,
         collabMode = _ref.collabMode,
         reason = _ref.reason,
-        numberOfStepCommitsSent = _ref.numberOfStepCommitsSent,
-        setNumberOfCommitsSent = _ref.setNumberOfCommitsSent,
         lockSteps = _ref.lockSteps;
       // this timer is for waiting to send the next batch in between acks from the BE
       var commitWaitTimer;
@@ -117,17 +114,11 @@ export var CommitStepService = /*#__PURE__*/function () {
         version: version
       });
       try {
-        var _FeatureGates$getExpe;
-        var n = (_FeatureGates$getExpe = FeatureGates.getExperimentValue('platform_editor_step_validation_on_connect', 'steps', 0)) !== null && _FeatureGates$getExpe !== void 0 ? _FeatureGates$getExpe : 0;
-        var isExperimentEnabled = n > 0;
-        // skip validation if FG is on and we have already sent n steps, or if FG is off
-        var skipValidation = isExperimentEnabled ? numberOfStepCommitsSent >= n : true;
         this.broadcast('steps:commit', {
           collabMode: collabMode,
           steps: stepsWithClientAndUserId,
           version: version,
-          userId: userId,
-          skipValidation: skipValidation
+          userId: userId
         }, function (response) {
           _this.lastBroadcastRequestAcked = true;
           var latency = new Date().getTime() - start;
@@ -178,9 +169,6 @@ export var CommitStepService = /*#__PURE__*/function () {
             console.error(ADD_STEPS_ACKNOWLEDGEMENT_ERROR_MSG);
           }
         });
-        if (isExperimentEnabled && numberOfStepCommitsSent < n) {
-          setNumberOfCommitsSent(numberOfStepCommitsSent + 1);
-        }
       } catch (error) {
         var _this$analyticsHelper2;
         // if the broadcast failed for any reason, we shouldn't keep the queue locked as the BE has not recieved any message