Refactoring to use Error instead of string in the useError hook state variable

This commit is contained in:
Koper
2023-09-01 12:36:13 +07:00
parent df4dc841fc
commit 41ca80358c
6 changed files with 23 additions and 61 deletions

View File

@@ -2,7 +2,6 @@ import { useEffect, useState } from "react";
import { DefaultApi, V1TranscriptsCreateRequest } from "../api/apis/DefaultApi";
import { GetTranscript } from "../api";
import { useError } from "../(errors)/errorContext";
import handleError from "../(errors)/handleError";
type UseTranscript = {
response: GetTranscript | null;
@@ -37,10 +36,7 @@ const useTranscript = (api: DefaultApi): UseTranscript => {
console.debug("New transcript created:", result);
})
.catch((err) => {
const errorString = err.response || err.message || "Unknown error";
handleError(setError, errorString, err);
setLoading(false);
console.error("Error creating transcript:", errorString);
setError(err);
});
};

View File

@@ -5,7 +5,6 @@ import {
V1TranscriptRecordWebrtcRequest,
} from "../api/apis/DefaultApi";
import { useError } from "../(errors)/errorContext";
import handleError from "../(errors)/handleError";
const useWebRTC = (
stream: MediaStream | null,
@@ -25,16 +24,12 @@ const useWebRTC = (
try {
p = new Peer({ initiator: true, stream: stream });
} catch (error) {
handleError(
setError,
`Failed to create WebRTC Peer: ${error.message}`,
error,
);
setError(error);
return;
}
p.on("error", (err) => {
handleError(setError, `WebRTC error: ${err.message}`, err);
setError(new Error(`WebRTC error: ${err}`));
});
p.on("signal", (data: any) => {
@@ -53,19 +48,11 @@ const useWebRTC = (
try {
p.signal(answer);
} catch (error) {
handleError(
setError,
`Failed to signal answer: ${error.message}`,
error,
);
setError(error);
}
})
.catch((err) => {
const errorString =
"WebRTC signaling error: " +
(err.response || err.message || "Unknown error");
handleError(setError, errorString, err);
console.error(errorString);
.catch((error) => {
setError(error);
});
}
});

View File

@@ -1,7 +1,6 @@
import { useEffect, useState } from "react";
import { Topic, FinalSummary, Status } from "./webSocketTypes";
import { useError } from "../(errors)/errorContext";
import handleError from "../(errors)/handleError";
type UseWebSockets = {
transcriptText: string;
@@ -106,32 +105,25 @@ export const useWebSockets = (transcriptId: string | null): UseWebSockets => {
break;
default:
console.error("Unknown event:", message.event);
handleError(
setError,
`Received unknown WebSocket event: ${message.event}`,
setError(
new Error(`Received unknown WebSocket event: ${message.event}`),
);
}
} catch (error) {
handleError(
setError,
`Failed to process WebSocket message: ${error.message}`,
error,
);
setError(error);
}
};
ws.onerror = (error) => {
console.error("WebSocket error:", error);
handleError(setError, "A WebSocket error occurred.", error);
setError(new Error("A WebSocket error occurred."));
};
ws.onclose = (event) => {
console.debug("WebSocket connection closed");
if (event.code !== 1000) {
handleError(
setError,
`WebSocket closed unexpectedly with code: ${event.code}`,
setError(
new Error(`WebSocket closed unexpectedly with code: ${event.code}`),
);
}
};