@atlaskit/collab-provider 7.6.1 → 7.6.3

package/dist/esm/provider/index.js

@@ -283,12 +283,14 @@ export var Provider = /*#__PURE__*/function (_Emitter) {
     _defineProperty(_assertThisInitialized(_this), "onErrorHandled", function (error) {
       if (error && error.data) {
         if (error.data.code === 'HEAD_VERSION_UPDATE_FAILED' || error.data.code === 'VERSION_NUMBER_ALREADY_EXISTS') {
+          var measure = stopMeasure(MEASURE_NAME.ADD_STEPS);
           triggerCollabAnalyticsEvent({
             eventAction: EVENT_ACTION.ADD_STEPS,
             attributes: {
               eventStatus: EVENT_STATUS.FAILURE,
               error: error,
-              documentAri: _this.config.documentAri
+              documentAri: _this.config.documentAri,
+              latency: measure === null || measure === void 0 ? void 0 : measure.duration
             }
           }, _this.analyticsClient);
           _this.stepRejectCounter++;
@@ -571,7 +573,7 @@ export var Provider = /*#__PURE__*/function (_Emitter) {
     _defineProperty(_assertThisInitialized(_this), "getFinalAcknowledgedState", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
       var _this$metadata$title;
 
-      var maxAttemptsToSync, count, unconfirmedState, state, adfDocument, measure, _measure2;
+      var maxAttemptsToSync, count, unconfirmedState, state, adfDocument, measure, _measure3;
 
       return _regeneratorRuntime.wrap(function _callee4$(_context4) {
         while (1) {
@@ -587,32 +589,33 @@ export var Provider = /*#__PURE__*/function (_Emitter) {
               }
 
               return _context4.delegateYield( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
-                var unconfirmedTrs, lastTr, isLastTrConfirmed, nextUnconfirmedState, nextUnconfirmedTrs, _state;
+                var unconfirmedTrs, lastTr, isLastTrConfirmed, nextUnconfirmedState, nextUnconfirmedTrs, _state, _measure2, measure;
 
                 return _regeneratorRuntime.wrap(function _callee3$(_context3) {
                   while (1) {
                     switch (_context3.prev = _context3.next) {
                       case 0:
-                        // We use origins here as steps can be rebased. When steps are rebased a new step is created.
+                        startMeasure(MEASURE_NAME.COMMIT_UNCONFIRMED_STEPS); // 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 = unconfirmedState.origins;
                         lastTr = unconfirmedTrs[unconfirmedTrs.length - 1];
                         isLastTrConfirmed = false;
 
-                      case 3:
+                      case 4:
                         if (isLastTrConfirmed) {
-                          _context3.next = 14;
+                          _context3.next = 17;
                           break;
                         }
 
                         _this.sendStepsFromCurrentState();
 
-                        _context3.next = 7;
-                        return sleep(500);
+                        _context3.next = 8;
+                        return sleep(1000);
 
-                      case 7:
+                      case 8:
                         nextUnconfirmedState = _this.getUnconfirmedSteps();
 
                         if (nextUnconfirmedState && nextUnconfirmedState.steps.length) {
@@ -625,7 +628,7 @@ export var Provider = /*#__PURE__*/function (_Emitter) {
                         }
 
                         if (!(!isLastTrConfirmed && count++ >= maxAttemptsToSync)) {
-                          _context3.next = 12;
+                          _context3.next = 15;
                           break;
                         }
 
@@ -641,13 +644,33 @@ export var Provider = /*#__PURE__*/function (_Emitter) {
                           });
                         }
 
-                        throw new Error("Can't syncup with Collab Service");
-
-                      case 12:
-                        _context3.next = 3;
+                        _measure2 = stopMeasure(MEASURE_NAME.COMMIT_UNCONFIRMED_STEPS);
+                        triggerCollabAnalyticsEvent({
+                          eventAction: EVENT_ACTION.COMMIT_UNCONFIRMED_STEPS,
+                          attributes: {
+                            eventStatus: EVENT_STATUS.FAILURE,
+                            latency: _measure2 === null || _measure2 === void 0 ? void 0 : _measure2.duration,
+                            documentAri: _this.config.documentAri
+                          }
+                        }, _this.analyticsClient);
+                        throw new Error("Can't sync up with Collab Service");
+
+                      case 15:
+                        _context3.next = 4;
                         break;
 
-                      case 14:
+                      case 17:
+                        measure = stopMeasure(MEASURE_NAME.COMMIT_UNCONFIRMED_STEPS);
+                        triggerCollabAnalyticsEvent({
+                          eventAction: EVENT_ACTION.COMMIT_UNCONFIRMED_STEPS,
+                          attributes: {
+                            eventStatus: EVENT_STATUS.SUCCESS,
+                            latency: measure === null || measure === void 0 ? void 0 : measure.duration,
+                            documentAri: _this.config.documentAri
+                          }
+                        }, _this.analyticsClient);
+
+                      case 19:
                       case "end":
                         return _context3.stop();
                     }
@@ -671,12 +694,12 @@ export var Provider = /*#__PURE__*/function (_Emitter) {
                   }
                 }, _this.analyticsClient);
               } catch (error) {
-                _measure2 = stopMeasure(MEASURE_NAME.CONVERT_PM_TO_ADF);
+                _measure3 = stopMeasure(MEASURE_NAME.CONVERT_PM_TO_ADF);
                 triggerCollabAnalyticsEvent({
                   eventAction: EVENT_ACTION.CONVERT_PM_TO_ADF,
                   attributes: {
                     eventStatus: EVENT_STATUS.FAILURE,
-                    latency: _measure2 === null || _measure2 === void 0 ? void 0 : _measure2.duration,
+                    latency: _measure3 === null || _measure3 === void 0 ? void 0 : _measure3.duration,
                     error: error,
                     documentAri: _this.config.documentAri
                   }
@@ -776,11 +799,12 @@ export var Provider = /*#__PURE__*/function (_Emitter) {
 
       if (!steps || !steps.length) {
         return;
-      } // Avoid reference issues using a
+      }
+
+      startMeasure(MEASURE_NAME.ADD_STEPS); // Avoid reference issues using a
       // method outside of the provider
       // scope
 
-
       throttledCommitStep({
         channel: this.channel,
         userId: this.userId,
@@ -843,14 +867,16 @@ export var Provider = /*#__PURE__*/function (_Emitter) {
           json: steps,
           version: version,
           userIds: clientIds
-        }); // If steps can apply to local editor sucessfully, no need to accumulate the error counter.
+        }); // If steps can apply to local editor successfully, no need to accumulate the error counter.
 
         this.stepRejectCounter = 0;
+        var measure = stopMeasure(MEASURE_NAME.ADD_STEPS);
         triggerCollabAnalyticsEvent({
           eventAction: EVENT_ACTION.ADD_STEPS,
           attributes: {
             eventStatus: EVENT_STATUS.SUCCESS,
-            documentAri: this.config.documentAri
+            documentAri: this.config.documentAri,
+            latency: measure === null || measure === void 0 ? void 0 : measure.duration
           }
         }, this.analyticsClient);
         this.emitTelepointersFromSteps(steps); // Resend local steps if none of the received steps originated with us!

package/dist/esm/socket-io-provider.js

@@ -17,6 +17,7 @@ export function createSocketIOSocket(url, auth, productInfo) {
     reconnectionDelayMax: SOCKET_IO_OPTIONS.RECONNECTION_DELAY_MAX,
     reconnectionDelay: SOCKET_IO_OPTIONS.RECONNECTION_DELAY,
     randomizationFactor: SOCKET_IO_OPTIONS.RANDOMIZATION_FACTOR,
+    closeOnBeforeunload: false,
     withCredentials: true,
     transports: ['polling', 'websocket'],
     path: "/".concat(pathname.split('/')[1], "/socket.io"),

package/dist/esm/version-wrapper.js

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

package/dist/esm/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/collab-provider",
-	"version": "7.6.1",
+	"version": "7.6.3",
 	"sideEffects": false
 }

package/dist/types/analytics/performance.d.ts

@@ -2,7 +2,9 @@ export declare enum MEASURE_NAME {
     CALLING_CATCHUP_API = "callingCatchupApi",
     SOCKET_CONNECT = "socketConnect",
     DOCUMENT_INIT = "documentInit",
-    CONVERT_PM_TO_ADF = "convertPMToADF"
+    CONVERT_PM_TO_ADF = "convertPMToADF",
+    ADD_STEPS = "addSteps",
+    COMMIT_UNCONFIRMED_STEPS = "commitUnconfirmedSteps"
 }
 export declare function startMeasure(measureName: MEASURE_NAME): void;
 export declare function stopMeasure(measureName: MEASURE_NAME, onMeasureComplete?: (duration: number, startTime: number) => void): {

package/dist/types/helpers/const.d.ts

@@ -1,5 +1,4 @@
 import { ErrorPayload } from '../types';
-export declare const ATTRIBUTES_PACKAGE = "collabProvider";
 export declare const EVENT_SUBJECT = "collab";
 export declare enum COLLAB_SERVICE {
     NCS = "ncs",
@@ -11,7 +10,8 @@ export declare enum EVENT_ACTION {
     DOCUMENT_INIT = "documentInit",
     ADD_STEPS = "addSteps",
     CONVERT_PM_TO_ADF = "convertPMToADF",
-    UPDATE_PARTICIPANTS = "updateParticipants"
+    UPDATE_PARTICIPANTS = "updateParticipants",
+    COMMIT_UNCONFIRMED_STEPS = "commitUnconfirmedSteps"
 }
 export declare enum EVENT_STATUS {
     SUCCESS = "SUCCESS",
@@ -28,4 +28,4 @@ export declare type AnalyticsEvent = {
         participants?: number;
     };
 };
-export declare const ACK_MAX_TRY = 10;
+export declare const ACK_MAX_TRY = 30;

package/dist/types/version-wrapper.d.ts

@@ -0,0 +1,3 @@
+export declare const name: string;
+export declare const version: string;
+export declare const nextMajorVersion: () => string;

package/dist/types-ts4.0/analytics/performance.d.ts

@@ -2,7 +2,9 @@ export declare enum MEASURE_NAME {
     CALLING_CATCHUP_API = "callingCatchupApi",
     SOCKET_CONNECT = "socketConnect",
     DOCUMENT_INIT = "documentInit",
-    CONVERT_PM_TO_ADF = "convertPMToADF"
+    CONVERT_PM_TO_ADF = "convertPMToADF",
+    ADD_STEPS = "addSteps",
+    COMMIT_UNCONFIRMED_STEPS = "commitUnconfirmedSteps"
 }
 export declare function startMeasure(measureName: MEASURE_NAME): void;
 export declare function stopMeasure(measureName: MEASURE_NAME, onMeasureComplete?: (duration: number, startTime: number) => void): {

package/dist/types-ts4.0/helpers/const.d.ts

@@ -1,5 +1,4 @@
 import { ErrorPayload } from '../types';
-export declare const ATTRIBUTES_PACKAGE = "collabProvider";
 export declare const EVENT_SUBJECT = "collab";
 export declare enum COLLAB_SERVICE {
     NCS = "ncs",
@@ -11,7 +10,8 @@ export declare enum EVENT_ACTION {
     DOCUMENT_INIT = "documentInit",
     ADD_STEPS = "addSteps",
     CONVERT_PM_TO_ADF = "convertPMToADF",
-    UPDATE_PARTICIPANTS = "updateParticipants"
+    UPDATE_PARTICIPANTS = "updateParticipants",
+    COMMIT_UNCONFIRMED_STEPS = "commitUnconfirmedSteps"
 }
 export declare enum EVENT_STATUS {
     SUCCESS = "SUCCESS",
@@ -28,4 +28,4 @@ export declare type AnalyticsEvent = {
         participants?: number;
     };
 };
-export declare const ACK_MAX_TRY = 10;
+export declare const ACK_MAX_TRY = 30;

package/dist/types-ts4.0/version-wrapper.d.ts

@@ -0,0 +1,3 @@
+export declare const name: string;
+export declare const version: string;
+export declare const nextMajorVersion: () => string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/collab-provider",
-  "version": "7.6.1",
+  "version": "7.6.3",
   "description": "A provider for collaborative editing.",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -15,7 +15,8 @@
   "typesVersions": {
     ">=4.0 <4.5": {
       "*": [
-        "dist/types-ts4.0/*"
+        "dist/types-ts4.0/*",
+        "dist/types-ts4.0/index.d.ts"
       ]
     }
   },
@@ -30,7 +31,7 @@
   "dependencies": {
     "@atlaskit/analytics-gas-types": "5.0.9",
     "@atlaskit/analytics-listeners": "^8.3.0",
-    "@atlaskit/editor-common": "^69.3.0",
+    "@atlaskit/editor-common": "^70.2.0",
     "@atlaskit/editor-json-transformer": "^8.8.0",
     "@atlaskit/util-service-support": "^6.1.0",
     "@babel/runtime": "^7.0.0",
@@ -39,7 +40,7 @@
     "prosemirror-collab": "^1.2.2",
     "prosemirror-state": "1.3.4",
     "prosemirror-transform": "1.3.2",
-    "socket.io-client": "^4.0.0"
+    "socket.io-client": "^4.1.3"
   },
   "techstack": {
     "@atlassian/frontend": {
@@ -47,7 +48,10 @@
     },
     "@repo/internal": {
       "deprecation": "no-deprecated-imports",
-      "theming": "tokens"
+      "theming": "tokens",
+      "styling": [
+        "emotion"
+      ]
     }
   },
   "devDependencies": {