@atlaskit/collab-provider 7.1.2 → 7.1.6

package/dist/esm/provider/index.js

@@ -11,14 +11,15 @@ 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";
+var _excluded = ["type"];
 
 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; } }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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; }
 
 import { getVersion, sendableSteps } from 'prosemirror-collab';
 import throttle from 'lodash/throttle';
@@ -42,6 +43,8 @@ export 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;
 
 var commitStep = function commitStep(_ref) {
@@ -85,6 +88,39 @@ export var Provider = /*#__PURE__*/function (_Emitter) {
 
     _defineProperty(_assertThisInitialized(_this), "stepRejectCounter", 0);
 
+    _defineProperty(_assertThisInitialized(_this), "isChannelInitialized", false);
+
+    _defineProperty(_assertThisInitialized(_this), "initializeChannel", function () {
+      _this.channel.on('connected', function (_ref2) {
+        var sid = _ref2.sid,
+            initialized = _ref2.initialized;
+        _this.sessionId = sid;
+
+        _this.emit('connected', {
+          sid: sid
+        }); // 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.disconnectedAt = undefined;
+      }).on('init', function (_ref3) {
+        var doc = _ref3.doc,
+            version = _ref3.version,
+            metadata = _ref3.metadata;
+
+        // Initial document and version
+        _this.updateDocumentWithMetadata({
+          doc: doc,
+          version: version,
+          metadata: metadata
+        });
+      }).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))).connect();
+    });
+
     _defineProperty(_assertThisInitialized(_this), "onStepsAdded", function (data) {
       logger("Received steps", {
         steps: data.steps,
@@ -112,8 +148,8 @@ export var Provider = /*#__PURE__*/function (_Emitter) {
         _this.throttledCatchup();
       }
 
-      _this.updateParticipants([], data.steps.map(function (_ref2) {
-        var userId = _ref2.userId;
+      _this.updateParticipants([], data.steps.map(function (_ref4) {
+        var userId = _ref4.userId;
         return userId;
       }));
     });
@@ -129,11 +165,11 @@ export var Provider = /*#__PURE__*/function (_Emitter) {
       _this.queue = _this.queue.filter(condition);
     });
 
-    _defineProperty(_assertThisInitialized(_this), "updateDocumentWithMetadata", function (_ref3) {
-      var doc = _ref3.doc,
-          version = _ref3.version,
-          metadata = _ref3.metadata,
-          reserveCursor = _ref3.reserveCursor;
+    _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,
@@ -263,15 +299,15 @@ export var Provider = /*#__PURE__*/function (_Emitter) {
       }, SEND_PRESENCE_INTERVAL);
     });
 
-    _defineProperty(_assertThisInitialized(_this), "onPresenceJoined", function (_ref5) {
-      var sessionId = _ref5.sessionId;
+    _defineProperty(_assertThisInitialized(_this), "onPresenceJoined", function (_ref7) {
+      var sessionId = _ref7.sessionId;
       logger('Participant joined with session: ', sessionId); // This expose existing users to the newly joined user
 
       _this.sendPresence();
     });
 
-    _defineProperty(_assertThisInitialized(_this), "onPresence", function (_ref6) {
-      var userId = _ref6.userId;
+    _defineProperty(_assertThisInitialized(_this), "onPresence", function (_ref8) {
+      var userId = _ref8.userId;
       logger('onPresence userId: ', userId);
       _this.userId = userId;
 
@@ -282,12 +318,14 @@ export var Provider = /*#__PURE__*/function (_Emitter) {
 
     _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 (_ref7) {
-      var sessionId = _ref7.sessionId;
+    _defineProperty(_assertThisInitialized(_this), "onParticipantLeft", function (_ref9) {
+      var sessionId = _ref9.sessionId;
       logger("Participant left");
 
       _this.participants.delete(sessionId);
@@ -299,11 +337,11 @@ export var Provider = /*#__PURE__*/function (_Emitter) {
       });
     });
 
-    _defineProperty(_assertThisInitialized(_this), "onParticipantUpdated", function (_ref8) {
-      var sessionId = _ref8.sessionId,
-          timestamp = _ref8.timestamp,
-          userId = _ref8.userId,
-          clientId = _ref8.clientId;
+    _defineProperty(_assertThisInitialized(_this), "onParticipantUpdated", function (_ref10) {
+      var sessionId = _ref10.sessionId,
+          timestamp = _ref10.timestamp,
+          userId = _ref10.userId,
+          clientId = _ref10.clientId;
 
       _this.updateParticipant({
         sessionId: sessionId,
@@ -313,12 +351,12 @@ export var Provider = /*#__PURE__*/function (_Emitter) {
       });
     });
 
-    _defineProperty(_assertThisInitialized(_this), "onParticipantTelepointer", function (_ref9) {
-      var sessionId = _ref9.sessionId,
-          timestamp = _ref9.timestamp,
-          selection = _ref9.selection,
-          userId = _ref9.userId,
-          clientId = _ref9.clientId;
+    _defineProperty(_assertThisInitialized(_this), "onParticipantTelepointer", function (_ref11) {
+      var sessionId = _ref11.sessionId,
+          timestamp = _ref11.timestamp,
+          selection = _ref11.selection,
+          userId = _ref11.userId,
+          clientId = _ref11.clientId;
 
       if (sessionId === _this.sessionId) {
         return;
@@ -347,14 +385,14 @@ export var Provider = /*#__PURE__*/function (_Emitter) {
     });
 
     _defineProperty(_assertThisInitialized(_this), "updateParticipant", /*#__PURE__*/function () {
-      var _ref11 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(_ref10) {
+      var _ref13 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(_ref12) {
         var sessionId, timestamp, userId, clientId, getUser, _yield, _yield$name, name, _yield$email, email, _yield$avatar, avatar, isNewParticipant;
 
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
-                sessionId = _ref10.sessionId, timestamp = _ref10.timestamp, userId = _ref10.userId, clientId = _ref10.clientId;
+                sessionId = _ref12.sessionId, timestamp = _ref12.timestamp, userId = _ref12.userId, clientId = _ref12.clientId;
 
                 if (userId) {
                   _context2.next = 3;
@@ -407,7 +445,7 @@ export var Provider = /*#__PURE__*/function (_Emitter) {
       }));
 
       return function (_x) {
-        return _ref11.apply(this, arguments);
+        return _ref13.apply(this, arguments);
       };
     }());
 
@@ -470,8 +508,8 @@ export var Provider = /*#__PURE__*/function (_Emitter) {
       }
     });
 
-    _defineProperty(_assertThisInitialized(_this), "onDisconnected", function (_ref12) {
-      var reason = _ref12.reason;
+    _defineProperty(_assertThisInitialized(_this), "onDisconnected", function (_ref14) {
+      var reason = _ref14.reason;
       _this.disconnectedAt = Date.now();
       var left = Array.from(_this.participants.values());
 
@@ -489,8 +527,75 @@ export var Provider = /*#__PURE__*/function (_Emitter) {
       }
     });
 
+    _defineProperty(_assertThisInitialized(_this), "getFinalAcknowledgedState", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
+      var _this$getUnconfirmedS, _this$metadata$title;
+
+      var maxAttemptsToSync, count, unconfirmedSteps, _this$getUnconfirmedS2, _unconfirmedSteps, _state, state;
+
+      return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+        while (1) {
+          switch (_context3.prev = _context3.next) {
+            case 0:
+              maxAttemptsToSync = ACK_MAX_TRY;
+              count = 0;
+              unconfirmedSteps = (_this$getUnconfirmedS = _this.getUnconfirmedSteps()) === null || _this$getUnconfirmedS === void 0 ? void 0 : _this$getUnconfirmedS.steps;
+
+            case 3:
+              if (!(unconfirmedSteps && unconfirmedSteps.length)) {
+                _context3.next = 13;
+                break;
+              }
+
+              _this.sendStepsFromCurrentState();
+
+              _context3.next = 7;
+              return sleep(500);
+
+            case 7:
+              unconfirmedSteps = (_this$getUnconfirmedS2 = _this.getUnconfirmedSteps()) === null || _this$getUnconfirmedS2 === void 0 ? void 0 : _this$getUnconfirmedS2.steps;
+
+              if (!(count++ >= maxAttemptsToSync)) {
+                _context3.next = 11;
+                break;
+              }
+
+              if (_this.onSyncUpError) {
+                _state = _this.getState();
+
+                _this.onSyncUpError({
+                  lengthOfUnconfirmedSteps: (_unconfirmedSteps = unconfirmedSteps) === null || _unconfirmedSteps === void 0 ? void 0 : _unconfirmedSteps.length,
+                  tries: count,
+                  maxRetries: maxAttemptsToSync,
+                  clientId: _this.clientId,
+                  version: getVersion(_state)
+                });
+              }
+
+              throw new Error("Can't syncup with Collab Service");
+
+            case 11:
+              _context3.next = 3;
+              break;
+
+            case 13:
+              state = _this.getState();
+              return _context3.abrupt("return", {
+                content: state.doc.toJSON(),
+                title: (_this$metadata$title = _this.metadata.title) === null || _this$metadata$title === void 0 ? void 0 : _this$metadata$title.toString(),
+                stepVersion: getVersion(state)
+              });
+
+            case 15:
+            case "end":
+              return _context3.stop();
+          }
+        }
+      }, _callee3);
+    })));
+
     _this.config = config;
     _this.channel = new Channel(config);
+    _this.isChannelInitialized = false;
 
     if (config.analyticsClient) {
       _this.analyticsClient = config.analyticsClient;
@@ -498,50 +603,35 @@ export var Provider = /*#__PURE__*/function (_Emitter) {
 
     return _this;
   }
-  /**
-   * Called by collab plugin in editor when it's ready to
-   * initialize a collab session.
-   */
-
 
   _createClass(Provider, [{
     key: "initialize",
-    value: function initialize(optionsOrGetState) {
-      var _this2 = this;
-
-      this.getState = typeof optionsOrGetState === 'function' ? optionsOrGetState : optionsOrGetState.getState;
-      this.clientId = typeof optionsOrGetState === 'function' ? // Quick-hack to get clientID from native collab-plugin.
-      this.getState().plugins.find(function (p) {
+    value:
+    /**
+     * Called by collab plugin in editor when it's ready to
+     * initialize a collab session.
+     */
+    function initialize(getState) {
+      return this.setup({
+        getState: getState
+      });
+    }
+  }, {
+    key: "setup",
+    value: function setup(_ref16) {
+      var getState = _ref16.getState,
+          onSyncUpError = _ref16.onSyncUpError;
+      this.getState = getState;
+      this.onSyncUpError = onSyncUpError || noop;
+      this.clientId = getState().plugins.find(function (p) {
         return p.key === 'collab$';
-      }).spec.config.clientID : optionsOrGetState.clientId;
-      this.channel.on('connected', function (_ref13) {
-        var sid = _ref13.sid,
-            initialized = _ref13.initialized;
-        _this2.sessionId = sid;
-
-        _this2.emit('connected', {
-          sid: sid
-        }); // If already initialized, `connected` means reconnected
+      }).spec.config.clientID;
 
+      if (!this.isChannelInitialized) {
+        this.initializeChannel();
+        this.isChannelInitialized = true;
+      }
 
-        if (initialized && _this2.disconnectedAt && // Offline longer than `OUT_OF_SYNC_PERIOD`
-        Date.now() - _this2.disconnectedAt >= OUT_OF_SYNC_PERIOD) {
-          _this2.throttledCatchup();
-        }
-
-        _this2.disconnectedAt = undefined;
-      }).on('init', function (_ref14) {
-        var doc = _ref14.doc,
-            version = _ref14.version,
-            metadata = _ref14.metadata;
-
-        // Initial document and version
-        _this2.updateDocumentWithMetadata({
-          doc: doc,
-          version: version,
-          metadata: metadata
-        });
-      }).on('steps:added', this.onStepsAdded).on('participant:telepointer', this.onParticipantTelepointer).on('presence:joined', this.onPresenceJoined).on('presence', this.onPresence).on('participant:left', this.onParticipantLeft).on('participant:updated', this.onParticipantUpdated).on('metadata:changed', this.onMetadataChanged).on('disconnect', this.onDisconnected).on('error', this.onErrorHandled).connect();
       return this;
     }
     /**
@@ -633,15 +723,15 @@ export var Provider = /*#__PURE__*/function (_Emitter) {
   }, {
     key: "processSteps",
     value: function processSteps(data) {
-      var _this3 = this;
+      var _this2 = this;
 
       var version = data.version,
           steps = data.steps;
       logger("Processing data. Version \"".concat(version, "\"."));
 
       if (steps && steps.length) {
-        var clientIds = steps.map(function (_ref15) {
-          var clientId = _ref15.clientId;
+        var clientIds = steps.map(function (_ref17) {
+          var clientId = _ref17.clientId;
           return clientId;
         });
         this.emit('data', {
@@ -656,7 +746,7 @@ export var Provider = /*#__PURE__*/function (_Emitter) {
 
         if (clientIds.indexOf(this.clientId) === -1) {
           setTimeout(function () {
-            return _this3.sendStepsFromCurrentState();
+            return _this2.sendStepsFromCurrentState();
           }, 100);
         }
       }
@@ -673,7 +763,7 @@ export var Provider = /*#__PURE__*/function (_Emitter) {
       }
 
       var type = data.type,
-          rest = _objectWithoutProperties(data, ["type"]);
+          rest = _objectWithoutProperties(data, _excluded);
 
       var userId = this.userId,
           sessionId = this.sessionId,
@@ -694,30 +784,30 @@ export var Provider = /*#__PURE__*/function (_Emitter) {
   }, {
     key: "emitTelepointersFromSteps",
     value: function emitTelepointersFromSteps(steps) {
-      var _this4 = this;
+      var _this3 = this;
 
       steps.forEach(function (step) {
-        var _Array$from$filter = Array.from(_this4.participants.values()).filter(function (p) {
+        var _Array$from$filter = Array.from(_this3.participants.values()).filter(function (p) {
           return p.clientId === step.clientId;
         }),
             _Array$from$filter2 = _slicedToArray(_Array$from$filter, 1),
             participant = _Array$from$filter2[0];
 
         if (participant) {
-          var _ref16 = step,
-              stepType = _ref16.stepType,
-              to = _ref16.to,
-              from = _ref16.from,
-              _ref16$slice = _ref16.slice,
-              slice = _ref16$slice === void 0 ? {
+          var _ref18 = step,
+              stepType = _ref18.stepType,
+              to = _ref18.to,
+              from = _ref18.from,
+              _ref18$slice = _ref18.slice,
+              slice = _ref18$slice === void 0 ? {
             content: []
-          } : _ref16$slice;
+          } : _ref18$slice;
 
           var _slice$content = _slicedToArray(slice.content, 1),
               node = _slice$content[0];
 
           if (stepType === 'replace' && to === from && slice.content.length === 1 && node.type === 'text' && node.text.length === 1) {
-            _this4.emit('telepointer', {
+            _this3.emit('telepointer', {
               sessionId: participant.sessionId,
               selection: {
                 type: 'textSelection',
@@ -772,80 +862,13 @@ export var Provider = /*#__PURE__*/function (_Emitter) {
       this.channel.sendMetadata(metadata);
       Object.assign(this.metadata, metadata);
     }
-    /**
-     * Get latest state.
-     *
-     * NOTE: Should this actually convert to ADF instead?
-     */
-
   }, {
-    key: "getFinalAcknowledgedState",
-    value: function () {
-      var _getFinalAcknowledgedState = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
-        var _this$getUnconfirmedS;
-
-        var state, count, unconfirmedSteps, _this$getUnconfirmedS2;
-
-        return _regeneratorRuntime.wrap(function _callee3$(_context3) {
-          while (1) {
-            switch (_context3.prev = _context3.next) {
-              case 0:
-                state = this.getState();
-                count = 0;
-                unconfirmedSteps = this.getUnconfirmedSteps() && ((_this$getUnconfirmedS = this.getUnconfirmedSteps()) === null || _this$getUnconfirmedS === void 0 ? void 0 : _this$getUnconfirmedS.steps);
-
-              case 3:
-                if (!(unconfirmedSteps && unconfirmedSteps.length)) {
-                  _context3.next = 12;
-                  break;
-                }
-
-                this.sendStepsFromCurrentState();
-                _context3.next = 7;
-                return sleep(500);
-
-              case 7:
-                unconfirmedSteps = this.getUnconfirmedSteps() && ((_this$getUnconfirmedS2 = this.getUnconfirmedSteps()) === null || _this$getUnconfirmedS2 === void 0 ? void 0 : _this$getUnconfirmedS2.steps);
-
-                if (!(count++ >= ACK_MAX_TRY)) {
-                  _context3.next = 10;
-                  break;
-                }
-
-                throw new Error("Can't syncup with Collab Service");
-
-              case 10:
-                _context3.next = 3;
-                break;
-
-              case 12:
-                return _context3.abrupt("return", {
-                  content: state.doc.toJSON(),
-                  title: this.metadata.title,
-                  stepVersion: getVersion(state)
-                });
-
-              case 13:
-              case "end":
-                return _context3.stop();
-            }
-          }
-        }, _callee3, this);
-      }));
-
-      function getFinalAcknowledgedState() {
-        return _getFinalAcknowledgedState.apply(this, arguments);
-      }
-
-      return getFinalAcknowledgedState;
-    }()
+    key: "unsubscribeAll",
+    value:
     /**
      * Unsubscribe from all events emitted by this provider.
      */
-
-  }, {
-    key: "unsubscribeAll",
-    value: function unsubscribeAll() {
+    function unsubscribeAll() {
       _get(_getPrototypeOf(Provider.prototype), "unsubscribeAll", this).call(this);
 
       this.channel.disconnect();

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

@@ -1,15 +1,14 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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; }
 
 import { Provider } from './provider';
 import { io } from 'socket.io-client';
-import urlParse from 'url-parse';
 export function createSocketIOSocket(url, auth) {
-  var _urlParse = urlParse(url),
-      pathname = _urlParse.pathname;
+  var _URL = new URL(url),
+      pathname = _URL.pathname;
 
   return io(url, {
     withCredentials: true,

package/dist/esm/version.json

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

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

@@ -1,6 +1,6 @@
 import type { AnalyticsWebClient } from '@atlaskit/analytics-listeners';
 import { GasPurePayload } from '@atlaskit/analytics-gas-types';
-import { ErrorPayload } from '../channel';
+import { ErrorPayload } from '../types';
 export declare const buildAnalyticsPayload: (subject: string, payload?: any) => GasPurePayload;
 export declare const fireAnalyticsEvent: (analyticsClient?: AnalyticsWebClient | undefined, analyticsEvent?: GasPurePayload | undefined) => void;
 export declare const triggerAnalyticsForStepsAddedSuccessfully: (analyticsClient?: AnalyticsWebClient | undefined) => void;

package/dist/types/channel.d.ts

@@ -1,74 +1,5 @@
 import { Emitter } from './emitter';
-import { Config, Socket } from './types';
-export interface Metadata {
-    [key: string]: string | number | boolean;
-}
-export declare type InitPayload = {
-    doc: any;
-    version: number;
-    userId?: string;
-    metadata?: Metadata;
-};
-export declare type PresencePayload = {
-    sessionId: string;
-    userId: string;
-    clientId: string;
-    timestamp: number;
-};
-export declare type TelepointerPayload = PresencePayload & {
-    selection: {
-        type: 'textSelection' | 'nodeSelection';
-        anchor: number;
-        head: number;
-    };
-};
-export declare type StepJson = {
-    from?: number;
-    to?: number;
-    stepType?: string;
-    clientId: string;
-    userId: string;
-};
-export declare type StepsPayload = {
-    version: number;
-    steps: StepJson[];
-};
-export declare type ErrorPayload = {
-    message: string;
-    data?: {
-        status: number;
-        code?: string;
-        meta?: string;
-    };
-};
-export declare type ChannelEvent = {
-    connected: {
-        sid: string;
-        initialized: boolean;
-    };
-    init: InitPayload;
-    reconnected: null;
-    'presence:joined': PresencePayload;
-    presence: PresencePayload;
-    'participant:left': PresencePayload;
-    'participant:telepointer': TelepointerPayload;
-    'participant:updated': PresencePayload;
-    'steps:commit': StepsPayload & {
-        userId: string;
-    };
-    'steps:added': StepsPayload;
-    'metadata:changed': Metadata;
-    error: ErrorPayload;
-    disconnect: {
-        reason: string;
-    };
-};
-export interface CatchupResponse {
-    doc?: string;
-    version?: number;
-    stepMaps?: any[];
-    metadata?: Metadata;
-}
+import type { Config, Socket, ChannelEvent, CatchupResponse, Metadata } from './types';
 export declare class Channel extends Emitter<ChannelEvent> {
     private connected;
     private config;

package/dist/types/error-code-mapper.d.ts

@@ -1,5 +1,4 @@
-import { ErrorPayload } from './channel';
-import { CollabErrorPayload } from './provider';
+import type { CollabErrorPayload, ErrorPayload } from './types';
 export declare const ErrorCodeMapper: {
     noPermissionError: {
         code: string;

package/dist/types/index.d.ts

@@ -1,3 +1,2 @@
 export { Provider } from './provider';
-export type { CollabConnectedPayload, CollabDisconnectedPayload, CollabErrorPayload, CollabInitPayload, CollabDataPayload, CollabTelepointerPayload, CollabPresencePayload, CollabMetadataPayload, CollabLocalStepsPayload, CollabEvents, } from './provider';
-export type { Socket } from './types';
+export type { CollabConnectedPayload, CollabDisconnectedPayload, CollabErrorPayload, CollabInitPayload, CollabDataPayload, CollabTelepointerPayload, CollabPresencePayload, CollabMetadataPayload, CollabLocalStepsPayload, CollabEvents, Socket, } from './types';

package/dist/types/provider/catchup.d.ts

@@ -1,20 +1,5 @@
-import { StepsPayload, CatchupResponse } from '../channel';
-import { CollabInitPayload } from '.';
+import type { CatchupOptions } from '../types';
 import { Mapping, Step } from 'prosemirror-transform';
-import { Transaction } from 'prosemirror-state';
-export interface CatchupOptions {
-    getCurrentPmVersion: () => number;
-    fetchCatchup: (fromVersion: number) => Promise<CatchupResponse>;
-    fitlerQueue: (condition: (stepsPayload: StepsPayload) => boolean) => void;
-    getUnconfirmedSteps: () => {
-        version: number;
-        steps: Step<any>[];
-        clientID: string | number;
-        origins: Transaction<any>[];
-    } | null | undefined;
-    updateDocumentWithMetadata: ({ doc, version, metadata, reserveCursor, }: CollabInitPayload) => void;
-    applyLocalsteps: (steps: Step[]) => void;
-}
 /**
  * Rebase the steps based on the mapping pipeline.
  * Some steps could be lost, if they are no longer