www: use a service worker to download the mp3 and add authorization header

This commit is contained in:
2023-11-10 18:24:26 +01:00
committed by Mathieu Virbel
parent c255b41475
commit 1c11b328b3
4 changed files with 70 additions and 54 deletions

View File

@@ -68,7 +68,8 @@ export default function TranscriptDetails(details: TranscriptDetails) {
waveform={waveform?.waveform}
isPastMeeting={true}
transcriptId={transcript?.response?.id}
mp3Blob={mp3.blob}
media={mp3?.media}
mediaDuration={transcript?.response?.duration}
/>
)}
</div>

View File

@@ -29,7 +29,8 @@ type RecorderProps = {
waveform?: AudioWaveform | null;
isPastMeeting: boolean;
transcriptId?: string | null;
mp3Blob?: Blob | null;
media?: HTMLMediaElement | null;
mediaDuration?: number | null;
};
export default function Recorder(props: RecorderProps) {
@@ -103,6 +104,11 @@ export default function Recorder(props: RecorderProps) {
// Waveform setup
useEffect(() => {
if (waveformRef.current) {
// XXX duration is required to prevent recomputing peaks from audio
// However, the current waveform returns only the peaks, and no duration
// And the backend does not save duration properly.
// So at the moment, we deduct the duration from the topics.
// This is not ideal, but it works for now.
const _wavesurfer = WaveSurfer.create({
container: waveformRef.current,
peaks: props.waveform?.data,
@@ -110,6 +116,7 @@ export default function Recorder(props: RecorderProps) {
autoCenter: true,
barWidth: 2,
height: "auto",
duration: props.mediaDuration || 1,
...waveSurferStyles.player,
});
@@ -139,8 +146,8 @@ export default function Recorder(props: RecorderProps) {
if (props.isPastMeeting) _wavesurfer.toggleInteraction(true);
if (props.mp3Blob) {
_wavesurfer.loadBlob(props.mp3Blob);
if (props.media) {
_wavesurfer.setMediaElement(props.media);
}
setWavesurfer(_wavesurfer);
@@ -156,9 +163,9 @@ export default function Recorder(props: RecorderProps) {
useEffect(() => {
if (!wavesurfer) return;
if (!props.mp3Blob) return;
wavesurfer.loadBlob(props.mp3Blob);
}, [props.mp3Blob, wavesurfer]);
if (!props.media) return;
wavesurfer.setMediaElement(props.media);
}, [props.media, wavesurfer]);
useEffect(() => {
topicsRef.current = props.topics;
@@ -282,8 +289,6 @@ export default function Recorder(props: RecorderProps) {
if (!record) return;
if (destinationStream !== null) return console.log("already recording");
console.log("startTabRecording");
// connect mic audio (microphone)
const micStream = await getCurrentStream();
if (!micStream) {

View File

@@ -7,74 +7,59 @@ import { shouldShowError } from "../../lib/errorUtils";
type Mp3Response = {
url: string | null;
blob: Blob | null;
media: HTMLMediaElement | null;
loading: boolean;
error: Error | null;
};
const useMp3 = (protectedPath: boolean, id: string): Mp3Response => {
const [url, setUrl] = useState<string | null>(null);
const [blob, setBlob] = useState<Blob | null>(null);
const [media, setMedia] = useState<HTMLMediaElement | null>(null);
const [loading, setLoading] = useState<boolean>(false);
const [error, setErrorState] = useState<Error | null>(null);
const { setError } = useError();
const api = getApi(protectedPath);
const { api_url } = useContext(DomainContext);
const accessTokenInfo = useFiefAccessTokenInfo();
const [serviceWorkerReady, setServiceWorkerReady] = useState(false);
useEffect(() => {
if ("serviceWorker" in navigator) {
navigator.serviceWorker.register("/service-worker.js").then(() => {
setServiceWorkerReady(true);
});
}
}, []);
useEffect(() => {
if (!navigator.serviceWorker) return;
if (!navigator.serviceWorker.controller) return;
if (!serviceWorkerReady) return;
// Send the token to the service worker
navigator.serviceWorker.controller.postMessage({
type: "SET_AUTH_TOKEN",
token: accessTokenInfo?.access_token,
});
}, [navigator.serviceWorker, serviceWorkerReady, accessTokenInfo]);
const getMp3 = (id: string) => {
if (!id || !api) return;
// createa a audio element and set the source
setLoading(true);
// XXX Current API interface does not output a blob, we need to to is manually
// const requestParameters: V1TranscriptGetAudioMp3Request = {
// transcriptId: id,
// };
// api
// .v1TranscriptGetAudioMp3(requestParameters)
// .then((result) => {
// setUrl(result);
// setLoading(false);
// console.debug("Transcript Mp3 loaded:", result);
// })
// .catch((err) => {
// setError(err);
// setErrorState(err);
// });
const localUrl = `${api_url}/v1/transcripts/${id}/audio/mp3`;
if (localUrl == url) return;
const headers = new Headers();
if (accessTokenInfo) {
headers.set("Authorization", "Bearer " + accessTokenInfo.access_token);
}
fetch(localUrl, {
method: "GET",
headers,
})
.then((response) => {
setUrl(localUrl);
response.blob().then((blob) => {
setBlob(blob);
setLoading(false);
});
})
.catch((err) => {
setErrorState(err);
const shouldShowHuman = shouldShowError(error);
if (shouldShowHuman) {
setError(err, "There was an error loading the audio");
} else {
setError(err);
}
});
const audioElement = document.createElement("audio");
audioElement.src = `${api_url}/v1/transcripts/${id}/audio/mp3`;
audioElement.crossOrigin = "anonymous";
audioElement.preload = "auto";
setMedia(audioElement);
setLoading(false);
};
useEffect(() => {
getMp3(id);
}, [id, api]);
return { url, blob, loading, error };
return { url, media, loading, error };
};
export default useMp3;