@webex/plugin-meetings 3.11.0 → 3.12.0-next.2

package/dist/meetings/index.js

@@ -48,7 +48,7 @@ var _constants = require("../constants");
 var _constants2 = _interopRequireDefault(require("../metrics/constants"));
 var _meetingInfo = _interopRequireDefault(require("../meeting-info"));
 var _meetingInfoV = _interopRequireDefault(require("../meeting-info/meeting-info-v2"));
-var _meeting = _interopRequireDefault(require("../meeting"));
+var _meeting = _interopRequireWildcard(require("../meeting"));
 var _personalMeetingRoom = _interopRequireDefault(require("../personal-meeting-room"));
 var _reachability = _interopRequireDefault(require("../reachability"));
 var _request2 = _interopRequireDefault(require("./request"));
@@ -63,6 +63,7 @@ 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");
+var _locusInfo = require("../locus-info");
 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; }
@@ -194,6 +195,8 @@ var Meetings = exports.default = /*#__PURE__*/function (_WebexPlugin) {
     (0, _defineProperty2.default)(_this, "preferredWebexSite", void 0);
     (0, _defineProperty2.default)(_this, "reachability", void 0);
     (0, _defineProperty2.default)(_this, "registered", void 0);
+    (0, _defineProperty2.default)(_this, "registrationPromise", void 0);
+    (0, _defineProperty2.default)(_this, "unregistrationPromise", void 0);
     (0, _defineProperty2.default)(_this, "request", void 0);
     (0, _defineProperty2.default)(_this, "geoHintInfo", void 0);
     (0, _defineProperty2.default)(_this, "meetingInfo", void 0);
@@ -446,6 +449,15 @@ var Meetings = exports.default = /*#__PURE__*/function (_WebexPlugin) {
       if (existingMeeting) {
         return existingMeeting;
       }
+      if (data.eventType === _constants.LOCUSEVENT.HASH_TREE_DATA_UPDATED) {
+        // need to check if maybe this event indicates a move to/from breakout
+        var meetingForHashTreeMessage = (0, _locusInfo.findMeetingForHashTreeMessage)(data.stateElementsMessage, this.meetingCollection,
+        // @ts-ignore
+        this.webex.internal.device.url);
+        if (meetingForHashTreeMessage) {
+          return meetingForHashTreeMessage;
+        }
+      }
 
       // if that didn't work, fallback to other fields like correlationId, sipUri, etc
 
@@ -482,6 +494,11 @@ var Meetings = exports.default = /*#__PURE__*/function (_WebexPlugin) {
       var useRandomDelayForInfo = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
       var meeting = this.getCorrespondingMeetingByLocus(data);
 
+      // @ts-ignore
+      if (this.config.experimental.storeLocusHashTreeEventsForDebugging) {
+        (0, _meeting.storeEventForDebugging)('mercury', data);
+      }
+
       // Special case when locus has got replaced, This only happend once if a replace locus exists
       // https://sqbu-github.cisco.com/WebExSquared/locus/wiki/Locus-changing-mid-call
 
@@ -492,7 +509,7 @@ var Meetings = exports.default = /*#__PURE__*/function (_WebexPlugin) {
           meeting = this.meetingCollection.getByKey(_meetings.MEETING_KEY.LOCUS_URL, data.locus.replaces[data.locus.replaces.length - 1].locusUrl);
         }
         if (meeting && !_util2.default.isBreakoutLocusDTO(data.locus)) {
-          meeting.locusInfo.updateMainSessionLocusCache(data.locus);
+          meeting.locusInfo.updateMainSessionLocusCache(data.locus); // here data.locus will never be a complete locus
         }
         if (!this.isNeedHandleLocusDTO(meeting, data.locus)) {
           _loggerProxy.default.logger.log("Meetings:index#handleLocusEvent --> doesn't need to process locus event");
@@ -519,25 +536,29 @@ var Meetings = exports.default = /*#__PURE__*/function (_WebexPlugin) {
         // };
         // rather then locus object change to locus url
 
-        if (data.eventType !== _constants.LOCUSEVENT.HASH_TREE_DATA_UPDATED) {
-          if (data.locus && data.locus.fullState && data.locus.fullState.state === _constants.LOCUS.STATE.INACTIVE) {
-            // just ignore the event as its already ended and not active
-            _loggerProxy.default.logger.warn('Meetings:index#handleLocusEvent --> Locus event received for meeting, after it was ended.');
-            return;
-          }
+        if (data.eventType === _constants.LOCUSEVENT.HASH_TREE_DATA_UPDATED) {
+          // We're about to create a new meeting object from this hash tree message.
+          // There is some existing (pre-hash trees) SDK logic here that requires a locus object
+          // (at the very minimum we need locus.url to be set)
+          // so we try to create locus from the received hash tree message
+          // it will not be complete, in most cases it will only have the self part, but that's still better than nothing
+          var _createLocusFromHashT = (0, _locusInfo.createLocusFromHashTreeMessage)(data.stateElementsMessage),
+            locus = _createLocusFromHashT.locus;
+          data.locus = locus;
+        }
+        if (data.locus && data.locus.fullState && data.locus.fullState.state === _constants.LOCUS.STATE.INACTIVE) {
+          // just ignore the event as its already ended and not active
+          _loggerProxy.default.logger.warn('Meetings:index#handleLocusEvent --> Locus event received for meeting, after it was ended.');
+          return;
+        }
 
-          // When its wireless share or guest and user leaves the meeting we dont have to keep the meeting object
-          // Any future events will be neglected
+        // When its wireless share or guest and user leaves the meeting we dont have to keep the meeting object
+        // Any future events will be neglected
 
-          if (data.locus && data.locus.self && data.locus.self.state === _constants._LEFT_ && data.locus.self.removed === true) {
-            // just ignore the event as its already ended and not active
-            _loggerProxy.default.logger.warn('Meetings:index#handleLocusEvent --> Locus event received for meeting, after it was ended.');
-            return;
-          }
-        }
-        if (data.eventType === _constants.LOCUSEVENT.HASH_TREE_DATA_UPDATED) {
-          // in hash tree messages we don't ge the locus object, but the meeting constructor needs at least locus.url
-          (0, _lodash.set)(data, 'locus.url', data.stateElementsMessage.locusUrl);
+        if (data.locus && data.locus.self && data.locus.self.state === _constants._LEFT_ && data.locus.self.removed === true) {
+          // just ignore the event as its already ended and not active
+          _loggerProxy.default.logger.warn('Meetings:index#handleLocusEvent --> Locus event received for meeting, after it was ended.');
+          return;
         }
         this.create(data.locus, _constants.DESTINATION_TYPE.LOCUS_ID, useRandomDelayForInfo).then(/*#__PURE__*/function () {
           var _ref3 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee3(newMeeting) {
@@ -608,7 +629,7 @@ var Meetings = exports.default = /*#__PURE__*/function (_WebexPlugin) {
     }
 
     /**
-     * handles locus events through mercury that are not roap
+     * handles locus events through mercury that are not roap or approval request events
      * @param {Object} envelope
      * @param {Object} envelope.data
      * @param {String} envelope.data.eventType
@@ -622,7 +643,7 @@ var Meetings = exports.default = /*#__PURE__*/function (_WebexPlugin) {
       var data = envelope.data;
       // eslint-disable-next-line @typescript-eslint/no-shadow
       var eventType = data.eventType;
-      if (eventType && eventType !== _constants.LOCUSEVENT.MESSAGE_ROAP) {
+      if (eventType && eventType !== _constants.LOCUSEVENT.MESSAGE_ROAP && eventType !== _constants.LOCUSEVENT.APPROVAL_REQUEST) {
         this.handleLocusEvent(data, true);
       }
     }
@@ -943,7 +964,11 @@ var Meetings = exports.default = /*#__PURE__*/function (_WebexPlugin) {
     value: function executeRegistrationStep(step, stepName) {
       var _this5 = this;
       return step().then(function () {
+        _loggerProxy.default.logger.info("Meetings:index#executeRegistrationStep --> INFO, ".concat(stepName, " completed"));
         _this5.registrationStatus[stepName] = true;
+      }).catch(function (error) {
+        _loggerProxy.default.logger.error("Meetings:index#executeRegistrationStep --> ERROR, ".concat(stepName, " failed: ").concat(error.message));
+        return _promise.default.reject(error);
       });
     }
 
@@ -960,7 +985,20 @@ var Meetings = exports.default = /*#__PURE__*/function (_WebexPlugin) {
     key: "register",
     value: function register(deviceRegistrationOptions) {
       var _this6 = this;
-      this.registrationStatus = (0, _lodash.clone)(_constants.INITIAL_REGISTRATION_STATUS);
+      if (this.unregistrationPromise) {
+        _loggerProxy.default.logger.info('Meetings:index#register --> INFO, Meetings plugin unregistration in progress, waiting to register');
+        this.registrationPromise = this.unregistrationPromise.catch(function () {}) // It doesn't matter what happened during unregistration
+        .finally(function () {
+          _loggerProxy.default.logger.info('Meetings:index#register --> INFO, Meetings plugin unregistration completed, proceeding to register');
+          _this6.registrationPromise = null;
+          return _this6.register(deviceRegistrationOptions);
+        });
+        return this.registrationPromise;
+      }
+      if (this.registrationPromise) {
+        _loggerProxy.default.logger.info('Meetings:index#register --> INFO, Meetings plugin registration in progress, returning existing promise');
+        return this.registrationPromise;
+      }
 
       // @ts-ignore
       if (!this.webex.canAuthorize) {
@@ -971,7 +1009,9 @@ var Meetings = exports.default = /*#__PURE__*/function (_WebexPlugin) {
         _loggerProxy.default.logger.info('Meetings:index#register --> INFO, Meetings plugin already registered');
         return _promise.default.resolve();
       }
-      return _promise.default.all([this.executeRegistrationStep(function () {
+      _loggerProxy.default.logger.info('Meetings:index#register --> INFO, Registering Meetings plugin');
+      this.registrationStatus = (0, _lodash.clone)(_constants.INITIAL_REGISTRATION_STATUS);
+      this.registrationPromise = _promise.default.all([this.executeRegistrationStep(function () {
         return _this6.fetchUserPreferredWebexSite();
       }, 'fetchWebexSite'), this.executeRegistrationStep(function () {
         return _this6.getGeoHint();
@@ -1012,7 +1052,10 @@ var Meetings = exports.default = /*#__PURE__*/function (_WebexPlugin) {
           stack: error.stack
         });
         return _promise.default.reject(error);
+      }).finally(function () {
+        _this6.registrationPromise = null;
       });
+      return this.registrationPromise;
     }
 
     /**
@@ -1027,35 +1070,61 @@ var Meetings = exports.default = /*#__PURE__*/function (_WebexPlugin) {
     key: "unregister",
     value: function unregister() {
       var _this7 = this;
+      if (this.unregistrationPromise) {
+        _loggerProxy.default.logger.info('Meetings:index#unregister --> INFO, Meetings plugin unregistration in progress, returning existing promise');
+        return this.unregistrationPromise;
+      }
+      if (this.registrationPromise) {
+        _loggerProxy.default.logger.info('Meetings:index#unregister --> INFO, Meetings plugin registration in progress, waiting to unregister');
+
+        // Wait for registration to complete (success or failure), then call unregister again
+        this.unregistrationPromise = this.registrationPromise.catch(function () {}) // It doesn't matter what happened during registration
+        .finally(function () {
+          _loggerProxy.default.logger.info('Meetings:index#unregister --> INFO, Meetings plugin registration completed, proceeding to unregister');
+          _this7.unregistrationPromise = null;
+          return _this7.unregister();
+        });
+        return this.unregistrationPromise;
+      }
       if (!this.registered) {
         _loggerProxy.default.logger.info('Meetings:index#unregister --> INFO, Meetings plugin already unregistered');
         return _promise.default.resolve();
       }
       this.stopListeningForEvents();
-      return (
-        // @ts-ignore
-        this.webex.internal.mercury.disconnect()
-        // @ts-ignore
-        .then(function () {
-          return _this7.webex.internal.device.unregister();
-        }).catch(function (error) {
-          // If error status code is 404, continue the chain
-          if (error.statusCode === 404) {
-            _loggerProxy.default.logger.info('Meetings:index#unregister --> 404 error during device unregister, proceeding normally');
-            return; // returning undefined allows the chain to continue
-          }
-          // For any other status code, break the chain by rethrowing
-          _loggerProxy.default.logger.error("Meetings:index#unregister --> Failed to unregister device: ".concat(error.message));
-          throw error; // rethrow to break the promise chain
-        }).then(function () {
-          _triggerProxy.default.trigger(_this7, {
-            file: 'meetings',
-            function: 'unregister'
-          }, _constants.EVENT_TRIGGERS.MEETINGS_UNREGISTERED);
-          _this7.registered = false;
-          _this7.registrationStatus = (0, _lodash.clone)(_constants.INITIAL_REGISTRATION_STATUS);
-        })
-      );
+      this.unregistrationPromise =
+      // @ts-ignore
+      this.webex.internal.mercury
+      // Use code 3050 with a non-reconnecting reason to prevent Mercury auto-reconnect
+      // during unregister. Without this, disconnect() defaults to code 1000/"Done" which
+      // force-closes as "Done (forced)" - a normalReconnectReason that triggers auto-reconnect,
+      // causing a race condition with device.unregister().
+      .disconnect({
+        code: 3050,
+        reason: 'meetings unregister'
+      })
+      // @ts-ignore
+      .then(function () {
+        return _this7.webex.internal.device.unregister();
+      }).catch(function (error) {
+        // If error status code is 404, continue the chain
+        if (error.statusCode === 404) {
+          _loggerProxy.default.logger.info('Meetings:index#unregister --> 404 error during device unregister, proceeding normally');
+          return; // returning undefined allows the chain to continue
+        }
+        // For any other status code, break the chain by rethrowing
+        _loggerProxy.default.logger.error("Meetings:index#unregister --> Failed to unregister device: ".concat(error.message));
+        throw error; // rethrow to break the promise chain
+      }).then(function () {
+        _triggerProxy.default.trigger(_this7, {
+          file: 'meetings',
+          function: 'unregister'
+        }, _constants.EVENT_TRIGGERS.MEETINGS_UNREGISTERED);
+        _this7.registered = false;
+        _this7.registrationStatus = (0, _lodash.clone)(_constants.INITIAL_REGISTRATION_STATUS);
+      }).finally(function () {
+        _this7.unregistrationPromise = null;
+      });
+      return this.unregistrationPromise;
     }
   }, {
     key: "uploadLogs",
@@ -1783,7 +1852,7 @@ var Meetings = exports.default = /*#__PURE__*/function (_WebexPlugin) {
       }
       var associateBreakoutLocus = this.breakoutLocusForHandleLater[existIndex];
       this.handleLocusEvent({
-        eventType: _constants.LOCUSEVENT.SDK_NO_EVENT,
+        eventType: _constants.LOCUSEVENT.SDK_LOCUS_FROM_SYNC_MEETINGS,
         locus: associateBreakoutLocus,
         locusUrl: associateBreakoutLocus.url
       });