@atlaskit/collab-provider 7.1.0 → 7.1.4

package/CHANGELOG.md

@@ -1,5 +1,39 @@
 # @atlaskit/collab-provider
 
+## 7.1.4
+
+### Patch Changes
+
+- [`19d72473dfb`](https://bitbucket.org/atlassian/atlassian-frontend/commits/19d72473dfb) - ED-13912 refactor editor collab-provider and make sure that initializeChannel is only called once
+- Updated dependencies
+
+## 7.1.3
+
+### Patch Changes
+
+- [`c55c736ecea`](https://bitbucket.org/atlassian/atlassian-frontend/commits/c55c736ecea) - Patch VULN AFP-3486 AFP-3487 AFP-3488 AFP-3489
+
+## 7.1.2
+
+### Patch Changes
+
+- Updated dependencies
+
+## 7.1.1
+
+### Patch Changes
+
+- [`c6feed82071`](https://bitbucket.org/atlassian/atlassian-frontend/commits/c6feed82071) - ED-11632: Bump prosemirror packages;
+
+  - prosmirror-commands 1.1.4 -> 1.1.11,
+  - prosemirror-model 1.11.0 -> 1.14.3,
+  - prosemirror-state 1.3.3 -> 1.3.4,
+  - prosemirror-transform 1.2.8 -> 1.3.2,
+  - prosemirror-view 1.15.4 + 1.18.8 -> 1.20.2.
+
+- [`b670f0469c4`](https://bitbucket.org/atlassian/atlassian-frontend/commits/b670f0469c4) - COLLAB-990: fixing duplciated avatar
+- Updated dependencies
+
 ## 7.1.0
 
 ### Minor Changes

package/dist/cjs/analytics/index.js

@@ -5,15 +5,15 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.triggerAnalyticsForCatchupSuccessfulWithLatency = exports.triggerAnalyticsForCatchupFailed = exports.triggerAnalyticsForStepsRejected = exports.triggerAnalyticsForStepsAddedSuccessfully = exports.fireAnalyticsEvent = exports.buildAnalyticsPayload = void 0;
+exports.triggerAnalyticsForStepsRejected = exports.triggerAnalyticsForStepsAddedSuccessfully = exports.triggerAnalyticsForCatchupSuccessfulWithLatency = exports.triggerAnalyticsForCatchupFailed = exports.fireAnalyticsEvent = exports.buildAnalyticsPayload = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
 var _const = require("../helpers/const");
 
-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) { (0, _defineProperty2.default)(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) { (0, _defineProperty2.default)(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; }
 
 var buildAnalyticsPayload = function buildAnalyticsPayload(subject, payload) {
   return {

package/dist/cjs/analytics/performance.js

@@ -3,9 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.clearMeasure = clearMeasure;
 exports.startMeasure = startMeasure;
 exports.stopMeasure = stopMeasure;
-exports.clearMeasure = clearMeasure;
 
 var isPerformanceAPIAvailable = function isPerformanceAPIAvailable() {
   return typeof window !== 'undefined' && 'performance' in window && ['measure', 'clearMeasures', 'clearMarks', 'getEntriesByName', 'getEntriesByType'].every(function (api) {

package/dist/cjs/channel.js

@@ -37,9 +37,9 @@ var _performance = require("./analytics/performance");
 
 var _analytics = require("./analytics");
 
-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) { (0, _defineProperty2.default)(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) { (0, _defineProperty2.default)(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 _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 
@@ -163,8 +163,11 @@ var Channel = /*#__PURE__*/function (_Emitter) {
       this.socket.on('participant:telepointer', function (payload) {
         _this2.emit('participant:telepointer', payload.data);
       });
-      this.socket.on('participant:joined', function (data) {
-        _this2.emit('participant:joined', data);
+      this.socket.on('presence:joined', function (data) {
+        _this2.emit('presence:joined', data);
+      });
+      this.socket.on('presence', function (data) {
+        _this2.emit('presence', data);
       });
       this.socket.on('participant:left', function (data) {
         _this2.emit('participant:left', data);
@@ -364,6 +367,15 @@ var Channel = /*#__PURE__*/function (_Emitter) {
 
       this.socket.emit('metadata', metadata);
     }
+  }, {
+    key: "sendPresenceJoined",
+    value: function sendPresenceJoined() {
+      if (!this.connected || !this.socket) {
+        return;
+      }
+
+      this.socket.emit('presence:joined');
+    }
   }, {
     key: "disconnect",
     value: function disconnect() {

package/dist/cjs/disconnected-reason-mapper.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.DisconnectReason = exports.socketIOReasons = void 0;
+exports.socketIOReasons = exports.DisconnectReason = void 0;
 // See https://socket.io/docs/v3/client-socket-instance#disconnect for emitted reasons
 var socketIOReasons = {
   IO_CLIENT_DISCONNECT: 'io client disconnect',

package/dist/cjs/helpers/const.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.ACK_MAX_TRY = exports.CATCHUP_FAILURE = exports.CATCHUP_SUCCESS = exports.ATTRIBUTES_PACKAGE = exports.STEPS_REJECTED = exports.STEPS_ADDED = void 0;
+exports.STEPS_REJECTED = exports.STEPS_ADDED = exports.CATCHUP_SUCCESS = exports.CATCHUP_FAILURE = exports.ATTRIBUTES_PACKAGE = exports.ACK_MAX_TRY = void 0;
 var STEPS_ADDED = 'collabStepsAddedSuccess';
 exports.STEPS_ADDED = STEPS_ADDED;
 var STEPS_REJECTED = 'collabStepsAddedRejected';

package/dist/cjs/helpers/utils.js

@@ -3,8 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.sleep = sleep;
 exports.getParticipant = exports.createLogger = void 0;
+exports.sleep = sleep;
 
 var createLogger = function createLogger(prefix) {
   var color = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'blue';
@@ -13,27 +13,22 @@ var createLogger = function createLogger(prefix) {
 
     if (window.COLLAB_PROVIDER_LOGGER) {
       // eslint-disable-next-line no-console
-      console.log("%cCollab-".concat(prefix, ": ").concat(msg), "color: ".concat(color, "; font-weight: bold"));
-
-      if (data) {
-        // eslint-disable-next-line no-console
-        console.log(data);
-      }
+      console.log("%cCollab-".concat(prefix, ": ").concat(msg), "color: ".concat(color, "; font-weight: bold"), data);
     }
   };
 };
 
 exports.createLogger = createLogger;
+var logger = createLogger('Helper:util', 'black');
 
 var getParticipant = function getParticipant(userId) {
-  // eslint-disable-next-line no-bitwise
-  var name = 'Demo User';
-  return Promise.resolve({
+  logger('getParticipant: ', userId);
+  return {
     userId: userId,
-    name: name,
-    avatar: "https://api.adorable.io/avatars/80/".concat(name.replace(/\s/g, ''), ".png"),
-    email: "".concat(name.replace(/\s/g, '').toLocaleLowerCase(), "@atlassian.com")
-  });
+    name: userId,
+    avatar: '',
+    email: "".concat(userId.replace(/\s/g, '').toLocaleLowerCase(), "@atlassian.com")
+  };
 };
 
 exports.getParticipant = getParticipant;

package/dist/cjs/provider/catchup.js

@@ -5,8 +5,8 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.rebaseSteps = rebaseSteps;
 exports.catchup = void 0;
+exports.rebaseSteps = rebaseSteps;
 
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 

package/dist/cjs/provider/index.js

@@ -55,13 +55,15 @@ var _errorCodeMapper = require("../error-code-mapper");
 
 var _disconnectedReasonMapper = require("../disconnected-reason-mapper");
 
+var _excluded = ["type"];
+
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(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) { (0, _defineProperty2.default)(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) { (0, _defineProperty2.default)(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; }
 
 var logger = (0, _utils.createLogger)('Provider', 'black');
 var PARTICIPANT_UPDATE_INTERVAL = 300 * 1000; // 300 seconds
@@ -115,6 +117,37 @@ var Provider = /*#__PURE__*/function (_Emitter) {
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "participants", new Map());
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "metadata", {});
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "stepRejectCounter", 0);
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "isChannelInitialized", false);
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_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).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();
+    });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onStepsAdded", function (data) {
       logger("Received steps", {
         steps: data.steps,
@@ -142,8 +175,8 @@ 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;
       }));
     });
@@ -156,11 +189,11 @@ var Provider = /*#__PURE__*/function (_Emitter) {
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "fitlerQueue", function (condition) {
       _this.queue = _this.queue.filter(condition);
     });
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "updateDocumentWithMetadata", function (_ref3) {
-      var doc = _ref3.doc,
-          version = _ref3.version,
-          metadata = _ref3.metadata,
-          reserveCursor = _ref3.reserveCursor;
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "updateDocumentWithMetadata", function (_ref5) {
+      var doc = _ref5.doc,
+          version = _ref5.version,
+          metadata = _ref5.metadata,
+          reserveCursor = _ref5.reserveCursor;
 
       _this.emit('init', _objectSpread({
         doc: doc,
@@ -282,19 +315,28 @@ var Provider = /*#__PURE__*/function (_Emitter) {
         return _this.sendPresence();
       }, SEND_PRESENCE_INTERVAL);
     });
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onParticipantJoined", function (_ref5) {
-      var sessionId = _ref5.sessionId;
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_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();
     });
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onPresence", function (_ref8) {
+      var userId = _ref8.userId;
+      logger('onPresence userId: ', userId);
+      _this.userId = userId;
+
+      _this.sendPresence();
+
+      _this.channel.sendPresenceJoined();
+    });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onMetadataChanged", function (metadata) {
       if (metadata !== undefined && !(0, _isEqual.default)(_this.metadata, metadata)) {
         _this.emit('metadata:changed', metadata);
       }
     });
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onParticipantLeft", function (_ref6) {
-      var sessionId = _ref6.sessionId;
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onParticipantLeft", function (_ref9) {
+      var sessionId = _ref9.sessionId;
       logger("Participant left");
 
       _this.participants.delete(sessionId);
@@ -305,11 +347,11 @@ var Provider = /*#__PURE__*/function (_Emitter) {
         }]
       });
     });
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onParticipantUpdated", function (_ref7) {
-      var sessionId = _ref7.sessionId,
-          timestamp = _ref7.timestamp,
-          userId = _ref7.userId,
-          clientId = _ref7.clientId;
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onParticipantUpdated", function (_ref10) {
+      var sessionId = _ref10.sessionId,
+          timestamp = _ref10.timestamp,
+          userId = _ref10.userId,
+          clientId = _ref10.clientId;
 
       _this.updateParticipant({
         sessionId: sessionId,
@@ -318,12 +360,12 @@ var Provider = /*#__PURE__*/function (_Emitter) {
         clientId: clientId
       });
     });
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onParticipantTelepointer", function (_ref8) {
-      var sessionId = _ref8.sessionId,
-          timestamp = _ref8.timestamp,
-          selection = _ref8.selection,
-          userId = _ref8.userId,
-          clientId = _ref8.clientId;
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_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;
@@ -351,19 +393,28 @@ var Provider = /*#__PURE__*/function (_Emitter) {
       });
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "updateParticipant", /*#__PURE__*/function () {
-      var _ref10 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(_ref9) {
+      var _ref13 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(_ref12) {
         var sessionId, timestamp, userId, clientId, getUser, _yield, _yield$name, name, _yield$email, email, _yield$avatar, avatar, isNewParticipant;
 
         return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
-                sessionId = _ref9.sessionId, timestamp = _ref9.timestamp, userId = _ref9.userId, clientId = _ref9.clientId;
+                sessionId = _ref12.sessionId, timestamp = _ref12.timestamp, userId = _ref12.userId, clientId = _ref12.clientId;
+
+                if (userId) {
+                  _context2.next = 3;
+                  break;
+                }
+
+                return _context2.abrupt("return");
+
+              case 3:
                 getUser = _this.config.getUser;
-                _context2.next = 4;
+                _context2.next = 6;
                 return getUser ? getUser(userId) : (0, _utils.getParticipant)(userId);
 
-              case 4:
+              case 6:
                 _yield = _context2.sent;
                 _yield$name = _yield.name;
                 name = _yield$name === void 0 ? '' : _yield$name;
@@ -393,7 +444,7 @@ var Provider = /*#__PURE__*/function (_Emitter) {
 
                 _this.updateParticipants(isNewParticipant ? [_this.participants.get(sessionId)] : []);
 
-              case 15:
+              case 17:
               case "end":
                 return _context2.stop();
             }
@@ -402,7 +453,7 @@ var Provider = /*#__PURE__*/function (_Emitter) {
       }));
 
       return function (_x) {
-        return _ref10.apply(this, arguments);
+        return _ref13.apply(this, arguments);
       };
     }());
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "updateParticipants", function () {
@@ -462,8 +513,8 @@ var Provider = /*#__PURE__*/function (_Emitter) {
           return _disconnectedReasonMapper.DisconnectReason.UNKNOWN_DISCONNECT;
       }
     });
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onDisconnected", function (_ref11) {
-      var reason = _ref11.reason;
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onDisconnected", function (_ref14) {
+      var reason = _ref14.reason;
       _this.disconnectedAt = Date.now();
       var left = Array.from(_this.participants.values());
 
@@ -482,6 +533,7 @@ var Provider = /*#__PURE__*/function (_Emitter) {
     });
     _this.config = config;
     _this.channel = new _channel.Channel(config);
+    _this.isChannelInitialized = false;
 
     if (config.analyticsClient) {
       _this.analyticsClient = config.analyticsClient;
@@ -489,56 +541,22 @@ var Provider = /*#__PURE__*/function (_Emitter) {
 
     return _this;
   }
-  /**
-   * Called by collab plugin in editor when it's ready to
-   * initialize a collab session.
-   */
-
 
   (0, _createClass2.default)(Provider, [{
     key: "initialize",
     value: function initialize(optionsOrGetState) {
-      var _this2 = this;
-
+      // move 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) {
         return p.key === 'collab$';
       }).spec.config.clientID : optionsOrGetState.clientId;
-      this.channel.on('connected', function (_ref12) {
-        var sid = _ref12.sid,
-            initialized = _ref12.initialized;
-        _this2.sessionId = sid;
-
-        _this2.emit('connected', {
-          sid: sid
-        });
-
-        _this2.sendPresence(); // If already initialized, `connected` means reconnected
-
-
-        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 (_ref13) {
-        var doc = _ref13.doc,
-            version = _ref13.version,
-            userId = _ref13.userId,
-            metadata = _ref13.metadata;
-        _this2.userId = userId;
-
-        _this2.sendPresence(); // Initial document and version
 
+      if (!this.isChannelInitialized) {
+        this.initializeChannel();
+        this.isChannelInitialized = true;
+      }
 
-        _this2.updateDocumentWithMetadata({
-          doc: doc,
-          version: version,
-          metadata: metadata
-        });
-      }).on('steps:added', this.onStepsAdded).on('participant:telepointer', this.onParticipantTelepointer).on('participant:joined', this.onParticipantJoined).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;
     }
     /**
@@ -630,15 +648,15 @@ 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 (_ref14) {
-          var clientId = _ref14.clientId;
+        var clientIds = steps.map(function (_ref15) {
+          var clientId = _ref15.clientId;
           return clientId;
         });
         this.emit('data', {
@@ -653,7 +671,7 @@ var Provider = /*#__PURE__*/function (_Emitter) {
 
         if (clientIds.indexOf(this.clientId) === -1) {
           setTimeout(function () {
-            return _this3.sendStepsFromCurrentState();
+            return _this2.sendStepsFromCurrentState();
           }, 100);
         }
       }
@@ -670,7 +688,7 @@ var Provider = /*#__PURE__*/function (_Emitter) {
       }
 
       var type = data.type,
-          rest = (0, _objectWithoutProperties2.default)(data, ["type"]);
+          rest = (0, _objectWithoutProperties2.default)(data, _excluded);
       var userId = this.userId,
           sessionId = this.sessionId,
           clientId = this.clientId;
@@ -690,30 +708,30 @@ 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 = (0, _slicedToArray2.default)(_Array$from$filter, 1),
             participant = _Array$from$filter2[0];
 
         if (participant) {
-          var _ref15 = step,
-              stepType = _ref15.stepType,
-              to = _ref15.to,
-              from = _ref15.from,
-              _ref15$slice = _ref15.slice,
-              slice = _ref15$slice === void 0 ? {
+          var _ref16 = step,
+              stepType = _ref16.stepType,
+              to = _ref16.to,
+              from = _ref16.from,
+              _ref16$slice = _ref16.slice,
+              slice = _ref16$slice === void 0 ? {
             content: []
-          } : _ref15$slice;
+          } : _ref16$slice;
 
           var _slice$content = (0, _slicedToArray2.default)(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',

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

@@ -5,8 +5,8 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.createSocketIOSocket = createSocketIOSocket;
 exports.createSocketIOCollabProvider = createSocketIOCollabProvider;
+exports.createSocketIOSocket = createSocketIOSocket;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
@@ -16,9 +16,9 @@ var _socket = require("socket.io-client");
 
 var _urlParse2 = _interopRequireDefault(require("url-parse"));
 
-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) { (0, _defineProperty2.default)(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) { (0, _defineProperty2.default)(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 createSocketIOSocket(url, auth) {
   var _urlParse = (0, _urlParse2.default)(url),

package/dist/cjs/version.json

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

package/dist/es2019/channel.js

@@ -116,8 +116,11 @@ export class Channel extends Emitter {
     this.socket.on('participant:telepointer', payload => {
       this.emit('participant:telepointer', payload.data);
     });
-    this.socket.on('participant:joined', data => {
-      this.emit('participant:joined', data);
+    this.socket.on('presence:joined', data => {
+      this.emit('presence:joined', data);
+    });
+    this.socket.on('presence', data => {
+      this.emit('presence', data);
     });
     this.socket.on('participant:left', data => {
       this.emit('participant:left', data);
@@ -242,6 +245,14 @@ export class Channel extends Emitter {
     this.socket.emit('metadata', metadata);
   }
 
+  sendPresenceJoined() {
+    if (!this.connected || !this.socket) {
+      return;
+    }
+
+    this.socket.emit('presence:joined');
+  }
+
   disconnect() {
     this.unsubscribeAll();
 

package/dist/es2019/helpers/utils.js

@@ -1,23 +1,18 @@
 export const createLogger = (prefix, color = 'blue') => (msg, data = null) => {
   if (window.COLLAB_PROVIDER_LOGGER) {
     // eslint-disable-next-line no-console
-    console.log(`%cCollab-${prefix}: ${msg}`, `color: ${color}; font-weight: bold`);
-
-    if (data) {
-      // eslint-disable-next-line no-console
-      console.log(data);
-    }
+    console.log(`%cCollab-${prefix}: ${msg}`, `color: ${color}; font-weight: bold`, data);
   }
 };
+const logger = createLogger('Helper:util', 'black');
 export const getParticipant = userId => {
-  // eslint-disable-next-line no-bitwise
-  const name = 'Demo User';
-  return Promise.resolve({
-    userId,
-    name,
-    avatar: `https://api.adorable.io/avatars/80/${name.replace(/\s/g, '')}.png`,
-    email: `${name.replace(/\s/g, '').toLocaleLowerCase()}@atlassian.com`
-  });
+  logger('getParticipant: ', userId);
+  return {
+    userId: userId,
+    name: userId,
+    avatar: '',
+    email: `${userId.replace(/\s/g, '').toLocaleLowerCase()}@atlassian.com`
+  };
 };
 export function sleep(ms) {
   return new Promise(resolve => {