@webex/plugin-meetings 3.0.0-beta.162 → 3.0.0-beta.164

package/src/meeting/util.ts

@@ -1,9 +1,6 @@
 import {LocalCameraTrack, LocalMicrophoneTrack} from '@webex/media-helpers';
-
 import {cloneDeep} from 'lodash';
 import {MeetingNotActiveError, UserNotJoinedError} from '../common/errors/webex-errors';
-import Metrics from '../metrics';
-import {eventType, trigger} from '../metrics/config';
 import LoggerProxy from '../common/logs/logger-proxy';
 import {
   INTENT_TO_JOIN,
@@ -43,6 +40,7 @@ const MeetingUtil = {
   },
 
   remoteUpdateAudioVideo: (meeting, audioMuted?: boolean, videoMuted?: boolean) => {
+    const webex = meeting.getWebexObject();
     if (!meeting) {
       return Promise.reject(new ParameterError('You need a meeting object.'));
     }
@@ -55,7 +53,11 @@ const MeetingUtil = {
       );
     }
 
-    Metrics.postEvent({event: eventType.MEDIA_REQUEST, meeting});
+    // @ts-ignore
+    webex.internal.newMetrics.submitClientEvent({
+      name: 'client.locus.media.request',
+      options: {meetingId: meeting.id},
+    });
 
     return meeting.locusMediaRequest
       .send({
@@ -69,7 +71,11 @@ const MeetingUtil = {
         },
       })
       .then((response) => {
-        Metrics.postEvent({event: eventType.MEDIA_RESPONSE, meeting});
+        // @ts-ignore
+        webex.internal.newMetrics.submitClientEvent({
+          name: 'client.locus.media.response',
+          options: {meetingId: meeting.id},
+        });
 
         return response?.body?.locus;
       });
@@ -85,8 +91,13 @@ const MeetingUtil = {
     if (!meeting) {
       return Promise.reject(new ParameterError('You need a meeting object.'));
     }
+    const webex = meeting.getWebexObject();
 
-    Metrics.postEvent({event: eventType.LOCUS_JOIN_REQUEST, meeting});
+    // @ts-ignore
+    webex.internal.newMetrics.submitClientEvent({
+      name: 'client.locus.join.request',
+      options: {meetingId: meeting.id},
+    });
 
     // eslint-disable-next-line no-warning-comments
     // TODO: check if the meeting is in JOINING state
@@ -112,14 +123,18 @@ const MeetingUtil = {
         liveAnnotationSupported: options.liveAnnotationSupported,
       })
       .then((res) => {
-        Metrics.postEvent({
-          event: eventType.LOCUS_JOIN_RESPONSE,
-          meeting,
-          data: {
-            trigger: trigger.LOCI_UPDATE,
-            locus: res.body.locus,
+        // @ts-ignore
+        webex.internal.newMetrics.submitClientEvent({
+          name: 'client.locus.join.response',
+          payload: {
+            trigger: 'loci-update',
+            identifiers: {
+              trackingId: res.headers.trackingid,
+            },
+          },
+          options: {
+            meetingId: meeting.id,
             mediaConnections: res.body.mediaConnections,
-            trackingId: res.headers.trackingid,
           },
         });
 
@@ -232,6 +247,8 @@ const MeetingUtil = {
     (currentMediaStatus.audio || currentMediaStatus.video || currentMediaStatus.share),
 
   joinMeetingOptions: (meeting, options: any = {}) => {
+    const webex = meeting.getWebexObject();
+
     meeting.resourceId = meeting.resourceId || options.resourceId;
 
     if (meeting.requiredCaptcha) {
@@ -242,9 +259,12 @@ const MeetingUtil = {
     }
 
     if (options.pin) {
-      Metrics.postEvent({
-        event: eventType.PIN_COLLECTED,
-        meeting,
+      // @ts-ignore
+      webex.internal.newMetrics.submitClientEvent({
+        name: 'client.pin.collected',
+        options: {
+          meetingId: meeting.id,
+        },
       });
     }
 
@@ -258,9 +278,12 @@ const MeetingUtil = {
       .catch((err) => {
         // joining a claimed PMR that is not my own, scenario B
         if (MeetingUtil.isPinOrGuest(err)) {
-          Metrics.postEvent({
-            event: eventType.PIN_PROMPT,
-            meeting,
+          // @ts-ignore
+          webex.internal.newMetrics.submitClientEvent({
+            name: 'client.pin.prompt',
+            options: {
+              meetingId: meeting.id,
+            },
           });
 
           // request host pin or non host for unclaimed PMR, start of Scenario C

package/src/meeting-info/index.ts

@@ -70,10 +70,22 @@ export default class MeetingInfo {
    * @private
    * @memberof MeetingInfo
    */
-  private requestFetchInfo(options: object) {
+  private requestFetchInfo(options: any) {
+    const {meetingId} = options;
+    if (meetingId) {
+      this.webex.internal.newMetrics.submitInternalEvent({
+        name: 'internal.client.meetinginfo.request',
+      });
+    }
+
     return this.meetingInfoRequest
       .fetchMeetingInfo(options)
       .then((info) => {
+        if (meetingId) {
+          this.webex.internal.newMetrics.submitInternalEvent({
+            name: 'internal.client.meetinginfo.response',
+          });
+        }
         if (info && info.body) {
           this.setMeetingInfo(info.body.sipMeetingUri || info.body.meetingLink, info.body);
         }
@@ -84,6 +96,21 @@ export default class MeetingInfo {
         LoggerProxy.logger.error(
           `Meeting-info:index#requestFetchInfo -->  ${error} fetch meetingInfo`
         );
+        this.webex.internal.newMetrics.submitInternalEvent({
+          name: 'internal.client.meetinginfo.response',
+        });
+        this.webex.internal.newMetrics.submitClientEvent({
+          name: 'client.meetinginfo.response',
+          payload: {
+            identifiers: {
+              meetingLookupUrl: error?.url,
+            },
+          },
+          options: {
+            meetingId,
+            rawError: error,
+          },
+        });
 
         return Promise.reject(error);
       });
@@ -105,6 +132,7 @@ export default class MeetingInfo {
     });
   }
 
+  // eslint-disable-next-line valid-jsdoc
   /**
    * Fetches meeting info from the server
    * @param {String} destination one of many different types of destinations to look up info for
@@ -113,21 +141,39 @@ export default class MeetingInfo {
    * @public
    * @memberof MeetingInfo
    */
-  public fetchMeetingInfo(destination: string, type: string = null) {
+  public fetchMeetingInfo(
+    destination: string,
+    type: string = null,
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    password: string = null,
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    captchaInfo: {
+      code: string;
+      id: string;
+    } = null,
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    installedOrgID = null,
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    locusId = null,
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    extraParams: object = {},
+    options: {meetingId?: string} = {}
+  ) {
     if (type === _PERSONAL_ROOM_ && !destination) {
       destination = this.webex.internal.device.userId;
     }
 
     return this.fetchInfoOptions(MeetingInfoUtil.extractDestination(destination, type), type).then(
-      (options) =>
+      (infoOptions) =>
         // fetch meeting info
-        this.requestFetchInfo(options).catch((error) => {
+        this.requestFetchInfo({...infoOptions, meetingId: options.meetingId}).catch((error) => {
           // if it failed the first time as meeting link
-          if (options.type === _MEETING_LINK_) {
+          if (infoOptions.type === _MEETING_LINK_) {
             // convert the meeting link to sip URI and retry
-            return this.requestFetchInfo(
-              this.fetchInfoOptions(MeetingInfoUtil.convertLinkToSip(destination), _SIP_URI_)
-            );
+            return this.requestFetchInfo({
+              ...this.fetchInfoOptions(MeetingInfoUtil.convertLinkToSip(destination), _SIP_URI_),
+              meetingId: options.meetingId,
+            });
           }
 
           return Promise.reject(error);

package/src/meeting-info/meeting-info-v2.ts

@@ -6,7 +6,6 @@ import {
   DEFAULT_MEETING_INFO_REQUEST_BODY,
 } from '../constants';
 import Metrics from '../metrics';
-import {eventType} from '../metrics/config';
 import BEHAVIORAL_METRICS from '../metrics/constants';
 
 import MeetingInfoUtil from './utilv2';
@@ -19,7 +18,6 @@ const ADHOC_MEETING_DEFAULT_ERROR =
   'Failed starting the adhoc meeting, Please contact support team ';
 const CAPTCHA_ERROR_REQUIRES_PASSWORD_CODES = [423005, 423006];
 const POLICY_ERROR_CODES = [403049, 403104, 403103, 403048, 403102, 403101];
-
 /**
  * Error to indicate that wbxappapi requires a password
  */
@@ -338,22 +336,39 @@ export default class MeetingInfoV2 {
       requestOptions.resource = 'meetingInfo';
     }
 
+    if (meetingId) {
+      this.webex.internal.newMetrics.submitInternalEvent({
+        name: 'internal.client.meetinginfo.request',
+      });
+    }
+
     return this.webex
       .request(requestOptions)
       .then((response) => {
+        if (meetingId) {
+          this.webex.internal.newMetrics.submitInternalEvent({
+            name: 'internal.client.meetinginfo.response',
+          });
+        }
         Metrics.sendBehavioralMetric(BEHAVIORAL_METRICS.FETCH_MEETING_INFO_V1_SUCCESS);
 
         return response;
       })
       .catch((err) => {
         if (meetingId) {
-          const parsedError = Metrics.parseWebexApiError(err, true);
-          Metrics.postEvent({
-            event: eventType.MEETING_INFO_RESPONSE,
-            meetingId,
-            data: {
-              errors: parsedError ? [parsedError] : undefined,
-              meetingLookupUrl: err?.url,
+          this.webex.internal.newMetrics.submitInternalEvent({
+            name: 'internal.client.meetinginfo.response',
+          });
+          this.webex.internal.newMetrics.submitClientEvent({
+            name: 'client.meetinginfo.response',
+            payload: {
+              identifiers: {
+                meetingLookupUrl: err?.url,
+              },
+            },
+            options: {
+              meetingId,
+              rawError: err,
             },
           });
         }

package/src/meetings/index.ts

@@ -2,6 +2,7 @@
 
 import '@webex/internal-plugin-mercury';
 import '@webex/internal-plugin-conversation';
+import '@webex/internal-plugin-metrics';
 // @ts-ignore
 import {WebexPlugin} from '@webex/webex-core';
 import {setLogger} from '@webex/internal-media-core';
@@ -11,7 +12,6 @@ import * as mediaHelpersModule from '@webex/media-helpers';
 import 'webrtc-adapter';
 
 import Metrics from '../metrics';
-import {trigger, eventType} from '../metrics/config';
 import LoggerConfig from '../common/logs/logger-config';
 import StaticConfig from '../common/config';
 import LoggerProxy from '../common/logs/logger-proxy';
@@ -492,10 +492,15 @@ export default class Meetings extends WebexPlugin {
           // because the other user left so before sending 'added' event make sure it exists in the collection
 
           if (this.getMeetingByType(_ID_, meeting.id)) {
-            Metrics.postEvent({
-              event: eventType.REMOTE_STARTED,
-              meeting,
-              data: {trigger: trigger.MERCURY_EVENT},
+            // @ts-ignore
+            this.webex.internal.newMetrics.submitClientEvent({
+              name: 'client.call.remote-started',
+              payload: {
+                trigger: 'mercury-event',
+              },
+              options: {
+                meetingId: meeting.id,
+              },
             });
             Trigger.trigger(
               this,
@@ -648,7 +653,7 @@ export default class Meetings extends WebexPlugin {
 
       MeetingsUtil.checkH264Support({disableNotifications: true});
       // @ts-ignore
-      Metrics.initialSetup(this.meetingCollection, this.webex);
+      Metrics.initialSetup(this.webex);
     });
   }