@webex/internal-plugin-metrics 3.12.0-webex-services-ready.4 → 3.13.0-next.1

package/dist/call-diagnostic/call-diagnostic-metrics.js

@@ -49,6 +49,10 @@ var _BrowserDetection = (0, _common.BrowserDetection)(),
   getOSVersion = _BrowserDetection.getOSVersion,
   getBrowserName = _BrowserDetection.getBrowserName,
   getBrowserVersion = _BrowserDetection.getBrowserVersion;
+var LOCUS_HTTP_STATUS_TO_CLIENT_ERROR_CODE = {
+  429: _config2.LOCUS_RATE_LIMITED_OUTGOING_CLIENT_CODE,
+  503: _config2.LOCUS_UNAVAILABLE_CLIENT_CODE
+};
 /**
  * @description Util class to handle Call Analyzer Metrics
  * @export
@@ -266,7 +270,7 @@ var CallDiagnosticMetrics = exports.default = /*#__PURE__*/function (_StatelessW
   }, {
     key: "getOrigin",
     value: function getOrigin(options, meetingId) {
-      var _this$webex$meetings, _this$webex$meetings$, _this$webex$meetings$2, _this$webex$meetings2, _this$webex$meetings3, _this$webex$meetings4, _this$webex$meetings5, _this$webex$meetings6, _this$webex$meetings7;
+      var _this$webex$meetings, _this$webex$meetings$, _this$webex$meetings$2, _this$webex$meetings2, _this$webex$meetings3, _this$webex$meetings4, _this$webex$meetings5, _this$webex$meetings6, _this$webex$meetings7, _this$webex$meetings$3, _this$webex$meetings8, _this$webex$meetings9;
       var defaultClientType = // @ts-ignore
       (_this$webex$meetings = this.webex.meetings) === null || _this$webex$meetings === void 0 ? void 0 : (_this$webex$meetings$ = _this$webex$meetings.config) === null || _this$webex$meetings$ === void 0 ? void 0 : (_this$webex$meetings$2 = _this$webex$meetings$.metrics) === null || _this$webex$meetings$2 === void 0 ? void 0 : _this$webex$meetings$2.clientType;
       var defaultSubClientType = // @ts-ignore
@@ -281,40 +285,55 @@ var CallDiagnosticMetrics = exports.default = /*#__PURE__*/function (_StatelessW
       if (providedClientVersion) {
         versionMetadata = (0, _callDiagnosticMetrics.extractVersionMetadata)(providedClientVersion);
       }
+
+      // Browser details and the support verdict can all be supplied by the host client, which is able
+      // to resolve wrapper browsers (Electron, WebOS) to the engine that actually determines
+      // capability. The browser fields fall back to the SDK's own detection when not supplied, the
+      // same way clientVersion falls back to the SDK version.
+      var _ref2 = (_this$webex$meetings$3 = (_this$webex$meetings8 = this.webex.meetings) === null || _this$webex$meetings8 === void 0 ? void 0 : (_this$webex$meetings9 = _this$webex$meetings8.config) === null || _this$webex$meetings9 === void 0 ? void 0 : _this$webex$meetings9.metrics) !== null && _this$webex$meetings$3 !== void 0 ? _this$webex$meetings$3 : {},
+        providedBrowser = _ref2.browser,
+        providedBrowserVersion = _ref2.browserVersion,
+        isSupportedBrowserFamily = _ref2.isSupportedBrowserFamily,
+        isOutdatedBrowserVersion = _ref2.isOutdatedBrowserVersion;
       if (!this.hasLoggedBrowserSerial) {
         this.logger.log(_config2.CALL_DIAGNOSTIC_LOG_IDENTIFIER, "CallDiagnosticMetrics: @createClientEventObjectInMeeting => collected browser data", (0, _stringify.default)((0, _common.getBrowserSerial)()));
         this.hasLoggedBrowserSerial = true;
       }
       if (defaultClientType && defaultSubClientType || options.clientType && options.subClientType) {
-        var _this$webex$meetings8, _this$webex$meetings9, _this$webex$meetings0, _this$webex$meetings1, _this$webex$meetings10, _this$webex$meetings11, _this$webex$meetings12, _this$webex$meetings13, _this$webex$meetings14;
+        var _this$webex$meetings0, _this$webex$meetings1, _this$webex$meetings10, _this$webex$meetings11, _this$webex$meetings12, _this$webex$meetings13, _this$webex$meetings14, _this$webex$meetings15, _this$webex$meetings16;
         var origin = {
           name: 'endpoint',
           networkType: (options === null || options === void 0 ? void 0 : options.networkType) || 'unknown',
           userAgent: (0, _callDiagnosticMetrics.userAgentToString)({
             // @ts-ignore
-            clientName: (_this$webex$meetings8 = this.webex.meetings) === null || _this$webex$meetings8 === void 0 ? void 0 : (_this$webex$meetings9 = _this$webex$meetings8.config) === null || _this$webex$meetings9 === void 0 ? void 0 : (_this$webex$meetings0 = _this$webex$meetings9.metrics) === null || _this$webex$meetings0 === void 0 ? void 0 : _this$webex$meetings0.clientName,
+            clientName: (_this$webex$meetings0 = this.webex.meetings) === null || _this$webex$meetings0 === void 0 ? void 0 : (_this$webex$meetings1 = _this$webex$meetings0.config) === null || _this$webex$meetings1 === void 0 ? void 0 : (_this$webex$meetings10 = _this$webex$meetings1.metrics) === null || _this$webex$meetings10 === void 0 ? void 0 : _this$webex$meetings10.clientName,
             // @ts-ignore
             webexVersion: this.webex.version
           }),
-          clientInfo: _objectSpread(_objectSpread({
+          clientInfo: _objectSpread(_objectSpread(_objectSpread({
             clientType: (options === null || options === void 0 ? void 0 : options.clientType) || defaultClientType,
             clientVersion: providedClientVersion || defaultSDKClientVersion
           }, versionMetadata), {}, {
             publicNetworkPrefix:
             // @ts-ignore
-            (0, _callDiagnosticMetrics.anonymizeIPAddress)((_this$webex$meetings1 = this.webex.meetings) === null || _this$webex$meetings1 === void 0 ? void 0 : (_this$webex$meetings10 = _this$webex$meetings1.geoHintInfo) === null || _this$webex$meetings10 === void 0 ? void 0 : _this$webex$meetings10.clientAddress) || undefined,
+            (0, _callDiagnosticMetrics.anonymizeIPAddress)((_this$webex$meetings11 = this.webex.meetings) === null || _this$webex$meetings11 === void 0 ? void 0 : (_this$webex$meetings12 = _this$webex$meetings11.geoHintInfo) === null || _this$webex$meetings12 === void 0 ? void 0 : _this$webex$meetings12.clientAddress) || undefined,
             localNetworkPrefix: (0, _callDiagnosticMetrics.anonymizeIPAddress)(// @ts-ignore
-            (_this$webex$meetings11 = this.webex.meetings) === null || _this$webex$meetings11 === void 0 ? void 0 : (_this$webex$meetings12 = _this$webex$meetings11.meetingCollection) === null || _this$webex$meetings12 === void 0 ? void 0 : (_this$webex$meetings13 = _this$webex$meetings12.get(meetingId)) === null || _this$webex$meetings13 === void 0 ? void 0 : (_this$webex$meetings14 = _this$webex$meetings13.statsAnalyzer) === null || _this$webex$meetings14 === void 0 ? void 0 : _this$webex$meetings14.getLocalIpAddress()) || undefined,
+            (_this$webex$meetings13 = this.webex.meetings) === null || _this$webex$meetings13 === void 0 ? void 0 : (_this$webex$meetings14 = _this$webex$meetings13.meetingCollection) === null || _this$webex$meetings14 === void 0 ? void 0 : (_this$webex$meetings15 = _this$webex$meetings14.get(meetingId)) === null || _this$webex$meetings15 === void 0 ? void 0 : (_this$webex$meetings16 = _this$webex$meetings15.statsAnalyzer) === null || _this$webex$meetings16 === void 0 ? void 0 : _this$webex$meetings16.getLocalIpAddress()) || undefined,
             osVersion: getOSVersion() || 'unknown',
             subClientType: (options === null || options === void 0 ? void 0 : options.subClientType) || defaultSubClientType,
             os: (0, _metrics.getOSNameInternal)(),
-            browser: getBrowserName(),
-            browserVersion: getBrowserVersion()
+            browser: providedBrowser || getBrowserName(),
+            browserVersion: providedBrowserVersion || getBrowserVersion()
+          }, isSupportedBrowserFamily === undefined ? {} : {
+            isSupportedBrowserFamily: isSupportedBrowserFamily
+          }), isOutdatedBrowserVersion === undefined ? {} : {
+            isOutdatedBrowserVersion: isOutdatedBrowserVersion
           })
         };
         if (meetingId) {
+          var _this$webex$meetings17;
           // @ts-ignore
-          var meeting = this.webex.meetings.getBasicMeetingInformation(meetingId);
+          var meeting = (_this$webex$meetings17 = this.webex.meetings) === null || _this$webex$meetings17 === void 0 ? void 0 : _this$webex$meetings17.getBasicMeetingInformation(meetingId);
           if (meeting !== null && meeting !== void 0 && meeting.environment) {
             origin.environment = meeting.environment;
           }
@@ -339,6 +358,22 @@ var CallDiagnosticMetrics = exports.default = /*#__PURE__*/function (_StatelessW
       throw new Error("ClientType and SubClientType can't be undefined");
     }
 
+    /**
+     * Returns the signed-in user's CI ID derived from credentials tokens.
+     * Used as a fallback when no device is registered.
+     * @returns the userId, or undefined if it can't be determined
+     */
+  }, {
+    key: "getUserIdFromCredentials",
+    value: function getUserIdFromCredentials() {
+      try {
+        // @ts-ignore
+        return this.webex.credentials.getUserId();
+      } catch (_unused) {
+        return undefined;
+      }
+    }
+
     /**
      * Gather identifier details for call diagnostic payload.
      * @throws Error if initialization fails.
@@ -347,14 +382,15 @@ var CallDiagnosticMetrics = exports.default = /*#__PURE__*/function (_StatelessW
   }, {
     key: "getIdentifiers",
     value: function getIdentifiers(options) {
-      var _meeting$locusInfo, _meeting$meetingInfo2, _meeting$meetingInfo3, _meeting$meetingInfo6, _meeting$meetingInfo8;
+      var _this$device, _meeting$locusInfo, _meeting$meetingInfo2, _meeting$meetingInfo3, _meeting$meetingInfo6, _meeting$meetingInfo8, _meeting$meetingInfo0;
       var meeting = options.meeting,
         mediaConnections = options.mediaConnections,
         correlationId = options.correlationId,
         webexConferenceIdStr = options.webexConferenceIdStr,
         globalMeetingId = options.globalMeetingId,
         preLoginId = options.preLoginId,
-        sessionCorrelationId = options.sessionCorrelationId;
+        sessionCorrelationId = options.sessionCorrelationId,
+        locusCluster = options.locusCluster;
       var identifiers = {
         correlationId: 'unknown' // concerned with setting this to unknown. This will fail diagnostic events parsing because it's not a uuid pattern
       };
@@ -378,9 +414,8 @@ var CallDiagnosticMetrics = exports.default = /*#__PURE__*/function (_StatelessW
 
       if (this.device) {
         var device = this.device;
-        var _ref2 = (device === null || device === void 0 ? void 0 : device.config) || {},
-          installationId = _ref2.installationId;
-        identifiers.userId = (device === null || device === void 0 ? void 0 : device.userId) || preLoginId;
+        var _ref3 = (device === null || device === void 0 ? void 0 : device.config) || {},
+          installationId = _ref3.installationId;
         identifiers.deviceId = device === null || device === void 0 ? void 0 : device.url;
         identifiers.orgId = device === null || device === void 0 ? void 0 : device.orgId;
         // @ts-ignore
@@ -389,6 +424,10 @@ var CallDiagnosticMetrics = exports.default = /*#__PURE__*/function (_StatelessW
           identifiers.machineId = installationId;
         }
       }
+
+      // Prefer the device's userId, but fall back to the signed-in user's ID from
+      // credentials when no device is registered, then to the pre-login ID.
+      identifiers.userId = ((_this$device = this.device) === null || _this$device === void 0 ? void 0 : _this$device.userId) || this.getUserIdFromCredentials() || preLoginId;
       if (meeting !== null && meeting !== void 0 && (_meeting$locusInfo = meeting.locusInfo) !== null && _meeting$locusInfo !== void 0 && _meeting$locusInfo.fullState) {
         identifiers.locusUrl = meeting.locusUrl;
         identifiers.locusId = meeting.locusUrl && meeting.locusUrl.split('/').pop();
@@ -407,6 +446,9 @@ var CallDiagnosticMetrics = exports.default = /*#__PURE__*/function (_StatelessW
         var _meeting$meetingInfo9;
         identifiers.webexSiteName = (_meeting$meetingInfo9 = meeting.meetingInfo) === null || _meeting$meetingInfo9 === void 0 ? void 0 : _meeting$meetingInfo9.siteName;
       }
+      if (meeting !== null && meeting !== void 0 && (_meeting$meetingInfo0 = meeting.meetingInfo) !== null && _meeting$meetingInfo0 !== void 0 && _meeting$meetingInfo0.locusClusterUrl) {
+        identifiers.locusCluster = meeting.meetingInfo.locusClusterUrl;
+      }
       if (mediaConnections) {
         var _mediaConnections$, _mediaConnections$2;
         identifiers.mediaAgentAlias = mediaConnections === null || mediaConnections === void 0 ? void 0 : (_mediaConnections$ = mediaConnections[0]) === null || _mediaConnections$ === void 0 ? void 0 : _mediaConnections$.mediaAgentAlias;
@@ -418,6 +460,9 @@ var CallDiagnosticMetrics = exports.default = /*#__PURE__*/function (_StatelessW
       if (!(identifiers !== null && identifiers !== void 0 && identifiers.globalMeetingId) && globalMeetingId) {
         identifiers.globalMeetingId = globalMeetingId;
       }
+      if (!(identifiers !== null && identifiers !== void 0 && identifiers.locusCluster) && locusCluster) {
+        identifiers.locusCluster = locusCluster;
+      }
       if (identifiers.correlationId === undefined) {
         throw new Error('Identifiers initialization failed.');
       }
@@ -434,7 +479,7 @@ var CallDiagnosticMetrics = exports.default = /*#__PURE__*/function (_StatelessW
   }, {
     key: "prepareDiagnosticEvent",
     value: function prepareDiagnosticEvent(eventData, options) {
-      var _this$webex$meetings15, _this$webex$meetings16;
+      var _this$webex$meetings18, _this$webex$meetings19;
       var meetingId = options.meetingId,
         triggeredTime = options.triggeredTime;
       var origin = this.getOrigin(options, meetingId);
@@ -448,7 +493,7 @@ var CallDiagnosticMetrics = exports.default = /*#__PURE__*/function (_StatelessW
           sent: 'not_defined_yet'
         },
         // @ts-ignore
-        senderCountryCode: (_this$webex$meetings15 = this.webex.meetings) === null || _this$webex$meetings15 === void 0 ? void 0 : (_this$webex$meetings16 = _this$webex$meetings15.geoHintInfo) === null || _this$webex$meetings16 === void 0 ? void 0 : _this$webex$meetings16.countryCode,
+        senderCountryCode: (_this$webex$meetings18 = this.webex.meetings) === null || _this$webex$meetings18 === void 0 ? void 0 : (_this$webex$meetings19 = _this$webex$meetings18.geoHintInfo) === null || _this$webex$meetings19 === void 0 ? void 0 : _this$webex$meetings19.countryCode,
         event: eventData
       };
 
@@ -470,10 +515,10 @@ var CallDiagnosticMetrics = exports.default = /*#__PURE__*/function (_StatelessW
      */
   }, {
     key: "prepareClientFeatureEvent",
-    value: function prepareClientFeatureEvent(_ref3) {
-      var name = _ref3.name,
-        payload = _ref3.payload,
-        options = _ref3.options;
+    value: function prepareClientFeatureEvent(_ref4) {
+      var name = _ref4.name,
+        payload = _ref4.payload,
+        options = _ref4.options;
       var meetingId = options.meetingId,
         correlationId = options.correlationId;
       var featureEventObject;
@@ -503,11 +548,11 @@ var CallDiagnosticMetrics = exports.default = /*#__PURE__*/function (_StatelessW
      */
   }, {
     key: "submitFeatureEvent",
-    value: function submitFeatureEvent(_ref4) {
-      var name = _ref4.name,
-        payload = _ref4.payload,
-        options = _ref4.options,
-        delaySubmitEvent = _ref4.delaySubmitEvent;
+    value: function submitFeatureEvent(_ref5) {
+      var name = _ref5.name,
+        payload = _ref5.payload,
+        options = _ref5.options,
+        delaySubmitEvent = _ref5.delaySubmitEvent;
       if (delaySubmitEvent) {
         // Preserve the time when the event was triggered if delaying the submission to Call Features
         var delayedOptions = _objectSpread(_objectSpread({}, options), {}, {
@@ -558,10 +603,10 @@ var CallDiagnosticMetrics = exports.default = /*#__PURE__*/function (_StatelessW
      */
   }, {
     key: "submitMQE",
-    value: function submitMQE(_ref5) {
-      var name = _ref5.name,
-        payload = _ref5.payload,
-        options = _ref5.options;
+    value: function submitMQE(_ref6) {
+      var name = _ref6.name,
+        payload = _ref6.payload,
+        options = _ref6.options;
       var meetingId = options.meetingId,
         mediaConnections = options.mediaConnections,
         webexConferenceIdStr = options.webexConferenceIdStr,
@@ -636,18 +681,18 @@ var CallDiagnosticMetrics = exports.default = /*#__PURE__*/function (_StatelessW
      * @param arg.clientErrorCode
      * @param arg.serviceErrorCode
      * @param arg.payloadOverrides
-     * @param arg.httpStatusCode
+     * @param arg.httpCode
      * @returns
      */
   }, {
     key: "getErrorPayloadForClientErrorCode",
-    value: function getErrorPayloadForClientErrorCode(_ref6) {
-      var clientErrorCode = _ref6.clientErrorCode,
-        serviceErrorCode = _ref6.serviceErrorCode,
-        serviceErrorName = _ref6.serviceErrorName,
-        rawErrorMessage = _ref6.rawErrorMessage,
-        payloadOverrides = _ref6.payloadOverrides,
-        httpStatusCode = _ref6.httpStatusCode;
+    value: function getErrorPayloadForClientErrorCode(_ref7) {
+      var clientErrorCode = _ref7.clientErrorCode,
+        serviceErrorCode = _ref7.serviceErrorCode,
+        serviceErrorName = _ref7.serviceErrorName,
+        rawErrorMessage = _ref7.rawErrorMessage,
+        payloadOverrides = _ref7.payloadOverrides,
+        httpCode = _ref7.httpCode;
       var error;
       if (clientErrorCode) {
         var partialParsedError = _config2.CLIENT_ERROR_CODE_TO_ERROR_PAYLOAD[clientErrorCode];
@@ -669,8 +714,8 @@ var CallDiagnosticMetrics = exports.default = /*#__PURE__*/function (_StatelessW
             serviceErrorCode: serviceErrorCode
           }, {
             rawErrorMessage: rawErrorMessage
-          }, httpStatusCode === undefined ? {} : {
-            httpStatusCode: httpStatusCode
+          }, httpCode === undefined ? {} : {
+            httpCode: httpCode
           }, partialParsedError, payloadOverrides || {});
           return error;
         }
@@ -695,9 +740,9 @@ var CallDiagnosticMetrics = exports.default = /*#__PURE__*/function (_StatelessW
      */
   }, {
     key: "shouldSendEvent",
-    value: function shouldSendEvent(_ref7) {
+    value: function shouldSendEvent(_ref8) {
       var _event$identifiers;
-      var event = _ref7.event;
+      var event = _ref8.event;
       var eventName = event === null || event === void 0 ? void 0 : event.name;
       var correlationId = event === null || event === void 0 ? void 0 : (_event$identifiers = event.identifiers) === null || _event$identifiers === void 0 ? void 0 : _event$identifiers.correlationId;
       if (!correlationId || correlationId === 'unknown') {
@@ -816,13 +861,14 @@ var CallDiagnosticMetrics = exports.default = /*#__PURE__*/function (_StatelessW
   }, {
     key: "generateClientEventErrorPayload",
     value: function generateClientEventErrorPayload(rawError) {
-      var _rawError$error, _rawError$error$body, _rawError$body, _rawError$body2, _rawError$body3, _rawError$body3$reaso;
+      var _rawError$error, _rawError$error$body, _rawError$body, _rawError$body2, _rawError$body3, _rawError$body3$reaso, _rawError$options, _rawError$options2;
       var cachedError = this.eventErrorCache.get(rawError);
       if (cachedError) {
         return [cachedError, true];
       }
       var rawErrorMessage = rawError.message;
-      var httpStatusCode = rawError.statusCode;
+      var httpCode = rawError.statusCode;
+      var serviceErrorCode = (rawError === null || rawError === void 0 ? void 0 : (_rawError$error = rawError.error) === null || _rawError$error === void 0 ? void 0 : (_rawError$error$body = _rawError$error.body) === null || _rawError$error$body === void 0 ? void 0 : _rawError$error$body.errorCode) || (rawError === null || rawError === void 0 ? void 0 : (_rawError$body = rawError.body) === null || _rawError$body === void 0 ? void 0 : _rawError$body.errorCode) || (rawError === null || rawError === void 0 ? void 0 : (_rawError$body2 = rawError.body) === null || _rawError$body2 === void 0 ? void 0 : _rawError$body2.code) || (rawError === null || rawError === void 0 ? void 0 : (_rawError$body3 = rawError.body) === null || _rawError$body3 === void 0 ? void 0 : (_rawError$body3$reaso = _rawError$body3.reason) === null || _rawError$body3$reaso === void 0 ? void 0 : _rawError$body3$reaso.reasonCode);
       var payload;
       if (rawError.name) {
         if ((0, _callDiagnosticMetrics.isBrowserMediaErrorName)(rawError.name)) {
@@ -831,7 +877,7 @@ var CallDiagnosticMetrics = exports.default = /*#__PURE__*/function (_StatelessW
             clientErrorCode: _config2.BROWSER_MEDIA_ERROR_NAME_TO_CLIENT_ERROR_CODES_MAP[rawError.name],
             serviceErrorName: rawError.name,
             rawErrorMessage: rawErrorMessage,
-            httpStatusCode: httpStatusCode
+            httpCode: httpCode
           });
         }
       }
@@ -844,10 +890,9 @@ var CallDiagnosticMetrics = exports.default = /*#__PURE__*/function (_StatelessW
           clientErrorCode: _config2.SDP_OFFER_CREATION_ERROR_MAP[causeType] || _config2.SDP_OFFER_CREATION_ERROR_MAP.GENERAL,
           serviceErrorName: rawError.name,
           rawErrorMessage: rawErrorMessage,
-          httpStatusCode: httpStatusCode
+          httpCode: httpCode
         });
       }
-      var serviceErrorCode = (rawError === null || rawError === void 0 ? void 0 : (_rawError$error = rawError.error) === null || _rawError$error === void 0 ? void 0 : (_rawError$error$body = _rawError$error.body) === null || _rawError$error$body === void 0 ? void 0 : _rawError$error$body.errorCode) || (rawError === null || rawError === void 0 ? void 0 : (_rawError$body = rawError.body) === null || _rawError$body === void 0 ? void 0 : _rawError$body.errorCode) || (rawError === null || rawError === void 0 ? void 0 : (_rawError$body2 = rawError.body) === null || _rawError$body2 === void 0 ? void 0 : _rawError$body2.code) || (rawError === null || rawError === void 0 ? void 0 : (_rawError$body3 = rawError.body) === null || _rawError$body3 === void 0 ? void 0 : (_rawError$body3$reaso = _rawError$body3.reason) === null || _rawError$body3$reaso === void 0 ? void 0 : _rawError$body3$reaso.reasonCode);
       if (serviceErrorCode) {
         var clientErrorCode = _config2.SERVICE_ERROR_CODES_TO_CLIENT_ERROR_CODES_MAP[serviceErrorCode];
         if (clientErrorCode && !payload) {
@@ -855,17 +900,28 @@ var CallDiagnosticMetrics = exports.default = /*#__PURE__*/function (_StatelessW
             clientErrorCode: clientErrorCode,
             serviceErrorCode: serviceErrorCode,
             rawErrorMessage: rawErrorMessage,
-            httpStatusCode: httpStatusCode
+            httpCode: httpCode
           });
         }
-
+      }
+      var locusHttpClientErrorCode = LOCUS_HTTP_STATUS_TO_CLIENT_ERROR_CODE[httpCode];
+      var requestUrl = ((_rawError$options = rawError.options) === null || _rawError$options === void 0 ? void 0 : _rawError$options.uri) || ((_rawError$options2 = rawError.options) === null || _rawError$options2 === void 0 ? void 0 : _rawError$options2.url);
+      if (locusHttpClientErrorCode && !payload && requestUrl !== null && requestUrl !== void 0 && requestUrl.includes('locus')) {
+        payload = this.getErrorPayloadForClientErrorCode({
+          clientErrorCode: locusHttpClientErrorCode,
+          serviceErrorCode: serviceErrorCode,
+          rawErrorMessage: rawErrorMessage,
+          httpCode: httpCode
+        });
+      }
+      if (serviceErrorCode) {
         // by default, if it is locus error, return new locus err
         if ((0, _callDiagnosticMetrics.isLocusServiceErrorCode)(serviceErrorCode) && !payload) {
           payload = this.getErrorPayloadForClientErrorCode({
             clientErrorCode: _config2.NEW_LOCUS_ERROR_CLIENT_CODE,
             serviceErrorCode: serviceErrorCode,
             rawErrorMessage: rawErrorMessage,
-            httpStatusCode: httpStatusCode
+            httpCode: httpCode
           });
         }
       }
@@ -874,7 +930,7 @@ var CallDiagnosticMetrics = exports.default = /*#__PURE__*/function (_StatelessW
           clientErrorCode: _config2.MEETING_INFO_LOOKUP_ERROR_CLIENT_CODE,
           serviceErrorCode: serviceErrorCode,
           rawErrorMessage: rawErrorMessage,
-          httpStatusCode: httpStatusCode
+          httpCode: httpCode
         });
       }
       if ((0, _callDiagnosticMetrics.isNetworkError)(rawError) && !payload) {
@@ -883,7 +939,7 @@ var CallDiagnosticMetrics = exports.default = /*#__PURE__*/function (_StatelessW
           serviceErrorCode: serviceErrorCode,
           payloadOverrides: rawError.payloadOverrides,
           rawErrorMessage: rawErrorMessage,
-          httpStatusCode: httpStatusCode
+          httpCode: httpCode
         });
       }
       if ((0, _callDiagnosticMetrics.isUnauthorizedError)(rawError) && !payload) {
@@ -892,7 +948,7 @@ var CallDiagnosticMetrics = exports.default = /*#__PURE__*/function (_StatelessW
           serviceErrorCode: serviceErrorCode,
           payloadOverrides: rawError.payloadOverrides,
           rawErrorMessage: rawErrorMessage,
-          httpStatusCode: httpStatusCode
+          httpCode: httpCode
         });
       }
       if (!payload) {
@@ -903,7 +959,7 @@ var CallDiagnosticMetrics = exports.default = /*#__PURE__*/function (_StatelessW
           serviceErrorName: rawError === null || rawError === void 0 ? void 0 : rawError.name,
           payloadOverrides: rawError.payloadOverrides,
           rawErrorMessage: rawErrorMessage,
-          httpStatusCode: httpStatusCode
+          httpCode: httpCode
         });
       }
 
@@ -921,17 +977,18 @@ var CallDiagnosticMetrics = exports.default = /*#__PURE__*/function (_StatelessW
      */
   }, {
     key: "createCommonEventObjectInMeeting",
-    value: function createCommonEventObjectInMeeting(_ref8) {
-      var _this$webex$meetings17, _this$webex$meetings18, _this$webex$meetings19, _meeting$meetingInfo0, _options$joinFlowVers, _meeting$callStateFor;
-      var name = _ref8.name,
-        options = _ref8.options,
-        _ref8$eventType = _ref8.eventType,
-        eventType = _ref8$eventType === void 0 ? 'client' : _ref8$eventType;
+    value: function createCommonEventObjectInMeeting(_ref9) {
+      var _this$webex$meetings20, _this$webex$meetings21, _this$webex$meetings22, _meeting$meetingInfo1, _options$joinFlowVers, _meeting$callStateFor, _options$meetingJoinP, _meeting$callStateFor2;
+      var name = _ref9.name,
+        options = _ref9.options,
+        _ref9$eventType = _ref9.eventType,
+        eventType = _ref9$eventType === void 0 ? 'client' : _ref9$eventType;
       var meetingId = options.meetingId,
         mediaConnections = options.mediaConnections,
         globalMeetingId = options.globalMeetingId,
         webexConferenceIdStr = options.webexConferenceIdStr,
-        sessionCorrelationId = options.sessionCorrelationId;
+        sessionCorrelationId = options.sessionCorrelationId,
+        locusCluster = options.locusCluster;
 
       // @ts-ignore
       var meeting = this.webex.meetings.getBasicMeetingInformation(meetingId);
@@ -953,7 +1010,8 @@ var CallDiagnosticMetrics = exports.default = /*#__PURE__*/function (_StatelessW
         mediaConnections: (meeting === null || meeting === void 0 ? void 0 : meeting.mediaConnections) || mediaConnections,
         webexConferenceIdStr: webexConferenceIdStr,
         globalMeetingId: globalMeetingId,
-        sessionCorrelationId: sessionCorrelationId
+        sessionCorrelationId: sessionCorrelationId,
+        locusCluster: locusCluster
       });
 
       // create common event object structure
@@ -977,8 +1035,8 @@ var CallDiagnosticMetrics = exports.default = /*#__PURE__*/function (_StatelessW
       }), {}, {
         webexSubServiceType: this.getSubServiceType(meeting),
         // @ts-ignore
-        webClientPreload: (_this$webex$meetings17 = this.webex.meetings) === null || _this$webex$meetings17 === void 0 ? void 0 : (_this$webex$meetings18 = _this$webex$meetings17.config) === null || _this$webex$meetings18 === void 0 ? void 0 : (_this$webex$meetings19 = _this$webex$meetings18.metrics) === null || _this$webex$meetings19 === void 0 ? void 0 : _this$webex$meetings19.webClientPreload,
-        isVipMeeting: (meeting === null || meeting === void 0 ? void 0 : (_meeting$meetingInfo0 = meeting.meetingInfo) === null || _meeting$meetingInfo0 === void 0 ? void 0 : _meeting$meetingInfo0.vipmeeting) || false,
+        webClientPreload: (_this$webex$meetings20 = this.webex.meetings) === null || _this$webex$meetings20 === void 0 ? void 0 : (_this$webex$meetings21 = _this$webex$meetings20.config) === null || _this$webex$meetings21 === void 0 ? void 0 : (_this$webex$meetings22 = _this$webex$meetings21.metrics) === null || _this$webex$meetings22 === void 0 ? void 0 : _this$webex$meetings22.webClientPreload,
+        isVipMeeting: (meeting === null || meeting === void 0 ? void 0 : (_meeting$meetingInfo1 = meeting.meetingInfo) === null || _meeting$meetingInfo1 === void 0 ? void 0 : _meeting$meetingInfo1.vipmeeting) || false,
         isAutomatedUser: AutomatedUserUtils.isAutomatedUser(),
         userActivation: this.getUserActivation()
       });
@@ -992,9 +1050,10 @@ var CallDiagnosticMetrics = exports.default = /*#__PURE__*/function (_StatelessW
         // @ts-ignore
         commonEventObject.meetingJoinedTime = meetingJoinedTime;
       }
-      if (options.meetingJoinPhase) {
+      var meetingJoinPhase = (_options$meetingJoinP = options.meetingJoinPhase) !== null && _options$meetingJoinP !== void 0 ? _options$meetingJoinP : (_meeting$callStateFor2 = meeting.callStateForMetrics) === null || _meeting$callStateFor2 === void 0 ? void 0 : _meeting$callStateFor2.meetingJoinPhase;
+      if (meetingJoinPhase) {
         // @ts-ignore
-        commonEventObject.meetingJoinPhase = options.meetingJoinPhase;
+        commonEventObject.meetingJoinPhase = meetingJoinPhase;
       }
       return commonEventObject;
     }
@@ -1008,10 +1067,10 @@ var CallDiagnosticMetrics = exports.default = /*#__PURE__*/function (_StatelessW
      */
   }, {
     key: "createClientEventObjectInMeeting",
-    value: function createClientEventObjectInMeeting(_ref9) {
-      var name = _ref9.name,
-        options = _ref9.options,
-        errors = _ref9.errors;
+    value: function createClientEventObjectInMeeting(_ref0) {
+      var name = _ref0.name,
+        options = _ref0.options,
+        errors = _ref0.errors;
       var commonObject = this.createCommonEventObjectInMeeting({
         name: name,
         options: options,
@@ -1034,9 +1093,9 @@ var CallDiagnosticMetrics = exports.default = /*#__PURE__*/function (_StatelessW
      */
   }, {
     key: "createFeatureEventObjectInMeeting",
-    value: function createFeatureEventObjectInMeeting(_ref0) {
-      var name = _ref0.name,
-        options = _ref0.options;
+    value: function createFeatureEventObjectInMeeting(_ref1) {
+      var name = _ref1.name,
+        options = _ref1.options;
       var commonObject = this.createCommonEventObjectInMeeting({
         name: name,
         options: options,
@@ -1057,16 +1116,17 @@ var CallDiagnosticMetrics = exports.default = /*#__PURE__*/function (_StatelessW
      */
   }, {
     key: "createClientEventObjectPreMeeting",
-    value: function createClientEventObjectPreMeeting(_ref1) {
-      var _this$webex$meetings20, _this$webex$meetings21, _this$webex$meetings22;
-      var name = _ref1.name,
-        options = _ref1.options,
-        errors = _ref1.errors;
+    value: function createClientEventObjectPreMeeting(_ref10) {
+      var _this$webex$meetings23, _this$webex$meetings24, _this$webex$meetings25, _options$meetingJoinP2;
+      var name = _ref10.name,
+        options = _ref10.options,
+        errors = _ref10.errors;
       var correlationId = options.correlationId,
         globalMeetingId = options.globalMeetingId,
         webexConferenceIdStr = options.webexConferenceIdStr,
         preLoginId = options.preLoginId,
-        sessionCorrelationId = options.sessionCorrelationId;
+        sessionCorrelationId = options.sessionCorrelationId,
+        locusCluster = options.locusCluster;
 
       // grab identifiers
       var identifiers = this.getIdentifiers({
@@ -1074,7 +1134,8 @@ var CallDiagnosticMetrics = exports.default = /*#__PURE__*/function (_StatelessW
         sessionCorrelationId: sessionCorrelationId,
         preLoginId: preLoginId,
         globalMeetingId: globalMeetingId,
-        webexConferenceIdStr: webexConferenceIdStr
+        webexConferenceIdStr: webexConferenceIdStr,
+        locusCluster: locusCluster
       });
 
       // create client event object
@@ -1090,16 +1151,16 @@ var CallDiagnosticMetrics = exports.default = /*#__PURE__*/function (_StatelessW
         loginType: this.getCurLoginType(),
         telemetryOptOut: this.getTelemetryOptOut(),
         // @ts-ignore
-        webClientPreload: (_this$webex$meetings20 = this.webex.meetings) === null || _this$webex$meetings20 === void 0 ? void 0 : (_this$webex$meetings21 = _this$webex$meetings20.config) === null || _this$webex$meetings21 === void 0 ? void 0 : (_this$webex$meetings22 = _this$webex$meetings21.metrics) === null || _this$webex$meetings22 === void 0 ? void 0 : _this$webex$meetings22.webClientPreload,
+        webClientPreload: (_this$webex$meetings23 = this.webex.meetings) === null || _this$webex$meetings23 === void 0 ? void 0 : (_this$webex$meetings24 = _this$webex$meetings23.config) === null || _this$webex$meetings24 === void 0 ? void 0 : (_this$webex$meetings25 = _this$webex$meetings24.metrics) === null || _this$webex$meetings25 === void 0 ? void 0 : _this$webex$meetings25.webClientPreload,
         isAutomatedUser: AutomatedUserUtils.isAutomatedUser(),
         userActivation: this.getUserActivation()
       };
       if (options.joinFlowVersion) {
         clientEventObject.joinFlowVersion = options.joinFlowVersion;
       }
-      if (options.meetingJoinPhase) {
-        clientEventObject.meetingJoinPhase = options.meetingJoinPhase;
-      }
+
+      // No meeting exists yet for pre-meeting events, so the join phase is pre-join by construction
+      clientEventObject.meetingJoinPhase = (_options$meetingJoinP2 = options.meetingJoinPhase) !== null && _options$meetingJoinP2 !== void 0 ? _options$meetingJoinP2 : 'pre-join';
       if (options.userNameInput) {
         clientEventObject.userNameInput = options.userNameInput;
       }
@@ -1120,10 +1181,10 @@ var CallDiagnosticMetrics = exports.default = /*#__PURE__*/function (_StatelessW
      */
   }, {
     key: "prepareClientEvent",
-    value: function prepareClientEvent(_ref10) {
-      var name = _ref10.name,
-        payload = _ref10.payload,
-        options = _ref10.options;
+    value: function prepareClientEvent(_ref11) {
+      var name = _ref11.name,
+        payload = _ref11.payload,
+        options = _ref11.options;
       var meetingId = options.meetingId,
         correlationId = options.correlationId,
         rawError = options.rawError;
@@ -1179,11 +1240,11 @@ var CallDiagnosticMetrics = exports.default = /*#__PURE__*/function (_StatelessW
      */
   }, {
     key: "submitClientEvent",
-    value: function submitClientEvent(_ref11) {
-      var name = _ref11.name,
-        payload = _ref11.payload,
-        options = _ref11.options,
-        delaySubmitEvent = _ref11.delaySubmitEvent;
+    value: function submitClientEvent(_ref12) {
+      var name = _ref12.name,
+        payload = _ref12.payload,
+        options = _ref12.options,
+        delaySubmitEvent = _ref12.delaySubmitEvent;
       if (delaySubmitEvent) {
         // Preserve the time when the event was triggered if delaying the submission to Call Diagnostics
         var delayedOptions = _objectSpread(_objectSpread({}, options), {}, {
@@ -1295,13 +1356,13 @@ var CallDiagnosticMetrics = exports.default = /*#__PURE__*/function (_StatelessW
      * @throws
      */
     function () {
-      var _buildClientEventFetchRequestOptions = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee(_ref12) {
+      var _buildClientEventFetchRequestOptions = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee(_ref13) {
         var _this$webex$internal$, _this$webex$internal$2;
         var name, payload, options, clientEvent, diagnosticEvent, request;
         return _regenerator.default.wrap(function (_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              name = _ref12.name, payload = _ref12.payload, options = _ref12.options;
+              name = _ref13.name, payload = _ref13.payload, options = _ref13.options;
               this.logger.log(_config2.CALL_DIAGNOSTIC_LOG_IDENTIFIER, 'CallDiagnosticMetrics: @buildClientEventFetchRequestOptions. Building request options object for fetch()...', "name: ".concat(name));
               clientEvent = this.prepareClientEvent({
                 name: name,