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

chore: improve test app sdk logic #4054

Merged
merged 6 commits into from
Jan 20, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
105 changes: 80 additions & 25 deletions docs/samples/browser-plugin-meetings/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,12 @@ let receiveTranscriptionOption;

let audioReceiveSlot;
let videoReceiveSlot;
let isMultistream = false;
let currentActiveSpeakersMemberIds = [];
let isMultistream = false;
let isBrb = false;
// cached state for local microphone and camera muted state
let localMediaMicMuted = undefined;
let localMediaCameraMuted = undefined;
antsukanova marked this conversation as resolved.
Show resolved Hide resolved

const authTypeElm = document.querySelector('#auth-type');
const credentialsFormElm = document.querySelector('#credentials');
Expand Down Expand Up @@ -857,6 +861,7 @@ const loadCameraBtn = document.querySelector('#ts-load-camera');
const toggleVbgBtn = document.querySelector('#ts-enable-VBG');
const loadMicrophoneBtn = document.querySelector('#ts-load-mic');
const toggleBNRBtn = document.querySelector('#ts-enable-BNR');
const startShareBtn = document.querySelector('#ts-start-screenshare');
const publishShareBtn = document.querySelector('#ts-publish-screenshare');
const unpublishShareBtn = document.querySelector('#ts-unpublish-screenshare');
const stopShareBtn = document.querySelector('#ts-stop-screenshare');
Expand All @@ -865,6 +870,8 @@ const stopVideoButton = document.querySelector('#ts-stop-video');
const stopAudioButton = document.querySelector('#ts-stop-audio');
const muteVideoMessage = document.querySelector('#ts-mute-video-message');
const muteAudioMessage = document.querySelector('#ts-mute-audio-message');
const defaultShareMessage = document.querySelector('#ts-default-share-message');
const brbShareMessage = document.querySelector('#ts-brb-share-message');
const modeBtn = document.getElementById('mode-type');

/**
Expand Down Expand Up @@ -1760,6 +1767,11 @@ function handleMuteAudioMessage() {
muteAudioMessage.innerHTML = localMedia.microphoneStream.systemMuted ? "Warning: microphone may be muted by the system" : "";
}

function handleBrbShareMessage(showMessage) {
brbShareMessage.hidden = !showMessage;
defaultShareMessage.hidden = showMessage;
}

function toggleSendAudio() {
console.log('MeetingControls#toggleSendAudio()');

Expand All @@ -1769,7 +1781,10 @@ function toggleSendAudio() {
localMedia.microphoneStream.setUserMuted(newMuteValue);

console.log(`MeetingControls#toggleSendAudio() :: Successfully ${newMuteValue ? 'muted': 'unmuted'} audio!`);
return;

if (isBrb) {
toggleBrb({unmuteAudio: true});
}
}
}

Expand All @@ -1787,7 +1802,9 @@ function toggleSendVideo() {

console.log(`MeetingControls#toggleSendVideo() :: Successfully ${newMuteValue ? 'muted': 'unmuted'} video!`);

return;
if (isBrb) {
toggleBrb({unmuteVideo: true});
}
}
}

Expand Down Expand Up @@ -1881,24 +1898,6 @@ async function unpublishScreenShare() {
}
}

async function stopScreenShare() {
console.log('MeetingControls#stopScreenShare()');
try {
if (localMedia.screenShare.audio) {
localMedia.screenShare.audio?.stop();
}
if (localMedia.screenShare.video) {
localMedia.screenShare.video?.stop();
}

console.log('MeetingControls#stopScreenShare() :: Successfully stopped sharing!');
}
catch (error) {
console.log('MeetingControls#stopScreenShare() :: Error stopping screen share!');
console.error(error);
}
}

function setLocalMeetingQuality() {
const audioVideoInputDevices = getAudioVideoInput();

Expand Down Expand Up @@ -3335,21 +3334,77 @@ function toggleBreakout() {
}
}

async function toggleBrb() {
async function stopScreenShare() {
console.log('MeetingControls#stopScreenShare()');
try {
if (localMedia.screenShare.audio) {
localMedia.screenShare.audio?.stop();
}
if (localMedia.screenShare.video) {
localMedia.screenShare.video?.stop();
}

console.log('MeetingControls#stopScreenShare() :: Successfully stopped sharing!');
}
catch (error) {
console.log('MeetingControls#stopScreenShare() :: Error stopping screen share!');
console.error(error);
}
}

async function toggleBrb({unmuteAudio = false, unmuteVideo = false}) {
const meeting = getCurrentMeeting();

if (meeting) {
const brbButton = document.getElementById('brb-btn');
const enableBrb = brbButton.innerText === 'Step away';

try {
isBrb = enableBrb;

if (enableBrb) {
localMediaCameraMuted = localMedia.cameraStream.userMuted;
localMediaMicMuted = localMedia.microphoneStream.userMuted;

// stop sharing and disable buttons to use it in brb
await stopScreenShare();
publishShareBtn.disabled = true;
unpublishShareBtn.disabled = true;
startShareBtn.disabled = true;
antsukanova marked this conversation as resolved.
Show resolved Hide resolved
handleBrbShareMessage(true);

localMedia.cameraStream.setUserMuted(true);
localMedia.microphoneStream.setUserMuted(true);
} else {
if (unmuteAudio) {
localMedia.microphoneStream.setUserMuted(false);
localMediaCameraMuted = undefined;
localMediaMicMuted = undefined;
}

if (unmuteVideo) {
localMedia.cameraStream.setUserMuted(false);
localMediaCameraMuted = undefined;
localMediaMicMuted = undefined;
}

if (localMediaCameraMuted !== undefined && localMediaMicMuted !== undefined) {
localMedia.cameraStream.setUserMuted(localMediaCameraMuted);
localMedia.microphoneStream.setUserMuted(localMediaMicMuted);
}

// restore user sharing buttons
publishShareBtn.disabled = false;
unpublishShareBtn.disabled = false;
startShareBtn.disabled = false;
handleBrbShareMessage(false);
}

const result = await meeting.beRightBack(enableBrb);

console.log(`meeting.beRightBack(${enableBrb}): success. Result: ${result}`);
} catch (error) {
console.error(`meeting.beRightBack({${enableBrb}): error: `, error);
} finally {
localMedia?.microphoneStream?.setUserMuted(enableBrb);
localMedia?.cameraStream?.setUserMuted(enableBrb);
}
}
}
Expand Down
3 changes: 2 additions & 1 deletion docs/samples/browser-plugin-meetings/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -736,10 +736,11 @@ <h2 class="collapsible">
<form id="streams">
<fieldset>
<legend>Local Screenshare</legend>
<p class="note">
<p class="note" id="ts-default-share-message">
NOTE: Start screenshare without a meeting and join meeting with a screenshare.
If started after joining a meeting then click Publish in meeting also.
</p>
<p class="note" id="ts-brb-share-message" hidden>NOTE: Share is disabled while you have stepped away from the meeting</p>
<div class="screenshare-section">
<div style="display: flex; gap: 1rem;">
<fieldset style="flex: 0.69;">
Expand Down
Loading