mirror of
https://github.com/Monadical-SAS/reflector.git
synced 2025-12-20 20:29:06 +00:00
adds timeout and humanMessage
This commit is contained in:
@@ -3,7 +3,8 @@ import React, { createContext, useContext, useState } from "react";
|
|||||||
|
|
||||||
interface ErrorContextProps {
|
interface ErrorContextProps {
|
||||||
error: Error | null;
|
error: Error | null;
|
||||||
setError: React.Dispatch<React.SetStateAction<Error | null>>;
|
humanMessage?: string;
|
||||||
|
setError: (error: Error, humanMessage?: string) => void;
|
||||||
}
|
}
|
||||||
|
|
||||||
const ErrorContext = createContext<ErrorContextProps | undefined>(undefined);
|
const ErrorContext = createContext<ErrorContextProps | undefined>(undefined);
|
||||||
@@ -22,9 +23,16 @@ interface ErrorProviderProps {
|
|||||||
|
|
||||||
export const ErrorProvider: React.FC<ErrorProviderProps> = ({ children }) => {
|
export const ErrorProvider: React.FC<ErrorProviderProps> = ({ children }) => {
|
||||||
const [error, setError] = useState<Error | null>(null);
|
const [error, setError] = useState<Error | null>(null);
|
||||||
|
const [humanMessage, setHumanMessage] = useState<string | undefined>();
|
||||||
|
|
||||||
|
const declareError = (error, humanMessage?) => {
|
||||||
|
setError(error);
|
||||||
|
setHumanMessage(humanMessage);
|
||||||
|
};
|
||||||
return (
|
return (
|
||||||
<ErrorContext.Provider value={{ error, setError }}>
|
<ErrorContext.Provider
|
||||||
|
value={{ error, setError: declareError, humanMessage }}
|
||||||
|
>
|
||||||
{children}
|
{children}
|
||||||
</ErrorContext.Provider>
|
</ErrorContext.Provider>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -4,29 +4,67 @@ import { useEffect, useState } from "react";
|
|||||||
import * as Sentry from "@sentry/react";
|
import * as Sentry from "@sentry/react";
|
||||||
|
|
||||||
const ErrorMessage: React.FC = () => {
|
const ErrorMessage: React.FC = () => {
|
||||||
const { error, setError } = useError();
|
const { error, setError, humanMessage } = useError();
|
||||||
const [isVisible, setIsVisible] = useState<boolean>(false);
|
const [isVisible, setIsVisible] = useState<boolean>(false);
|
||||||
|
const [timeoutId, setTimeoutId] = useState<NodeJS.Timeout>();
|
||||||
|
|
||||||
|
// Setup Shortcuts
|
||||||
|
useEffect(() => {
|
||||||
|
const handleKeyPress = (event: KeyboardEvent) => {
|
||||||
|
switch (event.key) {
|
||||||
|
case "^":
|
||||||
|
throw new Error("Unhandled Exception thrown by '^' shortcut");
|
||||||
|
case "$":
|
||||||
|
setError(
|
||||||
|
new Error("Unhandled Exception thrown by '$' shortcut"),
|
||||||
|
"You did this to yourself",
|
||||||
|
);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
document.addEventListener("keydown", handleKeyPress);
|
||||||
|
return () => document.removeEventListener("keydown", handleKeyPress);
|
||||||
|
}, []);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (error) {
|
if (error) {
|
||||||
setIsVisible(true);
|
if (humanMessage) {
|
||||||
Sentry.captureException(error);
|
setIsVisible(true);
|
||||||
console.error("Error", error.message, error);
|
Sentry.captureException(Error(humanMessage, { cause: error }));
|
||||||
|
} else {
|
||||||
|
Sentry.captureException(error);
|
||||||
|
}
|
||||||
|
|
||||||
|
console.error("Error", error);
|
||||||
}
|
}
|
||||||
}, [error]);
|
}, [error]);
|
||||||
|
|
||||||
if (!isVisible || !error) return null;
|
useEffect(() => {
|
||||||
|
if (isVisible) {
|
||||||
|
setTimeoutId(
|
||||||
|
setTimeout(() => {
|
||||||
|
setIsVisible(false);
|
||||||
|
setTimeoutId(undefined);
|
||||||
|
}, 30000),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
if (!isVisible && timeoutId) {
|
||||||
|
clearTimeout(timeoutId);
|
||||||
|
}
|
||||||
|
}, [isVisible]);
|
||||||
|
|
||||||
|
if (!isVisible || !humanMessage) return null;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<button
|
<button
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
setIsVisible(false);
|
setIsVisible(false);
|
||||||
setError(null);
|
setIsVisible(false);
|
||||||
}}
|
}}
|
||||||
className="max-w-xs z-50 fixed bottom-5 right-5 md:bottom-10 md:right-10 border-solid bg-red-100 border border-red-400 text-red-700 px-4 py-3 rounded transition-opacity duration-300 ease-out opacity-100 hover:opacity-80 focus-visible:opacity-80 cursor-pointer transform hover:scale-105 focus-visible:scale-105"
|
className="max-w-xs z-50 fixed bottom-5 right-5 md:bottom-10 md:right-10 border-solid bg-red-100 border border-red-400 text-red-700 px-4 py-3 rounded transition-opacity duration-300 ease-out opacity-100 hover:opacity-80 focus-visible:opacity-80 cursor-pointer transform hover:scale-105 focus-visible:scale-105"
|
||||||
role="alert"
|
role="alert"
|
||||||
>
|
>
|
||||||
<span className="block sm:inline">{error?.message}</span>
|
<span className="block sm:inline">{humanMessage}</span>
|
||||||
</button>
|
</button>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -52,7 +52,7 @@ export default function Pagination(props: PaginationProps) {
|
|||||||
{pageNumbers.map((pageNumber) => (
|
{pageNumbers.map((pageNumber) => (
|
||||||
<button
|
<button
|
||||||
key={pageNumber}
|
key={pageNumber}
|
||||||
className={`w-10 h-10 rounded-full p-2 border rounded-full ${
|
className={`w-10 h-10 rounded-full p-2 border ${
|
||||||
page === pageNumber ? "border-gray-600" : "border-gray-300"
|
page === pageNumber ? "border-gray-600" : "border-gray-300"
|
||||||
} rounded`}
|
} rounded`}
|
||||||
onClick={() => handlePageChange(pageNumber)}
|
onClick={() => handlePageChange(pageNumber)}
|
||||||
@@ -62,7 +62,7 @@ export default function Pagination(props: PaginationProps) {
|
|||||||
))}
|
))}
|
||||||
|
|
||||||
<button
|
<button
|
||||||
className={`w-10 h-10 rounded-full p-2 border border-gray-300 rounded-full disabled:bg-white ${
|
className={`w-10 h-10 rounded-full p-2 border border-gray-300 disabled:bg-white ${
|
||||||
canGoNext ? "text-gray-500" : "text-gray-300"
|
canGoNext ? "text-gray-500" : "text-gray-300"
|
||||||
}`}
|
}`}
|
||||||
onClick={() => handlePageChange(page + 1)}
|
onClick={() => handlePageChange(page + 1)}
|
||||||
|
|||||||
@@ -45,7 +45,10 @@ const useCreateTranscript = (): CreateTranscript => {
|
|||||||
console.debug("New transcript created:", result);
|
console.debug("New transcript created:", result);
|
||||||
})
|
})
|
||||||
.catch((err) => {
|
.catch((err) => {
|
||||||
setError(err);
|
setError(
|
||||||
|
err,
|
||||||
|
"There was an issue creating a transcript, please try again.",
|
||||||
|
);
|
||||||
setErrorState(err);
|
setErrorState(err);
|
||||||
setLoading(false);
|
setLoading(false);
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -13,7 +13,6 @@ import { Topic } from "./webSocketTypes";
|
|||||||
import { AudioWaveform } from "../../api";
|
import { AudioWaveform } from "../../api";
|
||||||
import AudioInputsDropdown from "./audioInputsDropdown";
|
import AudioInputsDropdown from "./audioInputsDropdown";
|
||||||
import { Option } from "react-dropdown";
|
import { Option } from "react-dropdown";
|
||||||
import { useError } from "../../(errors)/errorContext";
|
|
||||||
import { waveSurferStyles } from "../../styles/recorder";
|
import { waveSurferStyles } from "../../styles/recorder";
|
||||||
import useMp3 from "./useMp3";
|
import useMp3 from "./useMp3";
|
||||||
|
|
||||||
@@ -51,7 +50,6 @@ export default function Recorder(props: RecorderProps) {
|
|||||||
const [activeTopic, setActiveTopic] = props.useActiveTopic;
|
const [activeTopic, setActiveTopic] = props.useActiveTopic;
|
||||||
const topicsRef = useRef(props.topics);
|
const topicsRef = useRef(props.topics);
|
||||||
const [showDevices, setShowDevices] = useState(false);
|
const [showDevices, setShowDevices] = useState(false);
|
||||||
const { setError } = useError();
|
|
||||||
|
|
||||||
// Function used to setup keyboard shortcuts for the streamdeck
|
// Function used to setup keyboard shortcuts for the streamdeck
|
||||||
const setupProjectorKeys = (): (() => void) => {
|
const setupProjectorKeys = (): (() => void) => {
|
||||||
@@ -73,9 +71,6 @@ export default function Recorder(props: RecorderProps) {
|
|||||||
if (!record.isRecording()) return;
|
if (!record.isRecording()) return;
|
||||||
handleRecClick();
|
handleRecClick();
|
||||||
break;
|
break;
|
||||||
case "%":
|
|
||||||
setError(new Error("Error triggered by '%' shortcut"));
|
|
||||||
break;
|
|
||||||
case "^":
|
case "^":
|
||||||
throw new Error("Unhandled Exception thrown by '^' shortcut");
|
throw new Error("Unhandled Exception thrown by '^' shortcut");
|
||||||
case "(":
|
case "(":
|
||||||
|
|||||||
@@ -65,7 +65,7 @@ const useMp3 = (protectedPath: boolean, id: string): Mp3Response => {
|
|||||||
});
|
});
|
||||||
})
|
})
|
||||||
.catch((err) => {
|
.catch((err) => {
|
||||||
setError(err);
|
setError(err, "There was an error loading the audio");
|
||||||
setErrorState(err);
|
setErrorState(err);
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ const useTopics = (protectedPath, id: string): TranscriptTopics => {
|
|||||||
console.debug("Transcript topics loaded:", result);
|
console.debug("Transcript topics loaded:", result);
|
||||||
})
|
})
|
||||||
.catch((err) => {
|
.catch((err) => {
|
||||||
setError(err);
|
setError(err, "There was an error loading the topics");
|
||||||
setErrorState(err);
|
setErrorState(err);
|
||||||
});
|
});
|
||||||
}, [id, api]);
|
}, [id, api]);
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ const useTranscript = (
|
|||||||
console.debug("Transcript Loaded:", result);
|
console.debug("Transcript Loaded:", result);
|
||||||
})
|
})
|
||||||
.catch((err) => {
|
.catch((err) => {
|
||||||
setError(err);
|
setError(err, "There was an error loading the transcript");
|
||||||
setErrorState(err);
|
setErrorState(err);
|
||||||
});
|
});
|
||||||
}, [id, !api]);
|
}, [id, !api]);
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ const useWaveform = (protectedPath, id: string): AudioWaveFormResponse => {
|
|||||||
console.debug("Transcript waveform loaded:", result);
|
console.debug("Transcript waveform loaded:", result);
|
||||||
})
|
})
|
||||||
.catch((err) => {
|
.catch((err) => {
|
||||||
setError(err);
|
setError(err, "There was an error loading the waveform");
|
||||||
setErrorState(err);
|
setErrorState(err);
|
||||||
});
|
});
|
||||||
}, [id, api]);
|
}, [id, api]);
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ const useWebRTC = (
|
|||||||
try {
|
try {
|
||||||
p = new Peer({ initiator: true, stream: stream });
|
p = new Peer({ initiator: true, stream: stream });
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
setError(error);
|
setError(error, "Error creating WebRTC");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -57,7 +57,7 @@ const useWebRTC = (
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
.catch((error) => {
|
.catch((error) => {
|
||||||
setError(error);
|
setError(error, "Error loading WebRTCOffer");
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ export const useWebSockets = (transcriptId: string | null): UseWebSockets => {
|
|||||||
const [finalSummary, setFinalSummary] = useState<FinalSummary>({
|
const [finalSummary, setFinalSummary] = useState<FinalSummary>({
|
||||||
summary: "",
|
summary: "",
|
||||||
});
|
});
|
||||||
const [status, setStatus] = useState<Status>({ value: "disconnected" });
|
const [status, setStatus] = useState<Status>({ value: "initial" });
|
||||||
const { setError } = useError();
|
const { setError } = useError();
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user