@atlaskit/collab-provider 10.3.4 → 10.4.1

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

@@ -31,8 +31,6 @@ var SEND_PRESENCE_INTERVAL = 150 * 1000; // 150 seconds
  * @param sendPresenceJoined Callback to Channel class
  */
 var ParticipantsService = exports.ParticipantsService = /*#__PURE__*/function () {
-  // Ignored via go/ees005
-  // eslint-disable-next-line @typescript-eslint/max-params
   function ParticipantsService(analyticsHelper) {
     var _this = this;
     var participantsState = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : new _participantsState.ParticipantsState();

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

@@ -27,7 +27,8 @@ var commitStepQueue = exports.commitStepQueue = function commitStepQueue(_ref) {
     onErrorHandled = _ref.onErrorHandled,
     analyticsHelper = _ref.analyticsHelper,
     emit = _ref.emit,
-    __livePage = _ref.__livePage;
+    __livePage = _ref.__livePage,
+    hasRecovered = _ref.hasRecovered;
   if (!readyToCommit) {
     logger('Not ready to commit, skip');
     return;
@@ -69,6 +70,16 @@ var commitStepQueue = exports.commitStepQueue = function commitStepQueue(_ref) {
       return step;
     });
   }
+
+  // tag unconfirmed steps sent after page has been recovered during client's editing session
+  if (hasRecovered && (0, _platformFeatureFlags.fg)('tag_unconfirmed_steps_after_recovery')) {
+    stepsWithClientAndUserId = stepsWithClientAndUserId.map(function (step) {
+      step.metadata = _objectSpread(_objectSpread({}, step.metadata), {}, {
+        unconfirmedStepAfterRecovery: true
+      });
+      return step;
+    });
+  }
   var start = new Date().getTime();
   emit('commit-status', {
     status: 'attempt',

package/dist/cjs/provider/index.js

@@ -15,6 +15,7 @@ var _get2 = _interopRequireDefault(require("@babel/runtime/helpers/get"));
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _uuid = require("uuid");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _emitter = require("../emitter");
 var _channel = require("../channel");
 var _utils = require("../helpers/utils");
@@ -162,7 +163,29 @@ var Provider = exports.Provider = /*#__PURE__*/function (_Emitter) {
         _this.emit('permission', permit);
       }).on('steps:added', _this.documentService.onStepsAdded).on('metadata:changed', _this.metadataService.onMetadataChanged).on('participant:telepointer', function (payload) {
         return _this.participantsService.onParticipantTelepointer(payload, _this.sessionId);
-      }).on('participant:activity-join', _this.participantsService.onParticipantActivityJoin).on('participant:activity-ack', _this.participantsService.onParticipantActivityAck).on('presence:joined', _this.participantsService.onPresenceJoined).on('presence', _this.participantsService.onPresence).on('participant:left', _this.participantsService.onParticipantLeft).on('participant:updated', _this.participantsService.onParticipantUpdated).on('disconnect', _this.onDisconnected.bind(_this)).on('error', _this.onErrorHandled).on('status', _this.namespaceService.onNamespaceStatusChanged).connect(shouldSkipDocumentInit);
+      }).on('participant:activity-join', _this.participantsService.onParticipantActivityJoin).on('participant:activity-ack', _this.participantsService.onParticipantActivityAck).on('presence:joined', _this.participantsService.onPresenceJoined).on('presence', _this.participantsService.onPresence).on('participant:left', _this.participantsService.onParticipantLeft).on('participant:updated', _this.participantsService.onParticipantUpdated).on('disconnect', _this.onDisconnected.bind(_this)).on('error', _this.onErrorHandled).on('status', /*#__PURE__*/function () {
+        var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(status) {
+          var isLocked;
+          return _regenerator.default.wrap(function _callee$(_context) {
+            while (1) switch (_context.prev = _context.next) {
+              case 0:
+                _context.next = 2;
+                return _this.namespaceService.onNamespaceStatusChanged(status);
+              case 2:
+                isLocked = _this.namespaceService.getIsNamespaceLocked();
+                _this.emit('namespace-lock:check', {
+                  isLocked: isLocked
+                });
+              case 4:
+              case "end":
+                return _context.stop();
+            }
+          }, _callee);
+        }));
+        return function (_x) {
+          return _ref4.apply(this, arguments);
+        };
+      }()).connect(shouldSkipDocumentInit);
     });
     (0, _defineProperty2.default)(_this, "setUserId", function (id) {
       _this.userId = id;
@@ -209,8 +232,8 @@ var Provider = exports.Provider = /*#__PURE__*/function (_Emitter) {
       return _this.aiProviderActiveIds;
     });
     // Note: this gets triggered on page reload for Firefox (not other browsers) because of closeOnBeforeunload: false
-    (0, _defineProperty2.default)(_this, "onDisconnected", function (_ref4) {
-      var reason = _ref4.reason;
+    (0, _defineProperty2.default)(_this, "onDisconnected", function (_ref5) {
+      var reason = _ref5.reason;
       _this.disconnectedAt = Date.now();
       _this.participantsService.disconnect(reason, _this.sessionId);
     });
@@ -225,52 +248,52 @@ var Provider = exports.Provider = /*#__PURE__*/function (_Emitter) {
      * Used for draft sync, a process running every 5s for the first editor of a document to sync the document to the Confluence back-end.
      * @throws {GetCurrentStateError} Something went wrong while returning the current state
      */
-    (0, _defineProperty2.default)(_this, "getCurrentState", /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+    (0, _defineProperty2.default)(_this, "getCurrentState", /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
       var _this$analyticsHelper4;
-      return _regenerator.default.wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
+      return _regenerator.default.wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            _context.prev = 0;
-            _context.next = 3;
+            _context2.prev = 0;
+            _context2.next = 3;
             return _this.documentService.getCurrentState();
           case 3:
-            return _context.abrupt("return", _context.sent);
+            return _context2.abrupt("return", _context2.sent);
           case 6:
-            _context.prev = 6;
-            _context.t0 = _context["catch"](0);
-            (_this$analyticsHelper4 = _this.analyticsHelper) === null || _this$analyticsHelper4 === void 0 || _this$analyticsHelper4.sendErrorEvent(_context.t0, 'Error while returning ADF version of current draft document');
-            throw new _customErrors.GetCurrentStateError('Error while returning the current state of the draft document', _context.t0);
+            _context2.prev = 6;
+            _context2.t0 = _context2["catch"](0);
+            (_this$analyticsHelper4 = _this.analyticsHelper) === null || _this$analyticsHelper4 === void 0 || _this$analyticsHelper4.sendErrorEvent(_context2.t0, 'Error while returning ADF version of current draft document');
+            throw new _customErrors.GetCurrentStateError('Error while returning the current state of the draft document', _context2.t0);
           case 10:
           case "end":
-            return _context.stop();
+            return _context2.stop();
         }
-      }, _callee, null, [[0, 6]]);
+      }, _callee2, null, [[0, 6]]);
     })));
     /**
      * Return the final acknowledged (by NCS) ADF version of the current draft document, together with it's title and the current step version.
      * Used when returning the document to Confluence on publish.
      * @throws {GetFinalAcknowledgedStateError} Something went wrong while returning the acknowledged state
      */
-    (0, _defineProperty2.default)(_this, "getFinalAcknowledgedState", /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
+    (0, _defineProperty2.default)(_this, "getFinalAcknowledgedState", /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
       var _this$analyticsHelper5;
-      return _regenerator.default.wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
+      return _regenerator.default.wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
           case 0:
-            _context2.prev = 0;
-            _context2.next = 3;
+            _context3.prev = 0;
+            _context3.next = 3;
             return _this.documentService.getFinalAcknowledgedState();
           case 3:
-            return _context2.abrupt("return", _context2.sent);
+            return _context3.abrupt("return", _context3.sent);
           case 6:
-            _context2.prev = 6;
-            _context2.t0 = _context2["catch"](0);
-            (_this$analyticsHelper5 = _this.analyticsHelper) === null || _this$analyticsHelper5 === void 0 || _this$analyticsHelper5.sendErrorEvent(_context2.t0, 'Error while returning ADF version of the final draft document');
-            throw new _customErrors.GetFinalAcknowledgedStateError('Error while returning the final acknowledged state of the draft document', _context2.t0);
+            _context3.prev = 6;
+            _context3.t0 = _context3["catch"](0);
+            (_this$analyticsHelper5 = _this.analyticsHelper) === null || _this$analyticsHelper5 === void 0 || _this$analyticsHelper5.sendErrorEvent(_context3.t0, 'Error while returning ADF version of the final draft document');
+            throw new _customErrors.GetFinalAcknowledgedStateError('Error while returning the final acknowledged state of the draft document', _context3.t0);
           case 10:
           case "end":
-            return _context2.stop();
+            return _context3.stop();
         }
-      }, _callee2, null, [[0, 6]]);
+      }, _callee3, null, [[0, 6]]);
     })));
     (0, _defineProperty2.default)(_this, "getUnconfirmedSteps", function () {
       return _this.documentService.getUnconfirmedSteps();
@@ -359,10 +382,10 @@ var Provider = exports.Provider = /*#__PURE__*/function (_Emitter) {
      */
   }, {
     key: "setup",
-    value: function setup(_ref7) {
-      var getState = _ref7.getState,
-        editorApi = _ref7.editorApi,
-        onSyncUpError = _ref7.onSyncUpError;
+    value: function setup(_ref8) {
+      var getState = _ref8.getState,
+        editorApi = _ref8.editorApi,
+        onSyncUpError = _ref8.onSyncUpError;
       this.checkForCookies();
       try {
         // Ignored via go/ees005
@@ -456,16 +479,29 @@ var Provider = exports.Provider = /*#__PURE__*/function (_Emitter) {
   }, {
     key: "send",
     value: function send(_tr, _oldState, newState) {
+      var _this2 = this;
       try {
         if (this.isViewOnly()) {
-          var _this$analyticsHelper10;
           var error = {
             message: 'Attempted to send steps in view only mode',
             data: {
               code: _internalErrors.INTERNAL_ERROR_CODE.VIEW_ONLY_STEPS_ERROR
             }
           };
-          (_this$analyticsHelper10 = this.analyticsHelper) === null || _this$analyticsHelper10 === void 0 || _this$analyticsHelper10.sendErrorEvent(error, error.message);
+          if ((0, _platformFeatureFlags.fg)('log_obfuscated_steps_for_view_only')) {
+            (0, _utils.logObfuscatedSteps)(_oldState, newState).then(function (attributes) {
+              var _this2$analyticsHelpe;
+              var stepAttributes = attributes instanceof _customErrors.CustomError ? {} : _objectSpread({}, attributes);
+              var stepsError = new _customErrors.CustomError(error.message, error, _objectSpread({}, stepAttributes));
+              (_this2$analyticsHelpe = _this2.analyticsHelper) === null || _this2$analyticsHelpe === void 0 || _this2$analyticsHelpe.sendErrorEvent(stepsError, stepsError.message);
+            }).catch(function (err) {
+              var _this2$analyticsHelpe2;
+              return (_this2$analyticsHelpe2 = _this2.analyticsHelper) === null || _this2$analyticsHelpe2 === void 0 ? void 0 : _this2$analyticsHelpe2.sendErrorEvent(err, err.message);
+            });
+          } else {
+            var _this$analyticsHelper10;
+            (_this$analyticsHelper10 = this.analyticsHelper) === null || _this$analyticsHelper10 === void 0 || _this$analyticsHelper10.sendErrorEvent(error, error.message);
+          }
           return;
         }
         // Don't send steps while the document is locked (eg. when restoring the document)

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

package/dist/es2019/analytics/analytics-helper.js

@@ -58,8 +58,6 @@ const triggerAnalyticsEvent = (analyticsEvent, analyticsClient) => {
   }
 };
 export default class AnalyticsHelper {
-  // Ignored via go/ees005
-  // eslint-disable-next-line @typescript-eslint/max-params
   constructor(documentAri, subProduct, analyticsClient, getAnalyticsClient) {
     this.documentAri = documentAri;
     this.subProduct = subProduct;

package/dist/es2019/api/api.js

@@ -1,5 +1,8 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { getProduct, getSubProduct, createLogger } from '../helpers/utils';
+import { getActiveTraceHttpRequestHeaders } from '@atlaskit/react-ufo/experience-trace-id-context';
+import { fg } from '@atlaskit/platform-feature-flags';
+import { addFeatureFlagAccessed } from '@atlaskit/react-ufo/feature-flags-accessed';
 const logger = createLogger('Api', 'blue');
 class AddCommentError extends Error {
   constructor(message, status, meta) {
@@ -27,6 +30,14 @@ export class Api {
       });
       const url = `${this.config.url}/document/${encodeURIComponent(this.config.documentAri)}/comment`;
       logger(`Request url: `, url);
+
+      //Get tracing headers from UFO
+      const tracingHeaderEnabled = fg('platform_collab_provider_tracingheaders');
+      addFeatureFlagAccessed('platform_collab_provider_tracingheaders', tracingHeaderEnabled);
+      let tracingHeaders = {};
+      if (tracingHeaderEnabled) {
+        tracingHeaders = getActiveTraceHttpRequestHeaders(url);
+      }
       const fetchOptions = {
         credentials: 'include',
         headers: {
@@ -35,7 +46,8 @@ export class Api {
           } : {}),
           'x-product': getProduct(this.config.productInfo),
           'x-subproduct': getSubProduct(this.config.productInfo),
-          'Content-Type': 'application/json'
+          'Content-Type': 'application/json',
+          ...tracingHeaders
         },
         method: 'POST',
         body: reqBody

package/dist/es2019/channel.js

@@ -173,8 +173,6 @@ export class Channel extends Emitter {
         this.emit('steps:added', data);
       }
     });
-    // Ignored via go/ees005
-    // eslint-disable-next-line @typescript-eslint/max-params
     _defineProperty(this, "fetchCatchupv2", async (fromVersion, clientId, catchUpOutofSync, reason) => {
       try {
         const {

package/dist/es2019/document/catchupv2.js

@@ -1,4 +1,6 @@
-import { createLogger } from '../helpers/utils';
+import { EVENT_ACTION, EVENT_STATUS } from '../helpers/const';
+import { createLogger, getObfuscatedSteps, getDocAdfWithObfuscation } from '../helpers/utils';
+import { fg } from '@atlaskit/platform-feature-flags';
 const logger = createLogger('Catchupv2', 'red');
 export const catchupv2 = async opt => {
   // Ignored via go/ees005
@@ -34,7 +36,11 @@ export const catchupv2 = async opt => {
     };
     opt.onStepsAdded(stepsPayload);
     opt.updateMetadata(metadata);
-    return Boolean(opt.clientId && isOutOfSync(fromVersion, opt.getCurrentPmVersion(), steps, opt.clientId));
+    const clientOutOfSync = Boolean(opt.clientId && isOutOfSync(fromVersion, opt.getCurrentPmVersion(), steps, opt.clientId));
+    if (clientOutOfSync) {
+      logObfuscatedSteps(steps, opt);
+    }
+    return clientOutOfSync;
   } catch (error) {
     var _opt$analyticsHelper2;
     (_opt$analyticsHelper2 = opt.analyticsHelper) === null || _opt$analyticsHelper2 === void 0 ? void 0 : _opt$analyticsHelper2.sendErrorEvent(error, 'Failed to apply catchupv2 result in the editor');
@@ -42,6 +48,17 @@ export const catchupv2 = async opt => {
     throw error;
   }
 };
+const logObfuscatedSteps = (steps, opt) => {
+  if (fg('platform_editor_log_obfuscated_steps')) {
+    var _opt$getState, _opt$analyticsHelper3;
+    const state = (_opt$getState = opt.getState) === null || _opt$getState === void 0 ? void 0 : _opt$getState.call(opt);
+    (_opt$analyticsHelper3 = opt.analyticsHelper) === null || _opt$analyticsHelper3 === void 0 ? void 0 : _opt$analyticsHelper3.sendActionEvent(EVENT_ACTION.OUT_OF_SYNC, EVENT_STATUS.FAILURE, {
+      obfuscatedSteps: getObfuscatedSteps(steps),
+      obfuscatedDoc: state ? getDocAdfWithObfuscation(state.doc) : null,
+      catchupReason: opt.reason
+    });
+  }
+};
 
 /**
  * Checks if we're out of sync with the backend because catchup failed to apply, and thus the doc should be reset.
@@ -51,9 +68,6 @@ export const catchupv2 = async opt => {
  * @param clientId The ID of the currently connected session (one user can have multiple if theu have multiple tabs open)
  * @returns True if we're out of sync, false if not.
  */
-export const isOutOfSync = (fromVersion, currentVersion, steps, clientId
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
-) =>
+export const isOutOfSync = (fromVersion, currentVersion, steps, clientId) =>
 // If version number hasn't increased, and steps are not from our client, we're out of sync
 Boolean(fromVersion >= currentVersion && steps.some(step => step.clientId !== clientId));

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

@@ -34,8 +34,6 @@ export class DocumentService {
    * @param enableErrorOnFailedDocumentApply - Enable failed document update exceptions.
    * @param getConnected - if the channel is currently connected
    */
-  // Ignored via go/ees005
-  // eslint-disable-next-line @typescript-eslint/max-params
   constructor(participantsService, analyticsHelper, fetchCatchupv2, fetchReconcile,
   // Ignored via go/ees005
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -46,6 +44,7 @@ export class DocumentService {
     _defineProperty(this, "stepRejectCounter", 0);
     _defineProperty(this, "aggressiveCatchup", false);
     _defineProperty(this, "catchUpOutofSync", false);
+    _defineProperty(this, "hasRecovered", false);
     /**
      * To prevent calling catchup to often, use lodash throttle to reduce the frequency
      * @param reason - optional reason to attach.
@@ -116,7 +115,8 @@ export class DocumentService {
                 remoteStepsLength: (_steps$length = steps === null || steps === void 0 ? void 0 : steps.length) !== null && _steps$length !== void 0 ? _steps$length : 0
               });
             }
-          }
+          },
+          getState: this.getState
         });
         const latency = new Date().getTime() - start;
         (_this$analyticsHelper2 = this.analyticsHelper) === null || _this$analyticsHelper2 === void 0 ? void 0 : _this$analyticsHelper2.sendActionEvent(EVENT_ACTION.CATCHUP, EVENT_STATUS.SUCCESS, {
@@ -282,6 +282,9 @@ export class DocumentService {
       metadata,
       targetClientId
     }) => {
+      if (!targetClientId) {
+        this.hasRecovered = true;
+      }
       if (targetClientId && this.clientId !== targetClientId) {
         return;
       }
@@ -703,8 +706,6 @@ export class DocumentService {
    * Send steps from transaction to other participants
    * It needs the superfluous arguments because we keep the interface of the send API the same as the Synchrony plugin
    */
-  // Ignored via go/ees005
-  // eslint-disable-next-line @typescript-eslint/max-params
   send(_tr, _oldState, newState, sendAnalyticsEvent) {
     const unconfirmedStepsData = sendableSteps(newState);
     const version = this.getVersionFromCollabState(newState, 'collab-provider: send');
@@ -762,7 +763,8 @@ export class DocumentService {
       onErrorHandled: this.onErrorHandled,
       analyticsHelper: this.analyticsHelper,
       emit: this.providerEmitCallback,
-      __livePage: this.options.__livePage
+      __livePage: this.options.__livePage,
+      hasRecovered: this.hasRecovered
     });
   }
 }

package/dist/es2019/helpers/const.js

@@ -19,8 +19,9 @@ export let EVENT_ACTION = /*#__PURE__*/function (EVENT_ACTION) {
   EVENT_ACTION["RECONNECTION"] = "providerReconnection";
   EVENT_ACTION["PROVIDER_SETUP"] = "providerSetup";
   EVENT_ACTION["HAS_UNCONFIRMED_STEPS"] = "hasUnconfirmedSteps";
+  EVENT_ACTION["OUT_OF_SYNC"] = "outOfSync";
   return EVENT_ACTION;
-}({}); // https://data-portal.internal.atlassian.com/analytics/registry/56141
+}({}); // https://data-portal.internal.atlassian.com/analytics/registry/74993
 export let EVENT_STATUS = /*#__PURE__*/function (EVENT_STATUS) {
   EVENT_STATUS["SUCCESS"] = "SUCCESS";
   EVENT_STATUS["FAILURE"] = "FAILURE";

package/dist/es2019/helpers/utils.js

@@ -1,3 +1,6 @@
+import { scrubAdf } from '@atlaskit/adf-utils/scrub';
+import { sendableSteps } from '@atlaskit/prosemirror-collab';
+import { CustomError } from '../errors/custom-errors';
 export const createLogger = (prefix, color = 'blue') =>
 // Ignored via go/ees005
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -50,4 +53,159 @@ export const getStepUGCFreeDetails = step => {
     contentTypes,
     stepSizeInBytes: Buffer.byteLength(JSON.stringify(step))
   };
-};
+};
+const stepWithNextDocument = stepJson => {
+  return stepJson.stepType === 'override-document' && 'nextDocument' in stepJson;
+};
+const stepWithMark = stepJson => {
+  return stepJson.stepType === 'addMark' || stepJson.stepType === 'addNodeMark';
+};
+const stepWithAttrs = stepJson => {
+  return stepJson.stepType === 'setAttrs' && 'attrs' in stepJson;
+};
+const stepWithBatchAttrs = stepJson => {
+  return stepJson.stepType === 'batchAttrs' && 'data' in stepJson;
+};
+const stepWithFromTo = stepJson => {
+  return 'from' in stepJson && typeof stepJson.from === 'number' && 'to' in stepJson && typeof stepJson.to === 'number';
+};
+const stepWithGapFromTo = stepJson => {
+  return 'gapFrom' in stepJson && typeof stepJson.gapFrom === 'number' && 'gapTo' in stepJson && typeof stepJson.gapTo === 'number';
+};
+const stepWithInsert = stepJson => {
+  return 'insert' in stepJson && typeof stepJson.insert === 'number';
+};
+const stepWithPos = stepJson => {
+  return 'pos' in stepJson && typeof stepJson.pos === 'number';
+};
+const stepWithSlice = stepJson => {
+  var _stepJson$slice3;
+  return 'slice' in stepJson && Array.isArray((_stepJson$slice3 = stepJson.slice) === null || _stepJson$slice3 === void 0 ? void 0 : _stepJson$slice3.content);
+};
+
+// Get as step info which is known not to contain user generated content.
+export const getStepTypes = stepJson => {
+  let contentTypes = null;
+  if (stepWithSlice(stepJson)) {
+    contentTypes = stepJson.slice.content.map(c => {
+      return (c === null || c === void 0 ? void 0 : c.type) || 'unknown';
+    }).join(', ');
+  }
+  return {
+    type: stepJson.stepType || 'unknown',
+    contentTypes
+  };
+};
+export const getStepsAdfWithObfuscation = stepJson => {
+  const stepContentAsAdf = stepToAdf(stepJson);
+  if (!stepContentAsAdf) {
+    return null;
+  }
+  const scrubbedSteps = stepContentAsAdf.map(adf => scrubAdf(adf)).filter(adf => !!adf);
+  return scrubbedSteps;
+};
+export const getDocAdfWithObfuscation = doc => {
+  const docJson = doc.toJSON();
+  const scrubbedDoc = scrubAdf(docJson);
+  if (!scrubbedDoc) {
+    return null;
+  }
+  return scrubbedDoc;
+};
+export const getStepPositions = stepJson => {
+  return {
+    ...(stepWithFromTo(stepJson) && {
+      from: stepJson.from,
+      to: stepJson.to
+    }),
+    ...(stepWithGapFromTo(stepJson) && {
+      gapFrom: stepJson.gapFrom,
+      gapTo: stepJson.gapTo
+    }),
+    ...(stepWithInsert(stepJson) && {
+      insert: stepJson.insert
+    }),
+    ...(stepWithPos(stepJson) && {
+      pos: stepJson.pos
+    })
+  };
+};
+
+/**
+ * Returns the metadata for Step
+ * @description metadata is applied by transform overrides [here](https://bitbucket.org/atlassian/adf-schema/src/e13bbece84ede8f245067dc53dd7ce694f427eda/packages/editor-prosemirror/src/transform-override.ts#lines-12)
+ */
+const getStepMetadata = stepJson => {
+  return stepJson.metadata;
+};
+export const getObfuscatedSteps = (steps, endIndex = undefined) => {
+  return steps.slice(0, endIndex).map(step => {
+    return {
+      stepType: getStepTypes(step),
+      stepContent: getStepsAdfWithObfuscation(step),
+      stepPositions: getStepPositions(step),
+      stepMetadata: getStepMetadata(step)
+    };
+  });
+};
+const stepToAdf = step => {
+  if (stepWithSlice(step)) {
+    return [{
+      type: 'doc',
+      content: step.slice.content.filter(el => el !== null)
+    }];
+  } else if (stepWithNextDocument(step)) {
+    return [{
+      type: 'doc',
+      content: step.nextDocument.content
+    }];
+  } else if (stepWithMark(step) && step.mark) {
+    return [{
+      type: 'doc',
+      marks: [{
+        type: step.mark.type || 'unknown',
+        attrs: step.mark.attrs
+      }]
+    }];
+  } else if (stepWithAttrs(step)) {
+    return [{
+      type: 'doc',
+      attrs: step.attrs
+    }];
+  } else if (stepWithBatchAttrs(step)) {
+    return step.data.map(stepData => {
+      return {
+        type: 'doc',
+        attrs: stepData.attrs
+      };
+    });
+  }
+  return [];
+};
+export async function logObfuscatedSteps(oldState, newState) {
+  try {
+    var _states$new, _states$old;
+    let stepsFromOldState = '',
+      stepsFromNewState = '';
+    const states = {
+      old: oldState ? sendableSteps(oldState) : null,
+      new: sendableSteps(newState)
+    };
+    if ((_states$new = states.new) !== null && _states$new !== void 0 && _states$new.steps) {
+      stepsFromNewState = await toObfuscatedSteps(states.new.steps);
+    }
+    if ((_states$old = states.old) !== null && _states$old !== void 0 && _states$old.steps) {
+      stepsFromOldState = await toObfuscatedSteps(states.old.steps);
+    }
+    return {
+      stepsFromOldState,
+      stepsFromNewState
+    };
+  } catch (err) {
+    return new CustomError('Failed to obfuscate steps', err);
+  }
+}
+export async function toObfuscatedSteps(steps) {
+  const _steps = await Promise.resolve(steps.slice().map(s => s.toJSON()));
+  return JSON.stringify(getObfuscatedSteps(_steps));
+}

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

@@ -18,8 +18,6 @@ const SEND_PRESENCE_INTERVAL = 150 * 1000; // 150 seconds
  * @param sendPresenceJoined Callback to Channel class
  */
 export class ParticipantsService {
-  // Ignored via go/ees005
-  // eslint-disable-next-line @typescript-eslint/max-params
   constructor(analyticsHelper, participantsState = new ParticipantsState(), emit, getUser, channelBroadcast, sendPresenceJoined, getPresenceData, setUserId, getAIProviderActiveIds) {
     _defineProperty(this, "sendAIProviderChanged", payload => {
       if (payload.providerId) {

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

@@ -17,7 +17,8 @@ export const commitStepQueue = ({
   onErrorHandled,
   analyticsHelper,
   emit,
-  __livePage
+  __livePage,
+  hasRecovered
 }) => {
   if (!readyToCommit) {
     logger('Not ready to commit, skip');
@@ -60,6 +61,17 @@ export const commitStepQueue = ({
       return step;
     });
   }
+
+  // tag unconfirmed steps sent after page has been recovered during client's editing session
+  if (hasRecovered && fg('tag_unconfirmed_steps_after_recovery')) {
+    stepsWithClientAndUserId = stepsWithClientAndUserId.map(step => {
+      step.metadata = {
+        ...step.metadata,
+        unconfirmedStepAfterRecovery: true
+      };
+      return step;
+    });
+  }
   const start = new Date().getTime();
   emit('commit-status', {
     status: 'attempt',