@webex/plugin-meetings 1.156.0 → 1.156.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webex/plugin-meetings",
-  "version": "1.156.0",
+  "version": "1.156.1",
   "description": "",
   "license": "MIT",
   "contributors": [
@@ -24,18 +24,18 @@
   },
   "dependencies": {
     "@babel/runtime-corejs2": "^7.14.8",
-    "@webex/webex-core": "1.156.0",
-    "@webex/internal-plugin-mercury": "1.156.0",
+    "@webex/webex-core": "1.156.1",
+    "@webex/internal-plugin-mercury": "1.156.1",
     "webrtc-adapter": "^7.7.0",
     "lodash": "^4.17.21",
     "uuid": "^3.3.2",
     "global": "^4.4.0",
     "ip-anonymize": "^0.1.0",
-    "@webex/common": "1.156.0",
+    "@webex/common": "1.156.1",
     "bowser": "^2.11.0",
     "sdp-transform": "^2.12.0",
     "readable-stream": "^3.6.0",
-    "@webex/common-timers": "1.156.0",
+    "@webex/common-timers": "1.156.1",
     "btoa": "^1.2.1",
     "javascript-state-machine": "^3.1.0",
     "envify": "^4.1.0"

package/src/constants.js

@@ -1207,48 +1207,6 @@ export const MEDIA_DEVICES = {
   CAMERA: 'camera'
 };
 
-// Metrics constants ----------------------------------------------------------
-
-export const BEHAVIORAL_METRICS = {
-  MEETINGS_REGISTRATION_FAILED: 'js_sdk_meetings_registration_failed',
-  MEETINGS_REGISTRATION_SUCCESS: 'js_sdk_meetings_registration_success',
-  MERCURY_CONNECTION_FAILURE: 'js_sdk_mercury_connection_failure',
-  MERCURY_CONNECTION_RESTORED: 'js_sdk_mercury_connection_restored',
-  JOIN_SUCCESS: 'js_sdk_join_success',
-  JOIN_FAILURE: 'js_sdk_join_failures',
-  ADD_MEDIA_SUCCESS: 'js_sdk_add_media_success',
-  ADD_MEDIA_FAILURE: 'js_sdk_add_media_failures',
-  CONNECTION_SUCCESS: 'js_sdk_connection_success',
-  CONNECTION_FAILURE: 'js_sdk_connection_failures',
-  MEETING_LEAVE_FAILURE: 'js_sdk_meeting_leave_failure',
-  GET_USER_MEDIA_FAILURE: 'js_sdk_get_user_media_failures',
-  GET_DISPLAY_MEDIA_FAILURE: 'js_sdk_get_display_media_failures',
-  JOIN_WITH_MEDIA_FAILURE: 'js_sdk_join_with_media_failures',
-
-  DISCONNECT_DUE_TO_INACTIVITY: 'js_sdk_disconnect_due_to_inactivity',
-  MEETING_MEDIA_INACTIVE: 'js_sdk_meeting_media_inactive',
-  MEETING_RECONNECT_FAILURE: 'js_sdk_meeting_reconnect_failures',
-  MEETING_MAX_REJOIN_FAILURE: 'js_sdk_meeting_max_rejoin_failure',
-  MEETING_SHARE_FAILURE: 'js_sdk_meeting_share_failures',
-  MEETING_START_WHITEBOARD_SHARE_FAILURE: 'js_sdk_meeting_start_whiteboard_share_failures',
-  MEETING_STOP_WHITEBOARD_SHARE_FAILURE: 'js_sdk_meeting_stop_whiteboard_share_failures',
-  MUTE_AUDIO_FAILURE: 'js_sdk_mute_audio_failures',
-  MUTE_VIDEO_FAILURE: 'js_sdk_mute_video_failures',
-  SET_MEETING_QUALITY_FAILURE: 'js_sdk_set_meeting_quality_failures',
-  STOP_FLOOR_REQUEST_FAILURE: 'js_sdk_stop_floor_request_failures',
-  ADD_DIAL_IN_FAILURE: 'js_sdk_add_dial_in_failure',
-  ADD_DIAL_OUT_FAILURE: 'js_sdk_add_dial_out_failure',
-  UPDATE_MEDIA_FAILURE: 'js_sdk_update_media_failures',
-  UNMUTE_AUDIO_FAILURE: 'js_sdk_unmute_audio_failures',
-  UNMUTE_VIDEO_FAILURE: 'js_sdk_unmute_video_failures',
-  ROAP_ANSWER_FAILURE: 'js_sdk_roap_answer_failures',
-  ROAP_GLARE_CONDITION: 'js_sdk_roap_glar_condition',
-  PEERCONNECTION_FAILURE: 'js_sdk_peerConnection_failures',
-  INVALID_ICE_CANDIDATE: 'js_sdk_invalid_ice_candidate',
-  UPLOAD_LOGS_FAILURE: 'js_sdk_upload_logs_failure',
-  RECEIVE_TRANSCRIPTION_FAILURE: 'js_sdk_receive_transcription_failure'
-};
-
 export const METRICS_JOIN_TIMES_MAX_DURATION = 1200000;
 
 export const PSTN_STATUS = {

package/src/meeting/index.js

@@ -56,7 +56,6 @@ import {
   MEETING_STATE,
   MEETINGS,
   METRICS_JOIN_TIMES_MAX_DURATION,
-  BEHAVIORAL_METRICS,
   MQA_STATS,
   NETWORK_STATUS,
   ONLINE,
@@ -76,6 +75,7 @@ import {
   VIDEO,
   HTTP_VERBS
 } from '../constants';
+import BEHAVIORAL_METRICS from '../metrics/constants';
 import ParameterError from '../common/errors/parameter';
 import MediaError from '../common/errors/media';
 import {MeetingInfoV2PasswordError, MeetingInfoV2CaptchaError} from '../meeting-info/meeting-info-v2';

package/src/meetings/index.js

@@ -37,9 +37,9 @@ import {
   _ID_,
   MEETING_REMOVED_REASON,
   _CONVERSATION_URL_,
-  CONVERSATION_URL,
-  BEHAVIORAL_METRICS
+  CONVERSATION_URL
 } from '../constants';
+import BEHAVIORAL_METRICS from '../metrics/constants';
 import MeetingInfo from '../meeting-info';
 import MeetingInfoV2 from '../meeting-info/meeting-info-v2';
 import Meeting from '../meeting';

package/src/metrics/constants.js

@@ -0,0 +1,45 @@
+
+// Metrics constants ----------------------------------------------------------
+
+const BEHAVIORAL_METRICS = {
+  MEETINGS_REGISTRATION_FAILED: 'js_sdk_meetings_registration_failed',
+  MEETINGS_REGISTRATION_SUCCESS: 'js_sdk_meetings_registration_success',
+  MERCURY_CONNECTION_FAILURE: 'js_sdk_mercury_connection_failure',
+  MERCURY_CONNECTION_RESTORED: 'js_sdk_mercury_connection_restored',
+  JOIN_SUCCESS: 'js_sdk_join_success',
+  JOIN_FAILURE: 'js_sdk_join_failures',
+  ADD_MEDIA_SUCCESS: 'js_sdk_add_media_success',
+  ADD_MEDIA_FAILURE: 'js_sdk_add_media_failures',
+  CONNECTION_SUCCESS: 'js_sdk_connection_success',
+  CONNECTION_FAILURE: 'js_sdk_connection_failures',
+  MEETING_LEAVE_FAILURE: 'js_sdk_meeting_leave_failure',
+  GET_USER_MEDIA_FAILURE: 'js_sdk_get_user_media_failures',
+  GET_DISPLAY_MEDIA_FAILURE: 'js_sdk_get_display_media_failures',
+  JOIN_WITH_MEDIA_FAILURE: 'js_sdk_join_with_media_failures',
+
+  DISCONNECT_DUE_TO_INACTIVITY: 'js_sdk_disconnect_due_to_inactivity',
+  MEETING_MEDIA_INACTIVE: 'js_sdk_meeting_media_inactive',
+  MEETING_RECONNECT_FAILURE: 'js_sdk_meeting_reconnect_failures',
+  MEETING_MAX_REJOIN_FAILURE: 'js_sdk_meeting_max_rejoin_failure',
+  MEETING_SHARE_FAILURE: 'js_sdk_meeting_share_failures',
+  MEETING_START_WHITEBOARD_SHARE_FAILURE: 'js_sdk_meeting_start_whiteboard_share_failures',
+  MEETING_STOP_WHITEBOARD_SHARE_FAILURE: 'js_sdk_meeting_stop_whiteboard_share_failures',
+  MUTE_AUDIO_FAILURE: 'js_sdk_mute_audio_failures',
+  MUTE_VIDEO_FAILURE: 'js_sdk_mute_video_failures',
+  SET_MEETING_QUALITY_FAILURE: 'js_sdk_set_meeting_quality_failures',
+  STOP_FLOOR_REQUEST_FAILURE: 'js_sdk_stop_floor_request_failures',
+  ADD_DIAL_IN_FAILURE: 'js_sdk_add_dial_in_failure',
+  ADD_DIAL_OUT_FAILURE: 'js_sdk_add_dial_out_failure',
+  UPDATE_MEDIA_FAILURE: 'js_sdk_update_media_failures',
+  UNMUTE_AUDIO_FAILURE: 'js_sdk_unmute_audio_failures',
+  UNMUTE_VIDEO_FAILURE: 'js_sdk_unmute_video_failures',
+  ROAP_ANSWER_FAILURE: 'js_sdk_roap_answer_failures',
+  ROAP_GLARE_CONDITION: 'js_sdk_roap_glar_condition',
+  PEERCONNECTION_FAILURE: 'js_sdk_peerConnection_failures',
+  INVALID_ICE_CANDIDATE: 'js_sdk_invalid_ice_candidate',
+  UPLOAD_LOGS_FAILURE: 'js_sdk_upload_logs_failure',
+  RECEIVE_TRANSCRIPTION_FAILURE: 'js_sdk_receive_transcription_failure'
+};
+
+
+export {BEHAVIORAL_METRICS as default};

package/src/metrics/index.js

@@ -14,7 +14,7 @@ import BrowserDetection from '../common/browser-detection';
 
 import {
   error, eventType, errorCodes as ERROR_CODE, OS_NAME, UNKNOWN, CLIENT_NAME,
-  mediaType, PLATFORM
+  mediaType
 } from './config';
 
 const OSMap = {
@@ -504,44 +504,10 @@ class Metrics {
    * @returns {void}
    */
   sendBehavioralMetric(metricName, metricFields = {}, metricTags = {}) {
-    const fields = {
-      ...metricFields,
-      browser_version: getBrowserVersion(),
-      os_version: getOSVersion(),
-      sdk_version: this.webex.version,
-      platform: PLATFORM
-    };
-
-    const context = {
-      app: {
-        version: this.webex.version
-      },
-      locale: 'en-US',
-      os: {
-        name: getOSName(),
-        version: getOSVersion()
-      }
-    };
-
-    const tags = {
-      ...metricTags,
-      browser: getBrowserName(),
-      org_id: this.webex.credentials.getOrgId(),
-      os: getOSName(),
-      domain: window.location.hostname,
-      client_id: this.webex.credentials.config.client_id,
-      user_id: this.webex.internal.device.userId
-    };
-
-    if (!metricName) {
-      throw Error('Missing behavioral metric name. Please provide one');
-    }
-
     this.webex.internal.metrics.submitClientMetrics(metricName, {
-      type: ['behavioral', 'operational'],
-      fields,
-      tags,
-      context
+      type: this.webex.config.metrics.type,
+      fields: metricFields,
+      tags: metricTags
     });
   }
 }

package/src/peer-connection-manager/index.js

@@ -20,9 +20,9 @@ import {
   PEER_CONNECTION_STATE,
   OFFER,
   QUALITY_LEVELS,
-  MAX_FRAMESIZES,
-  BEHAVIORAL_METRICS
+  MAX_FRAMESIZES
 } from '../constants';
+import BEHAVIORAL_METRICS from '../metrics/constants';
 import {error, eventType} from '../metrics/config';
 import MediaError from '../common/errors/media';
 import ParameterError from '../common/errors/parameter';

package/src/reconnection-manager/index.js

@@ -8,7 +8,6 @@ import LoggerProxy from '../common/logs/logger-proxy';
 import Trigger from '../common/events/trigger-proxy';
 import {
   EVENT_TRIGGERS,
-  BEHAVIORAL_METRICS,
   RECONNECTION,
   SHARE_STATUS,
   SHARE_STOPPED_REASON,
@@ -16,6 +15,7 @@ import {
   _LEFT_,
   _ID_
 } from '../constants';
+import BEHAVIORAL_METRICS from '../metrics/constants';
 import ReconnectionError from '../common/errors/reconnection';
 import ReconnectInProgress from '../common/errors/reconnection-in-progress';
 import PeerConnectionManager from '../peer-connection-manager';

package/src/roap/handler.js

@@ -2,8 +2,9 @@
 import {StatelessWebexPlugin} from '@webex/webex-core';
 
 import LoggerProxy from '../common/logs/logger-proxy';
-import {ROAP, _OFFER_, BEHAVIORAL_METRICS} from '../constants';
+import {ROAP, _OFFER_} from '../constants';
 import Metrics from '../metrics';
+import BEHAVIORAL_METRICS from '../metrics/constants';
 
 import RoapUtil from './util';
 import RoapCollection from './collection';

package/test/unit/spec/meeting/index.js

@@ -30,13 +30,13 @@ import Metrics from '@webex/plugin-meetings/src/metrics';
 import {
   FLOOR_ACTION,
   SHARE_STATUS,
-  BEHAVIORAL_METRICS,
   MEETING_INFO_FAILURE_REASON,
   PASSWORD_STATUS,
   EVENTS,
   EVENT_TRIGGERS,
   _SIP_URI_
 } from '@webex/plugin-meetings/src/constants';
+import {BEHAVIORAL_METRICS} from '@webex/plugin-meetings/src/metrics/constants';
 
 import {
   UserNotJoinedError,