325887e325
This is a rework of the audio join procedure whithout the explict listen only separation in mind. It's supposed to be used in conjunction with the transparent listen only feature so that the distinction between modes is seamless with minimal server-side impact. An abridged list of changes: - Let the user pick no input device when joining microphone while allowing them to set an input device on the fly later on - Give the user the option to join audio with no input device whenever we fail to obtain input devices, with the option to try re-enabling them on the fly later on - Add the option to open the audio settings modal (echo test et al) via the in-call device selection chevron - Rework the SFU audio bridge and its services to support adding/removing tracks on the fly without renegotiation - Rework the SFU audio bridge and its services to support a new peer role called "passive-sendrecv". That role is used by dupled peers that have no active input source on start, but might have one later on. - Remove stale PermissionsOverlay component from the audio modal - Rework how permission errors are detected using the Permissions API - Rework the local echo test so that it uses a separate media tag rather than the remote - Add new, separate dialplans that mute/hold FreeSWITCH channels on hold based on UA strings. This is orchestrated server-side via webrtc-sfu and akka-apps. The basic difference here is that channels now join in their desired state rather than waiting for client side observers to sync the state up. It also mitigates transparent listen only performance edge cases on multiple audio channels joining at the same time. The old, decoupled listen only mode is still present in code while we validate this new approach. To test this, transparentListenOnly must be enabled and listen only mode must be disable on audio join so that the user skips straight through microphone join.
163 lines
7.1 KiB
JavaScript
Executable File
163 lines
7.1 KiB
JavaScript
Executable File
import React, { useCallback } from 'react';
|
|
import { useReactiveVar } from '@apollo/client';
|
|
import browserInfo from '/imports/utils/browserInfo';
|
|
import getFromUserSettings from '/imports/ui/services/users-settings';
|
|
import AudioModal from './component';
|
|
import AudioError from '/imports/ui/services/audio-manager/error-codes';
|
|
import AppService from '/imports/ui/components/app/service';
|
|
import {
|
|
joinMicrophone,
|
|
closeModal,
|
|
joinListenOnly,
|
|
leaveEchoTest,
|
|
} from './service';
|
|
import Service from '../service';
|
|
import AudioModalService from '/imports/ui/components/audio/audio-modal/service';
|
|
import useCurrentUser from '/imports/ui/core/hooks/useCurrentUser';
|
|
import AudioManager from '/imports/ui/services/audio-manager';
|
|
import { useStorageKey } from '/imports/ui/services/storage/hooks';
|
|
import useMeeting from '/imports/ui/core/hooks/useMeeting';
|
|
import useLockContext from '/imports/ui/components/lock-viewers/hooks/useLockContext';
|
|
import deviceInfo from '/imports/utils/deviceInfo';
|
|
|
|
const invalidDialNumbers = ['0', '613-555-1212', '613-555-1234', '0000'];
|
|
|
|
const AudioModalContainer = (props) => {
|
|
const { data: meeting } = useMeeting((m) => ({
|
|
voiceSettings: m.voiceSettings,
|
|
}));
|
|
const { data: currentUserData } = useCurrentUser((user) => ({
|
|
away: user.away,
|
|
isModerator: user.isModerator,
|
|
}));
|
|
const getEchoTest = useStorageKey('getEchoTest', 'session');
|
|
|
|
const away = currentUserData?.away;
|
|
const isModerator = currentUserData?.isModerator;
|
|
|
|
const isRTL = document.documentElement.getAttribute('dir') === 'rtl';
|
|
const APP_CONFIG = window.meetingClientSettings.public.app;
|
|
const forceListenOnly = getFromUserSettings('bbb_force_listen_only', APP_CONFIG.forceListenOnly);
|
|
const listenOnlyMode = getFromUserSettings('bbb_listen_only_mode', APP_CONFIG.listenOnlyMode);
|
|
const skipCheck = getFromUserSettings('bbb_skip_check_audio', APP_CONFIG.skipCheck);
|
|
const skipCheckOnJoin = getFromUserSettings('bbb_skip_check_audio_on_first_join', APP_CONFIG.skipCheckOnJoin);
|
|
// Mobile users have significant trouble figuring out correct audio I/O devices
|
|
// according to feedbacks. The potential absence of echo test after having set
|
|
// an initial device in the first join cycle might complicate things even further
|
|
// if they got it wrong. Hence, we ignore the flag for mobile users.
|
|
const skipEchoTestIfPreviousDevice = getFromUserSettings(
|
|
'bbb_skip_echotest_if_previous_device',
|
|
APP_CONFIG.skipEchoTestIfPreviousDevice,
|
|
) && !deviceInfo.isMobile;
|
|
const autoJoin = getFromUserSettings('bbb_auto_join_audio', APP_CONFIG.autoJoin);
|
|
|
|
let formattedDialNum = '';
|
|
let formattedTelVoice = '';
|
|
let combinedDialInNum = '';
|
|
if (meeting && meeting.voiceSettings) {
|
|
const { dialNumber, telVoice } = meeting.voiceSettings;
|
|
if (invalidDialNumbers.indexOf(dialNumber) < 0) {
|
|
formattedDialNum = dialNumber;
|
|
formattedTelVoice = telVoice;
|
|
combinedDialInNum = `${dialNumber.replace(/\D+/g, '')},,,${telVoice.replace(/\D+/g, '')}`;
|
|
}
|
|
}
|
|
const { isIe } = browserInfo;
|
|
|
|
const SHOW_VOLUME_METER = window.meetingClientSettings.public.media.showVolumeMeter;
|
|
|
|
const {
|
|
enabled: LOCAL_ECHO_TEST_ENABLED,
|
|
} = window.meetingClientSettings.public.media.localEchoTest;
|
|
|
|
const forceListenOnlyAttendee = forceListenOnly && !isModerator;
|
|
const inputDeviceId = useReactiveVar(AudioManager._inputDeviceId.value);
|
|
const outputDeviceId = useReactiveVar(AudioManager._outputDeviceId.value);
|
|
const showPermissionsOvelay = useReactiveVar(AudioManager._isWaitingPermissions.value);
|
|
const isUsingAudio = Service.useIsUsingAudio();
|
|
const isConnecting = useReactiveVar(AudioManager._isConnecting.value);
|
|
const isConnected = useReactiveVar(AudioManager._isConnected.value);
|
|
const isListenOnly = useReactiveVar(AudioManager._isListenOnly.value);
|
|
const isEchoTest = useReactiveVar(AudioManager._isEchoTest.value);
|
|
const autoplayBlocked = useReactiveVar(AudioManager._autoplayBlocked.value);
|
|
const isMuted = useReactiveVar(AudioManager._isMuted.value);
|
|
const meetingIsBreakout = AppService.useMeetingIsBreakout();
|
|
const supportsTransparentListenOnly = useReactiveVar(
|
|
AudioManager._transparentListenOnlySupported.value,
|
|
);
|
|
const permissionStatus = useReactiveVar(AudioManager._permissionStatus.value);
|
|
const { userLocks } = useLockContext();
|
|
const isListenOnlyInputDevice = Service.inputDeviceId() === 'listen-only';
|
|
const devicesAlreadyConfigured = skipEchoTestIfPreviousDevice
|
|
&& Service.inputDeviceId();
|
|
const joinFullAudioImmediately = !isListenOnlyInputDevice
|
|
&& (skipCheck || (skipCheckOnJoin && !getEchoTest) || devicesAlreadyConfigured);
|
|
const { setIsOpen } = props;
|
|
const close = useCallback(() => closeModal(() => setIsOpen(false)), [setIsOpen]);
|
|
const joinMic = useCallback(
|
|
(options = {}) => joinMicrophone({
|
|
skipEchoTest: options.skipEchoTest || joinFullAudioImmediately,
|
|
}),
|
|
[skipCheck, skipCheckOnJoin],
|
|
);
|
|
|
|
return (
|
|
<AudioModal
|
|
away={away}
|
|
forceListenOnlyAttendee={forceListenOnlyAttendee}
|
|
inputDeviceId={inputDeviceId}
|
|
outputDeviceId={outputDeviceId}
|
|
showPermissionsOvelay={showPermissionsOvelay}
|
|
isUsingAudio={isUsingAudio}
|
|
isConnecting={isConnecting}
|
|
isConnected={isConnected}
|
|
isListenOnly={isListenOnly}
|
|
isEchoTest={isEchoTest}
|
|
isMuted={isMuted}
|
|
toggleMuteMicrophoneSystem={Service.toggleMuteMicrophoneSystem}
|
|
autoplayBlocked={autoplayBlocked}
|
|
getEchoTest={getEchoTest}
|
|
joinFullAudioImmediately={joinFullAudioImmediately}
|
|
meetingIsBreakout={meetingIsBreakout}
|
|
closeModal={close}
|
|
joinMicrophone={joinMic}
|
|
joinListenOnly={joinListenOnly}
|
|
leaveEchoTest={leaveEchoTest}
|
|
changeInputDevice={Service.changeInputDevice}
|
|
liveChangeInputDevice={Service.liveChangeInputDevice}
|
|
changeInputStream={Service.changeInputStream}
|
|
changeOutputDevice={Service.changeOutputDevice}
|
|
joinEchoTest={Service.joinEchoTest}
|
|
exitAudio={Service.exitAudio}
|
|
showVolumeMeter={SHOW_VOLUME_METER}
|
|
localEchoEnabled={LOCAL_ECHO_TEST_ENABLED}
|
|
listenOnlyMode={listenOnlyMode}
|
|
formattedDialNum={formattedDialNum}
|
|
formattedTelVoice={formattedTelVoice}
|
|
combinedDialInNum={combinedDialInNum}
|
|
audioLocked={userLocks.userMic}
|
|
autoJoin={autoJoin}
|
|
skipCheck={skipCheck}
|
|
skipCheckOnJoin={skipCheckOnJoin}
|
|
isMobileNative={navigator.userAgent.toLowerCase().includes('bbbnative')}
|
|
isIE={isIe}
|
|
handleAllowAutoplay={Service.handleAllowAutoplay}
|
|
notify={Service.notify}
|
|
isRTL={isRTL}
|
|
AudioError={AudioError}
|
|
getTroubleshootingLink={AudioModalService.getTroubleshootingLink}
|
|
getMicrophonePermissionStatus={Service.getMicrophonePermissionStatus}
|
|
getAudioConstraints={Service.getAudioConstraints}
|
|
doGUM={Service.doGUM}
|
|
bypassGUM={Service.bypassGUM}
|
|
supportsTransparentListenOnly={supportsTransparentListenOnly}
|
|
setIsOpen={setIsOpen}
|
|
hasMicrophonePermission={Service.hasMicrophonePermission}
|
|
permissionStatus={permissionStatus}
|
|
{...props}
|
|
/>
|
|
);
|
|
};
|
|
|
|
export default AudioModalContainer;
|