@webex/plugin-meetings 2.39.0 → 2.39.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webex/plugin-meetings",
-  "version": "2.39.0",
+  "version": "2.39.2",
   "description": "",
   "license": "Cisco EULA (https://www.cisco.com/c/en/us/products/end-user-license-agreement.html)",
   "contributors": [
@@ -12,7 +12,6 @@
     "Taymoor Khan <taykhan@cisco.com>"
   ],
   "main": "dist/index.js",
-  "types": "types/index.d.ts",
   "devMain": "src/index.js",
   "repository": {
     "type": "git",
@@ -29,15 +28,15 @@
     ]
   },
   "scripts": {
-    "build": "yarn run -T tsc --declaration true --declarationDir ./types"
+    "build": "yarn run -T tsc --declaration true --declarationDir ./dist"
   },
   "devDependencies": {
-    "@webex/plugin-meetings": "2.39.0",
-    "@webex/test-helper-chai": "2.39.0",
-    "@webex/test-helper-mocha": "2.39.0",
-    "@webex/test-helper-mock-webex": "2.39.0",
-    "@webex/test-helper-retry": "2.39.0",
-    "@webex/test-helper-test-users": "2.39.0",
+    "@webex/plugin-meetings": "2.39.2",
+    "@webex/test-helper-chai": "2.39.2",
+    "@webex/test-helper-mocha": "2.39.2",
+    "@webex/test-helper-mock-webex": "2.39.2",
+    "@webex/test-helper-retry": "2.39.2",
+    "@webex/test-helper-test-users": "2.39.2",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
     "jsdom-global": "3.0.2",
@@ -45,18 +44,18 @@
     "typescript": "^4.7.4"
   },
   "dependencies": {
-    "@webex/common": "2.39.0",
+    "@webex/common": "2.39.2",
     "@webex/internal-media-core": "0.0.7-beta",
-    "@webex/internal-plugin-conversation": "2.39.0",
-    "@webex/internal-plugin-device": "2.39.0",
-    "@webex/internal-plugin-mercury": "2.39.0",
-    "@webex/internal-plugin-metrics": "2.39.0",
-    "@webex/internal-plugin-support": "2.39.0",
-    "@webex/internal-plugin-user": "2.39.0",
-    "@webex/plugin-people": "2.39.0",
-    "@webex/plugin-rooms": "2.39.0",
+    "@webex/internal-plugin-conversation": "2.39.2",
+    "@webex/internal-plugin-device": "2.39.2",
+    "@webex/internal-plugin-mercury": "2.39.2",
+    "@webex/internal-plugin-metrics": "2.39.2",
+    "@webex/internal-plugin-support": "2.39.2",
+    "@webex/internal-plugin-user": "2.39.2",
+    "@webex/plugin-people": "2.39.2",
+    "@webex/plugin-rooms": "2.39.2",
     "@webex/ts-sdp": "1.0.1",
-    "@webex/webex-core": "2.39.0",
+    "@webex/webex-core": "2.39.2",
     "bowser": "^2.11.0",
     "btoa": "^1.2.1",
     "dotenv": "^4.0.0",

package/src/metrics/config.ts

@@ -481,15 +481,5 @@ export const errorObjects = {
 
 export const UNKNOWN = 'unknown';
 
-export const OS_NAME = {
-  WINDOWS: 'windows',
-  MAC: 'mac',
-  IOS: 'ios',
-  ANDROID: 'android',
-  CHROME: 'chrome',
-  LINUX: 'linux',
-  OTHERS: 'other',
-};
-
 export const CLIENT_NAME = 'webex-js-sdk';
 export const PLATFORM = 'Web';

package/src/metrics/index.ts

@@ -8,6 +8,7 @@ import uuid from 'uuid';
 import window from 'global/window';
 import anonymize from 'ip-anonymize';
 
+import {getOSNameInternal} from '@webex/internal-plugin-metrics';
 import LoggerProxy from '../common/logs/logger-proxy';
 import {MEETING_ERRORS} from '../constants';
 import BrowserDetection from '../common/browser-detection';
@@ -16,22 +17,11 @@ import {
   error,
   eventType,
   errorCodes as ERROR_CODE,
-  OS_NAME,
   UNKNOWN,
   CLIENT_NAME,
   mediaType,
 } from './config';
 
-const OSMap = {
-  // @ts-ignore
-  'Chrome OS': OS_NAME.chrome,
-  macOS: OS_NAME.MAC,
-  Windows: OS_NAME.WINDOWS,
-  iOS: OS_NAME.IOS,
-  Android: OS_NAME.ANDROID,
-  Linux: OS_NAME.LINUX,
-};
-
 const {getOSName, getOSVersion, getBrowserName, getBrowserVersion} = BrowserDetection();
 
 // Apply a CIDR /28 format to the IPV4 and /96 to the IPV6 addresses
@@ -205,7 +195,7 @@ class Metrics {
           localNetworkPrefix: anonymizeIPAddress(this.webex.meetings.geoHintInfo?.clientAddress),
           osVersion: getOSVersion() || 'unknown',
           subClientType: options.subClientType,
-          os: this.getOsName(),
+          os: getOSNameInternal(),
           browser: getBrowserName(),
           browserVersion: getBrowserVersion(),
         },
@@ -256,17 +246,6 @@ class Metrics {
     return payload;
   }
 
-  /**
-   * returns metrics friendly OS versions
-   * @param {String} osName Os name
-   * @returns {String}
-   * @private
-   * @memberof Metrics
-   */
-  private getOsName() {
-    return OSMap[getOSName()] ?? OS_NAME.OTHERS;
-  }
-
   /**
    * get the payload specific for a media quality event through call analyzer
    * @param {String} eventType the event name
@@ -311,7 +290,7 @@ class Metrics {
           clientType: options.clientType, // TODO: Only clientType: 'TEAMS_CLIENT' is whitelisted
           clientVersion: `${CLIENT_NAME}/${this.webex.version}`,
           localNetworkPrefix: anonymizeIPAddress(this.webex.meetings.geoHintInfo?.clientAddress),
-          os: this.getOsName(),
+          os: getOSNameInternal(),
           osVersion: getOSVersion() || UNKNOWN,
           subClientType: options.subClientType,
           browser: getBrowserName(),