From 46535aec69229442bdc0f1374e65645e78bf4cce Mon Sep 17 00:00:00 2001 From: Tnze Date: Thu, 16 Nov 2023 10:16:35 +0800 Subject: [PATCH] optimize error handling --- src/App.vue | 4 +++- src/components/designer/Page.vue | 1 + src/libs/Solver.ts | 32 ++++++++++++++++++++++++-------- 3 files changed, 28 insertions(+), 9 deletions(-) diff --git a/src/App.vue b/src/App.vue index 0a8d5753..50b5b2e5 100644 --- a/src/App.vue +++ b/src/App.vue @@ -51,7 +51,9 @@ watchEffect(() => { }) // Check update -onMounted(() => import('./update').then(x => x.checkUpdate($t, true))) +if (import.meta.env.VITE_BESTCRAFT_TARGET == "tauri") { + onMounted(() => import('./update').then(x => x.checkUpdate($t, true))) +} async function loadStorages() { if (import.meta.env.VITE_BESTCRAFT_TARGET == "tauri") { diff --git a/src/components/designer/Page.vue b/src/components/designer/Page.vue index 9ec40d98..53ac131c 100644 --- a/src/components/designer/Page.vue +++ b/src/components/designer/Page.vue @@ -40,6 +40,7 @@ const attributes = computed(() => { const errorMessage = ref() onErrorCaptured((err: unknown) => { + console.error(err) try { errorMessage.value = $t(String(err)) } catch { diff --git a/src/libs/Solver.ts b/src/libs/Solver.ts index f9839290..5a3c45e4 100644 --- a/src/libs/Solver.ts +++ b/src/libs/Solver.ts @@ -51,13 +51,21 @@ export async function create_solver( }; export async function destroy_solver(status: Status) { - let { invoke } = await pkgTauri - return invoke("destroy_solver", { status }); + if (import.meta.env.VITE_BESTCRAFT_TARGET == "tauri") { + let { invoke } = await pkgTauri + invoke("destroy_solver", { status }); + } else { + throw "solver-doesn-t-exist" + } }; export async function read_solver(status: Status): Promise { - let { invoke } = await pkgTauri - return invoke("read_solver", { status }); + if (import.meta.env.VITE_BESTCRAFT_TARGET == "tauri") { + let { invoke } = await pkgTauri + return invoke("read_solver", { status }); + } else { + throw "solver-doesn-t-exist" + } }; export async function rika_solve(status: Status): Promise { @@ -69,8 +77,12 @@ export async function rika_solve(status: Status): Promise { } export async function rika_solve_tnzever(status: Status, useManipulation: boolean, useWastNot: number, useObserve: boolean, reduceSteps: boolean): Promise { - let { invoke } = await pkgTauri - return invoke("rika_solve_tnzever", { status, useManipulation, useWastNot, useObserve, reduceSteps }) + if (import.meta.env.VITE_BESTCRAFT_TARGET == "tauri") { + let { invoke } = await pkgTauri + return invoke("rika_solve_tnzever", { status, useManipulation, useWastNot, useObserve, reduceSteps }) + } else { + throw "solver-doesn-t-exist" + } } export async function dfs_solve(status: Status, depth: number, specialist: boolean): Promise { @@ -90,8 +102,12 @@ export async function nq_solve(status: Status, depth: number, specialist: boolea } export async function reflect_solve(status: Status, useManipulation: boolean): Promise { - let { invoke } = await pkgTauri - return invoke("reflect_solve", { status, useManipulation }) + if (import.meta.env.VITE_BESTCRAFT_TARGET == "tauri") { + let { invoke } = await pkgTauri + return invoke("reflect_solve", { status, useManipulation }) + } else { + throw "solver-doesn-t-exist" + } } export function formatDuration(u: number): string {