@atlaskit/collab-provider 10.3.2 → 10.3.4

package/dist/cjs/provider/index.js

@@ -107,6 +107,7 @@ var Provider = exports.Provider = /*#__PURE__*/function (_Emitter) {
       // shouldSkipDocumentInit will bypass the NCS draft fetch if the initial draft is passed to the provider
       var shouldSkipDocumentInit = Boolean(_this.initialDraft);
       _this.channel.on('connected', function (_ref2) {
+        var _this$documentService;
         var sid = _ref2.sid,
           initialized = _ref2.initialized;
         _this.sessionId = sid;
@@ -114,6 +115,7 @@ var Provider = exports.Provider = /*#__PURE__*/function (_Emitter) {
           sid: sid,
           initial: !initialized
         });
+        var unconfirmedStepsLength = (_this$documentService = _this.documentService.getUnconfirmedSteps()) === null || _this$documentService === void 0 ? void 0 : _this$documentService.length;
 
         // if buffering is enabled and the provider is initialized before connection,
         // send any unconfirmed steps
@@ -138,11 +140,10 @@ var Provider = exports.Provider = /*#__PURE__*/function (_Emitter) {
         if (initialized && _this.disconnectedAt &&
         // Offline longer than `OUT_OF_SYNC_PERIOD`
         Date.now() - _this.disconnectedAt >= OUT_OF_SYNC_PERIOD) {
-          var _this$analyticsHelper2;
-          (_this$analyticsHelper2 = _this.analyticsHelper) === null || _this$analyticsHelper2 === void 0 || _this$analyticsHelper2.sendActionEvent(_const.EVENT_ACTION.RECONNECTION, _const.EVENT_STATUS.INFO, {
-            disconnectionPeriodSeconds: Math.floor((Date.now() - _this.disconnectedAt) / 1000)
+          _this.documentService.throttledCatchupv2(_const.CatchupEventReason.RECONNECTED, {
+            disconnectionPeriodSeconds: Math.floor((Date.now() - _this.disconnectedAt) / 1000),
+            unconfirmedStepsLength: unconfirmedStepsLength
           });
-          _this.documentService.throttledCatchupv2(_const.CatchupEventReason.RECONNECTED);
         }
         _this.participantsService.startInactiveRemover(_this.sessionId);
         _this.disconnectedAt = undefined;
@@ -193,13 +194,13 @@ var Provider = exports.Provider = /*#__PURE__*/function (_Emitter) {
       if (((_error$data = error.data) === null || _error$data === void 0 ? void 0 : _error$data.code) === _ncsErrors.NCS_ERROR_CODE.HEAD_VERSION_UPDATE_FAILED || ((_error$data2 = error.data) === null || _error$data2 === void 0 ? void 0 : _error$data2.code) === _ncsErrors.NCS_ERROR_CODE.VERSION_NUMBER_ALREADY_EXISTS) {
         _this.documentService.onStepRejectedError();
       } else {
-        var _this$analyticsHelper3;
-        (_this$analyticsHelper3 = _this.analyticsHelper) === null || _this$analyticsHelper3 === void 0 || _this$analyticsHelper3.sendErrorEvent(error, 'Error handled');
+        var _this$analyticsHelper2;
+        (_this$analyticsHelper2 = _this.analyticsHelper) === null || _this$analyticsHelper2 === void 0 || _this$analyticsHelper2.sendErrorEvent(error, 'Error handled');
         var mappedError = (0, _errorCodeMapper.errorCodeMapper)(error);
         // Only emit errors to Confluence very intentionally because they will disconnect the collab provider
         if (mappedError) {
-          var _this$analyticsHelper4;
-          (_this$analyticsHelper4 = _this.analyticsHelper) === null || _this$analyticsHelper4 === void 0 || _this$analyticsHelper4.sendProviderErrorEvent(mappedError);
+          var _this$analyticsHelper3;
+          (_this$analyticsHelper3 = _this.analyticsHelper) === null || _this$analyticsHelper3 === void 0 || _this$analyticsHelper3.sendProviderErrorEvent(mappedError);
           _this.emit('error', mappedError);
         }
       }
@@ -225,7 +226,7 @@ var Provider = exports.Provider = /*#__PURE__*/function (_Emitter) {
      * @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() {
-      var _this$analyticsHelper5;
+      var _this$analyticsHelper4;
       return _regenerator.default.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -237,7 +238,7 @@ var Provider = exports.Provider = /*#__PURE__*/function (_Emitter) {
           case 6:
             _context.prev = 6;
             _context.t0 = _context["catch"](0);
-            (_this$analyticsHelper5 = _this.analyticsHelper) === null || _this$analyticsHelper5 === void 0 || _this$analyticsHelper5.sendErrorEvent(_context.t0, 'Error while returning ADF version of current draft document');
+            (_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);
           case 10:
           case "end":
@@ -251,7 +252,7 @@ var Provider = exports.Provider = /*#__PURE__*/function (_Emitter) {
      * @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() {
-      var _this$analyticsHelper6;
+      var _this$analyticsHelper5;
       return _regenerator.default.wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -263,7 +264,7 @@ var Provider = exports.Provider = /*#__PURE__*/function (_Emitter) {
           case 6:
             _context2.prev = 6;
             _context2.t0 = _context2["catch"](0);
-            (_this$analyticsHelper6 = _this.analyticsHelper) === null || _this$analyticsHelper6 === void 0 || _this$analyticsHelper6.sendErrorEvent(_context2.t0, 'Error while returning ADF version of the final draft document');
+            (_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);
           case 10:
           case "end":
@@ -387,7 +388,7 @@ var Provider = exports.Provider = /*#__PURE__*/function (_Emitter) {
           clientId: this.clientId
         });
         if (this.isBufferingEnabled && this.initialDraft && !this.isProviderInitialized) {
-          var _this$analyticsHelper7;
+          var _this$analyticsHelper6;
           var _this$initialDraft2 = this.initialDraft,
             document = _this$initialDraft2.document,
             version = _this$initialDraft2.version,
@@ -397,7 +398,7 @@ var Provider = exports.Provider = /*#__PURE__*/function (_Emitter) {
             version: version,
             metadata: metadata
           });
-          (_this$analyticsHelper7 = this.analyticsHelper) === null || _this$analyticsHelper7 === void 0 || _this$analyticsHelper7.sendActionEvent(_const.EVENT_ACTION.PROVIDER_INITIALIZED, _const.EVENT_STATUS.INFO, {
+          (_this$analyticsHelper6 = this.analyticsHelper) === null || _this$analyticsHelper6 === void 0 || _this$analyticsHelper6.sendActionEvent(_const.EVENT_ACTION.PROVIDER_INITIALIZED, _const.EVENT_STATUS.INFO, {
             isBuffered: true
           });
         }
@@ -406,8 +407,8 @@ var Provider = exports.Provider = /*#__PURE__*/function (_Emitter) {
           this.isChannelInitialized = true;
         }
       } catch (initError) {
-        var _this$analyticsHelper8;
-        (_this$analyticsHelper8 = this.analyticsHelper) === null || _this$analyticsHelper8 === void 0 || _this$analyticsHelper8.sendErrorEvent(initError, 'Error while initialising the provider');
+        var _this$analyticsHelper7;
+        (_this$analyticsHelper7 = this.analyticsHelper) === null || _this$analyticsHelper7 === void 0 || _this$analyticsHelper7.sendErrorEvent(initError, 'Error while initialising the provider');
         // Throw error so consumers are aware the initialisation failed when initialising themselves
         throw new _customErrors.ProviderInitialisationError('Provider initialisation error', initError);
       }
@@ -427,8 +428,8 @@ var Provider = exports.Provider = /*#__PURE__*/function (_Emitter) {
           this.isChannelInitialized = true;
         }
       } catch (initError) {
-        var _this$analyticsHelper9;
-        (_this$analyticsHelper9 = this.analyticsHelper) === null || _this$analyticsHelper9 === void 0 || _this$analyticsHelper9.sendErrorEvent(initError, 'Error while initialising the provider');
+        var _this$analyticsHelper8;
+        (_this$analyticsHelper8 = this.analyticsHelper) === null || _this$analyticsHelper8 === void 0 || _this$analyticsHelper8.sendErrorEvent(initError, 'Error while initialising the provider');
         // Throw error so consumers are aware the initialisation failed when initialising themselves
         throw new _customErrors.ProviderInitialisationError('Provider initialisation error', initError);
       }
@@ -438,9 +439,9 @@ var Provider = exports.Provider = /*#__PURE__*/function (_Emitter) {
     key: "checkForCookies",
     value: function checkForCookies() {
       if (!global.navigator.cookieEnabled) {
-        var _this$analyticsHelper10;
+        var _this$analyticsHelper9;
         var initError = new _customErrors.ProviderInitialisationError('Cookies are not enabled. Please enable cookies to use collaborative editing.');
-        (_this$analyticsHelper10 = this.analyticsHelper) === null || _this$analyticsHelper10 === void 0 || _this$analyticsHelper10.sendErrorEvent(initError, 'Error while initialising the provider - cookies disabled');
+        (_this$analyticsHelper9 = this.analyticsHelper) === null || _this$analyticsHelper9 === void 0 || _this$analyticsHelper9.sendErrorEvent(initError, 'Error while initialising the provider - cookies disabled');
         throw new _customErrors.ProviderInitialisationError('Provider initialisation error - cookies disabled', initError);
       }
     }
@@ -457,14 +458,14 @@ var Provider = exports.Provider = /*#__PURE__*/function (_Emitter) {
     value: function send(_tr, _oldState, newState) {
       try {
         if (this.isViewOnly()) {
-          var _this$analyticsHelper11;
+          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$analyticsHelper11 = this.analyticsHelper) === null || _this$analyticsHelper11 === void 0 || _this$analyticsHelper11.sendErrorEvent(error, error.message);
+          (_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)
@@ -474,8 +475,8 @@ var Provider = exports.Provider = /*#__PURE__*/function (_Emitter) {
         }
         this.documentService.send(_tr, _oldState, newState);
       } catch (error) {
-        var _this$analyticsHelper12;
-        (_this$analyticsHelper12 = this.analyticsHelper) === null || _this$analyticsHelper12 === void 0 || _this$analyticsHelper12.sendErrorEvent(error, 'Error while sending steps for a transaction');
+        var _this$analyticsHelper11;
+        (_this$analyticsHelper11 = this.analyticsHelper) === null || _this$analyticsHelper11 === void 0 || _this$analyticsHelper11.sendErrorEvent(error, 'Error while sending steps for a transaction');
         throw new _customErrors.SendTransactionError('Error while sending steps for a transaction', error);
       }
     }
@@ -526,9 +527,9 @@ var Provider = exports.Provider = /*#__PURE__*/function (_Emitter) {
           this.participantsService.sendAIProviderChanged(_objectSpread(_objectSpread({}, basePayload), data));
         }
       } catch (error) {
-        var _this$analyticsHelper13;
+        var _this$analyticsHelper12;
         // 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 || _this$analyticsHelper13.sendErrorEvent(error, 'Error while sending message - telepointer');
+        (_this$analyticsHelper12 = this.analyticsHelper) === null || _this$analyticsHelper12 === void 0 || _this$analyticsHelper12.sendErrorEvent(error, 'Error while sending message - telepointer');
       }
     }
   }, {
@@ -579,8 +580,8 @@ var Provider = exports.Provider = /*#__PURE__*/function (_Emitter) {
           this.sendStepsTimer = undefined;
         }
       } catch (error) {
-        var _this$analyticsHelper14;
-        (_this$analyticsHelper14 = this.analyticsHelper) === null || _this$analyticsHelper14 === void 0 || _this$analyticsHelper14.sendErrorEvent(error, 'Error while shutting down the collab provider');
+        var _this$analyticsHelper13;
+        (_this$analyticsHelper13 = this.analyticsHelper) === null || _this$analyticsHelper13 === void 0 || _this$analyticsHelper13.sendErrorEvent(error, 'Error while shutting down the collab provider');
         throw new _customErrors.DestroyError('Error while shutting down the collab provider', error);
       }
       this.clearTimers();
@@ -604,8 +605,8 @@ var Provider = exports.Provider = /*#__PURE__*/function (_Emitter) {
         }
         this.metadataService.setTitle(title, broadcast);
       } catch (error) {
-        var _this$analyticsHelper15;
-        (_this$analyticsHelper15 = this.analyticsHelper) === null || _this$analyticsHelper15 === void 0 || _this$analyticsHelper15.sendErrorEvent(error, 'Error while setting title');
+        var _this$analyticsHelper14;
+        (_this$analyticsHelper14 = this.analyticsHelper) === null || _this$analyticsHelper14 === void 0 || _this$analyticsHelper14.sendErrorEvent(error, 'Error while setting title');
         throw new _customErrors.SetTitleError('Error while setting title', error);
       }
     }
@@ -624,8 +625,8 @@ var Provider = exports.Provider = /*#__PURE__*/function (_Emitter) {
       try {
         this.metadataService.setEditorWidth(editorWidth, broadcast);
       } catch (error) {
-        var _this$analyticsHelper16;
-        (_this$analyticsHelper16 = this.analyticsHelper) === null || _this$analyticsHelper16 === void 0 || _this$analyticsHelper16.sendErrorEvent(error, 'Error while setting editor width');
+        var _this$analyticsHelper15;
+        (_this$analyticsHelper15 = this.analyticsHelper) === null || _this$analyticsHelper15 === void 0 || _this$analyticsHelper15.sendErrorEvent(error, 'Error while setting editor width');
         throw new _customErrors.SetEditorWidthError('Error while setting editor width', error);
       }
     }
@@ -644,8 +645,8 @@ var Provider = exports.Provider = /*#__PURE__*/function (_Emitter) {
         }
         this.metadataService.setMetadata(metadata);
       } catch (error) {
-        var _this$analyticsHelper17;
-        (_this$analyticsHelper17 = this.analyticsHelper) === null || _this$analyticsHelper17 === void 0 || _this$analyticsHelper17.sendErrorEvent(error, 'Error while setting metadata');
+        var _this$analyticsHelper16;
+        (_this$analyticsHelper16 = this.analyticsHelper) === null || _this$analyticsHelper16 === void 0 || _this$analyticsHelper16.sendErrorEvent(error, 'Error while setting metadata');
         throw new _customErrors.SetMetadataError('Error while setting metadata', error);
       }
     }

package/dist/cjs/version-wrapper.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.version = exports.nextMajorVersion = exports.name = void 0;
 var name = exports.name = "@atlaskit/collab-provider";
-var version = exports.version = "10.3.2";
+var version = exports.version = "10.3.4";
 var nextMajorVersion = exports.nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/es2019/document/catchupv2.js

@@ -20,6 +20,8 @@ export const catchupv2 = async opt => {
     throw error;
   }
   try {
+    var _opt$onCatchupComplet;
+    (_opt$onCatchupComplet = opt.onCatchupComplete) === null || _opt$onCatchupComplet === void 0 ? void 0 : _opt$onCatchupComplet.call(opt, steps);
     // skip onStepsAdded if steps are undefined or empty
     if (!steps || steps.length === 0) {
       opt.updateMetadata(metadata);