improve behavior

This commit is contained in:
Jose B
2023-08-22 17:25:34 -05:00
parent 7b7d87c06d
commit 0243d83533
2 changed files with 47 additions and 7 deletions

View File

@@ -30,6 +30,7 @@ const App = () => {
const { const {
loading, loading,
permissionOk, permissionOk,
permissionDenied,
audioDevices, audioDevices,
requestPermission, requestPermission,
getAudioStream, getAudioStream,
@@ -71,13 +72,16 @@ const App = () => {
<p className="text-gray-500 text-center mt-5"> <p className="text-gray-500 text-center mt-5">
Reflector needs access to your microphone to work. Reflector needs access to your microphone to work.
<br /> <br />
Please grant permission to continue. {permissionDenied
? "Please reset microphone permissions to continue."
: "Please grant permission to continue."}
</p> </p>
<button <button
className="mt-4 bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded m-auto" className="mt-4 bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded m-auto"
onClick={requestPermission} onClick={requestPermission}
disabled={permissionDenied}
> >
Grant Permission {permissionDenied ? "Access denied" : "Grant Permission"}
</button> </button>
</> </>
)} )}

View File

@@ -1,22 +1,57 @@
import { useState } from "react"; import { useEffect, useState } from "react";
import { Option } from "react-dropdown"; import { Option } from "react-dropdown";
const MIC_QUERY = { name: "microphone" as PermissionName };
const useAudioDevice = () => { const useAudioDevice = () => {
const [permissionOk, setPermissionOk] = useState(false); const [permissionOk, setPermissionOk] = useState<boolean>(false);
const [permissionDenied, setPermissionDenied] = useState<boolean>(false);
const [audioDevices, setAudioDevices] = useState<Option[]>([]); const [audioDevices, setAudioDevices] = useState<Option[]>([]);
const [loading, setLoading] = useState(true); const [loading, setLoading] = useState(true);
useEffect(() => {
checkPermission();
}, []);
useEffect(() => {
if (permissionOk) {
updateDevices();
}
}, [permissionOk]);
const checkPermission = (): void => {
navigator.permissions
.query(MIC_QUERY)
.then((permissionStatus) => {
setPermissionOk(permissionStatus.state === "granted");
setPermissionDenied(permissionStatus.state === "denied");
permissionStatus.onchange = () => {
setPermissionOk(permissionStatus.state === "granted");
setPermissionDenied(permissionStatus.state === "denied");
};
})
.catch(() => {
setPermissionOk(false);
setPermissionDenied(false);
})
.finally(() => {
setLoading(false);
});
};
const requestPermission = () => { const requestPermission = () => {
navigator.mediaDevices navigator.mediaDevices
.getUserMedia({ .getUserMedia({
audio: true, audio: true,
}) })
.then(() => { .then((stream) => {
if (!navigator.userAgent.includes("Firefox"))
stream.getTracks().forEach((track) => track.stop());
setPermissionOk(true); setPermissionOk(true);
updateDevices();
}) })
.catch(() => { .catch(() => {
setPermissionDenied(true);
setPermissionOk(false); setPermissionOk(false);
}) })
.finally(() => { .finally(() => {
@@ -56,11 +91,12 @@ const useAudioDevice = () => {
}; };
return { return {
loading,
permissionOk, permissionOk,
permissionDenied,
audioDevices, audioDevices,
getAudioStream, getAudioStream,
requestPermission, requestPermission,
loading,
}; };
}; };