Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: cannot unmute web client in moderated unmute mode when unmuteAllowed is false #3992

Merged
merged 1 commit into from
Nov 20, 2024

Conversation

marcin-bazyl
Copy link
Collaborator

@marcin-bazyl marcin-bazyl commented Nov 19, 2024

COMPLETES #SPARK-480563

This pull request addresses

When user is not allowed to unmute himself/herself, then when we receive unmute required from Locus and SDK calls setUserMuted(false), it fails because of the unmuteAllowed check.

by making the following changes

When Locus sends unmute required, they also send unmuteAllowed=true in the same update, so we need to make sure we process it and update unmuteAllowed when we handle unmute required in handleServerLocalUnmuteRequired()

Change Type

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Documentation update
  • Tooling change
  • Internal code refactor

The following scenarios where tested

unit tests, manual test with web app

I certified that

  • I have read and followed contributing guidelines

  • I discussed changes with code owners prior to submitting this pull request

  • I have not skipped any automated checks

  • All existing and new tests passed

  • I have updated the documentation accordingly


Make sure to have followed the contributing guidelines before submitting.

Summary by CodeRabbit

  • New Features

    • Enhanced handling of unmute requests, allowing users to be informed if they are permitted to unmute themselves during meetings.
    • New event handler for LOCAL_UNMUTE_REQUIRED event that triggers appropriate actions based on user permissions.
  • Bug Fixes

    • Improved logic for managing audio and video mute states in response to server commands.
  • Tests

    • Added tests to verify the correct behavior of the new unmute event handler and ensure the mute state reflects user permissions accurately.

@marcin-bazyl marcin-bazyl requested review from a team as code owners November 19, 2024 20:22
@marcin-bazyl marcin-bazyl added the validated If the pull request is validated for automation. label Nov 19, 2024
Copy link

coderabbitai bot commented Nov 19, 2024

Walkthrough

The changes in this pull request involve modifications to the Meeting and MuteState classes within the @webex/plugin-meetings package. Specifically, the handleServerLocalUnmuteRequired method in both classes has been updated to accept an additional parameter, unmuteAllowed, which indicates whether the user is permitted to unmute themselves. This enhancement improves the handling of mute and unmute events, ensuring that the system accurately reflects user permissions. Additionally, new event handling and tests have been introduced to verify functionality.

Changes

File Change Summary
packages/@webex/plugin-meetings/src/meeting/index.ts Updated handleServerLocalUnmuteRequired method to accept payload.unmuteAllowed.
packages/@webex/plugin-meetings/src/meeting/muteState.ts Modified handleServerLocalUnmuteRequired method to include unmuteAllowed: boolean. Adjusted logging and state management.
packages/@webex/plugin-meetings/test/unit/spec/meeting/index.js Added event handler for LOCAL_UNMUTE_REQUIRED event and tests for new functionality.
packages/@webex/plugin-meetings/test/unit/spec/meeting/muteState.js Updated handleServerLocalUnmuteRequired method for audio and video states. Expanded test assertions for unmuteAllowed.

Possibly related PRs

  • fix: more logs for publishing/unpublishing streams and sharing #3979: This PR modifies the Meeting class in the same package and file as the main PR, enhancing logging for the handleShareAudioStreamEnded and handleShareVideoStreamEnded methods, which are related to the overall handling of audio streams, similar to the changes made for the handleServerLocalUnmuteRequired method in the main PR.

Suggested labels

validated

Suggested reviewers

  • edvujic
  • antsukanova
  • chrisadubois

Poem

In the meadow where we play,
Unmute whispers, come what may.
With permissions clear and bright,
We hop and dance in pure delight!
A little change, a joyful tune,
Let’s celebrate beneath the moon! 🐇✨

Warning

There were issues while running some tools. Please review the errors and either fix the tool’s configuration or disable the tool if it’s a critical failure.

🔧 eslint

If the error stems from missing dependencies, add them to the package.json file. For unrecoverable errors (e.g., due to private dependencies), disable the tool in the CodeRabbit configuration.

warning eslint@8.57.1: This version is no longer supported. Please see https://eslint.org/version-support for other options.
warning eslint > @humanwhocodes/config-array@0.13.0: Use @eslint/config-array instead
warning eslint > file-entry-cache > flat-cache > rimraf@3.0.2: Rimraf versions prior to v4 are no longer supported
warning eslint > @humanwhocodes/config-array > @humanwhocodes/object-schema@2.0.3: Use @eslint/object-schema instead
warning eslint > file-entry-cache > flat-cache > rimraf > glob@7.2.3: Glob versions prior to v9 are no longer supported
warning eslint > file-entry-cache > flat-cache > rimraf > glob > inflight@1.0.6: This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.
warning eslint-import-resolver-typescript > glob@7.2.3: Glob versions prior to v9 are no longer supported
warning glob@7.2.3: Glob versions prior to v9 are no longer supported
warning intern > glob@7.1.7: Glob versions prior to v9 are no longer supported
warning intern > glob > inflight@1.0.6: This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.
warning jasmine > glob@7.2.3: Glob versions prior to v9 are no longer supported
warning jest > @jest/core > jest-config > glob@7.2.3: Glob versions prior to v9 are no longer supported
warning jest > @jest/core > jest-runtime > glob@7.2.3: Glob versions prior to v9 are no longer supported
warning jest > @jest/core > @jest/reporters > glob@7.2.3: Glob versions prior to v9 are no longer supported
warning jest > @jest/core > @jest/transform > babel-plugin-istanbul > test-exclude > glob@7.2.3: Glob versions prior to v9 are no longer supported
warning mocha > glob@7.2.0: Glob versions prior to v9 are no longer supported
warning mocha > glob > inflight@1.0.6: This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.
warning sinon@9.2.4: 16.1.1
warning wd > q@1.5.1: You or someone you depend on is using Q, the JavaScript Promise library that gave JavaScript developers strong feelings about promises. They can almost certainly migrate to the native JavaScript promise now. Thank you literally everyone for joining me in this bet against the odds. Be excellent to each other.

(For a CapTP with native promises, see @endo/eventual-send and @endo/captp)
warning wd > request@2.88.0: request has been deprecated, see request/request#3142
warning wd > archiver > glob@7.2.3: Glob versions prior to v9 are no longer supported
warning wd > request > uuid@3.4.0: Please upgrade to version 7 or higher. Older versions may use Math.random() in certain circumstances, which is known to be problematic. See https://v8.dev/blog/math-random for details.
warning wd > request > har-validator@5.1.5: this library is no longer supported
warning wd > archiver > archiver-utils > glob@7.2.3: Glob versions prior to v9 are no longer supported
warning @babel/cli > glob@7.2.3: Glob versions prior to v9 are no longer supported
warning @babel/plugin-proposal-async-generator-functions@7.20.7: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-async-generator-functions instead.
warning @babel/plugin-proposal-class-properties@7.18.6: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-class-properties instead.
warning @babel/plugin-proposal-export-namespace-from@7.18.9: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-export-namespace-from instead.
warning @babel/plugin-proposal-nullish-coalescing-operator@7.18.6: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-nullish-coalescing-operator instead.
warning @babel/plugin-proposal-object-rest-spread@7.20.7: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-object-rest-spread instead.
warning @babel/plugin-proposal-optional-chaining@7.21.0: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-optional-chaining instead.
warning @babel/polyfill@7.12.1: 🚨 This package has been deprecated in favor of separate inclusion of a polyfill and regenerator-runtime (when needed). See the @babel/polyfill docs (https://babeljs.io/docs/en/babel-polyfill) for more information.
warning @babel/polyfill > core-js@2.6.12: core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.
warning @babel/runtime-corejs2 > core-js@2.6.12: core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.
warning babel-plugin-lodash > glob@7.2.3: Glob versions prior to v9 are no longer supported
warning workspace-aggregator-68d695f7-5f1e-4e48-8e1a-c9210081c991 > eslint@8.57.1: This version is no longer supported. Please see https://eslint.org/version-support for other options.
warning workspace-aggregator-68d695f7-5f1e-4e48-8e1a-c9210081c991 > glob@7.2.3: Glob versions prior to v9 are no longer supported
warning workspace-aggregator-68d695f7-5f1e-4e48-8e1a-c9210081c991 > sinon@9.2.4: 16.1.1
warning workspace-aggregator-68d695f7-5f1e-4e48-8e1a-c9210081c991 > @babel/plugin-proposal-async-generator-functions@7.20.7: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-async-generator-functions instead.
warning workspace-aggregator-68d695f7-5f1e-4e48-8e1a-c9210081c991 > @babel/plugin-proposal-class-properties@7.18.6: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-class-properties instead.
warning workspace-aggregator-68d695f7-5f1e-4e48-8e1a-c9210081c991 > @babel/plugin-proposal-export-namespace-from@7.18.9: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-export-namespace-from instead.
warning workspace-aggregator-68d695f7-5f1e-4e48-8e1a-c9210081c991 > @babel/plugin-proposal-nullish-coalescing-operator@7.18.6: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-nullish-coalescing-operator instead.
warning workspace-aggregator-68d695f7-5f1e-4e48-8e1a-c9210081c991 > @babel/plugin-proposal-object-rest-spread@7.20.7: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-object-rest-spread instead.
warning workspace-aggregator-68d695f7-5f1e-4e48-8e1a-c9210081c991 > @babel/plugin-proposal-optional-chaining@7.21.0: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-optional-chaining instead.
warning workspace-aggregator-68d695f7-5f1e-4e48-8e1a-c9210081c991 > @babel/polyfill@7.12.1: 🚨 This package has been deprecated in favor of separate inclusion of a polyfill and regenerator-runtime (when needed). See the @babel/polyfill docs (https://babeljs.io/docs/en/babel-polyfill) for more information.
error eslint-plugin-jsdoc@40.3.0: The engine "node" is incompatible with this module. Expected version "^14 || ^16 || ^17 || ^18 || ^19". Got "22.9.0"
error Found incompatible module.


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 0

🧹 Outside diff range and nitpick comments (2)
packages/@webex/plugin-meetings/src/meeting/muteState.ts (1)

413-415: Consider adding parameter validation and handling race conditions

While the state updates are logically correct, consider these improvements:

  1. Add validation for the unmuteAllowed parameter at the start of the method
  2. Consider potential race conditions with concurrent state updates

Add parameter validation at the start of the method:

 public handleServerLocalUnmuteRequired(meeting: any, unmuteAllowed: boolean) {
+  if (typeof unmuteAllowed !== 'boolean') {
+    throw new ParameterError('unmuteAllowed must be a boolean');
+  }
+
   if (!this.state.client.enabled) {
     // ... rest of the method
packages/@webex/plugin-meetings/test/unit/spec/meeting/index.js (1)

12205-12232: Consider adding error case test coverage

While the happy path is well tested, consider adding test cases for error scenarios:

  • What happens if audio is not initialized?
  • What happens if the handler throws an error?
it('handles errors when audio is not initialized', async () => {
  meeting.audio = null;
  await meeting.locusInfo.emitScoped(
    {},
    LOCUSINFO.EVENTS.LOCAL_UNMUTE_REQUIRED,
    {unmuteAllowed: true}
  );
  // Add assertions
});

it('handles errors from handleServerLocalUnmuteRequired', async () => {
  meeting.audio = {
    handleServerLocalUnmuteRequired: sinon.stub().throws(new Error('test error'))
  };
  await meeting.locusInfo.emitScoped(
    {},
    LOCUSINFO.EVENTS.LOCAL_UNMUTE_REQUIRED,
    {unmuteAllowed: true}
  );
  // Add assertions
});
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between d5445fe and b4671d6.

📒 Files selected for processing (4)
  • packages/@webex/plugin-meetings/src/meeting/index.ts (1 hunks)
  • packages/@webex/plugin-meetings/src/meeting/muteState.ts (1 hunks)
  • packages/@webex/plugin-meetings/test/unit/spec/meeting/index.js (1 hunks)
  • packages/@webex/plugin-meetings/test/unit/spec/meeting/muteState.js (6 hunks)
🔇 Additional comments (10)
packages/@webex/plugin-meetings/src/meeting/muteState.ts (3)

397-397: LGTM: Method signature update aligns with PR objective

The addition of the required unmuteAllowed parameter correctly implements the fix for handling unmute requests in moderated mode.

Also applies to: 400-400


407-407: LGTM: Enhanced logging improves debuggability

The updated log message now includes the unmuteAllowed state, which will help with troubleshooting moderated unmute issues.


Line range hint 400-424: Verify security implications of unmute state changes

Let's ensure this change doesn't inadvertently bypass moderation controls or create race conditions in state transitions.

packages/@webex/plugin-meetings/test/unit/spec/meeting/muteState.js (5)

Line range hint 154-165: LGTM! Comprehensive test coverage for audio unmute.

The test case thoroughly verifies that:

  • The local stream is unmuted when handleServerLocalUnmuteRequired is called
  • The unmuteAllowed flag is properly set
  • The unmute operation is propagated to the server

189-190: LGTM! Proper handling of system mute state.

The test case correctly verifies that the unmute operation respects system mute state, preventing server updates when system is muted.


Line range hint 220-231: LGTM! Comprehensive test coverage for video unmute.

The test case thoroughly verifies that:

  • The local stream is unmuted when handleServerLocalUnmuteRequired is called
  • The unmuteAllowed flag is properly set
  • The unmute operation is propagated to the server

255-255: LGTM! Proper handling of system mute state for video.

The test case correctly verifies that the video unmute operation respects system mute state, preventing server updates when system is muted.


Line range hint 1-700: Verify edge cases for unmute operations.

While the test coverage is comprehensive for the happy path and system mute scenarios, consider adding test cases for:

  1. Network failures during unmute
  2. Race conditions between multiple unmute requests
  3. Edge cases where unmuteAllowed is toggled rapidly
packages/@webex/plugin-meetings/src/meeting/index.ts (1)

Line range hint 3107-3116: LGTM! Bug fix for unmute handling

The changes correctly propagate the unmuteAllowed flag from the payload to the audio handler's handleServerLocalUnmuteRequired method. This fixes the issue where users couldn't unmute in moderated unmute mode when unmuteAllowed is false.

packages/@webex/plugin-meetings/test/unit/spec/meeting/index.js (1)

12203-12239: LGTM! Well structured test cases for LOCAL_UNMUTE_REQUIRED event handling

The test implementation follows good practices:

  • Tests both true/false cases for unmuteAllowed parameter
  • Properly verifies event payload structure and handler calls
  • Uses clean test setup with proper stubs and assertions

Copy link

This pull request is automatically being deployed by Amplify Hosting (learn more).

Access this pull request here: https://pr-3992.d3m3l2kee0btzx.amplifyapp.com

Copy link
Contributor

@chburket chburket left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

code looks good, I did not test locally

@marcin-bazyl
Copy link
Collaborator Author

when testing, be aware that there is a separate issue related to moderated unmute mode: https://jira-eng-gpk2.cisco.com/jira/browse/SPARK-583170 which will be fixed in a separate PR

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
validated If the pull request is validated for automation.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants