Merge pull request #5250 from oswaldoacauan/fix-4690

Remove getUserMedia in the first join as listen only

bigbluebutton-html5/imports/ui/components/audio/service.js

@@ -36,9 +36,9 @@ export default {
   init,
   exitAudio: () => AudioManager.exitAudio(),
   transferCall: () => AudioManager.transferCall(),
-  joinListenOnly: () => AudioManager.joinAudio({ isListenOnly: true }),
-  joinMicrophone: () => AudioManager.joinAudio(),
-  joinEchoTest: () => AudioManager.joinAudio({ isEchoTest: true }),
+  joinListenOnly: () => AudioManager.joinListenOnly(),
+  joinMicrophone: () => AudioManager.joinMicrophone(),
+  joinEchoTest: () => AudioManager.joinEchoTest(),
   toggleMuteMicrophone: () => AudioManager.toggleMuteMicrophone(),
   changeInputDevice: inputDeviceId => AudioManager.changeInputDevice(inputDeviceId),
   changeOutputDevice: outputDeviceId => AudioManager.changeOutputDevice(outputDeviceId),

bigbluebutton-html5/imports/ui/services/audio-manager/index.js

@@ -64,49 +64,99 @@ class AudioManager {
     });
   }
 
-  joinAudio(options = {}) {
-    const {
-      isListenOnly,
-      isEchoTest,
-    } = options;
-
-    const permissionsTimeout = setTimeout(() => {
-      this.isWaitingPermissions = true;
+  askDevicesPermissions() {
+    // Only change the isWaitingPermissions for the case where the user didnt allowed it yet
+    const permTimeout = setTimeout(() => {
+      if (!this.devicesInitialized) { this.isWaitingPermissions = true; }
     }, 100);
 
-    const doCall = () => {
-      clearTimeout(permissionsTimeout);
-      this.isWaitingPermissions = false;
-      this.devicesInitialized = true;
-      this.isConnecting = true;
-      this.isMuted = false;
-      this.error = null;
-      this.isListenOnly = isListenOnly || false;
-      this.isEchoTest = isEchoTest || false;
-
-      const callOptions = {
-        isListenOnly: this.isListenOnly,
-        extension: isEchoTest ? ECHO_TEST_NUMBER : null,
-        inputStream: this.isListenOnly ? this.createListenOnlyStream() : this.inputStream,
-      };
-      return this.bridge.joinAudio(callOptions, this.callStateCallback.bind(this));
-    };
-
-    if (this.devicesInitialized) return doCall();
+    this.isWaitingPermissions = false;
+    this.devicesInitialized = false;
 
     return Promise.all([
       this.setDefaultInputDevice(),
       this.setDefaultOutputDevice(),
-    ]).then(doCall)
+    ]).then(() => {
+      this.devicesInitialized = true;
+      this.isWaitingPermissions = false;
+    }).catch((err) => {
+      clearTimeout(permTimeout);
+      this.isConnecting = false;
+      this.isWaitingPermissions = false;
+      throw err;
+    });
+  }
+
+  joinMicrophone() {
+    this.isListenOnly = false;
+    this.isEchoTest = false;
+
+    const callOptions = {
+      isListenOnly: false,
+      extension: null,
+      inputStream: this.inputStream,
+    };
+
+    return this.askDevicesPermissions()
+      .then(this.onAudioJoining.bind(this))
+      .then(() => this.bridge.joinAudio(callOptions, this.callStateCallback.bind(this)));
+  }
+
+  joinEchoTest() {
+    this.isListenOnly = false;
+    this.isEchoTest = true;
+
+    const callOptions = {
+      isListenOnly: false,
+      extension: ECHO_TEST_NUMBER,
+      inputStream: this.inputStream,
+    };
+
+    return this.askDevicesPermissions()
+      .then(this.onAudioJoining.bind(this))
+      .then(() => this.bridge.joinAudio(callOptions, this.callStateCallback.bind(this)));
+  }
+
+  joinListenOnly() {
+    this.isListenOnly = true;
+    this.isEchoTest = false;
+
+    const callOptions = {
+      isListenOnly: true,
+      extension: null,
+      inputStream: this.createListenOnlyStream(),
+    };
+
+    // We need this until we upgrade to SIP 9x. See #4690
+    const iceGatheringErr = 'ICE_TIMEOUT';
+    const iceGatheringTimeout = new Promise((resolve, reject) => {
+      setTimeout(reject, 12000, iceGatheringErr);
+    });
+
+    return this.onAudioJoining()
+      .then(() => Promise.race([
+        this.bridge.joinAudio(callOptions, this.callStateCallback.bind(this)),
+        iceGatheringTimeout,
+      ]))
       .catch((err) => {
-        clearTimeout(permissionsTimeout);
-        this.isWaitingPermissions = false;
-        this.error = err;
-        this.notify(err.message);
-        return Promise.reject(err);
+        // If theres a iceGathering timeout we retry to join after asking device permissions
+        if (err === iceGatheringErr && !this.devicesInitialized) {
+          return this.askDevicesPermissions()
+            .then(() => this.joinListenOnly());
+        }
+
+        throw err;
       });
   }
 
+  onAudioJoining() {
+    this.isConnecting = true;
+    this.isMuted = false;
+    this.error = false;
+
+    return Promise.resolve();
+  }
+
   exitAudio() {
     if (!this.isConnected) return Promise.resolve();
 
@@ -128,7 +178,7 @@ class AudioManager {
     this.isConnected = true;
 
     // listen to the VoiceUsers changes and update the flag
-    if(!this.muteHandle) {
+    if (!this.muteHandle) {
       const query = VoiceUsers.find({ intId: Auth.userID });
       this.muteHandle = query.observeChanges({
         changed: (id, fields) => {
@@ -153,11 +203,9 @@ class AudioManager {
     this.isConnecting = false;
     this.isHangingUp = false;
 
-
     if (!this.error && !this.isEchoTest) {
       this.notify(this.messages.info.LEFT_AUDIO);
     }
-    this.isEchoTest = false;
   }
 
   callStateCallback(response) {
@@ -181,7 +229,7 @@ class AudioManager {
         this.onAudioExit();
       } else if (status === FAILED) {
         this.error = error;
-        this.notify(this.messages.error[error]);
+        this.notify(this.messages.error[error], true);
         console.error('Audio Error:', error, bridgeError);
         this.onAudioExit();
       }
@@ -256,10 +304,10 @@ class AudioManager {
     return this._userData;
   }
 
-  notify(message) {
+  notify(message, error = false) {
     notify(
       message,
-      this.error ? 'error' : 'info',
+      error ? 'error' : 'info',
       this.isListenOnly ? 'audio_on' : 'unmute',
     );
   }