@webex/calling 3.8.0 → 3.8.1-next.10

package/dist/module/CallingClient/CallingClient.js

@@ -1,6 +1,6 @@
 import * as Media from '@webex/internal-media-core';
 import { Mutex } from 'async-mutex';
-import { v4 as uuid } from 'uuid';
+import { METHOD_START_MESSAGE } from '../common/constants';
 import { filterMobiusUris, handleCallingClientErrors, uploadLogs, validateServiceData, } from '../common/Utils';
 import { LOGGER } from '../Logger/types';
 import SDKConnector from '../SDKConnector';
@@ -9,7 +9,7 @@ import { MOBIUS_EVENT_KEYS, SessionType, CALLING_CLIENT_EVENT_KEYS, } from '../E
 import { ServiceIndicator, ALLOWED_SERVICES, HTTP_METHODS, RegistrationStatus, } from '../common/types';
 import log from '../Logger';
 import { getCallManager } from './calling/callManager';
-import { CALLING_CLIENT_FILE, CALLS_CLEARED_HANDLER_UTIL, CALLING_USER_AGENT, CISCO_DEVICE_URL, DISCOVERY_URL, GET_MOBIUS_SERVERS_UTIL, IP_ENDPOINT, SPARK_USER_AGENT, URL_ENDPOINT, NETWORK_FLAP_TIMEOUT, API_V1, MOBIUS_US_PROD, MOBIUS_EU_PROD, MOBIUS_US_INT, MOBIUS_EU_INT, } from './constants';
+import { CALLING_CLIENT_FILE, CALLS_CLEARED_HANDLER_UTIL, CALLING_USER_AGENT, CISCO_DEVICE_URL, DISCOVERY_URL, GET_MOBIUS_SERVERS_UTIL, IP_ENDPOINT, SPARK_USER_AGENT, URL_ENDPOINT, NETWORK_FLAP_TIMEOUT, API_V1, MOBIUS_US_PROD, MOBIUS_EU_PROD, MOBIUS_US_INT, MOBIUS_EU_INT, METHODS, } from './constants';
 import Line from './line';
 import { METRIC_EVENT, REG_ACTION, METRIC_TYPE } from '../Metrics/types';
 import { getMetricManager } from '../Metrics';
@@ -31,6 +31,10 @@ export class CallingClient extends Eventing {
         this.sdkConnector = SDKConnector;
         if (!this.sdkConnector.getWebex()) {
             SDKConnector.setWebex(webex);
+            if (config?.logger?.level && webex.logger.config) {
+                webex.logger.config.level = config.logger.level;
+            }
+            log.setWebexLogger(webex.logger);
         }
         this.mutex = new Mutex();
         this.webex = this.sdkConnector.getWebex();
@@ -81,6 +85,10 @@ export class CallingClient extends Eventing {
         this.detectNetworkChange();
     }
     async detectNetworkChange() {
+        log.info(METHOD_START_MESSAGE, {
+            file: CALLING_CLIENT_FILE,
+            method: METHODS.DETECT_NETWORK_CHANGE,
+        });
         let retry = false;
         const line = Object.values(this.lineDict)[0];
         setInterval(async () => {
@@ -89,7 +97,7 @@ export class CallingClient extends Eventing {
                 !Object.keys(this.callManager.getActiveCalls()).length) {
                 log.warn(`Network has flapped, waiting for mercury connection to be up`, {
                     file: CALLING_CLIENT_FILE,
-                    method: this.detectNetworkChange.name,
+                    method: METHODS.DETECT_NETWORK_CHANGE,
                 });
                 line.registration.clearKeepaliveTimer();
                 retry = true;
@@ -105,6 +113,10 @@ export class CallingClient extends Eventing {
         }, NETWORK_FLAP_TIMEOUT);
     }
     async getClientRegionInfo() {
+        log.info(METHOD_START_MESSAGE, {
+            file: CALLING_CLIENT_FILE,
+            method: METHODS.GET_CLIENT_REGION_INFO,
+        });
         const regionInfo = {};
         for (const mobius of this.mobiusClusters) {
             this.mobiusHost = `https://${mobius.host}${API_V1}`;
@@ -135,8 +147,13 @@ export class CallingClient extends Eventing {
                 break;
             }
             catch (err) {
+                const extendedError = new Error(`Failed to get client region info: ${err}`);
+                log.error(extendedError, {
+                    method: METHODS.GET_CLIENT_REGION_INFO,
+                    file: CALLING_CLIENT_FILE,
+                });
                 handleCallingClientErrors(err, (clientError) => {
-                    this.metricManager.submitRegistrationMetric(METRIC_EVENT.REGISTRATION_ERROR, REG_ACTION.REGISTER, METRIC_TYPE.BEHAVIORAL, clientError);
+                    this.metricManager.submitRegistrationMetric(METRIC_EVENT.REGISTRATION_ERROR, REG_ACTION.REGISTER, METRIC_TYPE.BEHAVIORAL, GET_MOBIUS_SERVERS_UTIL, 'UNKNOWN', err.headers?.trackingId ?? '', undefined, clientError);
                     this.emit(CALLING_CLIENT_EVENT_KEYS.ERROR, clientError);
                 }, { method: GET_MOBIUS_SERVERS_UTIL, file: CALLING_CLIENT_FILE });
                 regionInfo.clientRegion = '';
@@ -146,11 +163,15 @@ export class CallingClient extends Eventing {
         return regionInfo;
     }
     async getMobiusServers() {
+        log.info(METHOD_START_MESSAGE, {
+            file: CALLING_CLIENT_FILE,
+            method: METHODS.GET_MOBIUS_SERVERS,
+        });
         let useDefault = false;
         let clientRegion;
         let countryCode;
         if (this.sdkConfig?.discovery?.country && this.sdkConfig?.discovery?.region) {
-            log.info('Updating region and country from the SDK config', {
+            log.log('Updating region and country from the SDK config', {
                 file: CALLING_CLIENT_FILE,
                 method: GET_MOBIUS_SERVERS_UTIL,
             });
@@ -159,7 +180,7 @@ export class CallingClient extends Eventing {
             this.mobiusHost = this.webex.internal.services._serviceUrls.mobius;
         }
         else {
-            log.info('Updating region and country through Region discovery', {
+            log.log('Updating region and country through Region discovery', {
                 file: CALLING_CLIENT_FILE,
                 method: GET_MOBIUS_SERVERS_UTIL,
             });
@@ -187,8 +208,13 @@ export class CallingClient extends Eventing {
                 log.info(`Final list of Mobius Servers, primary: ${mobiusUris.primary} and backup: ${mobiusUris.backup}`, '');
             }
             catch (err) {
+                const extendedError = new Error(`Failed to get Mobius servers: ${err}`);
+                log.error(extendedError, {
+                    method: METHODS.GET_MOBIUS_SERVERS,
+                    file: CALLING_CLIENT_FILE,
+                });
                 handleCallingClientErrors(err, (clientError) => {
-                    this.metricManager.submitRegistrationMetric(METRIC_EVENT.REGISTRATION_ERROR, REG_ACTION.REGISTER, METRIC_TYPE.BEHAVIORAL, clientError);
+                    this.metricManager.submitRegistrationMetric(METRIC_EVENT.REGISTRATION_ERROR, REG_ACTION.REGISTER, METRIC_TYPE.BEHAVIORAL, GET_MOBIUS_SERVERS_UTIL, 'UNKNOWN', err.headers?.trackingId ?? '', undefined, clientError);
                     this.emit(CALLING_CLIENT_EVENT_KEYS.ERROR, clientError);
                 }, { method: GET_MOBIUS_SERVERS_UTIL, file: CALLING_CLIENT_FILE });
                 useDefault = true;
@@ -204,19 +230,22 @@ export class CallingClient extends Eventing {
         }
     }
     registerCallsClearedListener() {
-        const logContext = {
+        log.info(METHOD_START_MESSAGE, {
             file: CALLING_CLIENT_FILE,
-            method: this.registerCallsClearedListener.name,
-        };
-        log.log('Registering listener for all calls cleared event', logContext);
+            method: METHODS.REGISTER_CALLS_CLEARED_LISTENER,
+        });
         this.callManager.on(CALLING_CLIENT_EVENT_KEYS.ALL_CALLS_CLEARED, this.callsClearedHandler);
     }
     callsClearedHandler = async () => {
+        log.info(METHOD_START_MESSAGE, {
+            file: CALLING_CLIENT_FILE,
+            method: METHODS.CALLS_CLEARED_HANDLER,
+        });
         const { registration } = Object.values(this.lineDict)[0];
         if (!registration.isDeviceRegistered()) {
             await this.mutex.runExclusive(async () => {
                 if (registration.isReconnectPending()) {
-                    log.log('All calls cleared, reconnecting', {
+                    log.info('All calls cleared, reconnecting', {
                         file: CALLING_CLIENT_FILE,
                         method: CALLS_CLEARED_HANDLER_UTIL,
                     });
@@ -232,6 +261,10 @@ export class CallingClient extends Eventing {
         return this.sdkConnector;
     }
     registerSessionsListener() {
+        log.info(METHOD_START_MESSAGE, {
+            file: CALLING_CLIENT_FILE,
+            method: METHODS.REGISTER_SESSIONS_LISTENER,
+        });
         this.sdkConnector.registerListener(MOBIUS_EVENT_KEYS.CALL_SESSION_EVENT_INCLUSIVE, async (event) => {
             if (event && event.data.userSessions.userSessions) {
                 const sessionArr = event?.data.userSessions.userSessions;
@@ -250,6 +283,10 @@ export class CallingClient extends Eventing {
         });
     }
     async createLine() {
+        log.info(METHOD_START_MESSAGE, {
+            file: CALLING_CLIENT_FILE,
+            method: METHODS.CREATE_LINE,
+        });
         const line = new Line(this.webex.internal.device.userId, this.webex.internal.device.url, this.mutex, this.primaryMobiusUris, this.backupMobiusUris, this.getLoggingLevel(), this.sdkConfig?.serviceData, this.sdkConfig?.jwe);
         this.lineDict[line.lineId] = line;
     }
@@ -278,11 +315,12 @@ export class CallingClient extends Eventing {
         });
         return connectCall;
     }
-    async uploadLogs(data = {}) {
-        if (!data.feedbackId) {
-            data = { ...data, feedbackId: uuid() };
+    async uploadLogs() {
+        const result = await uploadLogs({}, true);
+        if (!result) {
+            throw new Error('Failed to upload logs: No response received.');
         }
-        return uploadLogs(data);
+        return result;
     }
 }
 export const createClient = async (webex, config) => {