From 898caf143021c2e2c95e51b42fe30dae19f6f020 Mon Sep 17 00:00:00 2001
From: akanyan <alicechecker01@proton.me>
Date: Mon, 3 Mar 2025 15:50:53 +0100
Subject: [PATCH] feat: very silly error handling

---
 src/components/InstallButton.vue |  2 +-
 src/components/Options.vue       |  2 +-
 src/components/StartButton.vue   |  8 ++++++--
 src/components/UpdateButton.vue  |  3 +--
 src/invoke.ts                    | 26 ++++++++++++++++++++++++++
 src/stores.ts                    |  2 +-
 6 files changed, 36 insertions(+), 7 deletions(-)
 create mode 100644 src/invoke.ts

diff --git a/src/components/InstallButton.vue b/src/components/InstallButton.vue
index 72d5259..b26cab1 100644
--- a/src/components/InstallButton.vue
+++ b/src/components/InstallButton.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import Button from 'primevue/button';
-import { invoke } from '@tauri-apps/api/core';
+import { invoke } from '../invoke';
 import { Package } from '../types';
 import { pkgKey } from '../util';
 
diff --git a/src/components/Options.vue b/src/components/Options.vue
index 11b0514..71c437d 100644
--- a/src/components/Options.vue
+++ b/src/components/Options.vue
@@ -5,7 +5,7 @@ import InputNumber from 'primevue/inputnumber';
 import InputText from 'primevue/inputtext';
 import RadioButton from 'primevue/radiobutton';
 import Toggle from 'primevue/toggleswitch';
-import { invoke } from '@tauri-apps/api/core';
+import { invoke } from '../invoke';
 import { usePrfStore } from '../stores';
 
 const prf = usePrfStore();
diff --git a/src/components/StartButton.vue b/src/components/StartButton.vue
index 157ab0c..f9d96be 100644
--- a/src/components/StartButton.vue
+++ b/src/components/StartButton.vue
@@ -1,15 +1,19 @@
 <script setup lang="ts">
 import { Ref, ref } from 'vue';
 import Button from 'primevue/button';
-import { invoke } from '@tauri-apps/api/core';
 import { listen } from '@tauri-apps/api/event';
+import { invoke } from '../invoke';
 
 type StartStatus = 'ready' | 'preparing' | 'running';
 const startStatus: Ref<StartStatus> = ref('ready');
 
 const startline = async () => {
     startStatus.value = 'preparing';
-    await invoke('startline');
+    try {
+        await invoke('startline');
+    } catch (e) {
+        startStatus.value = 'ready';
+    }
 };
 
 const kill = async () => {
diff --git a/src/components/UpdateButton.vue b/src/components/UpdateButton.vue
index 74c732a..a0f68c6 100644
--- a/src/components/UpdateButton.vue
+++ b/src/components/UpdateButton.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import Button from 'primevue/button';
-import { invoke } from '@tauri-apps/api/core';
+import { invoke } from '../invoke';
 import { Package } from '../types';
 import { needsUpdate, pkgKey } from '../util';
 
@@ -16,7 +16,6 @@ const install = async () => {
     try {
         await invoke('install_package', { key: pkgKey(props.pkg) });
     } catch (err) {
-        console.error(err);
         if (props.pkg !== undefined) {
             props.pkg.js.busy = false;
         }
diff --git a/src/invoke.ts b/src/invoke.ts
new file mode 100644
index 0000000..f33e88c
--- /dev/null
+++ b/src/invoke.ts
@@ -0,0 +1,26 @@
+import {
+    InvokeArgs,
+    InvokeOptions,
+    invoke as real_invoke,
+} from '@tauri-apps/api/core';
+import { message } from '@tauri-apps/plugin-dialog';
+
+export const invoke = async <T>(
+    cmd: string,
+    args?: InvokeArgs,
+    options?: InvokeOptions
+): Promise<T> => {
+    try {
+        return await real_invoke(cmd, args, options);
+    } catch (e: unknown) {
+        if (typeof e === 'string') {
+            await message(`${cmd}: ${e}`, {
+                title: `Error`,
+                kind: 'error',
+            });
+        } else {
+            console.error(`Unresolved error: ${e}`);
+        }
+        throw e;
+    }
+};
diff --git a/src/stores.ts b/src/stores.ts
index 50a7ca5..8b1e854 100644
--- a/src/stores.ts
+++ b/src/stores.ts
@@ -1,7 +1,7 @@
 import { defineStore } from 'pinia';
-import { invoke } from '@tauri-apps/api/core';
 import { listen } from '@tauri-apps/api/event';
 import { open } from '@tauri-apps/plugin-dialog';
+import { invoke } from './invoke';
 import { Game, Package, Profile, ProfileMeta } from './types';
 import { changePrimaryColor, pkgKey } from './util';