Merge branch 'develop' into plugins_system

# Conflicts:
#	src-tauri/tauri.conf.json

src-ui/logics/_useBackendErrorHandling.js

@@ -14,6 +14,8 @@ import {
     useSpeakerMaxWords,
 
     useDeepLAuthKey,
+
+    useOscIpAddress,
 } from "@logics_configs";
 import { ui_configs } from "../ui_configs";
 
@@ -29,14 +31,16 @@ export const _useBackendErrorHandling = () => {
     const { updateSpeakerPhraseTimeout } = useSpeakerPhraseTimeout();
     const { updateSpeakerMaxWords } = useSpeakerMaxWords();
 
-    const { updateDeepLAuthKey } = useDeepLAuthKey();
+    const { updateDeepLAuthKey, saveErrorDeepLAuthKey } = useDeepLAuthKey();
 
-    const errorHandling_Backend = ({message, data, endpoint}) => {
+    const { updateOscIpAddress } = useOscIpAddress();
+
+    const errorHandling_Backend = ({message, data, endpoint, _result}) => {
         switch (message) {
             case "No mic device detected":
                 showNotification_Error(t("common_error.no_device_mic"));
                 break;
-            case "No Speaker device detected":
+            case "No speaker device detected":
                 showNotification_Error(t("common_error.no_device_speaker"));
                 break;
 
@@ -47,9 +51,9 @@ export const _useBackendErrorHandling = () => {
                 break;
             case "Speaker energy threshold value is out of range":
                 showNotification_Error(t("common_error.threshold_invalid_value",
-                { min: ui_configs.speaker_threshold_min, max: ui_configs.speaker_threshold_max },
-            ));
-            break;
+                    { min: ui_configs.speaker_threshold_min, max: ui_configs.speaker_threshold_max },
+                ));
+                break;
 
             case "CTranslate2 weight download error":
                 showNotification_Error(t("common_error.failed_download_weight_ctranslate2"));
@@ -110,10 +114,23 @@ export const _useBackendErrorHandling = () => {
                 showNotification_Error(t("common_error.invalid_value_speaker_max_phrase"));
                 break;
 
-            default:
-                if (endpoint === "/set/data/deepl_auth_key") updateDeepLAuthKey(data);
+
+            // 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:
+                // determine by endpoint, not message.
+                if (endpoint === "/set/data/deepl_auth_key") saveErrorDeepLAuthKey({message, data, endpoint, _result});
+
+                break;
         }
 
     }

src-ui/logics/configs/advanced_settings/useOscPort.js

@@ -1,7 +1,9 @@
 import { useStore_OscPort } from "@store";
 import { useStdoutToPython } from "@logics/useStdoutToPython";
+import { useNotificationStatus } from "@logics_common";
 
 export const useOscPort = () => {
+    const { showNotification_Error } = useNotificationStatus();
     const { asyncStdoutToPython } = useStdoutToPython();
     const { currentOscPort, updateOscPort, pendingOscPort } = useStore_OscPort();
 
@@ -15,10 +17,17 @@ export const useOscPort = () => {
         asyncStdoutToPython("/set/data/osc_port", osc_port);
     };
 
+    const saveErrorOscPort = ({data, message, _result}) => {
+        updateOscPort(d => d.data);
+        showNotification_Error(_result);
+    };
+
     return {
         currentOscPort,
         getOscPort,
         updateOscPort,
         setOscPort,
+
+        saveErrorOscPort,
     };
 };

src-ui/logics/configs/translation/useDeepLAuthKey.js

@@ -18,22 +18,30 @@ export const useDeepLAuthKey = () => {
         pendingDeepLAuthKey();
         asyncStdoutToPython("/set/data/deepl_auth_key", selected_deepl_auth_key);
     };
-    const saveSuccessDeepLAuthKey = (saved_deepl_auth_key) => {
-        updateDeepLAuthKey(saved_deepl_auth_key);
-        showNotification_Success(t("config_page.translation.deepl_auth_key.auth_key_success"));
-    };
 
     const deleteDeepLAuthKey = () => {
         pendingDeepLAuthKey();
         asyncStdoutToPython("/delete/data/deepl_auth_key");
     };
 
+    const savedDeepLAuthKey = (data) => {
+        updateDeepLAuthKey(data);
+        showNotification_Success(t("config_page.translation.deepl_auth_key.auth_key_success"));
+    };
+
+    const saveErrorDeepLAuthKey = ({data, message}) => {
+        updateDeepLAuthKey(data);
+        showNotification_Error(message);
+    };
+
     return {
         currentDeepLAuthKey,
         getDeepLAuthKey,
         updateDeepLAuthKey,
         setDeepLAuthKey,
-        saveSuccessDeepLAuthKey,
         deleteDeepLAuthKey,
+
+        saveErrorDeepLAuthKey,
+        savedDeepLAuthKey,
     };
 };

src-ui/logics/useReceiveRoutes.js

@@ -148,7 +148,7 @@ export const useReceiveRoutes = () => {
     const { updateSpeakerPhraseTimeout } = useSpeakerPhraseTimeout();
     const { updateSpeakerMaxWords } = useSpeakerMaxWords();
 
-    const { updateDeepLAuthKey, saveSuccessDeepLAuthKey } = useDeepLAuthKey();
+    const { updateDeepLAuthKey, savedDeepLAuthKey } = useDeepLAuthKey();
     const { updateSelectedCTranslate2WeightType } = useSelectedCTranslate2WeightType();
     const {
         updateDownloadedCTranslate2WeightTypeStatus,
@@ -353,7 +353,7 @@ export const useReceiveRoutes = () => {
 
         // Translation
         "/get/data/deepl_auth_key": updateDeepLAuthKey,
-        "/set/data/deepl_auth_key": saveSuccessDeepLAuthKey,
+        "/set/data/deepl_auth_key": savedDeepLAuthKey,
         "/delete/data/deepl_auth_key": () => updateDeepLAuthKey(""),
 
         "/get/data/ctranslate2_weight_type": updateSelectedCTranslate2WeightType,
@@ -528,6 +528,8 @@ export const useReceiveRoutes = () => {
         "/set/data/speaker_record_timeout": errorHandling_Backend,
         "/set/data/speaker_phrase_timeout": errorHandling_Backend,
         "/set/data/speaker_max_phrases": errorHandling_Backend,
+
+        "/set/data/osc_ip_address": errorHandling_Backend,
     };
 
 
@@ -566,11 +568,16 @@ export const useReceiveRoutes = () => {
                         message: parsed_data.result.message,
                         data: parsed_data.result.data,
                         endpoint: parsed_data.endpoint,
+                        _result: parsed_data.result,
                     });
                 } else {
                     handleInvalidEndpoint(parsed_data);
                 }
                 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:
                 // console.log(`from backend: %c ${JSON.stringify(parsed_data)}`, style_348);

src-ui/logics/useStartPython.js

@@ -1,8 +1,13 @@
 import { Command } from "@tauri-apps/api/shell";
 import { store } from "@store";
 import { useReceiveRoutes } from "./useReceiveRoutes";
+import {
+    useNotificationStatus,
+} from "@logics_common";
+
 export const useStartPython = () => {
     const { receiveRoutes } = useReceiveRoutes();
+    const { showNotification_Success, showNotification_Error } = useNotificationStatus();
 
     const asyncStartPython = async () => {
         const command = Command.sidecar("bin/VRCT-sidecar");
@@ -16,7 +21,11 @@ export const useStartPython = () => {
                 console.log(error, line);
             }
         });
-        command.stderr.on("data", line => console.error("stderr:", line));
+        command.stderr.on("data", line => {
+            showNotification_Error(
+                `An error occurred. Please restart VRCT or contact the developers. The last line:${JSON.stringify(line)}`, { hide_duration: null });
+            console.error("stderr", line)
+        });
         const backend_subprocess = await command.spawn();
         store.backend_subprocess = backend_subprocess;
     };