@webex/plugin-meetings 3.0.0-beta.55 → 3.0.0-beta.57

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webex/plugin-meetings",
-  "version": "3.0.0-beta.55",
+  "version": "3.0.0-beta.57",
   "description": "",
   "license": "Cisco EULA (https://www.cisco.com/c/en/us/products/end-user-license-agreement.html)",
   "contributors": [
@@ -32,12 +32,12 @@
     "build": "yarn run -T tsc --declaration true --declarationDir ./dist/types"
   },
   "devDependencies": {
-    "@webex/plugin-meetings": "3.0.0-beta.55",
-    "@webex/test-helper-chai": "3.0.0-beta.55",
-    "@webex/test-helper-mocha": "3.0.0-beta.55",
-    "@webex/test-helper-mock-webex": "3.0.0-beta.55",
-    "@webex/test-helper-retry": "3.0.0-beta.55",
-    "@webex/test-helper-test-users": "3.0.0-beta.55",
+    "@webex/plugin-meetings": "3.0.0-beta.57",
+    "@webex/test-helper-chai": "3.0.0-beta.57",
+    "@webex/test-helper-mocha": "3.0.0-beta.57",
+    "@webex/test-helper-mock-webex": "3.0.0-beta.57",
+    "@webex/test-helper-retry": "3.0.0-beta.57",
+    "@webex/test-helper-test-users": "3.0.0-beta.57",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
     "jsdom-global": "3.0.2",
@@ -46,18 +46,18 @@
     "typescript": "^4.7.4"
   },
   "dependencies": {
-    "@webex/common": "3.0.0-beta.55",
+    "@webex/common": "3.0.0-beta.57",
     "@webex/internal-media-core": "1.35.3",
-    "@webex/internal-plugin-conversation": "3.0.0-beta.55",
-    "@webex/internal-plugin-device": "3.0.0-beta.55",
-    "@webex/internal-plugin-llm": "3.0.0-beta.55",
-    "@webex/internal-plugin-mercury": "3.0.0-beta.55",
-    "@webex/internal-plugin-metrics": "3.0.0-beta.55",
-    "@webex/internal-plugin-support": "3.0.0-beta.55",
-    "@webex/internal-plugin-user": "3.0.0-beta.55",
-    "@webex/plugin-people": "3.0.0-beta.55",
-    "@webex/plugin-rooms": "3.0.0-beta.55",
-    "@webex/webex-core": "3.0.0-beta.55",
+    "@webex/internal-plugin-conversation": "3.0.0-beta.57",
+    "@webex/internal-plugin-device": "3.0.0-beta.57",
+    "@webex/internal-plugin-llm": "3.0.0-beta.57",
+    "@webex/internal-plugin-mercury": "3.0.0-beta.57",
+    "@webex/internal-plugin-metrics": "3.0.0-beta.57",
+    "@webex/internal-plugin-support": "3.0.0-beta.57",
+    "@webex/internal-plugin-user": "3.0.0-beta.57",
+    "@webex/plugin-people": "3.0.0-beta.57",
+    "@webex/plugin-rooms": "3.0.0-beta.57",
+    "@webex/webex-core": "3.0.0-beta.57",
     "ampersand-collection": "^2.0.2",
     "bowser": "^2.11.0",
     "btoa": "^1.2.1",

package/src/controls-options-manager/index.ts

@@ -140,32 +140,48 @@ export default class ControlsOptionsManager {
    * @returns {Promise}
    */
   private setControls(setting: {[key in Setting]?: boolean}): Promise<any> {
-    const muteUnmuteAll = Object.keys(setting).includes(Setting.muted);
-
-    const body = muteUnmuteAll ? {audio: {}} : {};
-    for (const [key, value] of Object.entries(setting)) {
-      LoggerProxy.logger.log(`ControlsOptionsManager:index#setControls --> ${key} [${value}]`);
-      // mute unmute all has different body structure than toggling disable hard mute
-      // or mute on entry by themselves
-      if (muteUnmuteAll) {
-        if (Util?.[`${value ? CAN_SET : CAN_UNSET}${Setting.muted}`](this.displayHints)) {
-          body.audio[camelCase(key)] = value;
-        } else {
-          return Promise.reject(
-            new PermissionError(
-              `${Setting.muted} [${value}] not allowed, due to moderator property.`
-            )
-          );
-        }
-      } else if (Util?.[`${value ? CAN_SET : CAN_UNSET}${key}`](this.displayHints)) {
-        body[camelCase(key)] = {
-          [ENABLED]: value,
-        };
-      } else {
-        return Promise.reject(
-          new PermissionError(`${key} [${value}] not allowed, due to moderator property.`)
-        );
+    LoggerProxy.logger.log(
+      `ControlsOptionsManager:index#setControls --> ${JSON.stringify(setting)}`
+    );
+
+    const body: Record<string, any> = {};
+    let error: PermissionError;
+
+    Object.entries(setting).forEach(([key, value]) => {
+      if (!Util?.[`${value ? CAN_SET : CAN_UNSET}${key}`](this.displayHints)) {
+        error = new PermissionError(`${key} [${value}] not allowed, due to moderator property.`);
+      }
+
+      if (error) {
+        return;
       }
+
+      switch (key) {
+        case Setting.muted:
+          body.audio = body.audio
+            ? {...body.audio, [camelCase(key)]: value}
+            : {[camelCase(key)]: value};
+          break;
+
+        case Setting.disallowUnmute:
+        case Setting.muteOnEntry:
+          if (Object.keys(setting).includes(Setting.muted)) {
+            body.audio = body.audio
+              ? {...body.audio, [camelCase(key)]: value}
+              : {[camelCase(key)]: value};
+            body.audio[camelCase(key)] = value;
+          } else {
+            body[camelCase(key)] = {[ENABLED]: value};
+          }
+          break;
+
+        default:
+          error = new PermissionError(`${key} [${value}] not allowed, due to moderator property.`);
+      }
+    });
+
+    if (error) {
+      return Promise.reject(error);
     }
 
     // @ts-ignore

package/src/meeting/index.ts

@@ -116,17 +116,17 @@ import ControlsOptionsManager from '../controls-options-manager';
 
 const {isBrowser} = BrowserDetection();
 
-const logRequest = (request: any, {header = '', success = '', failure = ''}) => {
-  LoggerProxy.logger.info(header);
+const logRequest = (request: any, {logText = ''}) => {
+  LoggerProxy.logger.info(`${logText} - sending request`);
 
   return request
     .then((arg) => {
-      LoggerProxy.logger.info(success);
+      LoggerProxy.logger.info(`${logText} - has been successfully sent`);
 
       return arg;
     })
     .catch((error) => {
-      LoggerProxy.logger.error(failure, error);
+      LoggerProxy.logger.error(`${logText} - has failed: `, error);
       throw error;
     });
 };
@@ -3490,8 +3490,6 @@ export default class Meeting extends StatelessWebexPlugin {
       return Promise.reject(new ParameterError('no audio control associated to the meeting'));
     }
 
-    const LOG_HEADER = 'Meeting:index#muteAudio -->';
-
     // First, stop sending the local audio media
     return logRequest(
       this.audio
@@ -3515,9 +3513,7 @@ export default class Meeting extends StatelessWebexPlugin {
           throw error;
         }),
       {
-        header: `${LOG_HEADER} muting audio`,
-        success: `${LOG_HEADER} muted audio successfully`,
-        failure: `${LOG_HEADER} muting audio failed, `,
+        logText: `Meeting:index#muteAudio --> correlationId=${this.correlationId} muting audio`,
       }
     );
   }
@@ -3543,8 +3539,6 @@ export default class Meeting extends StatelessWebexPlugin {
       return Promise.reject(new ParameterError('no audio control associated to the meeting'));
     }
 
-    const LOG_HEADER = 'Meeting:index#unmuteAudio -->';
-
     // First, send the control to unmute the participant on the server
     return logRequest(
       this.audio
@@ -3568,9 +3562,7 @@ export default class Meeting extends StatelessWebexPlugin {
           throw error;
         }),
       {
-        header: `${LOG_HEADER} unmuting audio`,
-        success: `${LOG_HEADER} unmuted audio successfully`,
-        failure: `${LOG_HEADER} unmuting audio failed, `,
+        logText: `Meeting:index#unmuteAudio --> correlationId=${this.correlationId} unmuting audio`,
       }
     );
   }
@@ -3596,8 +3588,6 @@ export default class Meeting extends StatelessWebexPlugin {
       return Promise.reject(new ParameterError('no video control associated to the meeting'));
     }
 
-    const LOG_HEADER = 'Meeting:index#muteVideo -->';
-
     return logRequest(
       this.video
         .handleClientRequest(this, true)
@@ -3620,9 +3610,7 @@ export default class Meeting extends StatelessWebexPlugin {
           throw error;
         }),
       {
-        header: `${LOG_HEADER} muting video`,
-        success: `${LOG_HEADER} muted video successfully`,
-        failure: `${LOG_HEADER} muting video failed, `,
+        logText: `Meeting:index#muteVideo --> correlationId=${this.correlationId} muting video`,
       }
     );
   }
@@ -3648,8 +3636,6 @@ export default class Meeting extends StatelessWebexPlugin {
       return Promise.reject(new ParameterError('no audio control associated to the meeting'));
     }
 
-    const LOG_HEADER = 'Meeting:index#unmuteVideo -->';
-
     return logRequest(
       this.video
         .handleClientRequest(this, false)
@@ -3672,9 +3658,7 @@ export default class Meeting extends StatelessWebexPlugin {
           throw error;
         }),
       {
-        header: `${LOG_HEADER} unmuting video`,
-        success: `${LOG_HEADER} unmuted video successfully`,
-        failure: `${LOG_HEADER} unmuting video failed, `,
+        logText: `Meeting:index#unmuteVideo --> correlationId=${this.correlationId} unmuting video`,
       }
     );
   }
@@ -4799,7 +4783,7 @@ export default class Meeting extends StatelessWebexPlugin {
     this.mediaProperties.webrtcMediaConnection.on(Event.ROAP_FAILURE, this.handleRoapFailure);
 
     this.mediaProperties.webrtcMediaConnection.on(Event.ROAP_MESSAGE_TO_SEND, (event) => {
-      const LOG_HEADER = 'Meeting:index#setupMediaConnectionListeners.ROAP_MESSAGE_TO_SEND -->';
+      const LOG_HEADER = `Meeting:index#setupMediaConnectionListeners.ROAP_MESSAGE_TO_SEND --> correlationId=${this.correlationId}`;
 
       switch (event.roapMessage.messageType) {
         case 'OK':
@@ -4815,9 +4799,7 @@ export default class Meeting extends StatelessWebexPlugin {
               correlationId: this.correlationId,
             }),
             {
-              header: `${LOG_HEADER} Send Roap OK`,
-              success: `${LOG_HEADER} Successfully send roap OK`,
-              failure: `${LOG_HEADER} Error joining the call on send roap OK, `,
+              logText: `${LOG_HEADER} Roap OK`,
             }
           );
           break;
@@ -4837,9 +4819,7 @@ export default class Meeting extends StatelessWebexPlugin {
               reconnect: this.reconnectionManager.isReconnectInProgress(),
             }),
             {
-              header: `${LOG_HEADER} Send Roap Offer`,
-              success: `${LOG_HEADER} Successfully send roap offer`,
-              failure: `${LOG_HEADER} Error joining the call on send roap offer, `,
+              logText: `${LOG_HEADER} Roap Offer`,
             }
           );
           break;
@@ -4858,9 +4838,7 @@ export default class Meeting extends StatelessWebexPlugin {
               correlationId: this.correlationId,
             }),
             {
-              header: `${LOG_HEADER} Send Roap Answer.`,
-              success: `${LOG_HEADER} Successfully send roap answer`,
-              failure: `${LOG_HEADER} Error joining the call on send roap answer, `,
+              logText: `${LOG_HEADER} Roap Answer`,
             }
           ).catch((error) => {
             const metricName = BEHAVIORAL_METRICS.ROAP_ANSWER_FAILURE;
@@ -4897,9 +4875,7 @@ export default class Meeting extends StatelessWebexPlugin {
               correlationId: this.correlationId,
             }),
             {
-              header: `${LOG_HEADER} Send Roap Error.`,
-              success: `${LOG_HEADER} Successfully send roap error`,
-              failure: `${LOG_HEADER} Failed to send roap error, `,
+              logText: `${LOG_HEADER} Roap Error (${event.roapMessage.errorType})`,
             }
           );
           break;
@@ -4993,7 +4969,7 @@ export default class Meeting extends StatelessWebexPlugin {
       };
 
       LoggerProxy.logger.info(
-        `Meeting:index#setupMediaConnectionListeners --> connection state changed to ${event.state}`
+        `Meeting:index#setupMediaConnectionListeners --> correlationId=${this.correlationId} connection state changed to ${event.state}`
       );
       switch (event.state) {
         case ConnectionState.Connecting: