@livedigital/client 2.41.0 → 2.41.1

package/package.json

@@ -2,7 +2,7 @@
   "name": "@livedigital/client",
   "author": "vlprojects",
   "license": "MIT",
-  "version": "2.41.0",
+  "version": "2.41.1",
   "private": false,
   "bugs": {
     "url": "https://github.com/vlprojects/livedigital-sdk/issues"

package/src/engine/system/index.ts

@@ -4,6 +4,16 @@ import EnhancedEventEmitter from '../../EnhancedEventEmitter';
 import { AvailableMediaDevices, DeviceErrors } from '../../types/common';
 import Logger from '../Logger';
 
+const isUnexpectedError = (errorMessage: string) => {
+  const errors: string[] = [
+    DeviceErrors.NotFoundError,
+    DeviceErrors.NotAllowedError,
+    DeviceErrors.DeviceIsBusy,
+  ];
+
+  return !errors.includes(errorMessage);
+};
+
 class System {
   public isEnableVideoDevicesLock = false;
 
@@ -113,18 +123,14 @@ class System {
     try {
       tracks = await this.requestMediaDevicesAccess();
     } catch (errorVideoAndAudio) {
-      if (![DeviceErrors.NotFoundError, DeviceErrors.NotAllowedError].includes(errorVideoAndAudio.message)) {
+      if (isUnexpectedError(errorVideoAndAudio.message)) {
         throw errorVideoAndAudio;
       }
 
-      try {
-        tracks = await this.requestMediaDevicesAccess({ audio: true });
-      } catch (errorAudioOnly) {
-        if (![DeviceErrors.NotFoundError, DeviceErrors.NotAllowedError].includes(errorAudioOnly.message)) {
-          throw errorAudioOnly;
-        }
-
-        tracks = await this.requestMediaDevicesAccess({ video: true });
+      /* if device is busy that means we have permissions */
+      if (errorVideoAndAudio.message !== DeviceErrors.DeviceIsBusy) {
+        await this.assertHasAccessToMediaDevices({ audio: true });
+        await this.assertHasAccessToMediaDevices({ video: true });
       }
     }
 
@@ -158,6 +164,19 @@ class System {
   listenDevices(): void {
     navigator.mediaDevices.addEventListener('devicechange', this.deviceChangeHandler);
   }
+
+  private async assertHasAccessToMediaDevices(
+    constraints: MediaStreamConstraints = { video: true, audio: true },
+  ): Promise<void> {
+    try {
+      const tracks = await this.requestMediaDevicesAccess(constraints);
+      tracks.forEach((track) => track.stop());
+    } catch (accessError) {
+      if (isUnexpectedError(accessError.message)) {
+        throw accessError;
+      }
+    }
+  }
 }
 
 export default System;