[Update] AdvancedSettings: OSC IP Address: Add error notifications.
Add 500 status error message.
This commit is contained in:
@@ -15,9 +15,7 @@ import {
|
|||||||
|
|
||||||
useDeepLAuthKey,
|
useDeepLAuthKey,
|
||||||
|
|
||||||
|
|
||||||
useOscIpAddress,
|
useOscIpAddress,
|
||||||
useOscPort,
|
|
||||||
} from "@logics_configs";
|
} from "@logics_configs";
|
||||||
import { ui_configs } from "../ui_configs";
|
import { ui_configs } from "../ui_configs";
|
||||||
|
|
||||||
@@ -35,9 +33,7 @@ export const _useBackendErrorHandling = () => {
|
|||||||
|
|
||||||
const { updateDeepLAuthKey, saveErrorDeepLAuthKey } = useDeepLAuthKey();
|
const { updateDeepLAuthKey, saveErrorDeepLAuthKey } = useDeepLAuthKey();
|
||||||
|
|
||||||
|
const { updateOscIpAddress } = useOscIpAddress();
|
||||||
const { saveErrorOscIpAddress } = useOscIpAddress();
|
|
||||||
const { saveErrorOscPort } = useOscPort();
|
|
||||||
|
|
||||||
const errorHandling_Backend = ({message, data, endpoint, _result}) => {
|
const errorHandling_Backend = ({message, data, endpoint, _result}) => {
|
||||||
switch (message) {
|
switch (message) {
|
||||||
@@ -118,12 +114,21 @@ export const _useBackendErrorHandling = () => {
|
|||||||
showNotification_Error(t("common_error.invalid_value_speaker_max_phrase"));
|
showNotification_Error(t("common_error.invalid_value_speaker_max_phrase"));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|
||||||
|
// Advanced Settings, error messages are set by Backend (EN only)
|
||||||
|
case "Invalid IP address":
|
||||||
|
updateOscIpAddress(data);
|
||||||
|
showNotification_Error(message);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case "Cannot set IP address":
|
||||||
|
updateOscIpAddress(data);
|
||||||
|
showNotification_Error(message);
|
||||||
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
// determine by endpoint, not message.
|
// determine by endpoint, not message.
|
||||||
if (endpoint === "/set/data/deepl_auth_key") saveErrorDeepLAuthKey({message, data, endpoint, _result});
|
if (endpoint === "/set/data/deepl_auth_key") saveErrorDeepLAuthKey({message, data, endpoint, _result});
|
||||||
if (endpoint === "/set/data/osc_ip_address") saveErrorOscIpAddress({message, data, endpoint, _result});
|
|
||||||
if (endpoint === "/set/data/osc_port") saveErrorOscPort({message, data, endpoint, _result});
|
|
||||||
|
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,9 +1,7 @@
|
|||||||
import { useStore_OscIpAddress } from "@store";
|
import { useStore_OscIpAddress } from "@store";
|
||||||
import { useStdoutToPython } from "@logics/useStdoutToPython";
|
import { useStdoutToPython } from "@logics/useStdoutToPython";
|
||||||
import { useNotificationStatus } from "@logics_common";
|
|
||||||
|
|
||||||
export const useOscIpAddress = () => {
|
export const useOscIpAddress = () => {
|
||||||
const { showNotification_Error } = useNotificationStatus();
|
|
||||||
const { asyncStdoutToPython } = useStdoutToPython();
|
const { asyncStdoutToPython } = useStdoutToPython();
|
||||||
const { currentOscIpAddress, updateOscIpAddress, pendingOscIpAddress } = useStore_OscIpAddress();
|
const { currentOscIpAddress, updateOscIpAddress, pendingOscIpAddress } = useStore_OscIpAddress();
|
||||||
|
|
||||||
@@ -17,17 +15,10 @@ export const useOscIpAddress = () => {
|
|||||||
asyncStdoutToPython("/set/data/osc_ip_address", osc_ip_address);
|
asyncStdoutToPython("/set/data/osc_ip_address", osc_ip_address);
|
||||||
};
|
};
|
||||||
|
|
||||||
const saveErrorOscIpAddress = ({data, message, _result}) => {
|
|
||||||
updateOscIpAddress(d => d.data);
|
|
||||||
showNotification_Error(_result);
|
|
||||||
};
|
|
||||||
|
|
||||||
return {
|
return {
|
||||||
currentOscIpAddress,
|
currentOscIpAddress,
|
||||||
getOscIpAddress,
|
getOscIpAddress,
|
||||||
updateOscIpAddress,
|
updateOscIpAddress,
|
||||||
setOscIpAddress,
|
setOscIpAddress,
|
||||||
|
|
||||||
saveErrorOscIpAddress,
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
@@ -525,7 +525,6 @@ export const useReceiveRoutes = () => {
|
|||||||
"/set/data/speaker_max_phrases": errorHandling_Backend,
|
"/set/data/speaker_max_phrases": errorHandling_Backend,
|
||||||
|
|
||||||
"/set/data/osc_ip_address": errorHandling_Backend,
|
"/set/data/osc_ip_address": errorHandling_Backend,
|
||||||
"/set/data/osc_port": errorHandling_Backend,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
@@ -558,7 +557,6 @@ export const useReceiveRoutes = () => {
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case 400:
|
case 400:
|
||||||
case 500:
|
|
||||||
const error_route = error_status_routes[parsed_data.endpoint];
|
const error_route = error_status_routes[parsed_data.endpoint];
|
||||||
if (error_route) {
|
if (error_route) {
|
||||||
error_route({
|
error_route({
|
||||||
@@ -571,6 +569,10 @@ export const useReceiveRoutes = () => {
|
|||||||
handleInvalidEndpoint(parsed_data);
|
handleInvalidEndpoint(parsed_data);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
case 500:
|
||||||
|
showNotification_Error(
|
||||||
|
`An error occurred. Please restart VRCT or contact the developers. ${JSON.stringify(parsed_data.result)}`, { hide_duration: null });
|
||||||
|
break;
|
||||||
|
|
||||||
case 348:
|
case 348:
|
||||||
// console.log(`from backend: %c ${JSON.stringify(parsed_data)}`, style_348);
|
// console.log(`from backend: %c ${JSON.stringify(parsed_data)}`, style_348);
|
||||||
|
|||||||
Reference in New Issue
Block a user