From 07000a23d4f666ef4657889bb36cfa19f071e3b4 Mon Sep 17 00:00:00 2001
From: Chenlei Hu <huchenlei@proton.me>
Date: Tue, 7 Jan 2025 10:40:32 -0500
Subject: [PATCH] Wrap each init task with error handling (#2187)

---
 src/views/GraphView.vue | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/views/GraphView.vue b/src/views/GraphView.vue
index 71721f333..0fa3bb23a 100644
--- a/src/views/GraphView.vue
+++ b/src/views/GraphView.vue
@@ -24,6 +24,7 @@ import GlobalToast from '@/components/toast/GlobalToast.vue'
 import TopMenubar from '@/components/topbar/TopMenubar.vue'
 import { SERVER_CONFIG_ITEMS } from '@/constants/serverConfig'
 import { useCoreCommands } from '@/hooks/coreCommandHooks'
+import { useErrorHandling } from '@/hooks/errorHooks'
 import { i18n } from '@/i18n'
 import { api } from '@/scripts/api'
 import { app } from '@/scripts/app'
@@ -162,29 +163,30 @@ onBeforeUnmount(() => {
 
 useEventListener(window, 'keydown', useKeybindingService().keybindHandler)
 
+const { wrapWithErrorHandling, wrapWithErrorHandlingAsync } = useErrorHandling()
 const onGraphReady = () => {
   requestIdleCallback(
     () => {
       // Setting values now available after comfyApp.setup.
       // Load keybindings.
-      useKeybindingService().registerUserKeybindings()
+      wrapWithErrorHandling(useKeybindingService().registerUserKeybindings)()
 
       // Load server config
-      useServerConfigStore().loadServerConfig(
+      wrapWithErrorHandling(useServerConfigStore().loadServerConfig)(
         SERVER_CONFIG_ITEMS,
         settingStore.get('Comfy.Server.ServerConfigValues')
       )
 
       // Load model folders
-      useModelStore().loadModelFolders()
+      wrapWithErrorHandlingAsync(useModelStore().loadModelFolders)()
+
+      // Non-blocking load of node frequencies
+      wrapWithErrorHandlingAsync(useNodeFrequencyStore().loadNodeFrequencies)()
 
       // Node defs now available after comfyApp.setup.
       // Explicitly initialize nodeSearchService to avoid indexing delay when
       // node search is triggered
       useNodeDefStore().nodeSearchService.endsWithFilterStartSequence('')
-
-      // Non-blocking load of node frequencies
-      useNodeFrequencyStore().loadNodeFrequencies()
     },
     { timeout: 1000 }
   )