@atlaskit/collab-provider 8.4.0 → 8.6.0

package/dist/esm/provider/index.js

@@ -1,4 +1,4 @@
-import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+import _typeof from "@babel/runtime/helpers/typeof";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
@@ -8,56 +8,51 @@ import _inherits from "@babel/runtime/helpers/inherits";
 import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-import _regeneratorRuntime from "@babel/runtime/regenerator";
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) { if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; } return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) { keys.push(key); } return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) { "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); } }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-import { getVersion, sendableSteps } from '@atlaskit/prosemirror-collab';
-import throttle from 'lodash/throttle';
-import isEqual from 'lodash/isEqual';
-import { JSONTransformer } from '@atlaskit/editor-json-transformer';
 import { Emitter } from '../emitter';
 import { Channel } from '../channel';
-import { createLogger, getParticipant, sleep } from '../helpers/utils';
-import { ACK_MAX_TRY, EVENT_ACTION, EVENT_STATUS } from '../helpers/const';
-import AnalyticsHelper from '../analytics';
-import { catchup } from './catchup';
-import { ErrorCodeMapper, errorCodeMapper } from '../errors/error-code-mapper';
-import { disconnectedReasonMapper } from '../disconnected-reason-mapper';
-import { MEASURE_NAME, startMeasure, stopMeasure } from '../analytics/performance';
-import { commitStep } from './commit-step';
-import { telepointerCallback, telepointersFromStep } from './telepointers';
+import { createLogger } from '../helpers/utils';
+import AnalyticsHelper from '../analytics/analytics-helper';
+import { telepointerCallback } from '../participants/telepointers-helper';
+import { ParticipantsService } from '../participants/participants-service';
+import { DestroyError, GetCurrentStateError, GetFinalAcknowledgedStateError, ProviderInitialisationError, SendTransactionError, SetEditorWidthError, SetMetadataError, SetTitleError, NCS_ERROR_CODE } from '../errors/error-types';
+import { MetadataService } from '../metadata/metadata-service';
+import { DocumentService } from '../document/document-service';
+import { errorCodeMapper } from '../errors/error-code-mapper';
 var logger = createLogger('Provider', 'black');
-var PARTICIPANT_UPDATE_INTERVAL = 300 * 1000; // 300 seconds
 var SEND_PRESENCE_INTERVAL = 150 * 1000; // 150 seconds
-var SEND_STEPS_THROTTLE = 500; // 0.5 second
-var CATCHUP_THROTTLE = 1 * 1000; // 1 second
+
 var OUT_OF_SYNC_PERIOD = 3 * 1000; // 3 seconds
-var noop = function noop() {};
+
 export var MAX_STEP_REJECTED_ERROR = 15;
-export var throttledCommitStep = throttle(commitStep, SEND_STEPS_THROTTLE, {
-  leading: false,
-  trailing: true
-});
 export var Provider = /*#__PURE__*/function (_Emitter) {
   _inherits(Provider, _Emitter);
   var _super = _createSuper(Provider);
   // To keep track of the namespace event changes from the server.
 
+  // SessionID is the unique socket-session.
+
+  // ClientID is the unique ID for a prosemirror client. Used for step-rebasing.
+
+  // UserID is the users actual account id.
+
   function Provider(config) {
     var _this;
     _classCallCheck(this, Provider);
     _this = _super.call(this);
-    _defineProperty(_assertThisInitialized(_this), "participants", new Map());
-    _defineProperty(_assertThisInitialized(_this), "metadata", {});
-    _defineProperty(_assertThisInitialized(_this), "stepRejectCounter", 0);
     _defineProperty(_assertThisInitialized(_this), "isChannelInitialized", false);
+    _defineProperty(_assertThisInitialized(_this), "isProviderInitialized", false);
     _defineProperty(_assertThisInitialized(_this), "isNamespaceLocked", false);
+    _defineProperty(_assertThisInitialized(_this), "emitCallback", function (evt, data) {
+      return _this.emit(evt, data);
+    });
     _defineProperty(_assertThisInitialized(_this), "initializeChannel", function () {
       _this.emit('connecting', {
         initial: true
       });
+      var shouldInitialize = Boolean(_this.initialDraft) && !_this.isProviderInitialized;
       _this.channel.on('connected', function (_ref) {
         var sid = _ref.sid,
           initialized = _ref.initialized;
@@ -66,253 +61,62 @@ export var Provider = /*#__PURE__*/function (_Emitter) {
           sid: sid,
           initial: !initialized
         });
+        // If initial draft is already present and the channel is initialized,
+        // fire the provider's init event with initial draft document and version
+        if (_this.initialDraft && initialized && !_this.isProviderInitialized) {
+          var _this$initialDraft = _this.initialDraft,
+            document = _this$initialDraft.document,
+            version = _this$initialDraft.version,
+            metadata = _this$initialDraft.metadata;
+          // Initial document, version, metadata from initial draft
+          _this.documentService.updateDocument({
+            doc: document,
+            version: version,
+            metadata: metadata
+          });
+          _this.metadataService.updateMetadata(metadata);
+          _this.isProviderInitialized = true;
+        }
         // If already initialized, `connected` means reconnected
         if (initialized && _this.disconnectedAt &&
         // Offline longer than `OUT_OF_SYNC_PERIOD`
         Date.now() - _this.disconnectedAt >= OUT_OF_SYNC_PERIOD) {
-          _this.throttledCatchup();
+          _this.documentService.throttledCatchup();
         }
+        _this.startInactiveRemover();
         _this.disconnectedAt = undefined;
       }).on('init', function (_ref2) {
         var doc = _ref2.doc,
           version = _ref2.version,
           metadata = _ref2.metadata;
         // Initial document and version
-        _this.updateDocumentWithMetadata({
+        _this.documentService.updateDocument({
           doc: doc,
           version: version,
           metadata: metadata
         });
-      }).on('restore', _this.onRestore.bind(_assertThisInitialized(_this))).on('steps:added', _this.onStepsAdded.bind(_assertThisInitialized(_this))).on('participant:telepointer', _this.onParticipantTelepointer.bind(_assertThisInitialized(_this))).on('presence:joined', _this.onPresenceJoined.bind(_assertThisInitialized(_this))).on('presence', _this.onPresence.bind(_assertThisInitialized(_this))).on('participant:left', _this.onParticipantLeft.bind(_assertThisInitialized(_this))).on('participant:updated', _this.onParticipantUpdated.bind(_assertThisInitialized(_this))).on('metadata:changed', _this.onMetadataChanged.bind(_assertThisInitialized(_this))).on('disconnect', _this.onDisconnected.bind(_assertThisInitialized(_this))).on('error', _this.onErrorHandled.bind(_assertThisInitialized(_this))).on('status', _this.onNamespaceStatusChanged.bind(_assertThisInitialized(_this))).connect();
-    });
-    _defineProperty(_assertThisInitialized(_this), "onRestore", function (_ref3) {
-      var doc = _ref3.doc,
-        version = _ref3.version,
-        metadata = _ref3.metadata;
-      // Preserve the unconfirmed steps to prevent data loss.
-      var unconfirmedSteps = _this.getUnconfirmedSteps();
-      try {
-        var _this$analyticsHelper;
-        // Reset the editor,
-        //  - Replace the document, keep in sync with the server
-        //  - Replace the version number, so editor is in sync with NCS server and can commit new changes.
-        //  - Replace the metadata
-        //  - Reserve the cursor position, in case a cursor jump.
-        _this.updateDocumentWithMetadata({
-          doc: doc,
-          version: version,
-          metadata: metadata,
-          reserveCursor: true
-        });
-        (_this$analyticsHelper = _this.analyticsHelper) === null || _this$analyticsHelper === void 0 ? void 0 : _this$analyticsHelper.sendActionEvent(EVENT_ACTION.REINITIALISE_DOCUMENT, EVENT_STATUS.SUCCESS, {
-          numUnconfirmedSteps: unconfirmedSteps === null || unconfirmedSteps === void 0 ? void 0 : unconfirmedSteps.length
-        });
-        // Re-apply the unconfirmed steps, not 100% of them can be applied, if document is changed significantly.
-        if (unconfirmedSteps !== null && unconfirmedSteps !== void 0 && unconfirmedSteps.length) {
-          _this.applyLocalSteps(unconfirmedSteps);
-        }
-      } catch (restoreError) {
-        var _this$analyticsHelper2, _this$analyticsHelper3;
-        (_this$analyticsHelper2 = _this.analyticsHelper) === null || _this$analyticsHelper2 === void 0 ? void 0 : _this$analyticsHelper2.sendActionEvent(EVENT_ACTION.REINITIALISE_DOCUMENT, EVENT_STATUS.FAILURE, {
-          numUnconfirmedSteps: unconfirmedSteps === null || unconfirmedSteps === void 0 ? void 0 : unconfirmedSteps.length
-        });
-        (_this$analyticsHelper3 = _this.analyticsHelper) === null || _this$analyticsHelper3 === void 0 ? void 0 : _this$analyticsHelper3.sendErrorEvent(restoreError, 'Error while reinitialising document');
-        _this.onErrorHandled({
-          message: 'Caught error while trying to recover the document',
-          data: {
-            status: 500,
-            // Meaningless, remove when we review error structure
-            code: ErrorCodeMapper.restoreError.code
-          }
-        });
-      }
-    });
-    _defineProperty(_assertThisInitialized(_this), "onStepsAdded", function (data) {
-      logger("Received steps", {
-        steps: data.steps,
-        version: data.version
-      });
-      if (!data.steps) {
-        logger("No steps.. waiting..");
-        return;
-      }
-      try {
-        var currentVersion = _this.getCurrentPmVersion();
-        var expectedVersion = currentVersion + data.steps.length;
-        if (data.version === currentVersion) {
-          logger("Received steps we already have. Ignoring.");
-        } else if (data.version === expectedVersion) {
-          _this.processSteps(data);
-        } else if (data.version > expectedVersion) {
-          logger("Version too high. Expected \"".concat(expectedVersion, "\" but got \"").concat(data.version, ". Current local version is ").concat(currentVersion, "."));
-          _this.queueSteps(data);
-          _this.throttledCatchup();
-        }
-        _this.updateParticipants([], data.steps.map(function (_ref4) {
-          var userId = _ref4.userId;
-          return userId;
-        }));
-      } catch (stepsAddedError) {
-        var _this$analyticsHelper4;
-        (_this$analyticsHelper4 = _this.analyticsHelper) === null || _this$analyticsHelper4 === void 0 ? void 0 : _this$analyticsHelper4.sendErrorEvent(stepsAddedError, 'Error while adding steps in the provider');
-        _this.onErrorHandled({
-          message: 'Error while adding steps in the provider',
-          data: {
-            status: 500,
-            // Meaningless, remove when we review error structure
-            code: ErrorCodeMapper.internalError.code
-          }
-        });
-      }
-    });
-    _defineProperty(_assertThisInitialized(_this), "throttledCatchup", throttle(function () {
-      return _this.catchup();
-    }, CATCHUP_THROTTLE, {
-      leading: false,
-      trailing: true
-    }));
-    _defineProperty(_assertThisInitialized(_this), "filterQueue", function (condition) {
-      _this.queue = _this.queue.filter(condition);
+        _this.metadataService.updateMetadata(metadata);
+      }).on('restore', _this.documentService.onRestore).on('steps:added', _this.documentService.onStepsAdded).on('metadata:changed', _this.metadataService.onMetadataChanged).on('participant:telepointer', _this.onParticipantTelepointer.bind(_assertThisInitialized(_this))).on('presence:joined', _this.onPresenceJoined.bind(_assertThisInitialized(_this))).on('presence', _this.onPresence.bind(_assertThisInitialized(_this))).on('participant:left', _this.onParticipantLeft.bind(_assertThisInitialized(_this))).on('participant:updated', _this.onParticipantUpdated.bind(_assertThisInitialized(_this))).on('disconnect', _this.onDisconnected.bind(_assertThisInitialized(_this))).on('error', _this.onErrorHandled).on('status', _this.onNamespaceStatusChanged.bind(_assertThisInitialized(_this))).connect(shouldInitialize);
     });
-    _defineProperty(_assertThisInitialized(_this), "updateDocumentWithMetadata", function (_ref5) {
-      var doc = _ref5.doc,
-        version = _ref5.version,
-        metadata = _ref5.metadata,
-        reserveCursor = _ref5.reserveCursor;
-      _this.emit('init', _objectSpread({
-        doc: doc,
-        version: version,
-        metadata: metadata
-      }, reserveCursor ? {
-        reserveCursor: reserveCursor
-      } : {}));
-      if (metadata && Object.keys(metadata).length > 0) {
-        _this.metadata = metadata;
-        _this.emit('metadata:changed', metadata);
-      }
-    });
-    _defineProperty(_assertThisInitialized(_this), "applyLocalSteps", function (steps) {
-      // Re-apply local steps
-      _this.emit('local-steps', {
-        steps: steps
-      });
-    });
-    _defineProperty(_assertThisInitialized(_this), "getCurrentPmVersion", function () {
-      var _this$getState, _this2;
-      var state = (_this$getState = (_this2 = _this).getState) === null || _this$getState === void 0 ? void 0 : _this$getState.call(_this2);
-      if (!state) {
-        var _this$analyticsHelper5;
-        (_this$analyticsHelper5 = _this.analyticsHelper) === null || _this$analyticsHelper5 === void 0 ? void 0 : _this$analyticsHelper5.sendErrorEvent(new Error('No editor state when calling ProseMirror function'), 'getCurrentPmVersion called without state');
-        return 0;
-      }
-      return getVersion(state);
-    });
-    _defineProperty(_assertThisInitialized(_this), "getUnconfirmedSteps", function () {
-      var _this$getState2, _this3, _sendableSteps;
-      var state = (_this$getState2 = (_this3 = _this).getState) === null || _this$getState2 === void 0 ? void 0 : _this$getState2.call(_this3);
-      if (!state) {
-        var _this$analyticsHelper6;
-        (_this$analyticsHelper6 = _this.analyticsHelper) === null || _this$analyticsHelper6 === void 0 ? void 0 : _this$analyticsHelper6.sendErrorEvent(new Error('No editor state when calling ProseMirror function'), 'getUnconfirmedSteps called without state');
-        return;
-      }
-      return (_sendableSteps = sendableSteps(state)) === null || _sendableSteps === void 0 ? void 0 : _sendableSteps.steps;
-    });
-    _defineProperty(_assertThisInitialized(_this), "getUnconfirmedStepsOrigins", function () {
-      var _this$getState3, _this4, _sendableSteps2;
-      var state = (_this$getState3 = (_this4 = _this).getState) === null || _this$getState3 === void 0 ? void 0 : _this$getState3.call(_this4);
-      if (!state) {
-        var _this$analyticsHelper7;
-        (_this$analyticsHelper7 = _this.analyticsHelper) === null || _this$analyticsHelper7 === void 0 ? void 0 : _this$analyticsHelper7.sendErrorEvent(new Error('No editor state when calling ProseMirror function'), 'getUnconfirmedStepsOrigins called without state');
-        return;
-      }
-      return (_sendableSteps2 = sendableSteps(state)) === null || _sendableSteps2 === void 0 ? void 0 : _sendableSteps2.origins;
-    });
-    _defineProperty(_assertThisInitialized(_this), "catchup", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-      var start, _this$analyticsHelper8, latency, _this$analyticsHelper9, _this$analyticsHelper10, _latency;
-      return _regeneratorRuntime.wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              start = new Date().getTime(); // if the queue is already paused, we are busy with something else, so don't proceed.
-              if (!_this.pauseQueue) {
-                _context.next = 4;
-                break;
-              }
-              logger("Queue is paused. Aborting.");
-              return _context.abrupt("return");
-            case 4:
-              _this.pauseQueue = true;
-              _context.prev = 5;
-              _context.next = 8;
-              return catchup({
-                getCurrentPmVersion: _this.getCurrentPmVersion,
-                fetchCatchup: _this.channel.fetchCatchup.bind(_this.channel),
-                getUnconfirmedSteps: _this.getUnconfirmedSteps,
-                getUnconfirmedStepsOrigins: _this.getUnconfirmedStepsOrigins,
-                filterQueue: _this.filterQueue,
-                updateDocumentWithMetadata: _this.updateDocumentWithMetadata,
-                applyLocalSteps: _this.applyLocalSteps
-              });
-            case 8:
-              latency = new Date().getTime() - start;
-              (_this$analyticsHelper8 = _this.analyticsHelper) === null || _this$analyticsHelper8 === void 0 ? void 0 : _this$analyticsHelper8.sendActionEvent(EVENT_ACTION.CATCHUP, EVENT_STATUS.SUCCESS, {
-                latency: latency
-              });
-              _context.next = 18;
-              break;
-            case 12:
-              _context.prev = 12;
-              _context.t0 = _context["catch"](5);
-              _latency = new Date().getTime() - start;
-              (_this$analyticsHelper9 = _this.analyticsHelper) === null || _this$analyticsHelper9 === void 0 ? void 0 : _this$analyticsHelper9.sendActionEvent(EVENT_ACTION.CATCHUP, EVENT_STATUS.FAILURE, {
-                latency: _latency
-              });
-              (_this$analyticsHelper10 = _this.analyticsHelper) === null || _this$analyticsHelper10 === void 0 ? void 0 : _this$analyticsHelper10.sendErrorEvent(_context.t0, 'Error while catching up');
-              logger("Catch-Up Failed:", _context.t0.message);
-            case 18:
-              _context.prev = 18;
-              _this.pauseQueue = false;
-              _this.processQueue();
-              _this.sendStepsFromCurrentState(); // this will eventually retry catchup as it calls commitStep which will either catchup on onStepsAdded or onErrorHandled
-              _this.stepRejectCounter = 0;
-              return _context.finish(18);
-            case 24:
-            case "end":
-              return _context.stop();
-          }
-        }
-      }, _callee, null, [[5, 12, 18, 24]]);
-    })));
     _defineProperty(_assertThisInitialized(_this), "onErrorHandled", function (error) {
       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) === 'HEAD_VERSION_UPDATE_FAILED' || ((_error$data2 = error.data) === null || _error$data2 === void 0 ? void 0 : _error$data2.code) === 'VERSION_NUMBER_ALREADY_EXISTS') {
-        _this.stepRejectCounter++;
-        logger("Steps rejected (tries=".concat(_this.stepRejectCounter, ")"));
-        if (_this.stepRejectCounter >= MAX_STEP_REJECTED_ERROR) {
-          logger("The steps were rejected too many times (tries=".concat(_this.stepRejectCounter, ", limit=").concat(MAX_STEP_REJECTED_ERROR, "). Trying to catch-up."));
-          _this.throttledCatchup();
-        } else {
-          // If committing steps failed try again automatically in 1s
-          // This makes it more likely that unconfirmed steps trigger a catch-up
-          // within 15s even if there is no one editing actively (or draft sync polling)
-          // reducing the risk of data loss at the expense of step commits
-          setTimeout(function () {
-            return _this.sendStepsFromCurrentState();
-          }, 1000);
-        }
+      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 {
-        logger('Error from collab service', error);
+        var _this$analyticsHelper;
+        (_this$analyticsHelper = _this.analyticsHelper) === null || _this$analyticsHelper === void 0 ? void 0 : _this$analyticsHelper.sendErrorEvent(error, 'Error handled');
         var mappedError = errorCodeMapper(error);
         // Temporarily only emit errors to Confluence very intentionally because they will disconnect the collab provider
         if (mappedError) {
+          var _this$analyticsHelper2;
+          (_this$analyticsHelper2 = _this.analyticsHelper) === null || _this$analyticsHelper2 === void 0 ? void 0 : _this$analyticsHelper2.sendErrorEvent(mappedError, 'Error emitted');
           _this.emit('error', mappedError);
         }
       }
     });
-    _defineProperty(_assertThisInitialized(_this), "queue", []);
     _defineProperty(_assertThisInitialized(_this), "sendPresence", function () {
       try {
         if (_this.presenceUpdateTimeout) {
@@ -327,399 +131,102 @@ export var Provider = /*#__PURE__*/function (_Emitter) {
           return _this.sendPresence();
         }, SEND_PRESENCE_INTERVAL);
       } catch (error) {
-        var _this$analyticsHelper11;
+        var _this$analyticsHelper3;
         // We don't want to throw errors for Presence features as they tend to self-restore
-        (_this$analyticsHelper11 = _this.analyticsHelper) === null || _this$analyticsHelper11 === void 0 ? void 0 : _this$analyticsHelper11.sendErrorEvent(error, 'Error while sending presence');
+        (_this$analyticsHelper3 = _this.analyticsHelper) === null || _this$analyticsHelper3 === void 0 ? void 0 : _this$analyticsHelper3.sendErrorEvent(error, 'Error while sending presence');
       }
     });
-    _defineProperty(_assertThisInitialized(_this), "onPresenceJoined", function (_ref7) {
-      var sessionId = _ref7.sessionId;
+    _defineProperty(_assertThisInitialized(_this), "onPresenceJoined", function (_ref3) {
+      var sessionId = _ref3.sessionId;
       try {
         logger('Participant joined with session: ', sessionId);
         // This expose existing users to the newly joined user
         _this.sendPresence();
       } catch (error) {
-        var _this$analyticsHelper12;
+        var _this$analyticsHelper4;
         // We don't want to throw errors for Presence features as they tend to self-restore
-        (_this$analyticsHelper12 = _this.analyticsHelper) === null || _this$analyticsHelper12 === void 0 ? void 0 : _this$analyticsHelper12.sendErrorEvent(error, 'Error while joining presence');
+        (_this$analyticsHelper4 = _this.analyticsHelper) === null || _this$analyticsHelper4 === void 0 ? void 0 : _this$analyticsHelper4.sendErrorEvent(error, 'Error while joining presence');
       }
     });
-    _defineProperty(_assertThisInitialized(_this), "onPresence", function (_ref8) {
-      var userId = _ref8.userId;
+    _defineProperty(_assertThisInitialized(_this), "onPresence", function (_ref4) {
+      var userId = _ref4.userId;
       try {
         logger('onPresence userId: ', userId);
         _this.userId = userId;
         _this.sendPresence();
         _this.channel.sendPresenceJoined();
       } catch (error) {
-        var _this$analyticsHelper13;
+        var _this$analyticsHelper5;
         // We don't want to throw errors for Presence features as they tend to self-restore
-        (_this$analyticsHelper13 = _this.analyticsHelper) === null || _this$analyticsHelper13 === void 0 ? void 0 : _this$analyticsHelper13.sendErrorEvent(error, 'Error while receiving presence');
+        (_this$analyticsHelper5 = _this.analyticsHelper) === null || _this$analyticsHelper5 === void 0 ? void 0 : _this$analyticsHelper5.sendErrorEvent(error, 'Error while receiving presence');
       }
     });
-    _defineProperty(_assertThisInitialized(_this), "onMetadataChanged", function (metadata) {
-      if (metadata !== undefined && !isEqual(_this.metadata, metadata)) {
-        _this.metadata = metadata;
-        _this.emit('metadata:changed', metadata);
-      }
+    _defineProperty(_assertThisInitialized(_this), "onParticipantLeft", function (data) {
+      return _this.participantsService.participantLeft(data, _this.emitCallback);
     });
-    _defineProperty(_assertThisInitialized(_this), "onParticipantLeft", function (_ref9) {
-      var sessionId = _ref9.sessionId;
-      try {
-        logger("Participant left");
-        _this.participants.delete(sessionId);
-        _this.emit('presence', {
-          left: [{
-            sessionId: sessionId
-          }]
-        });
-      } catch (error) {
-        var _this$analyticsHelper14;
-        // We don't want to throw errors for Presence features as they tend to self-restore
-        (_this$analyticsHelper14 = _this.analyticsHelper) === null || _this$analyticsHelper14 === void 0 ? void 0 : _this$analyticsHelper14.sendErrorEvent(error, 'Error while participant leaving');
-      }
+    _defineProperty(_assertThisInitialized(_this), "startInactiveRemover", function () {
+      return _this.participantsService.removeInactiveParticipants(_this.sessionId, _this.emitCallback);
     });
-    _defineProperty(_assertThisInitialized(_this), "onParticipantUpdated", function (_ref10) {
-      var sessionId = _ref10.sessionId,
-        timestamp = _ref10.timestamp,
-        userId = _ref10.userId,
-        clientId = _ref10.clientId;
-      try {
-        _this.updateParticipant({
-          sessionId: sessionId,
-          timestamp: timestamp,
-          userId: userId,
-          clientId: clientId
-        });
-      } catch (error) {
-        var _this$analyticsHelper15;
-        // We don't want to throw errors for Presence features as they tend to self-restore
-        (_this$analyticsHelper15 = _this.analyticsHelper) === null || _this$analyticsHelper15 === void 0 ? void 0 : _this$analyticsHelper15.sendErrorEvent(error, 'Error while handling participant updated event');
-      }
+    _defineProperty(_assertThisInitialized(_this), "onParticipantUpdated", function (data) {
+      return _this.participantsService.updateParticipant(data, _this.config.getUser, _this.emitCallback);
     });
     _defineProperty(_assertThisInitialized(_this), "onParticipantTelepointer", function (data) {
-      try {
-        var sessionId = data.sessionId,
-          selection = data.selection,
-          timestamp = data.timestamp;
-        var participant = _this.participants.get(sessionId);
-        if (sessionId === _this.sessionId ||
-        // Ignore old telepointer events
-        participant && participant.lastActive > timestamp) {
-          return;
-        }
-
-        // Set last active
-        _this.updateParticipant(data);
-        _this.emit('telepointer', {
-          type: 'telepointer',
-          selection: selection,
-          sessionId: sessionId
-        });
-      } catch (error) {
-        var _this$analyticsHelper16;
-        // We don't want to throw errors for Presence features as they tend to self-restore
-        (_this$analyticsHelper16 = _this.analyticsHelper) === null || _this$analyticsHelper16 === void 0 ? void 0 : _this$analyticsHelper16.sendErrorEvent(error, 'Error while handling participant telepointer event');
-      }
-    });
-    _defineProperty(_assertThisInitialized(_this), "updateParticipant", /*#__PURE__*/function () {
-      var _ref12 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(_ref11) {
-        var sessionId, timestamp, userId, clientId, getUser, _yield, _yield$name, name, _yield$email, email, _yield$avatar, avatar, isNewParticipant, _this$analyticsHelper17;
-        return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-          while (1) {
-            switch (_context2.prev = _context2.next) {
-              case 0:
-                sessionId = _ref11.sessionId, timestamp = _ref11.timestamp, userId = _ref11.userId, clientId = _ref11.clientId;
-                _context2.prev = 1;
-                if (userId) {
-                  _context2.next = 4;
-                  break;
-                }
-                return _context2.abrupt("return");
-              case 4:
-                getUser = _this.config.getUser;
-                _context2.next = 7;
-                return getUser ? getUser(userId) : getParticipant(userId);
-              case 7:
-                _yield = _context2.sent;
-                _yield$name = _yield.name;
-                name = _yield$name === void 0 ? '' : _yield$name;
-                _yield$email = _yield.email;
-                email = _yield$email === void 0 ? '' : _yield$email;
-                _yield$avatar = _yield.avatar;
-                avatar = _yield$avatar === void 0 ? '' : _yield$avatar;
-                isNewParticipant = !_this.participants.has(sessionId);
-                if (isNewParticipant) {
-                  logger('new Participant updated', {
-                    name: name,
-                    avatar: avatar
-                  });
-                }
-                _this.participants.set(sessionId, {
-                  name: name,
-                  email: email,
-                  avatar: avatar,
-                  sessionId: sessionId,
-                  lastActive: timestamp,
-                  userId: userId,
-                  clientId: clientId
-                });
-
-                // Collab-plugin expects an array of users that joined.
-                _this.updateParticipants(isNewParticipant ? [_this.participants.get(sessionId)] : []);
-                _context2.next = 23;
-                break;
-              case 20:
-                _context2.prev = 20;
-                _context2.t0 = _context2["catch"](1);
-                // We don't want to throw errors for Presence features as they tend to self-restore
-                (_this$analyticsHelper17 = _this.analyticsHelper) === null || _this$analyticsHelper17 === void 0 ? void 0 : _this$analyticsHelper17.sendErrorEvent(_context2.t0, 'Error while updating participant');
-              case 23:
-              case "end":
-                return _context2.stop();
-            }
-          }
-        }, _callee2, null, [[1, 20]]);
-      }));
-      return function (_x) {
-        return _ref12.apply(this, arguments);
-      };
-    }());
-    _defineProperty(_assertThisInitialized(_this), "updateParticipants", function () {
-      var joined = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-      var userIds = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
-      try {
-        if (_this.participantUpdateTimeout) {
-          clearTimeout(_this.participantUpdateTimeout);
-        }
-        var now = new Date().getTime();
-        Array.from(_this.participants.values()).forEach(function (p) {
-          if (userIds.indexOf(p.userId) !== -1) {
-            _this.participants.set(p.sessionId, _objectSpread(_objectSpread({}, p), {}, {
-              lastActive: now
-            }));
-          }
-        });
-
-        // Filter out participants that's been inactive for more than 5 minutes.
-        var left = Array.from(_this.participants.values()).filter(function (p) {
-          return p.sessionId !== _this.sessionId && now - p.lastActive > PARTICIPANT_UPDATE_INTERVAL;
-        });
-        left.forEach(function (p) {
-          return _this.participants.delete(p.sessionId);
-        });
-        if (joined.length || left.length) {
-          var _this$analyticsHelper18, _this$participants$si;
-          (_this$analyticsHelper18 = _this.analyticsHelper) === null || _this$analyticsHelper18 === void 0 ? void 0 : _this$analyticsHelper18.sendActionEvent(EVENT_ACTION.UPDATE_PARTICIPANTS, EVENT_STATUS.SUCCESS, {
-            participants: (_this$participants$si = _this.participants.size) !== null && _this$participants$si !== void 0 ? _this$participants$si : 1
-          });
-          _this.emit('presence', _objectSpread(_objectSpread({}, joined.length ? {
-            joined: joined
-          } : {}), left.length ? {
-            left: left
-          } : {}));
-        }
-        _this.participantUpdateTimeout = window.setTimeout(function () {
-          return _this.updateParticipants();
-        }, PARTICIPANT_UPDATE_INTERVAL);
-      } catch (error) {
-        var _this$analyticsHelper19;
-        // We don't want to throw errors for Presence features as they tend to self-restore
-        (_this$analyticsHelper19 = _this.analyticsHelper) === null || _this$analyticsHelper19 === void 0 ? void 0 : _this$analyticsHelper19.sendErrorEvent(error, 'Error while updating participants');
-      }
+      return _this.participantsService.participantTelepointer(data, _this.sessionId, _this.config.getUser, _this.emitCallback);
     });
-    _defineProperty(_assertThisInitialized(_this), "onDisconnected", function (_ref13) {
-      var reason = _ref13.reason;
+    _defineProperty(_assertThisInitialized(_this), "onDisconnected", function (_ref5) {
+      var reason = _ref5.reason;
       _this.disconnectedAt = Date.now();
-      var left = Array.from(_this.participants.values());
-      _this.participants.clear();
-      _this.emit('disconnected', {
-        reason: disconnectedReasonMapper(reason),
-        sid: _this.sessionId
-      });
-      if (left.length) {
-        _this.emit('presence', {
-          left: left
-        });
-      }
+      _this.participantsService.disconnect(reason, _this.sessionId, _this.emitCallback);
     });
-    _defineProperty(_assertThisInitialized(_this), "getCurrentState", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
-      var _this$metadata$title, _this$analyticsHelper20, state, adfDocument, currentState, measure, _this$analyticsHelper21, _this$analyticsHelper22, _measure;
-      return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+    _defineProperty(_assertThisInitialized(_this), "getCurrentState", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var _this$analyticsHelper6;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) {
-          switch (_context3.prev = _context3.next) {
-            case 0:
-              _context3.prev = 0;
-              startMeasure(MEASURE_NAME.GET_CURRENT_STATE, _this.analyticsHelper);
-
-              // Convert ProseMirror document in Editor state to ADF document
-              state = _this.getState();
-              adfDocument = new JSONTransformer().encode(state.doc);
-              currentState = {
-                content: adfDocument,
-                title: (_this$metadata$title = _this.metadata.title) === null || _this$metadata$title === void 0 ? void 0 : _this$metadata$title.toString(),
-                stepVersion: getVersion(state)
-              };
-              measure = stopMeasure(MEASURE_NAME.GET_CURRENT_STATE, _this.analyticsHelper);
-              (_this$analyticsHelper20 = _this.analyticsHelper) === null || _this$analyticsHelper20 === void 0 ? void 0 : _this$analyticsHelper20.sendActionEvent(EVENT_ACTION.GET_CURRENT_STATE, EVENT_STATUS.SUCCESS, {
-                latency: measure === null || measure === void 0 ? void 0 : measure.duration
-              });
-              return _context3.abrupt("return", currentState);
-            case 10:
-              _context3.prev = 10;
-              _context3.t0 = _context3["catch"](0);
-              _measure = stopMeasure(MEASURE_NAME.GET_CURRENT_STATE, _this.analyticsHelper);
-              (_this$analyticsHelper21 = _this.analyticsHelper) === null || _this$analyticsHelper21 === void 0 ? void 0 : _this$analyticsHelper21.sendActionEvent(EVENT_ACTION.GET_CURRENT_STATE, EVENT_STATUS.FAILURE, {
-                latency: _measure === null || _measure === void 0 ? void 0 : _measure.duration
-              });
-              (_this$analyticsHelper22 = _this.analyticsHelper) === null || _this$analyticsHelper22 === void 0 ? void 0 : _this$analyticsHelper22.sendErrorEvent(_context3.t0, 'Error while returning ADF version of current draft document');
-              throw _context3.t0;
-            case 16:
-            case "end":
-              return _context3.stop();
-          }
-        }
-      }, _callee3, null, [[0, 10]]);
-    })));
-    _defineProperty(_assertThisInitialized(_this), "commitUnconfirmedSteps", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
-      var unconfirmedSteps, _this$analyticsHelper24, _this$analyticsHelper25, measure;
-      return _regeneratorRuntime.wrap(function _callee5$(_context5) {
-        while (1) {
-          switch (_context5.prev = _context5.next) {
+          switch (_context.prev = _context.next) {
             case 0:
-              unconfirmedSteps = _this.getUnconfirmedSteps();
-              _context5.prev = 1;
-              if (!(unconfirmedSteps !== null && unconfirmedSteps !== void 0 && unconfirmedSteps.length)) {
-                _context5.next = 4;
-                break;
-              }
-              return _context5.delegateYield( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
-                var _this$analyticsHelper23;
-                var count, unconfirmedTrs, lastTr, isLastTrConfirmed, nextUnconfirmedSteps, nextUnconfirmedTrs, state, measure;
-                return _regeneratorRuntime.wrap(function _callee4$(_context4) {
-                  while (1) {
-                    switch (_context4.prev = _context4.next) {
-                      case 0:
-                        startMeasure(MEASURE_NAME.COMMIT_UNCONFIRMED_STEPS, _this.analyticsHelper);
-                        count = 0; // We use origins here as steps can be rebased. When steps are rebased a new step is created.
-                        // This means that we can not track if it has been removed from the unconfirmed array or not.
-                        // Origins points to the original transaction that the step was created in. This is never changed
-                        // and gets passed down when a step is rebased.
-                        unconfirmedTrs = _this.getUnconfirmedStepsOrigins();
-                        lastTr = unconfirmedTrs === null || unconfirmedTrs === void 0 ? void 0 : unconfirmedTrs[unconfirmedTrs.length - 1];
-                        isLastTrConfirmed = false;
-                      case 5:
-                        if (isLastTrConfirmed) {
-                          _context4.next = 16;
-                          break;
-                        }
-                        _this.sendStepsFromCurrentState();
-                        _context4.next = 9;
-                        return sleep(1000);
-                      case 9:
-                        nextUnconfirmedSteps = _this.getUnconfirmedSteps();
-                        if (nextUnconfirmedSteps !== null && nextUnconfirmedSteps !== void 0 && nextUnconfirmedSteps.length) {
-                          nextUnconfirmedTrs = _this.getUnconfirmedStepsOrigins();
-                          isLastTrConfirmed = !(nextUnconfirmedTrs !== null && nextUnconfirmedTrs !== void 0 && nextUnconfirmedTrs.some(function (tr) {
-                            return tr === lastTr;
-                          }));
-                        } else {
-                          isLastTrConfirmed = true;
-                        }
-                        if (!(!isLastTrConfirmed && count++ >= ACK_MAX_TRY)) {
-                          _context4.next = 14;
-                          break;
-                        }
-                        if (_this.onSyncUpError) {
-                          state = _this.getState();
-                          _this.onSyncUpError({
-                            lengthOfUnconfirmedSteps: nextUnconfirmedSteps === null || nextUnconfirmedSteps === void 0 ? void 0 : nextUnconfirmedSteps.length,
-                            tries: count,
-                            maxRetries: ACK_MAX_TRY,
-                            clientId: _this.clientId,
-                            version: getVersion(state)
-                          });
-                        }
-                        throw new Error("Can't sync up with Collab Service");
-                      case 14:
-                        _context4.next = 5;
-                        break;
-                      case 16:
-                        measure = stopMeasure(MEASURE_NAME.COMMIT_UNCONFIRMED_STEPS, _this.analyticsHelper);
-                        (_this$analyticsHelper23 = _this.analyticsHelper) === null || _this$analyticsHelper23 === void 0 ? void 0 : _this$analyticsHelper23.sendActionEvent(EVENT_ACTION.COMMIT_UNCONFIRMED_STEPS, EVENT_STATUS.SUCCESS, {
-                          latency: measure === null || measure === void 0 ? void 0 : measure.duration,
-                          // upon success, emit the total number of unconfirmed steps we synced
-                          numUnconfirmedSteps: unconfirmedSteps === null || unconfirmedSteps === void 0 ? void 0 : unconfirmedSteps.length
-                        });
-                      case 18:
-                      case "end":
-                        return _context4.stop();
-                    }
-                  }
-                }, _callee4);
-              })(), "t0", 4);
+              _context.prev = 0;
+              return _context.abrupt("return", _this.documentService.getCurrentState());
             case 4:
-              _context5.next = 12;
-              break;
-            case 6:
-              _context5.prev = 6;
-              _context5.t1 = _context5["catch"](1);
-              measure = stopMeasure(MEASURE_NAME.COMMIT_UNCONFIRMED_STEPS, _this.analyticsHelper);
-              (_this$analyticsHelper24 = _this.analyticsHelper) === null || _this$analyticsHelper24 === void 0 ? void 0 : _this$analyticsHelper24.sendActionEvent(EVENT_ACTION.COMMIT_UNCONFIRMED_STEPS, EVENT_STATUS.FAILURE, {
-                latency: measure === null || measure === void 0 ? void 0 : measure.duration,
-                numUnconfirmedSteps: unconfirmedSteps === null || unconfirmedSteps === void 0 ? void 0 : unconfirmedSteps.length
-              });
-              (_this$analyticsHelper25 = _this.analyticsHelper) === null || _this$analyticsHelper25 === void 0 ? void 0 : _this$analyticsHelper25.sendErrorEvent(_context5.t1, 'Error while committing unconfirmed steps');
-              throw _context5.t1;
-            case 12:
+              _context.prev = 4;
+              _context.t0 = _context["catch"](0);
+              (_this$analyticsHelper6 = _this.analyticsHelper) === null || _this$analyticsHelper6 === void 0 ? void 0 : _this$analyticsHelper6.sendErrorEvent(_context.t0, 'Error while returning ADF version of current draft document');
+              throw new GetCurrentStateError('Error while returning the current state of the draft document', _context.t0);
+            case 8:
             case "end":
-              return _context5.stop();
+              return _context.stop();
           }
         }
-      }, _callee5, null, [[1, 6]]);
+      }, _callee, null, [[0, 4]]);
     })));
-    _defineProperty(_assertThisInitialized(_this), "getFinalAcknowledgedState", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6() {
-      var _this$analyticsHelper26, currentState, measure, _this$analyticsHelper27, _this$analyticsHelper28, _measure2;
-      return _regeneratorRuntime.wrap(function _callee6$(_context6) {
+    _defineProperty(_assertThisInitialized(_this), "getFinalAcknowledgedState", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+      var _this$analyticsHelper7;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) {
-          switch (_context6.prev = _context6.next) {
+          switch (_context2.prev = _context2.next) {
             case 0:
-              _context6.prev = 0;
-              startMeasure(MEASURE_NAME.PUBLISH_PAGE, _this.analyticsHelper);
-              _context6.next = 4;
-              return _this.commitUnconfirmedSteps();
+              _context2.prev = 0;
+              return _context2.abrupt("return", _this.documentService.getFinalAcknowledgedState());
             case 4:
-              _context6.next = 6;
-              return _this.getCurrentState();
-            case 6:
-              currentState = _context6.sent;
-              measure = stopMeasure(MEASURE_NAME.PUBLISH_PAGE, _this.analyticsHelper);
-              (_this$analyticsHelper26 = _this.analyticsHelper) === null || _this$analyticsHelper26 === void 0 ? void 0 : _this$analyticsHelper26.sendActionEvent(EVENT_ACTION.PUBLISH_PAGE, EVENT_STATUS.SUCCESS, {
-                latency: measure === null || measure === void 0 ? void 0 : measure.duration
-              });
-              return _context6.abrupt("return", currentState);
-            case 12:
-              _context6.prev = 12;
-              _context6.t0 = _context6["catch"](0);
-              _measure2 = stopMeasure(MEASURE_NAME.PUBLISH_PAGE, _this.analyticsHelper);
-              (_this$analyticsHelper27 = _this.analyticsHelper) === null || _this$analyticsHelper27 === void 0 ? void 0 : _this$analyticsHelper27.sendActionEvent(EVENT_ACTION.PUBLISH_PAGE, EVENT_STATUS.FAILURE, {
-                latency: _measure2 === null || _measure2 === void 0 ? void 0 : _measure2.duration
-              });
-              (_this$analyticsHelper28 = _this.analyticsHelper) === null || _this$analyticsHelper28 === void 0 ? void 0 : _this$analyticsHelper28.sendErrorEvent(_context6.t0, 'Error while returning ADF version of the final draft document');
-              throw _context6.t0;
-            case 18:
+              _context2.prev = 4;
+              _context2.t0 = _context2["catch"](0);
+              (_this$analyticsHelper7 = _this.analyticsHelper) === null || _this$analyticsHelper7 === void 0 ? void 0 : _this$analyticsHelper7.sendErrorEvent(_context2.t0, 'Error while returning ADF version of the final draft document');
+              throw new GetFinalAcknowledgedStateError('Error while returning the final acknowledged state of the draft document', _context2.t0);
+            case 8:
             case "end":
-              return _context6.stop();
+              return _context2.stop();
           }
         }
-      }, _callee6, null, [[0, 12]]);
+      }, _callee2, null, [[0, 4]]);
     })));
+    _defineProperty(_assertThisInitialized(_this), "getUnconfirmedSteps", function () {
+      return _this.documentService.getUnconfirmedSteps();
+    });
     _defineProperty(_assertThisInitialized(_this), "onNamespaceStatusChanged", /*#__PURE__*/function () {
-      var _ref17 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(data) {
+      var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(data) {
         var isLocked, waitTimeInMs, timestamp, start;
-        return _regeneratorRuntime.wrap(function _callee7$(_context7) {
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) {
-            switch (_context7.prev = _context7.next) {
+            switch (_context3.prev = _context3.next) {
               case 0:
                 isLocked = data.isLocked, waitTimeInMs = data.waitTimeInMs, timestamp = data.timestamp;
                 start = Date.now();
@@ -727,7 +234,7 @@ export var Provider = /*#__PURE__*/function (_Emitter) {
                   data: data
                 });
                 if (!(isLocked && waitTimeInMs)) {
-                  _context7.next = 8;
+                  _context3.next = 8;
                   break;
                 }
                 _this.isNamespaceLocked = true;
@@ -743,195 +250,132 @@ export var Provider = /*#__PURE__*/function (_Emitter) {
                   });
                   _this.isNamespaceLocked = false;
                 }, waitTimeInMs);
-                return _context7.abrupt("return");
+                return _context3.abrupt("return");
               case 8:
                 _this.isNamespaceLocked = false;
                 logger("The page lock has expired");
               case 10:
               case "end":
-                return _context7.stop();
+                return _context3.stop();
             }
           }
-        }, _callee7);
+        }, _callee3);
       }));
-      return function (_x2) {
-        return _ref17.apply(this, arguments);
+      return function (_x) {
+        return _ref8.apply(this, arguments);
       };
     }());
+    _defineProperty(_assertThisInitialized(_this), "clearTimers", function () {
+      clearTimeout(_this.presenceUpdateTimeout);
+      _this.participantsService.clearTimers();
+    });
     _this.config = config;
-    _this.analyticsHelper = new AnalyticsHelper(_this.config.documentAri, config.analyticsClient);
+    _this.analyticsHelper = new AnalyticsHelper(_this.config.documentAri, _this.config.analyticsClient, _this.config.getAnalyticsWebClient);
     _this.channel = new Channel(config, _this.analyticsHelper);
     _this.isChannelInitialized = false;
+    _this.initialDraft = _this.config.initialDraft;
+    _this.isProviderInitialized = false;
+    _this.participantsService = new ParticipantsService(_this.analyticsHelper);
+    _this.metadataService = new MetadataService(_this.emitCallback, _this.channel.sendMetadata);
+    _this.documentService = new DocumentService(_this.participantsService, _this.analyticsHelper, _this.channel.fetchCatchup, _this.emitCallback, _this.channel.broadcast, function () {
+      return _this.userId;
+    }, _this.onErrorHandled, _this.metadataService);
     return _this;
   }
   _createClass(Provider, [{
     key: "initialize",
     value:
     /**
-     * Called by collab plugin in editor when it's ready to
-     * initialize a collab session.
+     * Initialisation logic, called by Jira with a dummy getState function, deprecated in favour of the setup method which allows more configuration
+     * @param {Function} getState Function that returns the editor state, used to retrieve collab-edit properties and to interact with prosemirror-collab
+     * @throws {ProviderInitialisationError} Something went wrong during provider initialisation
+     * @deprecated Use setup method instead
      */
     function initialize(getState) {
       return this.setup({
         getState: getState
       });
     }
+
+    /**
+     * Initialisation logic, called by the editor in the collab-edit plugin
+     * @param {Object} parameters ...
+     * @param {Function} parameters.getState Function that returns the editor state, used to retrieve collab-edit properties and to interact with prosemirror-collab
+     * @param {SyncUpErrorFunction} parameters.onSyncUpError (Optional) Function that gets called when the sync of steps fails after retrying 30 times, used by Editor to log to analytics
+     * @throws {ProviderInitialisationError} Something went wrong during provider initialisation
+     */
   }, {
     key: "setup",
-    value: function setup(_ref18) {
-      var getState = _ref18.getState,
-        onSyncUpError = _ref18.onSyncUpError;
+    value: function setup(_ref9) {
+      var getState = _ref9.getState,
+        onSyncUpError = _ref9.onSyncUpError;
       try {
-        this.getState = getState;
-        this.onSyncUpError = onSyncUpError || noop;
-        this.clientId = getState().plugins.find(function (p) {
+        var collabPlugin = getState().plugins.find(function (p) {
           return p.key === 'collab$';
-        }).spec.config.clientID;
+        });
+        if (collabPlugin === undefined) {
+          throw new ProviderInitialisationError('Collab provider attempted to initialise, but Editor state is missing collab plugin');
+        }
+        this.clientId = collabPlugin.spec.config.clientID;
+        this.documentService.setup({
+          getState: getState,
+          onSyncUpError: onSyncUpError,
+          clientId: this.clientId
+        });
         if (!this.isChannelInitialized) {
           this.initializeChannel();
           this.isChannelInitialized = true;
         }
       } catch (initError) {
-        var _this$analyticsHelper29;
-        (_this$analyticsHelper29 = this.analyticsHelper) === null || _this$analyticsHelper29 === void 0 ? void 0 : _this$analyticsHelper29.sendErrorEvent(initError, 'Error while initialising the provider');
+        var _this$analyticsHelper8;
+        (_this$analyticsHelper8 = this.analyticsHelper) === null || _this$analyticsHelper8 === void 0 ? void 0 : _this$analyticsHelper8.sendErrorEvent(initError, 'Error while initialising the provider');
         // Throw error so consumers are aware the initialisation failed when initialising themselves
-        throw initError;
+        throw new ProviderInitialisationError('Provider initialisation error', initError);
       }
       return this;
     }
 
     /**
-     * We can use this function to throttle/delay
-     * Any send steps operation
-     *
-     * The getState function will return the current EditorState
-     * from the EditorView.
-     */
-  }, {
-    key: "sendStepsFromCurrentState",
-    value: function sendStepsFromCurrentState() {
-      var _this$getState4;
-      var state = (_this$getState4 = this.getState) === null || _this$getState4 === void 0 ? void 0 : _this$getState4.call(this);
-      if (!state) {
-        return;
-      }
-      this.send(null, null, state);
-    }
-
-    /**
-     * 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
+     * Send steps from transaction to NCS (and as a consequence to other participants), called from the collab-edit plugin in the editor
+     * @param {Transaction} _tr Deprecated, included to keep API consistent with Synchrony provider
+     * @param {EditorState} _oldState Deprecated, included to keep API consistent with Synchrony provider
+     * @param {EditorState} newState The editor state after applying the transaction
+     * @throws {SendTransactionError} Something went wrong while sending the steps for this transaction
      */
   }, {
     key: "send",
     value: function send(_tr, _oldState, newState) {
-      var unconfirmedStepsData = sendableSteps(newState);
-      var version = getVersion(newState);
-
-      // Don't send any steps before we're ready.
-      if (!unconfirmedStepsData) {
-        return;
-      }
-      // Don't send steps while the document is locked (eg. when restoring the document)
-      if (this.isNamespaceLocked) {
-        logger('The document is temporary locked');
-        return;
-      }
-      var unconfirmedSteps = unconfirmedStepsData.steps;
-      if (!(unconfirmedSteps !== null && unconfirmedSteps !== void 0 && unconfirmedSteps.length)) {
-        return;
-      }
-
-      // Avoid reference issues using a
-      // method outside of the provider
-      // scope
-      throttledCommitStep({
-        channel: this.channel,
-        userId: this.userId,
-        clientId: this.clientId,
-        steps: unconfirmedSteps,
-        version: version,
-        onStepsAdded: this.onStepsAdded.bind(this),
-        onErrorHandled: this.onErrorHandled.bind(this),
-        analyticsHelper: this.analyticsHelper
-      });
-    }
-
-    // Triggered when page recovery has emitted an 'init' event on a page client is currently connected to.
-  }, {
-    key: "queueSteps",
-    value: function queueSteps(data) {
-      logger("Queueing data for version \"".concat(data.version, "\"."));
-      var orderedQueue = [].concat(_toConsumableArray(this.queue), [data]).sort(function (a, b) {
-        return a.version > b.version ? 1 : -1;
-      });
-      this.queue = orderedQueue;
-    }
-  }, {
-    key: "processQueue",
-    value: function processQueue() {
-      if (this.pauseQueue) {
-        logger("Queue is paused. Aborting.");
-        return;
-      }
-      logger("Looking for processable data.");
-      if (this.queue.length > 0) {
-        var firstItem = this.queue.shift();
-        var currentVersion = this.getCurrentPmVersion();
-        var expectedVersion = currentVersion + firstItem.steps.length;
-        if (firstItem.version === expectedVersion) {
-          logger("Applying data from queue!");
-          this.processSteps(firstItem);
-          // recur
-          this.processQueue();
-        }
-      }
-    }
-  }, {
-    key: "processSteps",
-    value: function processSteps(data) {
-      var _this5 = this;
-      var version = data.version,
-        steps = data.steps;
-      logger("Processing data. Version \"".concat(version, "\"."));
-      if (steps !== null && steps !== void 0 && steps.length) {
-        try {
-          var clientIds = steps.map(function (_ref19) {
-            var clientId = _ref19.clientId;
-            return clientId;
-          });
-          this.emit('data', {
-            json: steps,
-            version: version,
-            userIds: clientIds
-          });
-          // If steps can apply to local editor successfully, no need to accumulate the error counter.
-          this.stepRejectCounter = 0;
-          this.emitTelepointersFromSteps(steps);
-
-          // Resend local steps if none of the received steps originated with us!
-          if (clientIds.indexOf(this.clientId) === -1) {
-            setTimeout(function () {
-              return _this5.sendStepsFromCurrentState();
-            }, 100);
-          }
-        } catch (error) {
-          var _this$analyticsHelper30;
-          logger("Processing steps failed with error: ".concat(error, ". Triggering catch up call."));
-          (_this$analyticsHelper30 = this.analyticsHelper) === null || _this$analyticsHelper30 === void 0 ? void 0 : _this$analyticsHelper30.sendErrorEvent(error, 'Error while processing steps');
-          this.throttledCatchup();
+      try {
+        // Don't send steps while the document is locked (eg. when restoring the document)
+        if (this.isNamespaceLocked) {
+          logger('The document is temporary locked');
+          return;
         }
+        this.documentService.send(_tr, _oldState, newState);
+      } catch (error) {
+        var _this$analyticsHelper9;
+        (_this$analyticsHelper9 = this.analyticsHelper) === null || _this$analyticsHelper9 === void 0 ? void 0 : _this$analyticsHelper9.sendErrorEvent(error, 'Error while sending steps for a transaction');
+        throw new SendTransactionError('Error while sending steps for a transaction', error);
       }
     }
 
     /**
-     * Send messages, such as telepointers, to other participants.
+     * @param {InternalError} error The error to handle
      */
   }, {
     key: "sendMessage",
-    value: function sendMessage(data) {
-      if ((data === null || data === void 0 ? void 0 : data.type) === 'telepointer') {
-        try {
+    value:
+    /**
+     * Send messages, such as telepointers, to NCS and other participants. Only used for telepointer data (text and node selections) in the editor and JWM. JWM does some weird serialisation stuff on the node selections.
+     * Silently fails if an error occurs, since Presence isn't a critical functionality and self-restores over time.
+     * @param {CollabEventTelepointerData} data Data you want to send to NCS / the other participants
+     * @param {string} data.type Can only be 'telepointer' for now, we don't support anything else yet
+     * @param {CollabSendableSelection} data.selection Object representing the selected element
+     * @param {string} data.sessionId Identifier identifying the session
+     */
+    function sendMessage(data) {
+      try {
+        if ((data === null || data === void 0 ? void 0 : data.type) === 'telepointer') {
           var payload = {
             userId: this.userId,
             sessionId: this.sessionId,
@@ -940,87 +384,155 @@ export var Provider = /*#__PURE__*/function (_Emitter) {
           };
           var callback = telepointerCallback(this.config.documentAri);
           this.channel.broadcast('participant:telepointer', payload, callback);
-        } catch (error) {
-          var _this$analyticsHelper31;
-          // We don't want to throw errors for Presence features as they tend to self-restore
-          (_this$analyticsHelper31 = this.analyticsHelper) === null || _this$analyticsHelper31 === void 0 ? void 0 : _this$analyticsHelper31.sendErrorEvent(error, 'Error while sending message - telepointer');
         }
-      }
-    }
-  }, {
-    key: "emitTelepointersFromSteps",
-    value: function emitTelepointersFromSteps(steps) {
-      var _this6 = this;
-      try {
-        steps.forEach(function (step) {
-          var event = telepointersFromStep(_this6.participants, step);
-          if (event) {
-            _this6.emit('telepointer', event);
-          }
-        });
       } catch (error) {
-        var _this$analyticsHelper32;
+        var _this$analyticsHelper10;
         // We don't want to throw errors for Presence features as they tend to self-restore
-        (_this$analyticsHelper32 = this.analyticsHelper) === null || _this$analyticsHelper32 === void 0 ? void 0 : _this$analyticsHelper32.sendErrorEvent(error, 'Error while emitting telepointers from steps');
+        (_this$analyticsHelper10 = this.analyticsHelper) === null || _this$analyticsHelper10 === void 0 ? void 0 : _this$analyticsHelper10.sendErrorEvent(error, 'Error while sending message - telepointer');
       }
     }
 
+    /**
+     * Called when a participant joins the session.
+     *
+     * We keep track of participants internally in this class, and emit the `presence` event to update
+     * the active avatars in the editor.
+     * This method will be triggered from backend to notify all participants to exchange presence
+     */
+
+    /**
+     * Called when a participant leaves the session.
+     *
+     * We emit the `presence` event to update the active avatars in the editor.
+     */
+
+    /**
+     * Called when we receive an update event from another participant.
+     */
+
+    /**
+     * Called when we receive a telepointer update from another
+     * participant.
+     */
+
     // Note: this gets triggered on page reload for Firefox (not other browsers) because of closeOnBeforeunload: false
   }, {
     key: "destroy",
-    value: function destroy() {
-      return this.disconnect();
+    value:
+    /**
+     * "Destroy" the provider, disconnect it's connection to the back-end service and unsubscribe all event listeners on the provider.
+     * Used by Jira products (JWM, JPD) to disable the provider
+     * @throws {DestroyError} Something went wrong while shutting down the collab provider
+     */
+    function destroy() {
+      return this.unsubscribeAll();
     }
+
+    /**
+     * Disconnect the provider, disconnect it's connection to the back-end service and unsubscribe all event listeners on the provider.
+     * Used by Confluence to disable the provider when a user doesn't have access to a resource.
+     * @deprecated use destroy instead, it does the same thing
+     * @throws {DestroyError} Something went wrong while shutting down the collab provider
+     */
   }, {
     key: "disconnect",
     value: function disconnect() {
       return this.unsubscribeAll();
     }
+
+    /**
+     * Disconnect the provider's connection to the back-end service and unsubscribe from all events emitted by this provider. Kept to keep roughly aligned to Synchrony API, which you need to call for each event.
+     * @deprecated use destroy instead, it does the same thing
+     * @throws {DestroyError} Something went wrong while shutting down the collab provider
+     */
+  }, {
+    key: "unsubscribeAll",
+    value: function unsubscribeAll() {
+      try {
+        _get(_getPrototypeOf(Provider.prototype), "unsubscribeAll", this).call(this);
+        this.channel.disconnect();
+      } catch (error) {
+        var _this$analyticsHelper11;
+        (_this$analyticsHelper11 = this.analyticsHelper) === null || _this$analyticsHelper11 === void 0 ? void 0 : _this$analyticsHelper11.sendErrorEvent(error, 'Error while shutting down the collab provider');
+        throw new DestroyError('Error while shutting down the collab provider', error);
+      }
+      this.clearTimers();
+      return this;
+    }
+
+    /**
+     * Update the title of the document in the collab provider and optionally broadcast it to other participants and NCS
+     * @param {string} title Title you want to set on the document
+     * @param {boolean} broadcast (Optional) Flag indicating whether you want to broadcast the title change to the other participants, always true for now (otherwise we would lose title changes)
+     * @throws {SetTitleError} Something went wrong while setting the title
+     */
   }, {
     key: "setTitle",
     value: function setTitle(title, broadcast) {
-      if (broadcast) {
-        this.channel.sendMetadata({
-          title: title
-        });
+      try {
+        this.metadataService.setTitle(title, broadcast);
+      } catch (error) {
+        var _this$analyticsHelper12;
+        (_this$analyticsHelper12 = this.analyticsHelper) === null || _this$analyticsHelper12 === void 0 ? void 0 : _this$analyticsHelper12.sendErrorEvent(error, 'Error while setting title');
+        throw new SetTitleError('Error while setting title', error);
       }
-      Object.assign(this.metadata, {
-        title: title
-      });
     }
+
+    /**
+     * Set editor width, not used any more
+     * @deprecated use setMetadata instead, it does the same thing
+     * @param {string} editorWidth string? indicating the editor width
+     * @param {boolean} broadcast (Optional) Flag indicating whether you want to broadcast the editor width change
+     * @throws {SetEditorWidthError} Something went wrong while setting the editor width
+     */
   }, {
     key: "setEditorWidth",
     value: function setEditorWidth(editorWidth, broadcast) {
-      if (broadcast) {
-        this.channel.sendMetadata({
-          editorWidth: editorWidth
-        });
+      try {
+        this.metadataService.setEditorWidth(editorWidth, broadcast);
+      } catch (error) {
+        var _this$analyticsHelper13;
+        (_this$analyticsHelper13 = this.analyticsHelper) === null || _this$analyticsHelper13 === void 0 ? void 0 : _this$analyticsHelper13.sendErrorEvent(error, 'Error while setting editor width');
+        throw new SetEditorWidthError('Error while setting editor width', error);
       }
-      Object.assign(this.metadata, {
-        editorWidth: editorWidth
-      });
     }
+
+    /**
+     * Set the editor width and title and distribute it to all participants. Used by Confluence
+     * @param {Metadata} metadata The metadata you want to update
+     * @throws {ExampleError} Something went wrong while setting the metadata
+     */
   }, {
     key: "setMetadata",
     value: function setMetadata(metadata) {
-      this.channel.sendMetadata(metadata);
-      Object.assign(this.metadata, metadata);
+      try {
+        this.metadataService.setMetadata(metadata);
+      } catch (error) {
+        var _this$analyticsHelper14;
+        (_this$analyticsHelper14 = this.analyticsHelper) === null || _this$analyticsHelper14 === void 0 ? void 0 : _this$analyticsHelper14.sendErrorEvent(error, 'Error while setting metadata');
+        throw new SetMetadataError('Error while setting metadata', error);
+      }
     }
-  }, {
-    key: "unsubscribeAll",
-    value:
+
     /**
-     * Unsubscribe from all events emitted by this provider.
+     * Return the ADF version of the current draft document, together with it's title and the current step version.
+     * 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
+     */
+
+    /**
+     * 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
      */
-    function unsubscribeAll() {
-      _get(_getPrototypeOf(Provider.prototype), "unsubscribeAll", this).call(this);
-      this.channel.disconnect();
-      return this;
-    }
 
     /**
      * ESS-2916 namespace status event- lock/unlock
      */
+
+    /**
+     * Used when the provider is disconnected or destroyed to prevent perpetual timers from continuously running
+     */
   }]);
   return Provider;
 }(Emitter);