@webex/plugin-meetings 3.10.0-next.27 → 3.10.0-next.29

package/dist/meetings/index.js

@@ -62,6 +62,7 @@ var _joinWebinarError = _interopRequireDefault(require("../common/errors/join-we
 var _webexErrors = require("../common/errors/webex-errors");
 var _noMeetingInfo = _interopRequireDefault(require("../common/errors/no-meeting-info"));
 var _joinForbiddenError = _interopRequireDefault(require("../common/errors/join-forbidden-error"));
+var _utils = require("../hashTree/utils");
 function _interopRequireWildcard(e, t) { if ("function" == typeof _WeakMap) var r = new _WeakMap(), n = new _WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t3 in e) "default" !== _t3 && {}.hasOwnProperty.call(e, _t3) && ((i = (o = _Object$defineProperty) && _Object$getOwnPropertyDescriptor(e, _t3)) && (i.get || i.set) ? o(f, _t3, i) : f[_t3] = e[_t3]); return f; })(e, t); }
 function ownKeys(e, r) { var t = _Object$keys2(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -435,19 +436,32 @@ var Meetings = exports.default = /*#__PURE__*/function (_WebexPlugin) {
   }, {
     key: "getCorrespondingMeetingByLocus",
     value: function getCorrespondingMeetingByLocus(data) {
-      var _data$stateElementsMe, _data$locus, _data$locus$self, _data$locus$self$call, _data$locus2, _data$locus2$info, _data$locus3, _data$locus4, _data$locus4$info;
-      if (data.eventType === _constants.LOCUSEVENT.HASH_TREE_DATA_UPDATED && (_data$stateElementsMe = data.stateElementsMessage) !== null && _data$stateElementsMe !== void 0 && _data$stateElementsMe.locusUrl) {
-        return this.meetingCollection.getByKey(_meetings.MEETING_KEY.LOCUS_URL, data.stateElementsMessage.locusUrl);
+      var _data$stateElementsMe, _data$stateElementsMe2, _data$stateElementsMe3, _data$stateElementsMe4, _data$locus, _self$callbackInfo, _data$locus2, _data$locus2$info, _data$locus3, _data$locus4, _data$locus4$info;
+      var locusUrl = ((_data$stateElementsMe = data.stateElementsMessage) === null || _data$stateElementsMe === void 0 ? void 0 : _data$stateElementsMe.locusUrl) ||
+      // hash tree event
+      data.locusUrl; // classic event
+
+      // first try to find by locusUrl - that's the simplest and quickest way
+      var existingMeeting = this.meetingCollection.getByKey(_meetings.MEETING_KEY.LOCUS_URL, locusUrl);
+      if (existingMeeting) {
+        return existingMeeting;
       }
 
-      // getting meeting by correlationId. This will happen for the new event
-      // Either the locus
-      // TODO : Add check for the callBack Address
-      return this.meetingCollection.getByKey(_meetings.MEETING_KEY.LOCUS_URL, data.locusUrl) ||
-      // @ts-ignore
-      this.meetingCollection.getByKey(_meetings.MEETING_KEY.CORRELATION_ID,
-      // @ts-ignore
-      _util2.default.checkForCorrelationId(this.webex.internal.device.url, data.locus)) || this.meetingCollection.getByKey(_meetings.MEETING_KEY.SIP_URI, (_data$locus = data.locus) === null || _data$locus === void 0 ? void 0 : (_data$locus$self = _data$locus.self) === null || _data$locus$self === void 0 ? void 0 : (_data$locus$self$call = _data$locus$self.callbackInfo) === null || _data$locus$self$call === void 0 ? void 0 : _data$locus$self$call.callbackAddress) || ((_data$locus2 = data.locus) !== null && _data$locus2 !== void 0 && (_data$locus2$info = _data$locus2.info) !== null && _data$locus2$info !== void 0 && _data$locus2$info.isUnifiedSpaceMeeting ? undefined : this.meetingCollection.getByKey(_meetings.MEETING_KEY.CONVERSATION_URL, (_data$locus3 = data.locus) === null || _data$locus3 === void 0 ? void 0 : _data$locus3.conversationUrl)) || this.meetingCollection.getByKey(_meetings.MEETING_KEY.MEETINGNUMBER, (_data$locus4 = data.locus) === null || _data$locus4 === void 0 ? void 0 : (_data$locus4$info = _data$locus4.info) === null || _data$locus4$info === void 0 ? void 0 : _data$locus4$info.webExMeetingId);
+      // if that didn't work, fallback to other fields like correlationId, sipUri, etc
+
+      // If the event is a hash tree event, we need to extract "self" object from it
+      // We don't care about the version, just need to find the meeting this event is for,
+      // so any hash tree object of type "self" will do
+      var hashTreeEventSelf = (_data$stateElementsMe2 = data.stateElementsMessage) === null || _data$stateElementsMe2 === void 0 ? void 0 : (_data$stateElementsMe3 = _data$stateElementsMe2.locusStateElements) === null || _data$stateElementsMe3 === void 0 ? void 0 : (_data$stateElementsMe4 = _data$stateElementsMe3.find(function (obj) {
+        return (0, _utils.isSelf)(obj);
+      })) === null || _data$stateElementsMe4 === void 0 ? void 0 : _data$stateElementsMe4.data;
+      var self = hashTreeEventSelf || ((_data$locus = data.locus) === null || _data$locus === void 0 ? void 0 : _data$locus.self);
+      return (
+        // @ts-ignore
+        this.meetingCollection.getByKey(_meetings.MEETING_KEY.CORRELATION_ID,
+        // @ts-ignore
+        _util2.default.getCorrelationIdForDevice(this.webex.internal.device.url, self)) || this.meetingCollection.getByKey(_meetings.MEETING_KEY.SIP_URI, self === null || self === void 0 ? void 0 : (_self$callbackInfo = self.callbackInfo) === null || _self$callbackInfo === void 0 ? void 0 : _self$callbackInfo.callbackAddress) || ((_data$locus2 = data.locus) !== null && _data$locus2 !== void 0 && (_data$locus2$info = _data$locus2.info) !== null && _data$locus2$info !== void 0 && _data$locus2$info.isUnifiedSpaceMeeting ? undefined : this.meetingCollection.getByKey(_meetings.MEETING_KEY.CONVERSATION_URL, (_data$locus3 = data.locus) === null || _data$locus3 === void 0 ? void 0 : _data$locus3.conversationUrl)) || this.meetingCollection.getByKey(_meetings.MEETING_KEY.MEETINGNUMBER, (_data$locus4 = data.locus) === null || _data$locus4 === void 0 ? void 0 : (_data$locus4$info = _data$locus4.info) === null || _data$locus4$info === void 0 ? void 0 : _data$locus4$info.webExMeetingId)
+      );
     }
 
     /**