Merge remote-tracking branch 'origin/main'

binbat · Nov 19, 2024 · aac5cc4 · aac5cc4
2 parents cae9af7 + e233362
commit aac5cc4
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/.github/CLA.md b/.github/CLA.md
@@ -47,3 +47,4 @@ Example:
 - Hongcha Zhang, @hongcha98, 2024/10/24
 - Winter Zhang, @WinterJack002, 2024/10/26
 - Rocket Aaron, @rocka, 2024/11/06
+- xdzqyyds, @xdzqyyds, 2024/11/19
diff --git a/webapp/components/device.tsx b/webapp/components/device.tsx
@@ -68,8 +68,18 @@ export default function DeviceBar(props: { streamId: string }) {
   const updateDeviceList = async () => {
     // to obtain non-empty device label, there needs to be an active media stream or persistent permission
     // https://developer.mozilla.org/en-US/docs/Web/API/MediaDeviceInfo/label#value
-    await navigator.mediaDevices.getUserMedia({ audio: true, video: true })
-
+    try {
+      await navigator.mediaDevices.getUserMedia({ audio: true, video: true })
+    } catch {
+      try {
+        await navigator.mediaDevices.getUserMedia({ audio: true })
+      } catch { /* empty */ }
+
+      try {
+        await navigator.mediaDevices.getUserMedia({ video: true })
+      } catch { /* empty */ }
+    }
+
     const devices = (await navigator.mediaDevices.enumerateDevices()).filter(i => !!i.deviceId)
 
     const audios = devices.filter(i => i.kind === 'audioinput').map(toDevice)
@@ -97,7 +107,16 @@ export default function DeviceBar(props: { streamId: string }) {
       // - Android Web Browser
       // - Wechat WebView
       await permissionsQuery()
-    } catch { /* empty */ }
+    } catch {
+      try {
+        (await navigator.mediaDevices.getUserMedia({ audio: true })).getTracks().map(track => track.stop())
+        await permissionsQuery()
+      } catch { /* empty */ }
+      try {
+        (await navigator.mediaDevices.getUserMedia({ video: true })).getTracks().map(track => track.stop())
+        await permissionsQuery()
+      } catch { /* empty */ }
+    }
     await updateDeviceList()
   }